From 7859d98a321354bcb374cfd468b749d888a2c239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Mon, 9 Nov 2020 16:10:18 -0500 Subject: [PATCH 001/318] [unpackfs] Skip overlay extended attributes The module preserves the extended attributes at rsync and the overlay filesystem stores extended attributes by inodes. The overlay filesystem keeps traces of the lower directory by encoding and storing its UUID to the attribute trusted.overlay.origin. If the index feature is on, that attribute is compared to the UUID of the lower directory at every subsequent mounts and causes mount to fail with ESTATE if it does not match. This filters the namespace trusted.overlay.* by using the rsync option --filter='-x trusted.overlay.*' to make sure the overlays extended attributes are not preserved. Fixes: # mount -t overlay -o lowerdir=...,upperdir,...,workdir= overlay /mnt/etc mount: /var/mnt/etc: mount(2) system call failed: Stale file handle. # dmesg (...) overlayfs: "xino" feature enabled using 32 upper inode bits. overlayfs: failed to verify origin (/etc, ino=524292, err=-116) overlayfs: failed to verify upper root origin --- src/modules/unpackfs/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/unpackfs/main.py b/src/modules/unpackfs/main.py index a573cf6e72..085034b8d9 100644 --- a/src/modules/unpackfs/main.py +++ b/src/modules/unpackfs/main.py @@ -181,7 +181,7 @@ def file_copy(source, entry, progress_cb): num_files_total_local = 0 num_files_copied = 0 # Gets updated through rsync output - args = ['rsync', '-aHAXr'] + args = ['rsync', '-aHAXr', '--filter=-x trusted.overlay.*'] args.extend(global_excludes()) if entry.excludeFile: args.extend(["--exclude-from=" + entry.excludeFile]) From e8238ca71307ac3b250b3edb848a4b21b4758850 Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Fri, 4 Dec 2020 23:01:06 +0530 Subject: [PATCH 002/318] Name added in copyright section --- src/calamares/CalamaresWindow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index a141317e01..103b69a907 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -4,6 +4,7 @@ * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot * SPDX-FileCopyrightText: 2018 Raul Rodrigo Segura (raurodse) * SPDX-FileCopyrightText: 2019 Collabora Ltd + * SPDX-FileCopyrightText: 2020 Anubhav Choudhary * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is Free Software: see the License-Identifier above. From ba514506bb6fe554ddc8c060ec8e971ec1ac2aae Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Sun, 6 Dec 2020 00:25:56 +0530 Subject: [PATCH 003/318] setting.conf template updated --- settings.conf | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/settings.conf b/settings.conf index 17e4d690c8..bd5b06bda7 100644 --- a/settings.conf +++ b/settings.conf @@ -2,7 +2,7 @@ # SPDX-License-Identifier: CC0-1.0 # # Configuration file for Calamares -# +# # This is the top-level configuration file for Calamares. # It specifies what modules will be used, as well as some # overall characteristics -- is this a setup program, or @@ -217,6 +217,14 @@ disable-cancel: false # YAML: boolean. disable-cancel-during-exec: false +# If this is set to true, the "Next" and "Back" button will be hidden once +# you start the 'Installation'. +# +# Default is false, but Calamares will complain if this is not explicitly set. +# +# YAML: boolean. +hide-back-and-next-during-exec: false + # If this is set to true, then once the end of the sequence has # been reached, the quit (done) button is clicked automatically # and Calamares will close. Default is false: the user will see From 03d1fe434c58ce0071a69d864481ae4ab8075a3e Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Sun, 6 Dec 2020 04:32:18 +0530 Subject: [PATCH 004/318] Navigation button hideability added --- src/calamares/calamares-navigation.qml | 4 ++-- src/libcalamares/Settings.cpp | 1 + src/libcalamares/Settings.h | 3 +++ src/libcalamaresui/ViewManager.cpp | 7 +++++++ src/libcalamaresui/ViewManager.h | 10 ++++++++++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/calamares/calamares-navigation.qml b/src/calamares/calamares-navigation.qml index 1319261759..937e355293 100644 --- a/src/calamares/calamares-navigation.qml +++ b/src/calamares/calamares-navigation.qml @@ -35,7 +35,7 @@ Rectangle { icon.name: ViewManager.backIcon; enabled: ViewManager.backEnabled; - visible: true; + visible: ViewManager.backAndNextVisible; onClicked: { ViewManager.back(); } } Button @@ -44,7 +44,7 @@ Rectangle { icon.name: ViewManager.nextIcon; enabled: ViewManager.nextEnabled; - visible: true; + visible: ViewManager.backAndNextVisible; onClicked: { ViewManager.next(); } } Button diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp index dcb5c70b0f..9453075b61 100644 --- a/src/libcalamares/Settings.cpp +++ b/src/libcalamares/Settings.cpp @@ -308,6 +308,7 @@ Settings::setConfiguration( const QByteArray& ba, const QString& explainName ) m_isSetupMode = requireBool( config, "oem-setup", !m_doChroot ); m_disableCancel = requireBool( config, "disable-cancel", false ); m_disableCancelDuringExec = requireBool( config, "disable-cancel-during-exec", false ); + m_hideBackAndNextDuringExec = requireBool( config, "hide-back-and-next-during-exec", false ); m_quitAtEnd = requireBool( config, "quit-at-end", false ); reconcileInstancesAndSequence(); diff --git a/src/libcalamares/Settings.h b/src/libcalamares/Settings.h index 0abf3b8669..b1a1c661c9 100644 --- a/src/libcalamares/Settings.h +++ b/src/libcalamares/Settings.h @@ -157,6 +157,8 @@ class DLLEXPORT Settings : public QObject /** @brief Temporary setting of disable-cancel: can't cancel during exec. */ bool disableCancelDuringExec() const { return m_disableCancelDuringExec; } + bool hideBackAndNextDuringExec() const { return m_hideBackAndNextDuringExec; } + /** @brief Is quit-at-end set? (Quit automatically when done) */ bool quitAtEnd() const { return m_quitAtEnd; } @@ -176,6 +178,7 @@ class DLLEXPORT Settings : public QObject bool m_promptInstall; bool m_disableCancel; bool m_disableCancelDuringExec; + bool m_hideBackAndNextDuringExec; bool m_quitAtEnd; }; diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 8094e52235..0c5987bb89 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -369,6 +369,7 @@ ViewManager::next() UPDATE_BUTTON_PROPERTY( backEnabled, false ) } updateCancelEnabled( !settings->disableCancel() && !( executing && settings->disableCancelDuringExec() ) ); + updateBackAndNextVisibility(!executing || !settings->hideBackAndNextDuringExec()); } else { @@ -528,6 +529,12 @@ ViewManager::updateCancelEnabled( bool enabled ) emit cancelEnabled( enabled ); } +void +ViewManager::updateBackAndNextVisibility( bool visible) +{ + UPDATE_BUTTON_PROPERTY( backAndNextVisible, visible ) +} + QVariant ViewManager::data( const QModelIndex& index, int role ) const { diff --git a/src/libcalamaresui/ViewManager.h b/src/libcalamaresui/ViewManager.h index 165358b76d..4fbcda39df 100644 --- a/src/libcalamaresui/ViewManager.h +++ b/src/libcalamaresui/ViewManager.h @@ -45,6 +45,8 @@ class UIDLLEXPORT ViewManager : public QAbstractListModel Q_PROPERTY( bool quitVisible READ quitVisible NOTIFY quitVisibleChanged FINAL ) + Q_PROPERTY( bool backAndNextVisible READ backAndNextVisible NOTIFY backAndNextVisibleChanged FINAL ) + ///@brief Sides on which the ViewManager has side-panels Q_PROPERTY( Qt::Orientations panelSides READ panelSides WRITE setPanelSides MEMBER m_panelSides ) @@ -144,6 +146,10 @@ public Q_SLOTS: return m_backIcon; ///< Name of the icon to show } + bool backAndNextVisible() const + { + return m_backAndNextVisible; ///< Is the quit-button to be enabled + } /** * @brief Probably quit * @@ -203,6 +209,7 @@ public Q_SLOTS: void backEnabledChanged( bool ) const; void backLabelChanged( QString ) const; void backIconChanged( QString ) const; + void backAndNextVisibleChanged( bool ) const; void quitEnabledChanged( bool ) const; void quitLabelChanged( QString ) const; @@ -217,6 +224,7 @@ public Q_SLOTS: void insertViewStep( int before, ViewStep* step ); void updateButtonLabels(); void updateCancelEnabled( bool enabled ); + void updateBackAndNextVisibility( bool visible ); inline bool currentStepValid() const { return ( 0 <= m_currentStep ) && ( m_currentStep < m_steps.length() ); } @@ -236,6 +244,8 @@ public Q_SLOTS: QString m_backLabel; QString m_backIcon; + bool m_backAndNextVisible = true; + bool m_quitEnabled = false; QString m_quitLabel; QString m_quitIcon; From 0f2320bd47e100b39e29a544f491675f62ef10a7 Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Mon, 7 Dec 2020 21:40:59 +0530 Subject: [PATCH 005/318] Initializing bools in settings.h --- src/libcalamares/Settings.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/libcalamares/Settings.h b/src/libcalamares/Settings.h index b1a1c661c9..4d3d2db3a1 100644 --- a/src/libcalamares/Settings.h +++ b/src/libcalamares/Settings.h @@ -172,14 +172,15 @@ class DLLEXPORT Settings : public QObject QString m_brandingComponentName; + // bools are initialized here according to default setting bool m_debug; - bool m_doChroot; - bool m_isSetupMode; - bool m_promptInstall; - bool m_disableCancel; - bool m_disableCancelDuringExec; - bool m_hideBackAndNextDuringExec; - bool m_quitAtEnd; + bool m_doChroot = true; + bool m_isSetupMode = false; + bool m_promptInstall = false; + bool m_disableCancel = false; + bool m_disableCancelDuringExec = false; + bool m_hideBackAndNextDuringExec=false; + bool m_quitAtEnd = false; }; } // namespace Calamares From 3f0612b4ada4a895f29613a46acfe57a5de92418 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Mon, 7 Dec 2020 22:30:57 +0200 Subject: [PATCH 006/318] Use different location for swapfile on btrfs root --- src/modules/fstab/main.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index 6c2168a8e1..8b5deecb17 100644 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -319,14 +319,19 @@ def create_swapfile(root_mount_point, root_btrfs): The swapfile-creation covers progress from 0.2 to 0.5 """ libcalamares.job.setprogress(0.2) - swapfile_path = os.path.join(root_mount_point, "swapfile") - with open(swapfile_path, "wb") as f: - pass if root_btrfs: + # btrfs swapfiles must reside on a subvolume that is not snapshotted to prevent file system corruption + swapfile_path = os.path.join(root_mount_point, "swap/swapfile") + with open(swapfile_path, "wb") as f: + pass o = subprocess.check_output(["chattr", "+C", swapfile_path]) libcalamares.utils.debug("swapfile attributes: {!s}".format(o)) o = subprocess.check_output(["btrfs", "property", "set", swapfile_path, "compression", "none"]) libcalamares.utils.debug("swapfile compression: {!s}".format(o)) + else: + swapfile_path = os.path.join(root_mount_point, "swapfile") + with open(swapfile_path, "wb") as f: + pass # Create the swapfile; swapfiles are small-ish zeroes = bytes(16384) with open(swapfile_path, "wb") as f: From 80a538665e3837fd16cdf6b9ac667d2850dd49fc Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Mon, 7 Dec 2020 22:39:21 +0200 Subject: [PATCH 007/318] Generate entry for subvolume @swap --- src/modules/fstab/main.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index 8b5deecb17..9827198cec 100644 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -183,7 +183,7 @@ def generate_fstab(self): print(FSTAB_HEADER, file=fstab_file) for partition in self.partitions: - # Special treatment for a btrfs root with @ and @home + # Special treatment for a btrfs root with @, @home and @swap # subvolumes if (partition["fs"] == "btrfs" and partition["mountPoint"] == "/"): @@ -206,6 +206,13 @@ def generate_fstab(self): dct = self.generate_fstab_line_info(home_entry) if dct: self.print_fstab_line(dct, file=fstab_file) + elif line.endswith(b'path @swap'): + swap_part_entry = partition + swap_part_entry["mountPoint"] = "/swap" + swap_part_entry["subvol"] = "@swap" + dct = self.generate_fstab_line_info(swap_part_entry) + if dct: + self.print_fstab_line(dct, file=fstab_file) else: dct = self.generate_fstab_line_info(partition) From 97eb32bf5c9e6521780dc95fa9e17c203fb58dcb Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Mon, 7 Dec 2020 22:47:32 +0200 Subject: [PATCH 008/318] Correct the path of swapfile on btrfs --- src/modules/fstab/main.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index 9827198cec..6977ccad18 100644 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -386,7 +386,12 @@ def run(): swap_choice = swap_choice.get( "swap", None ) if swap_choice and swap_choice == "file": # There's no formatted partition for it, so we'll sneak in an entry - partitions.append( dict(fs="swap", mountPoint=None, claimed=True, device="/swapfile", uuid=None) ) + root_partitions = [ p["fs"].lower() for p in partitions if p["mountPoint"] == "/" ] + root_btrfs = (root_partitions[0] == "btrfs") if root_partitions else False + if root_btrfs: + partitions.append( dict(fs="swap", mountPoint=None, claimed=True, device="/swap/swapfile", uuid=None) ) + else: + partitions.append( dict(fs="swap", mountPoint=None, claimed=True, device="/swapfile", uuid=None) ) else: swap_choice = None From b180cbd47d88379d9002956fe678e0c2d2278e19 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Mon, 7 Dec 2020 22:52:39 +0200 Subject: [PATCH 009/318] Generate a subvolume for swap if swapfile is used --- src/modules/mount/main.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 1313fca49b..8e7dce7ba0 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -77,6 +77,7 @@ def mount_partition(root_mount_point, partition, partitions): # for the root mount point. # If a separate /home partition isn't defined, we also create # a subvolume "@home". + # If a swapfile is used, we also create a subvolume "@swap". # Finally we remount all of the above on the correct paths. if fstype == "btrfs" and partition["mountPoint"] == '/': has_home_mount_point = False @@ -94,6 +95,13 @@ def mount_partition(root_mount_point, partition, partitions): subprocess.check_call(['btrfs', 'subvolume', 'create', root_mount_point + '/@home']) + swap_choice = global_storage.value( "partitionChoices" ) + if swap_choice: + swap_choice = swap_choice.get( "swap", None ) + if swap_choice and swap_choice == "file": + subprocess.check_call(['btrfs', 'subvolume', 'create', + root_mount_point + '/@swap']) + subprocess.check_call(["umount", "-v", root_mount_point]) device = partition["device"] From 727f7859b7a1399144664c429cc832f7be9fb30c Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Mon, 7 Dec 2020 22:59:29 +0200 Subject: [PATCH 010/318] Mount @swap to /swap when needed --- src/modules/mount/main.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 8e7dce7ba0..89e1328ebf 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -87,6 +87,12 @@ def mount_partition(root_mount_point, partition, partitions): if p["mountPoint"] == "/home": has_home_mount_point = True break + needs_swap_subvolume = False + swap_choice = global_storage.value( "partitionChoices" ) + if swap_choice: + swap_choice = swap_choice.get( "swap", None ) + if swap_choice and swap_choice == "file": + needs_swap_subvolume = True subprocess.check_call(['btrfs', 'subvolume', 'create', root_mount_point + '/@']) @@ -94,12 +100,8 @@ def mount_partition(root_mount_point, partition, partitions): if not has_home_mount_point: subprocess.check_call(['btrfs', 'subvolume', 'create', root_mount_point + '/@home']) - - swap_choice = global_storage.value( "partitionChoices" ) - if swap_choice: - swap_choice = swap_choice.get( "swap", None ) - if swap_choice and swap_choice == "file": - subprocess.check_call(['btrfs', 'subvolume', 'create', + if needs_swap_subvolume: + subprocess.check_call(['btrfs', 'subvolume', 'create', root_mount_point + '/@swap']) subprocess.check_call(["umount", "-v", root_mount_point]) @@ -121,6 +123,13 @@ def mount_partition(root_mount_point, partition, partitions): fstype, ",".join(["subvol=@home", partition.get("options", "")])) != 0: libcalamares.utils.warning("Cannot mount {}".format(device)) + + if needs_swap_subvolume: + if libcalamares.utils.mount(device, + root_mount_point + "/swap", + fstype, + ",".join(["subvol=@swap", partition.get("options", "")])) != 0: + libcalamares.utils.warning("Cannot mount {}".format(device)) def run(): From e3a41571f0b8e95d2387bf10a8f81045b561aa92 Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Tue, 8 Dec 2020 18:19:14 +0530 Subject: [PATCH 011/318] Spacing added --- src/libcalamaresui/ViewManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 0c5987bb89..a661c37501 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -369,7 +369,7 @@ ViewManager::next() UPDATE_BUTTON_PROPERTY( backEnabled, false ) } updateCancelEnabled( !settings->disableCancel() && !( executing && settings->disableCancelDuringExec() ) ); - updateBackAndNextVisibility(!executing || !settings->hideBackAndNextDuringExec()); + updateBackAndNextVisibility( !( executing && !settings->hideBackAndNextDuringExec() ) ); } else { From b7a27b3f9ff307d854e3f60e52ea32fcc0b96106 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 9 Dec 2020 11:35:42 +0100 Subject: [PATCH 012/318] Changes: post-release housekeeping --- CHANGES | 12 ++++++++++++ CMakeLists.txt | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 84b9e39379..b3bf7f53da 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,18 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. +# 3.2.36 (unreleased) # + +This release contains contributions from (alphabetically by first name): + - No external contributors yet + +## Core ## + - No core changes yet + +## Modules ## + - No module changes yet + + # 3.2.35.1 (2020-12-07) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index c7c59a2019..9768238054 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,11 +41,11 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.35.1 + VERSION 3.2.36 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development ### OPTIONS # From 2ccd5a2043003024a801e3d41f4604cd3a60ebf0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 14 Dec 2020 16:17:32 +0100 Subject: [PATCH 013/318] Docs: explain about loadmodule The Python-specific `testmodule.py` was replaced by the more general `loadmodule`. FIXES #1596 --- src/modules/README.md | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/src/modules/README.md b/src/modules/README.md index 89085e54ee..d3611448c0 100644 --- a/src/modules/README.md +++ b/src/modules/README.md @@ -180,6 +180,11 @@ a `CMakeLists.txt` with a `calamares_add_plugin` call. It will be picked up automatically by our CMake magic. The `module.desc` file is not recommended: nearly all cases can be described in CMake. +Modules can be tested with the `loadmodule` testing executable in +the build directory. See the section on [testing modules](#testing-modules) +for more details. + + ### C++ Jobmodule **TODO:** this needs documentation @@ -258,8 +263,10 @@ All code in Python job modules must obey PEP8, the only exception are `libcalamares.globalstorage` keys, which should always be camelCaseWithLowerCaseInitial to match the C++ identifier convention. -For testing and debugging we provide the `testmodule.py` script which -fakes a limited Calamares Python environment for running a single jobmodule. +Modules can be tested with the `loadmodule` testing executable in +the build directory. See the section on [testing modules](#testing-modules) +for more details. + ### Python Jobmodule @@ -301,3 +308,29 @@ The module-descriptor key *command* should have a string as value, which is passed to the shell -- remember to quote it properly. It is generally recommended to use a *shellprocess* job module instead (less configuration, easier to have multiple instances). + + +## Testing Modules + +For testing purposes there is an executable `loadmodule` which is +built, but not installed. It can be found in the build directory. +The `loadmodule` executable behaves like single-module Calamares: +it loads global configuration, job configuration, and then runs +a single module which may be a C++ module or a Python module, +a Job or a ViewModule. + +The same application can also be used to test translations, +branding, and slideshows, without starting up a whole Calamares +each time. It is possible to run multiple `loadmodule` executables +at the same time (Calamares tries to enforce that it runs only +once). + +The following arguments can be used with `loadmodule` +(there are more; run `loadmodule --help` for a complete list): + - `--global` takes a filename and reads the file to provide data in + global storage. The file must be YAML-formatted. + - `--job` takes a filename and reads that to provide the job + configuration (e.g. the `.conf` file for the module). + - `--ui` runs a view module with a UI. Without this option, + view modules are run as jobs, and most of them are not + prepared for that, and will crash. From 271122865faf4885f226092ce1267ce3270f9e37 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Sun, 20 Dec 2020 01:27:45 +0200 Subject: [PATCH 014/318] define global storage --- src/modules/mount/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 89e1328ebf..3982176df5 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -38,6 +38,7 @@ def mount_partition(root_mount_point, partition, partitions): """ # Create mount point with `+` rather than `os.path.join()` because # `partition["mountPoint"]` starts with a '/'. + global_storage = libcalamares.globalstorage raw_mount_point = partition["mountPoint"] if not raw_mount_point: return From c963d8905fb37c7f87495035a7af6d3c52dbb89e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 21 Dec 2020 17:24:06 +0100 Subject: [PATCH 015/318] [netinstall] Merge the two descriptions of *immutable* --- src/modules/netinstall/netinstall.conf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/modules/netinstall/netinstall.conf b/src/modules/netinstall/netinstall.conf index a9243510b2..c377b526e3 100644 --- a/src/modules/netinstall/netinstall.conf +++ b/src/modules/netinstall/netinstall.conf @@ -162,13 +162,14 @@ label: # Defaults to false. If not set in a subgroup (see below), inherits from # the parent group. # - *immutable*: if true, the state of the group (and all its subgroups) -# cannot be changed; it really only makes sense in combination -# with *selected* set to true. This only affects the user-interface. +# cannot be changed; no packages can be selected or deselected. No +# checkboxes are show for the group. Setting *immutable* to true +# really only makes sense in combination with *selected* set to true, +# so that the packages will be installed. (Setting a group to immutable +# can be seen as removing it from the user-interface.) # - *expanded*: if true, the group is shown in an expanded form (that is, # not-collapsed) in the treeview on start. This only affects the user- # interface. Only top-level groups are show expanded-initially. -# - *immutable*: if true, the group cannot be changed (packages selected -# or deselected) and no checkboxes are shown for the group. # - *subgroups*: if present this follows the same structure as the top level # groups, allowing sub-groups of packages to an arbitary depth. # - *pre-install*: an optional command to run within the new system before From 1c285f011b5067c75f2812343c20a8d2eb457903 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 22 Dec 2020 16:03:51 +0100 Subject: [PATCH 016/318] [libcalamares] Export partition-syncer symbols --- src/libcalamares/partition/Sync.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/partition/Sync.h b/src/libcalamares/partition/Sync.h index 8bb516214d..bcb2832ede 100644 --- a/src/libcalamares/partition/Sync.h +++ b/src/libcalamares/partition/Sync.h @@ -11,6 +11,8 @@ #ifndef PARTITION_SYNC_H #define PARTITION_SYNC_H +#include "DllMacro.h" + namespace CalamaresUtils { namespace Partition @@ -24,10 +26,10 @@ namespace Partition * are sensitive, and systemd tends to keep disks busy after a change * for a while). */ -void sync(); +DLLEXPORT void sync(); /** @brief RAII class for calling sync() */ -struct Syncer +struct DLLEXPORT Syncer { ~Syncer() { sync(); } }; From 9e6bddf31a61b5f1399c44d20e8c085b5a985f34 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 22 Dec 2020 16:05:20 +0100 Subject: [PATCH 017/318] [partition] Add new AutoMount-manipulating helpers --- src/libcalamares/CMakeLists.txt | 8 +++ src/libcalamares/partition/AutoMount.cpp | 89 ++++++++++++++++++++++++ src/libcalamares/partition/AutoMount.h | 48 +++++++++++++ 3 files changed, 145 insertions(+) create mode 100644 src/libcalamares/partition/AutoMount.cpp create mode 100644 src/libcalamares/partition/AutoMount.h diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 3964eb3e60..fd3a678c3d 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -77,6 +77,14 @@ set( libSources utils/Yaml.cpp ) +### OPTIONAL Automount support (requires dbus) +# +# +if( Qt5DBus_FOUND) + list( APPEND libSources partition/AutoMount.cpp ) + list( APPEND OPTIONAL_PRIVATE_LIBRARIES Qt5::DBus ) +endif() + ### OPTIONAL Python support # # diff --git a/src/libcalamares/partition/AutoMount.cpp b/src/libcalamares/partition/AutoMount.cpp new file mode 100644 index 0000000000..29fbfea5f0 --- /dev/null +++ b/src/libcalamares/partition/AutoMount.cpp @@ -0,0 +1,89 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2020 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + */ + +#include "AutoMount.h" + +#include "utils/Logger.h" + +#include + +namespace CalamaresUtils +{ +namespace Partition +{ + +struct AutoMountInfo +{ + bool wasSolidModuleAutoLoaded = false; +}; + +static inline QDBusMessage +kdedCall( const QString& method ) +{ + return QDBusMessage::createMethodCall( + QStringLiteral( "org.kde.kded5" ), QStringLiteral( "/kded" ), QStringLiteral( "org.kde.kded5" ), method ); +} + +// This code comes, roughly, from the KCM for removable devices. +static void +enableSolidAutoMount( QDBusConnection& dbus, bool enable ) +{ + const auto moduleName = QVariant( QStringLiteral( "device_automounter" ) ); + + // Stop module from auto-loading + { + auto msg = kdedCall( QStringLiteral( "setModuleAutoloading" ) ); + msg.setArguments( { moduleName, QVariant( enable ) } ); + dbus.call( msg, QDBus::NoBlock ); + } + + // Stop module + { + auto msg = kdedCall( enable ? QStringLiteral( "loadModule" ) : QStringLiteral( "unloadModule" ) ); + msg.setArguments( { moduleName } ); + dbus.call( msg, QDBus::NoBlock ); + } +} + +static void +querySolidAutoMount( QDBusConnection& dbus, AutoMountInfo& info ) +{ + const auto moduleName = QVariant( QStringLiteral( "device_automounter" ) ); + + // Find previous setting; this **does** need to block + auto msg = kdedCall( QStringLiteral( "isModuleAutoloaded" ) ); + msg.setArguments( { moduleName } ); + QDBusMessage r = dbus.call( msg, QDBus::Block ); + if ( r.type() == QDBusMessage::ReplyMessage ) + { + auto arg = r.arguments(); + cDebug() << arg; + info.wasSolidModuleAutoLoaded = false; + } +} + +std::unique_ptr< AutoMountInfo > +automountDisable() +{ + auto u = std::make_unique< AutoMountInfo >(); + QDBusConnection dbus = QDBusConnection::sessionBus(); + querySolidAutoMount( dbus, *u ); + enableSolidAutoMount( dbus, false ); + return u; +} + + +void +automountRestore( std::unique_ptr< AutoMountInfo >&& t ) +{ + QDBusConnection dbus = QDBusConnection::sessionBus(); + enableSolidAutoMount( dbus, t->wasSolidModuleAutoLoaded ); +} + +} // namespace Partition +} // namespace CalamaresUtils diff --git a/src/libcalamares/partition/AutoMount.h b/src/libcalamares/partition/AutoMount.h new file mode 100644 index 0000000000..ecb1780a0e --- /dev/null +++ b/src/libcalamares/partition/AutoMount.h @@ -0,0 +1,48 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2020 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + * + */ + +#ifndef PARTITION_AUTOMOUNT_H +#define PARTITION_AUTOMOUNT_H + +#include "DllMacro.h" + +#include + +namespace CalamaresUtils +{ +namespace Partition +{ + +struct AutoMountInfo; + +/** @brief Disable automount + * + * Various subsystems can do "agressive automount", which can get in the + * way of partitioning actions. In particular, Solid can be configured + * to automount every device it sees, and partitioning happens in multiple + * steps (create table, create partition, set partition flags) which are + * blocked if the partition gets mounted partway through the operation. + * + * Returns an opaque structure which can be passed to automountRestore() + * to return the system to the previously-configured automount settings. + */ +DLLEXPORT std::unique_ptr< AutoMountInfo > automountDisable(); + +/** @brief Restore automount settings + * + * Pass the value returned from automountDisable() to restore the + * previous settings. + */ +DLLEXPORT void automountRestore( std::unique_ptr< AutoMountInfo >&& t ); + +} // namespace Partition +} // namespace CalamaresUtils + +#endif From f0a33a235c1bf7d29fa2c08c8120acac8b88c6d0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 22 Dec 2020 21:23:50 +0100 Subject: [PATCH 018/318] [libcalamares] Make automountDisable() more flexible --- src/libcalamares/partition/AutoMount.cpp | 4 ++-- src/libcalamares/partition/AutoMount.h | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libcalamares/partition/AutoMount.cpp b/src/libcalamares/partition/AutoMount.cpp index 29fbfea5f0..9846629600 100644 --- a/src/libcalamares/partition/AutoMount.cpp +++ b/src/libcalamares/partition/AutoMount.cpp @@ -68,12 +68,12 @@ querySolidAutoMount( QDBusConnection& dbus, AutoMountInfo& info ) } std::unique_ptr< AutoMountInfo > -automountDisable() +automountDisable( bool disable ) { auto u = std::make_unique< AutoMountInfo >(); QDBusConnection dbus = QDBusConnection::sessionBus(); querySolidAutoMount( dbus, *u ); - enableSolidAutoMount( dbus, false ); + enableSolidAutoMount( dbus, !disable ); return u; } diff --git a/src/libcalamares/partition/AutoMount.h b/src/libcalamares/partition/AutoMount.h index ecb1780a0e..b77bdbae65 100644 --- a/src/libcalamares/partition/AutoMount.h +++ b/src/libcalamares/partition/AutoMount.h @@ -30,10 +30,13 @@ struct AutoMountInfo; * steps (create table, create partition, set partition flags) which are * blocked if the partition gets mounted partway through the operation. * + * @param disable set this to false to reverse the sense of the function + * call and force *enabling* automount, instead. + * * Returns an opaque structure which can be passed to automountRestore() * to return the system to the previously-configured automount settings. */ -DLLEXPORT std::unique_ptr< AutoMountInfo > automountDisable(); +DLLEXPORT std::unique_ptr< AutoMountInfo > automountDisable( bool disable = true ); /** @brief Restore automount settings * From 1c4bf58fb459c58a2f18c302c724aa44ddf14573 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 22 Dec 2020 21:25:00 +0100 Subject: [PATCH 019/318] [libcalamares] automount-manipulation test-program --- src/libcalamares/CMakeLists.txt | 5 +++ src/libcalamares/partition/calautomount.cpp | 48 +++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 src/libcalamares/partition/calautomount.cpp diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index fd3a678c3d..87eb387fae 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -260,3 +260,8 @@ calamares_add_test( add_executable( test_geoip geoip/test_geoip.cpp ${geoip_src} ) target_link_libraries( test_geoip calamares Qt5::Network yamlcpp ) calamares_automoc( test_geoip ) + +if ( Qt5DBus_FOUND ) + add_executable( calautomount partition/calautomount.cpp ) + target_link_libraries( calautomount calamares Qt5::DBus ) +endif() diff --git a/src/libcalamares/partition/calautomount.cpp b/src/libcalamares/partition/calautomount.cpp new file mode 100644 index 0000000000..3eb95be089 --- /dev/null +++ b/src/libcalamares/partition/calautomount.cpp @@ -0,0 +1,48 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2020 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + * + */ + +/** @brief Command-line tool to enable or disable automounting + * + * This application uses Calamares methods to enable or disable + * automount settings in the running system. This can be used to + * test the automount-manipulating code without running + * a full Calamares or doing an installation. + * + */ + +static const char usage[] = "Usage: calautomount <-e|-d>\n" +"\n" +"Enables (if `-e` is passed as command-line option) or\n" +"Disables (if `-d` is passed as command-line option)\n" +"\n" +"automounting of disks in the host system as best it can.\n" +"Exits with code 0 on success or 1 if an unknown option is\n" +"passed on the command-line.\n\n"; + +#include "AutoMount.h" +#include "Sync.h" + +#include +#include + +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + + if ((argc != 2) || (argv[1][0] != '-') || (argv[1][1] !='e' && argv[1][1] !='d')) + { + qWarning() << usage; + return 1; + } + + CalamaresUtils::Partition::automountDisable( argv[1][1] == 'd'); + + return 0; +} From 3150785ff1aecc4b971ab8faa597d5f4ec6eed02 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 22 Dec 2020 21:29:49 +0100 Subject: [PATCH 020/318] [libcalamares] Use shared_ptr instead of unique_ptr The value inside a unique_ptr can't be opaque, it needs to be known at any site where the pointer may be deleted. shared_ptr does not have that (deletion is part of the shared_ptr object, which is larger than the unique_ptr) and so can be used for opaque deletions. --- src/libcalamares/partition/AutoMount.cpp | 6 +++--- src/libcalamares/partition/AutoMount.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libcalamares/partition/AutoMount.cpp b/src/libcalamares/partition/AutoMount.cpp index 9846629600..0fc2530678 100644 --- a/src/libcalamares/partition/AutoMount.cpp +++ b/src/libcalamares/partition/AutoMount.cpp @@ -67,10 +67,10 @@ querySolidAutoMount( QDBusConnection& dbus, AutoMountInfo& info ) } } -std::unique_ptr< AutoMountInfo > +std::shared_ptr< AutoMountInfo > automountDisable( bool disable ) { - auto u = std::make_unique< AutoMountInfo >(); + auto u = std::make_shared< AutoMountInfo >(); QDBusConnection dbus = QDBusConnection::sessionBus(); querySolidAutoMount( dbus, *u ); enableSolidAutoMount( dbus, !disable ); @@ -79,7 +79,7 @@ automountDisable( bool disable ) void -automountRestore( std::unique_ptr< AutoMountInfo >&& t ) +automountRestore( std::shared_ptr< AutoMountInfo >&& t ) { QDBusConnection dbus = QDBusConnection::sessionBus(); enableSolidAutoMount( dbus, t->wasSolidModuleAutoLoaded ); diff --git a/src/libcalamares/partition/AutoMount.h b/src/libcalamares/partition/AutoMount.h index b77bdbae65..a9a88e3205 100644 --- a/src/libcalamares/partition/AutoMount.h +++ b/src/libcalamares/partition/AutoMount.h @@ -36,14 +36,14 @@ struct AutoMountInfo; * Returns an opaque structure which can be passed to automountRestore() * to return the system to the previously-configured automount settings. */ -DLLEXPORT std::unique_ptr< AutoMountInfo > automountDisable( bool disable = true ); +DLLEXPORT std::shared_ptr< AutoMountInfo > automountDisable( bool disable = true ); /** @brief Restore automount settings * * Pass the value returned from automountDisable() to restore the * previous settings. */ -DLLEXPORT void automountRestore( std::unique_ptr< AutoMountInfo >&& t ); +DLLEXPORT void automountRestore( std::shared_ptr< AutoMountInfo >&& t ); } // namespace Partition } // namespace CalamaresUtils From d74bdbcfd0d6b10dd698abd27034b81f5b5acc61 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 22 Dec 2020 22:07:17 +0100 Subject: [PATCH 021/318] [libcalamares] coding-style, logging in calautomount --- src/libcalamares/partition/calautomount.cpp | 26 ++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/libcalamares/partition/calautomount.cpp b/src/libcalamares/partition/calautomount.cpp index 3eb95be089..a91fc3ddab 100644 --- a/src/libcalamares/partition/calautomount.cpp +++ b/src/libcalamares/partition/calautomount.cpp @@ -18,31 +18,35 @@ */ static const char usage[] = "Usage: calautomount <-e|-d>\n" -"\n" -"Enables (if `-e` is passed as command-line option) or\n" -"Disables (if `-d` is passed as command-line option)\n" -"\n" -"automounting of disks in the host system as best it can.\n" -"Exits with code 0 on success or 1 if an unknown option is\n" -"passed on the command-line.\n\n"; + "\n" + "Enables (if `-e` is passed as command-line option) or\n" + "Disables (if `-d` is passed as command-line option)\n" + "\n" + "automounting of disks in the host system as best it can.\n" + "Exits with code 0 on success or 1 if an unknown option is\n" + "passed on the command-line.\n\n"; #include "AutoMount.h" #include "Sync.h" +#include "utils/Logger.h" #include #include -int main(int argc, char **argv) +int +main( int argc, char** argv ) { - QCoreApplication app(argc, argv); + QCoreApplication app( argc, argv ); - if ((argc != 2) || (argv[1][0] != '-') || (argv[1][1] !='e' && argv[1][1] !='d')) + if ( ( argc != 2 ) || ( argv[ 1 ][ 0 ] != '-' ) || ( argv[ 1 ][ 1 ] != 'e' && argv[ 1 ][ 1 ] != 'd' ) ) { qWarning() << usage; return 1; } - CalamaresUtils::Partition::automountDisable( argv[1][1] == 'd'); + Logger::setupLogfile(); + Logger::setupLogLevel( Logger::LOGDEBUG ); + CalamaresUtils::Partition::automountDisable( argv[ 1 ][ 1 ] == 'd' ); return 0; } From a3eae323f1982945f6e807b4fb345b67d5c73417 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 22 Dec 2020 22:08:23 +0100 Subject: [PATCH 022/318] [libcalamares] Rename test-executable: avoid clashes with 'cala' --- src/libcalamares/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 87eb387fae..700eff37b4 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -262,6 +262,6 @@ target_link_libraries( test_geoip calamares Qt5::Network yamlcpp ) calamares_automoc( test_geoip ) if ( Qt5DBus_FOUND ) - add_executable( calautomount partition/calautomount.cpp ) - target_link_libraries( calautomount calamares Qt5::DBus ) + add_executable( test_automount partition/calautomount.cpp ) + target_link_libraries( test_automount calamares Qt5::DBus ) endif() From 132ff59d9c8b20147d3e16112c70998b59b05c69 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 5 Jan 2021 23:58:52 +0100 Subject: [PATCH 023/318] [libcalamares] Make running commands less chatty If there's no output, don't mention it; don't mention failure modes if the command was successful. --- .../utils/CalamaresUtilsSystem.cpp | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp index dad6e5b127..841d529694 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp +++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp @@ -201,12 +201,29 @@ System::runCommand( System::RunLocation location, } auto r = process.exitCode(); - cDebug() << Logger::SubEntry << "Finished. Exit code:" << r; bool showDebug = ( !Calamares::Settings::instance() ) || ( Calamares::Settings::instance()->debugMode() ); - if ( ( r != 0 ) || showDebug ) + if ( r == 0 ) { - cDebug() << Logger::SubEntry << "Target cmd:" << RedactedList( args ) << "output:\n" - << Logger::NoQuote {} << output; + if ( showDebug && !output.isEmpty() ) + { + cDebug() << Logger::SubEntry << "Finished. Exit code:" << r << "output:\n" << Logger::NoQuote {} << output; + } + else + { + cDebug() << Logger::SubEntry << "Finished. Exit code:" << r; + } + } + else // if ( r != 0 ) + { + if ( !output.isEmpty() ) + { + cDebug() << Logger::SubEntry << "Target cmd:" << RedactedList( args ) << "Exit code:" << r << "output:\n" + << Logger::NoQuote {} << output; + } + else + { + cDebug() << Logger::SubEntry << "Target cmd:" << RedactedList( args ) << "Exit code:" << r << "(no output)"; + } } return ProcessResult( r, output ); } From bf9c9a64f1b6900b81eb15dbe1f0ccbe7f35c1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 28 Oct 2020 10:11:57 -0400 Subject: [PATCH 024/318] [libcalamares] Introduce new function getPartitionTable --- src/libcalamares/partition/PartitionQuery.cpp | 14 ++++++++++++++ src/libcalamares/partition/PartitionQuery.h | 5 +++++ src/modules/partition/core/PartUtils.cpp | 15 +-------------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/libcalamares/partition/PartitionQuery.cpp b/src/libcalamares/partition/PartitionQuery.cpp index 4c9c1549d8..0356f920ce 100644 --- a/src/libcalamares/partition/PartitionQuery.cpp +++ b/src/libcalamares/partition/PartitionQuery.cpp @@ -16,6 +16,7 @@ #include #include +#include namespace CalamaresUtils { @@ -26,6 +27,19 @@ namespace Partition using ::Device; using ::Partition; +const PartitionTable* +getPartitionTable( const Partition* partition ) +{ + const PartitionNode* root = partition; + while ( root && !root->isRoot() ) + { + root = root->parent(); + } + + return dynamic_cast< const PartitionTable* >( root ); +} + + bool isPartitionFreeSpace( const Partition* partition ) { diff --git a/src/libcalamares/partition/PartitionQuery.h b/src/libcalamares/partition/PartitionQuery.h index 9ef5f41f6f..364c747fee 100644 --- a/src/libcalamares/partition/PartitionQuery.h +++ b/src/libcalamares/partition/PartitionQuery.h @@ -24,6 +24,7 @@ class Device; class Partition; +class PartitionTable; namespace CalamaresUtils { @@ -32,6 +33,10 @@ namespace Partition using ::Device; using ::Partition; +using ::PartitionTable; + +/** @brief Get partition table */ +const PartitionTable* getPartitionTable( const Partition* partition ); /** @brief Is this a free-space area? */ bool isPartitionFreeSpace( const Partition* ); diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 92bcbace06..065f88d99b 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -454,20 +454,7 @@ isEfiBootable( const Partition* candidate ) } /* Otherwise, if it's a GPT table, Boot (bit 0) is the same as Esp */ - const PartitionNode* root = candidate; - while ( root && !root->isRoot() ) - { - root = root->parent(); - } - - // Strange case: no root found, no partition table node? - if ( !root ) - { - cWarning() << "No root of partition table found."; - return false; - } - - const PartitionTable* table = dynamic_cast< const PartitionTable* >( root ); + const PartitionTable* table = CalamaresUtils::Partition::getPartitionTable( candidate ); if ( !table ) { cWarning() << "Root of partition table is not a PartitionTable object"; From c045af1975e1000acb70aa4dceadfd9a32ee1c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 29 Oct 2020 09:31:47 -0400 Subject: [PATCH 025/318] [partition] Output GPT entries in overview --- .../partition/jobs/CreatePartitionJob.cpp | 123 ++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index a4fa195ee5..301edbfce8 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -12,6 +12,7 @@ #include "CreatePartitionJob.h" #include "partition/FileSystem.h" +#include "partition/PartitionQuery.h" #include "utils/Logger.h" #include "utils/Units.h" @@ -32,9 +33,92 @@ CreatePartitionJob::CreatePartitionJob( Device* device, Partition* partition ) { } +static const QMap < QString, QString > gptTypePrettyStrings = { + { "44479540-f297-41b2-9af7-d131d5f0458a", "Linux Root Partition (x86)" }, + { "4f68bce3-e8cd-4db1-96e7-fbcaf984b709", "Linux Root Partition (x86-64)" }, + { "69dad710-2ce4-4e3c-b16c-21a1d49abed3", "Linux Root Partition (32-bit ARM)" }, + { "b921b045-1df0-41c3-af44-4c6f280d3fae", "Linux Root Partition (64-bit ARM)" }, + { "993d8d3d-f80e-4225-855a-9daf8ed7ea97", "Linux Root Partition (Itanium/IA-64)" }, + { "d13c5d3b-b5d1-422a-b29f-9454fdc89d76", "Linux Root Verity Partition (x86)" }, + { "2c7357ed-ebd2-46d9-aec1-23d437ec2bf5", "Linux Root Verity Partition (x86-64)" }, + { "7386cdf2-203c-47a9-a498-f2ecce45a2d6", "Linux Root Verity Partition (32-bit ARM)" }, + { "df3300ce-d69f-4c92-978c-9bfb0f38d820", "Linux Root Verity Partition (64-bit ARM/AArch64)" }, + { "86ed10d5-b607-45bb-8957-d350f23d0571", "Linux Root Verity Partition (Itanium/IA-64)" }, + { "75250d76-8cc6-458e-bd66-bd47cc81a812", "Linux /usr Partition (x86)" }, + { "8484680c-9521-48c6-9c11-b0720656f69e", "Linux /usr Partition (x86-64)" }, + { "7d0359a3-02b3-4f0a-865c-654403e70625", "Linux /usr Partition (32-bit ARM)" }, + { "b0e01050-ee5f-4390-949a-9101b17104e9", "Linux /usr Partition (64-bit ARM/AArch64)" }, + { "4301d2a6-4e3b-4b2a-bb94-9e0b2c4225ea", "Linux /usr Partition (Itanium/IA-64)" }, + { "8f461b0d-14ee-4e81-9aa9-049b6fb97abd", "Linux /usr Verity Partition (x86)" }, + { "77ff5f63-e7b6-4633-acf4-1565b864c0e6", "Linux /usr Verity Partition (x86-64)" }, + { "c215d751-7bcd-4649-be90-6627490a4c05", "Linux /usr Verity Partition (32-bit ARM)" }, + { "6e11a4e7-fbca-4ded-b9e9-e1a512bb664e", "Linux /usr Verity Partition (64-bit ARM/AArch64)" }, + { "6a491e03-3be7-4545-8e38-83320e0ea880", "Linux /usr Verity Partition (Itanium/IA-64)" }, + { "933ac7e1-2eb4-4f13-b844-0e14e2aef915", "Linux Home Partition" }, + { "3b8f8425-20e0-4f3b-907f-1a25a76f98e8", "Linux Server Data Partition" }, + { "4d21b016-b534-45c2-a9fb-5c16e091fd2d", "Linux Variable Data Partition" }, + { "7ec6f557-3bc5-4aca-b293-16ef5df639d1", "Linux Temporary Data Partition" }, + { "0657fd6d-a4ab-43c4-84e5-0933c84b4f4f", "Linux Swap" }, + { "c12a7328-f81f-11d2-ba4b-00a0c93ec93b", "EFI System Partition" }, + { "bc13c2ff-59e6-4262-a352-b275fd6f7172", "Extended Boot Loader Partition" }, + { "0fc63daf-8483-4772-8e79-3d69d8477de4", "Other Data Partitions" }, + { "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7", "Microsoft basic data" }, +}; + +static QString +prettyGptType( const QString& type ) +{ + return gptTypePrettyStrings.value( type.toLower(), type ); +} + +static QString +prettyGptEntries( const Partition* partition ) +{ + if ( !partition ) + { + return QString(); + } + + QStringList list; + + if ( !partition->label().isEmpty() ) + { + list += partition->label(); + } + + QString type = prettyGptType( partition->type() ); + if ( !type.isEmpty() ) + { + list += type; + } + + return list.join( QStringLiteral( ", " ) ); +} + QString CreatePartitionJob::prettyName() const { + const PartitionTable* table = CalamaresUtils::Partition::getPartitionTable( m_partition ); + if ( table && table->type() == PartitionTable::TableType::gpt ) + { + QString entries = prettyGptEntries( m_partition ); + if ( !entries.isEmpty() ) + { + return tr( "Create new %1MiB partition on %3 (%2) with entries %4." ) + .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) + .arg( m_device->name() ) + .arg( m_device->deviceNode() ) + .arg( entries ); + } + else + { + return tr( "Create new %1MiB partition on %3 (%2)." ) + .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) + .arg( m_device->name() ) + .arg( m_device->deviceNode() ); + } + } + return tr( "Create new %2MiB partition on %4 (%3) with file system %1." ) .arg( userVisibleFS( m_partition->fileSystem() ) ) .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) @@ -46,6 +130,27 @@ CreatePartitionJob::prettyName() const QString CreatePartitionJob::prettyDescription() const { + const PartitionTable* table = CalamaresUtils::Partition::getPartitionTable( m_partition ); + if ( table && table->type() == PartitionTable::TableType::gpt ) + { + QString entries = prettyGptEntries( m_partition ); + if ( !entries.isEmpty() ) + { + return tr( "Create new %1MiB partition on %3 (%2) with entries %4." ) + .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) + .arg( m_device->name() ) + .arg( m_device->deviceNode() ) + .arg( entries ); + } + else + { + return tr( "Create new %1MiB partition on %3 (%2)." ) + .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) + .arg( m_device->name() ) + .arg( m_device->deviceNode() ); + } + } + return tr( "Create new %2MiB partition on %4 " "(%3) with file system %1." ) .arg( userVisibleFS( m_partition->fileSystem() ) ) @@ -58,6 +163,24 @@ CreatePartitionJob::prettyDescription() const QString CreatePartitionJob::prettyStatusMessage() const { + const PartitionTable* table = CalamaresUtils::Partition::getPartitionTable( m_partition ); + if ( table && table->type() == PartitionTable::TableType::gpt ) + { + QString type = prettyGptType( m_partition->type() ); + if ( type.isEmpty() ) + { + type = m_partition->label(); + } + if ( type.isEmpty() ) + { + type = userVisibleFS( m_partition->fileSystem() ); + } + + return tr( "Creating new %1 partition on %2." ) + .arg( type ) + .arg( m_device->deviceNode() ); + } + return tr( "Creating new %1 partition on %2." ) .arg( userVisibleFS( m_partition->fileSystem() ) ) .arg( m_device->deviceNode() ); From af5c57a713bbf87a40374331db8ed9b5274661b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Sun, 1 Nov 2020 21:29:47 -0500 Subject: [PATCH 026/318] [partition] Output filesystem features in overview --- .../partition/jobs/FillGlobalStorageJob.cpp | 108 +++++++++++++++--- 1 file changed, 92 insertions(+), 16 deletions(-) diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index 5384cf2432..bda5365c3f 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -91,6 +91,7 @@ mapForPartition( Partition* partition, const QString& uuid ) map[ "mountPoint" ] = PartitionInfo::mountPoint( partition ); map[ "fsName" ] = userVisibleFS( partition->fileSystem() ); map[ "fs" ] = untranslatedFS( partition->fileSystem() ); + map[ "features" ] = partition->fileSystem().features(); if ( partition->fileSystem().type() == FileSystem::Luks && dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() ) { @@ -126,6 +127,33 @@ mapForPartition( Partition* partition, const QString& uuid ) return map; } +static QString +prettyFileSystemFeatures( const QVariantMap& features ) +{ + QStringList list; + for ( const auto& key : features.keys() ) + { + const auto& value = features.value( key ); + if ( value.type() == QVariant::Bool ) + { + if ( value.toBool() ) + { + list += key; + } + else + { + list += QString( "not " ) + key; + } + } + else + { + list += key + QString( "=" ) + value.toString(); + } + } + + return list.join( QStringLiteral( ", " ) ); +} + FillGlobalStorageJob::FillGlobalStorageJob( const Config*, QList< Device* > devices, const QString& bootLoaderPath ) : m_devices( devices ) , m_bootLoaderPath( bootLoaderPath ) @@ -153,6 +181,7 @@ FillGlobalStorageJob::prettyDescription() const QString path = partitionMap.value( "device" ).toString(); QString mountPoint = partitionMap.value( "mountPoint" ).toString(); QString fsType = partitionMap.value( "fs" ).toString(); + QString features = prettyFileSystemFeatures( partitionMap.value( "features" ).toMap() ); if ( mountPoint.isEmpty() || fsType.isEmpty() || fsType == QString( "unformatted" ) ) { continue; @@ -161,34 +190,81 @@ FillGlobalStorageJob::prettyDescription() const { if ( mountPoint == "/" ) { - lines.append( tr( "Install %1 on new %2 system partition." ) - .arg( Calamares::Branding::instance()->shortProductName() ) - .arg( fsType ) ); + if ( !features.isEmpty() ) + { + lines.append( tr( "Install %1 on new %2 system partition " + "with features %3" ) + .arg( Calamares::Branding::instance()->shortProductName() ) + .arg( fsType ) + .arg( features ) ); + } + else + { + lines.append( tr( "Install %1 on new %2 system partition." ) + .arg( Calamares::Branding::instance()->shortProductName() ) + .arg( fsType ) ); + } } else { - lines.append( tr( "Set up new %2 partition with mount point " - "%1." ) - .arg( mountPoint ) - .arg( fsType ) ); + if ( !features.isEmpty() ) + { + lines.append( tr( "Set up new %2 partition with mount point " + "%1 and features %3." ) + .arg( mountPoint ) + .arg( fsType ) + .arg( features ) ); + } + else + { + lines.append( tr( "Set up new %2 partition with mount point " + "%1%3." ) + .arg( mountPoint ) + .arg( fsType ) + .arg( features ) ); + } } } else { if ( mountPoint == "/" ) { - lines.append( tr( "Install %2 on %3 system partition %1." ) - .arg( path ) - .arg( Calamares::Branding::instance()->shortProductName() ) - .arg( fsType ) ); + if ( !features.isEmpty() ) + { + lines.append( tr( "Install %2 on %3 system partition %1" + " with features %4." ) + .arg( path ) + .arg( Calamares::Branding::instance()->shortProductName() ) + .arg( fsType ) + .arg( features ) ); + } + else + { + lines.append( tr( "Install %2 on %3 system partition %1." ) + .arg( path ) + .arg( Calamares::Branding::instance()->shortProductName() ) + .arg( fsType ) ); + } } else { - lines.append( tr( "Set up %3 partition %1 with mount point " - "%2." ) - .arg( path ) - .arg( mountPoint ) - .arg( fsType ) ); + if ( !features.isEmpty() ) + { + lines.append( tr( "Set up %3 partition %1 with mount point " + "%2 and features %4." ) + .arg( path ) + .arg( mountPoint ) + .arg( fsType ) + .arg( features ) ); + } + else + { + lines.append( tr( "Set up %3 partition %1 with mount point " + "%2%4." ) + .arg( path ) + .arg( mountPoint ) + .arg( fsType ) ); + } } } } From dd7a5c45ede3b00b7d8a420abd59a058cff1e963 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Wed, 13 Jan 2021 01:03:41 +0100 Subject: [PATCH 027/318] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_az.ts | 4 +- lang/calamares_az_AZ.ts | 8 +- lang/calamares_be.ts | 120 +++++++------- lang/calamares_ca.ts | 6 +- lang/calamares_cs_CZ.ts | 16 +- lang/calamares_da.ts | 2 +- lang/calamares_de.ts | 72 ++++----- lang/calamares_fi_FI.ts | 8 +- lang/calamares_fr.ts | 59 +++---- lang/calamares_fur.ts | 2 +- lang/calamares_he.ts | 10 +- lang/calamares_hi.ts | 2 +- lang/calamares_hr.ts | 2 +- lang/calamares_hu.ts | 12 +- lang/calamares_id.ts | 89 +++++----- lang/calamares_ja.ts | 4 +- lang/calamares_nl.ts | 2 +- lang/calamares_pt_BR.ts | 8 +- lang/calamares_pt_PT.ts | 348 ++++++++++++++++++++++------------------ lang/calamares_sk.ts | 14 +- lang/calamares_sq.ts | 2 +- lang/calamares_sv.ts | 2 +- lang/calamares_tr_TR.ts | 8 +- lang/calamares_uk.ts | 2 +- lang/calamares_vi.ts | 54 +++---- lang/calamares_zh_CN.ts | 4 +- lang/calamares_zh_TW.ts | 2 +- 27 files changed, 462 insertions(+), 400 deletions(-) diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts index dcf3128364..52ca0f6677 100644 --- a/lang/calamares_az.ts +++ b/lang/calamares_az.ts @@ -1036,7 +1036,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Creating user %1 - %1 istifadəçisinin yaradılması. + İsitfadəçi %1 yaradılır @@ -2065,7 +2065,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.The password contains fewer than %n lowercase letters Şifrə %n-dən(dan) az kiçik hərflərdən ibarətdir - Şifrə %n-dən(dan) az kiçik hərflərdən ibarətdir + Şifrə %n hərfdən az kiçik hərflərdən ibarətdir diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts index 2e2a3a4965..37d3dc28b5 100644 --- a/lang/calamares_az_AZ.ts +++ b/lang/calamares_az_AZ.ts @@ -1036,7 +1036,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Creating user %1 - %1 istifadəçisinin yaradılması. + İstifadəçi %1 yaradılır @@ -2063,9 +2063,9 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. The password contains fewer than %n lowercase letters - - - + + Şifrə %n hərfdən az kiçik hərflərdən ibarətdir + Şifrə %n hərfdən az kiçik hərflərdən ibarətdir diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts index 01341ac08f..0f94413d38 100644 --- a/lang/calamares_be.ts +++ b/lang/calamares_be.ts @@ -11,12 +11,12 @@ 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. - Гэтая сістэма выкарыстоўвае асяроддзе загрузкі <strong>EFI</strong>.<br><br>Каб наладзіць запуск з EFI, усталёўшчык выкарыстоўвае праграму <strong>GRUB</strong> альбо <strong>systemd-boot</strong> на <strong>Сістэмным раздзеле EFI</strong>. Працэс аўтаматызаваны, але вы можаце абраць ручны рэжым, у якім зможаце абраць ці стварыць раздзел. + Гэтая сістэма выкарыстоўвае асяроддзе загрузкі <strong>EFI</strong>.<br><br>Каб наладзіць запуск з EFI, сродак усталёўкі выкарыстоўвае праграму <strong>GRUB</strong> альбо <strong>systemd-boot</strong> на <strong>Сістэмным раздзеле EFI</strong>. Працэс аўтаматызаваны, але вы можаце абраць ручны рэжым, у якім зможаце абраць ці стварыць раздзел. 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. - Сістэма запушчаная ў працоўным асяроддзі <strong>BIOS</strong>.<br><br>Каб наладзіць запуск з BIOS, усталёўшчыку неабходна ўсталяваць загрузчык <strong>GRUB</strong>, альбо ў пачатку раздзела, альбо ў <strong>Галоўны загрузачны запіс. (MBR)</strong>, які прадвызначана знаходзіцца ў пачатку табліцы раздзелаў. Працэс аўтаматычны, але вы можаце перайсці ў ручны рэжым, дзе зможаце наладзіць гэта ўласнаручна. + Сістэма запушчаная ў працоўным асяроддзі <strong>BIOS</strong>.<br><br>Каб наладзіць запуск з BIOS, сродку ўсталёўкі неабходна ўсталяваць загрузчык <strong>GRUB</strong>, альбо ў пачатку раздзела, альбо ў <strong>Галоўны загрузачны запіс. (MBR)</strong>, які прадвызначана знаходзіцца ў пачатку табліцы раздзелаў. Працэс аўтаматычны, але вы можаце перайсці ў ручны рэжым, дзе зможаце наладзіць гэта ўласнаручна. @@ -427,7 +427,7 @@ 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. - Сапраўды хочаце скасаваць працэс усталёўкі? Усталёўшчык спыніць працу, а ўсе змены страцяцца. + Сапраўды хочаце скасаваць працэс усталёўкі? Праграма спыніць працу, а ўсе змены страцяцца. @@ -711,7 +711,7 @@ The installer will quit and all changes will be lost. The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. - Загад выконваецца ў асяроддзі ўсталёўшчыка. Яму неабходна ведаць шлях да каранёвага раздзела, але rootMountPoint не вызначаны. + Загад выконваецца ў асяроддзі праграмы для ўсталёўкі. Яму неабходна ведаць шлях да каранёвага раздзела, але rootMountPoint не вызначаны. @@ -1032,23 +1032,23 @@ The installer will quit and all changes will be lost. Preserving home directory - + Захаванне хатняга каталога Creating user %1 - + Стварэнне карыстальніка %1 Configuring user %1 - + Наладка карыстальніка %1 Setting file permissions - + Наладка правоў доступу да файлаў @@ -2065,11 +2065,11 @@ The installer will quit and all changes will be lost. The password contains fewer than %n lowercase letters - - - - - + + У паролі менш %n малой літары + У паролі менш %n малых літар + У паролі менш %n малых літар + У паролі менш %n малых літар @@ -2105,86 +2105,86 @@ The installer will quit and all changes will be lost. The password contains fewer than %n digits - - - - - + + Пароль змяшчае менш %n лічбы + Пароль змяшчае менш %n лічбаў + Пароль змяшчае менш %n лічбаў + Пароль змяшчае менш %n лічбаў The password contains fewer than %n uppercase letters - - - - - + + У паролі менш %n вялікай літары + У паролі менш %n вялікіх літар + У паролі менш %n вялікіх літар + У паролі менш %n вялікіх літар The password contains fewer than %n non-alphanumeric characters - - - - - + + У паролі менш %n адмысловага знака + У паролі менш %n адмысловых знакаў + У паролі менш %n адмысловых знакаў + У паролі менш %n адмысловых знакаў The password is shorter than %n characters - - - - - + + Пароль карацейшы за %n знак + Пароль карацейшы за %n знакі + Пароль карацейшы за %n знакаў + Пароль карацейшы за %n знакаў The password is a rotated version of the previous one - + Пароль ёсць адваротнай версіяй мінулага The password contains fewer than %n character classes - - - - - + + Пароль змяшчае менш %n класа сімвалаў + Пароль змяшчае менш %n класаў сімвалаў + Пароль змяшчае менш %n класаў сімвалаў + Пароль змяшчае менш %n класаў сімвалаў The password contains more than %n same characters consecutively - - - - - + + Пароль змяшчае больш за %n аднолькавы паслядоўны знак + Пароль змяшчае больш за %n аднолькавыя паслядоўныя знакі + Пароль змяшчае больш за %n аднолькавых паслядоўных знакаў + Пароль змяшчае больш за %n аднолькавых паслядоўных знакаў The password contains more than %n characters of the same class consecutively - - - - - + + Пароль змяшчае больш за %n паслядоўны знак таго ж класа + Пароль змяшчае больш за %n паслядоўныя знакі таго ж класа + Пароль змяшчае больш за %n паслядоўных знакаў таго ж класа + Пароль змяшчае больш за %n паслядоўных знакаў таго ж класа The password contains monotonic sequence longer than %n characters - - - - - + + Пароль змяшчае аднастайную паслядоўнасць, даўжэйшую за %n знак + Пароль змяшчае аднастайную паслядоўнасць, даўжэйшую за %n знакі + Пароль змяшчае аднастайную паслядоўнасць, даўжэйшую за %n знакаў + Пароль змяшчае аднастайную паслядоўнасць, даўжэйшую за %n знакаў @@ -3463,18 +3463,18 @@ Output: Preparing groups. - + Падрыхтоўка групаў. Could not create groups in target system - + Не атрымалася стварыць групы ў мэтавай сістэме These groups are missing in the target system: %1 - + Наступныя групы адсутнічаюць у мэтавай сістэме: %1 @@ -3482,7 +3482,7 @@ Output: Configure <pre>sudo</pre> users. - + Наладка <pre>суперкарыстальнікаў</pre>. @@ -3833,7 +3833,7 @@ Output: <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Вітаем ва ўсталёўшчыку Calamares для %1.</h1> + <h1>Вітаем у Calamares для %1.</h1> @@ -3853,7 +3853,7 @@ Output: About %1 installer - Пра ўсталёўшчык %1 + Пра %1 diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index d522f9abbc..118f454463 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -1046,7 +1046,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. Setting file permissions - S'estableixen els permisos del fitxer + S'estableixen els permisos del fitxer. @@ -2133,7 +2133,7 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé The password is a rotated version of the previous one - La contrasenya és només l'anterior capgirada. + La contrasenya és una versió capgirada de l'anterior. @@ -3462,7 +3462,7 @@ La configuració pot continuar, però algunes característiques podrien estar in Configure <pre>sudo</pre> users. - Configuració d'usuaris de <pre>sudo</pre>. + Configuració d'usuaris de <pre>sudo</pre> diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts index cfcad7d22f..789fea0dbe 100644 --- a/lang/calamares_cs_CZ.ts +++ b/lang/calamares_cs_CZ.ts @@ -1034,23 +1034,23 @@ Instalační program bude ukončen a všechny změny ztraceny. Preserving home directory - + Zachování domovského adresáře Creating user %1 - + Vytváření uživatele %1 Configuring user %1 - + Konfigurace uživatele %1 Setting file permissions - + Nastavení oprávnění souboru @@ -2147,7 +2147,7 @@ Instalační program bude ukončen a všechny změny ztraceny. The password is a rotated version of the previous one - + Heslo je otočenou verzí některého z předchozích @@ -3465,13 +3465,13 @@ Výstup: Preparing groups. - + Příprava skupin. Could not create groups in target system - + V cílovém systému nelze vytvořit skupiny @@ -3484,7 +3484,7 @@ Výstup: Configure <pre>sudo</pre> users. - + Nakonfigurujte <pre>sudo</pre> uživatele. diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index 66f2b45529..d97d97efd7 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -1036,7 +1036,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Creating user %1 - Opretter brugeren %1. + diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index 8596b5c6a7..a1147010bc 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -1030,23 +1030,23 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Preserving home directory - + Home-Verzeichnis wird beibehalten Creating user %1 - + Erstelle Benutzer %1 Configuring user %1 - + Konfiguriere Benutzer %1 Setting file permissions - + Setze Dateiberechtigungen @@ -2063,9 +2063,9 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. The password contains fewer than %n lowercase letters - - - + + Das Passwort enthält weniger als %n Kleinbuchstaben + Das Passwort enthält weniger als %n Kleinbuchstaben @@ -2101,70 +2101,70 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. The password contains fewer than %n digits - - - + + Das Passwort enthält weniger als %n Zeichen + Das Passwort enthält weniger als %n Zeichen The password contains fewer than %n uppercase letters - - - + + Das Passwort enthält weniger als %n Großbuchstaben + Das Passwort enthält weniger als %n Großbuchstaben The password contains fewer than %n non-alphanumeric characters - - - + + Das Passwort enthält weniger als %n nicht-alphanumerische Zeichen + Das Passwort enthält weniger als %n nicht-alphanumerische Zeichen The password is shorter than %n characters - - - + + Das Passwort ist kürzer als %n Zeichen + Das Passwort ist kürzer als %n Zeichen The password is a rotated version of the previous one - + Dieses Passwort ist eine abgeänderte Version des vorigen The password contains fewer than %n character classes - - - + + Dieses Passwort enthält weniger als %n Zeichenarten + Dieses Passwort enthält weniger als %n Zeichenarten The password contains more than %n same characters consecutively - - - + + Dieses Passwort enthält mehr als %n geiche Zeichen hintereinander + Dieses Passwort enthält mehr als %n geiche Zeichen hintereinander The password contains more than %n characters of the same class consecutively - - - + + Dieses Passwort enthält mehr als %n Zeichen derselben Zeichenart hintereinander + Dieses Passwort enthält mehr als %n Zeichen derselben Zeichenart hintereinander The password contains monotonic sequence longer than %n characters - - - + + Dieses Passwort enthält eine abwechslungslose Sequenz länger als %n Zeichen + Dieses Passwort enthält eine abwechslungslose Sequenz länger als %n Zeichen @@ -3443,18 +3443,18 @@ Ausgabe: Preparing groups. - + Bereite Gruppen vor. Could not create groups in target system - + Auf dem Zielsystem konnten keine Gruppen erstellt werden. These groups are missing in the target system: %1 - + Folgende Gruppen fehlen auf dem Zielsystem: %1 @@ -3462,7 +3462,7 @@ Ausgabe: Configure <pre>sudo</pre> users. - + Konfiguriere <pre>sudo</pre> Benutzer. diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index 0c0b7412a9..fed6cf513c 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -244,8 +244,8 @@ (%n second(s)) - (%n sekunttia(s)) - (%n sekunttia(s)) + (%n sekunti(a)) + (%n sekunti(a)) @@ -570,7 +570,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. EFI system partition: - EFI järjestelmäosio + EFI järjestelmäosio: @@ -1037,7 +1037,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Creating user %1 - Luodaan käyttäjää %1. + Luodaan käyttäjä %1. diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index 6b876dd536..64304cce8a 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -217,7 +217,7 @@ QML Step <i>%1</i>. - + Étape QML <i>%1</i>. @@ -619,17 +619,17 @@ L'installateur se fermera et les changements seront perdus. 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/> - + Le périphérique de stockage contient déjà un système d'exploitation, mais la table de partition <strong>%1</strong> est différente de celle nécessaire <strong>%2</strong>.<br/> This storage device has one of its partitions <strong>mounted</strong>. - + Une des partitions de ce périphérique de stockage est <strong>montée</strong>. This storage device is a part of an <strong>inactive RAID</strong> device. - + Ce périphérique de stockage fait partie d'une grappe <strong>RAID inactive</strong>. @@ -732,7 +732,7 @@ L'installateur se fermera et les changements seront perdus. Set timezone to %1/%2. - + Configurer timezone sur %1/%2. @@ -792,22 +792,22 @@ L'installateur se fermera et les changements seront perdus. <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Bienvenue dans le programme de configuration Calamares pour %1</h1> <h1>Welcome to %1 setup</h1> - + <h1>Bienvenue dans la configuration de %1</h1> <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Bienvenue dans l'installateur Calamares pour %1</h1> <h1>Welcome to the %1 installer</h1> - + <h1>Bienvenue dans l'installateur de %1</h1> @@ -817,7 +817,7 @@ L'installateur se fermera et les changements seront perdus. '%1' is not allowed as username. - + '%1' n'est pas autorisé comme nom d'utilisateur. @@ -842,7 +842,7 @@ L'installateur se fermera et les changements seront perdus. '%1' is not allowed as hostname. - + '%1' n'est pas autorisé comme nom d'hôte. @@ -1030,23 +1030,23 @@ L'installateur se fermera et les changements seront perdus. Preserving home directory - + Conserver le dossier home Creating user %1 - + Création de l'utilisateur %1 Configuring user %1 - + Configuration de l'utilisateur %1 Setting file permissions - + Définition des autorisations de fichiers @@ -1808,14 +1808,15 @@ L'installateur se fermera et les changements seront perdus. Timezone: %1 - + Fuseau horaire : %1 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. - + Sélectionnez votre emplacement préféré sur la carte pour que l'installateur vous suggère les paramètres linguistiques et de fuseau horaire. Vous pouvez affiner les paramètres suggérés ci-dessous. Cherchez sur la carte en la faisant glisser +et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de la souris. @@ -1834,7 +1835,7 @@ L'installateur se fermera et les changements seront perdus. Office package - + Suite bureautique @@ -1844,7 +1845,7 @@ L'installateur se fermera et les changements seront perdus. Browser package - + Navigateur Web @@ -1879,42 +1880,42 @@ L'installateur se fermera et les changements seront perdus. Communication - + Communication Development - + Développement Office - + Bureautique Multimedia - + Multimédia Internet - + Internet Theming - + Thèmes Gaming - + Jeux Utilities - + Utilitaires @@ -1961,14 +1962,14 @@ L'installateur se fermera et les changements seront perdus. Select your preferred Region, or use the default one based on your current location. - + Sélectionnez votre région préférée, ou utilisez celle par défaut basée sur votre localisation actuelle. Timezone: %1 - + Fuseau horaire : %1 diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts index a647e9298f..2d2c8eb3fb 100644 --- a/lang/calamares_fur.ts +++ b/lang/calamares_fur.ts @@ -1036,7 +1036,7 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Creating user %1 - Daûr a creâ l'utent %1. + diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index 17bdc44d17..7e8ae9cdb4 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -1113,17 +1113,17 @@ The installer will quit and all changes will be lost. Delete partition <strong>%1</strong>. - מחק את מחיצה <strong>%1</strong>. + מחיקת המחיצה <strong>%1</strong>. Deleting partition %1. - מבצע מחיקה של מחיצה %1. + מחיקת המחיצה %1 מתבצעת. The installer failed to delete partition %1. - תכנית ההתקנה כשלה במחיקת המחיצה %1. + כשל של תכנית ההתקנה במחיקת המחיצה %1. @@ -2435,7 +2435,7 @@ The installer will quit and all changes will be lost. Log in automatically without asking for the password. - כניסה אוטומטית מבלי לבקש סיסמה. + כניסה אוטומטית מבלי להישאל על הסיסמה. @@ -3636,7 +3636,7 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> - <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">לחץ כאן למידע נוסף אודות משוב מצד המשתמש</span></a></p></body></html> + <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">יש ללחוץ כאן למידע נוסף על המשוב מצד המשתמשים</span></a></p></body></html> diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts index 881954b773..d37b295211 100644 --- a/lang/calamares_hi.ts +++ b/lang/calamares_hi.ts @@ -1036,7 +1036,7 @@ The installer will quit and all changes will be lost. Creating user %1 - उपयोक्ता %1 बनाना जारी। + उपयोक्ता %1 बनाना जारी diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts index 229b2199ea..24d19128db 100644 --- a/lang/calamares_hr.ts +++ b/lang/calamares_hr.ts @@ -1038,7 +1038,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. Creating user %1 - Stvaranje korisnika %1. + Stvaram korisnika %1 diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts index f40c969c05..0ec4648e1c 100644 --- a/lang/calamares_hu.ts +++ b/lang/calamares_hu.ts @@ -1849,32 +1849,32 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> Web browser - + Böngésző Kernel - + Kernel Services - + Szolgáltatások Login - + Bejelentkezés Desktop - + Asztal Applications - + Alkalmazások diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index e5c009c53f..33966e696f 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -615,42 +615,42 @@ Instalasi akan ditutup dan semua perubahan akan hilang. 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/> - + Perngkat penyimpanan ini sudah terdapat sistem operasi, tetapi tabel partisi <strong>%1</strong>berbeda dari yang dibutuhkan <strong>%2</strong>.<br/> This storage device has one of its partitions <strong>mounted</strong>. - + Perangkat penyimpanan ini terdapat partisi yang <strong>terpasang</strong>. This storage device is a part of an <strong>inactive RAID</strong> device. - + Perangkat penyimpanan ini merupakan bagian dari sebuah <strong>perangkat RAID yang tidak aktif</strong>. No Swap - + Tidak perlu SWAP Reuse Swap - + Gunakan kembali SWAP Swap (no Hibernate) - + Swap (tidak hibernasi) Swap (with Hibernate) - + Swap (dengan hibernasi) Swap to file - + Swap ke file @@ -728,7 +728,7 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Set timezone to %1/%2. - + Terapkan zona waktu ke %1/%2 @@ -743,7 +743,7 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Network Installation. (Disabled: Incorrect configuration) - + Pemasangan jaringan. (Dimatikan: Konfigurasi yang tidak sesuai) @@ -753,7 +753,7 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Network Installation. (Disabled: internal error) - + Pemasangan jaringan. (Dimatikan: kesalahan internal) @@ -1694,22 +1694,22 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. File: %1 - + File: %1 Hide license text - + Sembunyikan teks lisensi Show the license text - + Tampilkan lisensi teks Open license agreement in browser. - + Buka perjanjian lisensi di peramban @@ -1752,7 +1752,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Configuring LUKS key file. - + Mengkonfigurasi file kunci LUKS @@ -1765,22 +1765,22 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. 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 @@ -1793,12 +1793,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Configuration Error - + Kesalahan Konfigurasi No root mount point is set for MachineId. - + Tidak ada titik pemasangan root yang disetel untuk MachineId. @@ -1806,14 +1806,14 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Timezone: %1 - + Zona Waktu: %1 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. - + Mohon untuk memilih preferensi lokasi anda yang berada di peta agar pemasang dapat menyarankan pengaturan lokal dan zona waktu untuk anda. Anda dapat menyetel setelan yang disarankan dibawah berikut. Cari dengan menyeret peta.untuk memindahkan dan menggunakan tombol +/- guna memper-besar/kecil atau gunakan guliran tetikus untuk zooming. @@ -1827,62 +1827,62 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Office software - + Perangkat lunak perkantoran Office package - + Paket perkantoran Browser software - + Peramban perangkat lunak Browser package - + Peramban paket Web browser - + Peramban web Kernel - + Inti Services - + Jasa Login - + Masuk Desktop - + Desktop Applications - + Aplikasi Communication - + Komunikasi Development - + Pengembangan @@ -1966,7 +1966,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Timezone: %1 - + Zona Waktu: %1 @@ -3824,7 +3824,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.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. - + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Hak cipta 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Hak cipta 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Terimakasih kepada <a href="https://calamares.io/team/">Tim Calamares</a>dan <a href="https://www.transifex.com/calamares/calamares/">Tim penerjemah Calamares </a>.<br/><br/><a href="https://calamares.io/">Calamares</a>pengembangan disponsori oleh <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. @@ -3859,7 +3859,18 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. - + <h1>%1</h1><br/> + <strong>%2<br/> + for %3</strong><br/><br/> + Hak cipta 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Hak cipta 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + Terimakasih kepada <a href='https://calamares.io/team/'>Tim Calamares</a> + dan <a href='https://www.transifex.com/calamares/calamares/'>Tim penerjemah + Calamares</a><br/><br/> + <a href='https://calamares.io/'>Calamares</a> + pengembangan disponsori oleh<br/> + <a href='http://www.blue-systems.com/'>Blue Systems</a>- + Liberating Software. diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index 7d0211d5cb..da705cf7b6 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -1034,7 +1034,7 @@ The installer will quit and all changes will be lost. Creating user %1 - ユーザー %1 を作成しています。 + ユーザー %1 を作成しています @@ -1932,7 +1932,7 @@ The installer will quit and all changes will be lost. Ba&tch: - バッチ (&) + バッチ (&t) diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts index 90db0183da..6d848dbaf2 100644 --- a/lang/calamares_nl.ts +++ b/lang/calamares_nl.ts @@ -1036,7 +1036,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Creating user %1 - Gebruiker %1 wordt aangemaakt. + diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index 49f8ba64e9..563fa29825 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -1036,7 +1036,7 @@ O instalador será fechado e todas as alterações serão perdidas. Creating user %1 - Criando usuário %1. + Criando usuário %1 @@ -2063,9 +2063,9 @@ O instalador será fechado e todas as alterações serão perdidas. The password contains fewer than %n lowercase letters - - - + + A senha contém menos que %n letras minúsculas + A senha contém menos que %n letras minúsculas diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index acaa2103b5..bc16f043e7 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -16,7 +16,7 @@ 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. - Este sistema foi iniciado com um ambiente de arranque <strong>BIOS</strong>.<br><br>Para configurar um arranque de um ambiente BIOS, este instalador tem de instalar um carregador de arranque, tipo <strong>GRUB</strong>, quer no início da partição ou no <strong>Master Boot Record</strong> perto do início da tabela de partições (preferido). Isto é automático, a não ser que escolha particionamento manual, e nesse caso tem de o configurar por si próprio + Este sistema foi iniciado com um ambiente de arranque <strong>BIOS</strong>.<br><br>Para configurar um arranque de um ambiente BIOS, este instalador tem de instalar um carregador de arranque, tipo <strong>GRUB</strong>, quer no início da partição ou no <strong>Master Boot Record</strong> perto do início da tabela de partições (preferido). Isto é automático, a não ser que escolha particionamento manual, e nesse caso tem de o configurar por si próprio. @@ -161,12 +161,12 @@ Run command '%1' in target system. - Execute o comando '%1' no sistema alvo. + Executar o comando '%1' no sistema de destino. Run command '%1'. - Execute o comando '%1'. + Executar comando '%1'. @@ -217,12 +217,12 @@ QML Step <i>%1</i>. - Passo QML %1. + Passo QML <i>%1</i>. Loading failed. - Carregamento falhou. + Falha ao carregar. @@ -230,7 +230,7 @@ Requirements checking for module <i>%1</i> is complete. - A verificação de requisitos para módulo <i>%1</i> está completa. + A verificação de requisitos para o módulo <i>%1</i> está completa. @@ -264,7 +264,7 @@ Installation Failed - Falha na Instalação + Falha na Instalação @@ -296,7 +296,7 @@ Install Log Paste URL - Instalar o URL da pasta de registo + Instalar o Registo Colar URL @@ -476,7 +476,7 @@ O instalador será encerrado e todas as alterações serão perdidas. &Next - &Próximo + &Seguinte @@ -619,17 +619,17 @@ O instalador será encerrado e todas as alterações serão perdidas. 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/> - + O dispositivo de armazenamento já possui um sistema operativo, mas a tabela de partições <strong>%1</strong> é diferente da necessária <strong>%2</strong>.<br/> This storage device has one of its partitions <strong>mounted</strong>. - + O dispositivo de armazenamento tem uma das suas partições <strong>montada</strong>. This storage device is a part of an <strong>inactive RAID</strong> device. - + O dispositivo de armazenamento é parte de um dispositivo <strong>RAID inativo</strong>. @@ -772,7 +772,7 @@ O instalador será encerrado e todas as alterações serão perdidas. This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - Este computador não satisfaz os requisitos mínimos para instalar %1.<br/>A instalação não pode continuar. <a href="#details">Detalhes...</a> + Este computador não satisfaz os requisitos mínimos para instalar o %1.<br/>A instalação não pode continuar. <a href="#details">Detalhes...</a> @@ -782,7 +782,7 @@ O instalador será encerrado e todas as alterações serão perdidas. This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - Este computador não satisfaz alguns dos requisitos recomendados para instalar %1.<br/>A instalação pode continuar, mas algumas funcionalidades poderão ser desativadas. + Este computador não satisfaz alguns dos requisitos recomendados para instalar o %1.<br/>A instalação pode continuar, mas algumas funcionalidades poderão ser desativadas. @@ -817,7 +817,7 @@ O instalador será encerrado e todas as alterações serão perdidas. '%1' is not allowed as username. - + '%1' não é permitido como nome de utilizador. @@ -842,7 +842,7 @@ O instalador será encerrado e todas as alterações serão perdidas. '%1' is not allowed as hostname. - + '%1' não é permitido como nome da máquina. @@ -946,12 +946,12 @@ O instalador será encerrado e todas as alterações serão perdidas. Create new %2MiB partition on %4 (%3) with file system %1. - + Criar nova partição de %2MiB em %4 (%3) com o sistema de ficheiros %1. Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Criar nova partição de <strong>%2MiB</strong> em <strong>%4</strong> (%3) com o sistema de ficheiros <strong>%1</strong>. @@ -1046,7 +1046,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Setting file permissions - + A definir permissões de ficheiro @@ -1193,7 +1193,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Dummy C++ Job - Tarefa Dummy C++ + Tarefa Dummy C++ @@ -1216,7 +1216,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Format - Formatar: + Formatar @@ -1336,12 +1336,12 @@ O instalador será encerrado e todas as alterações serão perdidas. <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <h1>Tudo concluído.</h1><br/>%1 foi configurado no seu computador.<br/>Pode agora começar a utilizar o seu novo 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 esta caixa for marcada, o seu sistema irá reiniciar imediatamente quando clicar em <span style="font-style:italic;">Concluído</span> ou fechar o programa de configuração.</p></body></html> @@ -1351,12 +1351,12 @@ O instalador será encerrado e todas as alterações serão perdidas. <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 esta caixa for marcada, o seu sistema irá reiniciar imediatamente quando clicar em <span style="font-style:italic;">Concluído</span> ou fechar o instalador.</p></body></html> <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Falha na configuração</h1><br/>%1 não foi configurado no seu computador.<br/>A mensagem de erro foi: %2. @@ -1397,12 +1397,12 @@ O instalador será encerrado e todas as alterações serão perdidas. Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Formatar partição %1 (sistema de ficheiros: %2, tamanho: %3 MiB) em %4. Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatar partição de <strong>%3MiB</strong> <strong>%1</strong> com o sistema de ficheiros <strong>%2</strong>. @@ -1425,7 +1425,7 @@ O instalador será encerrado e todas as alterações serão perdidas. There is not enough drive space. At least %1 GiB is required. - Não existe espaço livre suficiente em disco. É necessário pelo menos %1 GiB. + Não existe espaço livre suficiente em disco. É necessário pelo menos %1 GiB. @@ -1475,7 +1475,7 @@ O instalador será encerrado e todas as alterações serão perdidas. has a screen large enough to show the whole installer - + tem um ecrã grande o suficiente para mostrar todo o instalador @@ -1493,7 +1493,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Collecting information about your machine. - A recolher informação acerca da sua máquina + A recolher informação acerca da sua máquina. @@ -1590,7 +1590,7 @@ O instalador será encerrado e todas as alterações serão perdidas. 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>. - A definição local do sistema afeta o idioma e conjunto de carateres para alguns elementos do interface da linha de comandos.<br/>A definição atual é <strong>%1</strong>. + A definição local do sistema afeta o idioma e conjunto de carateres para alguns elementos da interface da linha de comandos.<br/>A definição atual é <strong>%1</strong>. @@ -1623,27 +1623,27 @@ O instalador será encerrado e todas as alterações serão perdidas. Please review the End User License Agreements (EULAs). - + Reveja o contrato de licença de utilizador final (EULAs). This setup procedure will install proprietary software that is subject to licensing terms. - + Este procedimento de configuração irá instalar software proprietário que está sujeito aos termos de licença. If you do not agree with the terms, the setup procedure cannot continue. - + Se não concordar com os termos, o procedimento de configuração não poderá continuar. This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience. - + Este procedimento de configuração pode instalar software proprietário sujeito a termos de licenciamento para fornecer recursos adicionais e aprimorar a experiência do utilizador. If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead. - + Se não concordar com os termos, o software proprietário não será instalado e serão utilizadas as alternativas de código aberto. @@ -1772,17 +1772,17 @@ O instalador será encerrado e todas as alterações serão perdidas. 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. @@ -1790,7 +1790,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Generate machine-id. - Gerar id-máquina + Gerar id-máquina. @@ -1800,7 +1800,7 @@ O instalador será encerrado e todas as alterações serão perdidas. No root mount point is set for MachineId. - + Nenhum ponto de montagem root está definido para IdMáquina. @@ -1815,7 +1815,9 @@ O instalador será encerrado e todas as alterações serão perdidas.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. - + Por favor selecione o seu local preferido no mapa para que o instalador possa sugerir a localização + e fuso horário para si. Pode ajustar as definições sugeridas abaixo. Procure no mapa arrastando + para mover e utilizando os botões +/- para aumentar/diminuir ou utilize a roda do rato para dar zoom. @@ -1834,17 +1836,17 @@ O instalador será encerrado e todas as alterações serão perdidas. Office package - Pacote de Escritório + Pacote de escritório Browser software - Programas de Navegação + Software de navegação Browser package - Pacote de Navegadores + Pacote de navegador @@ -1930,17 +1932,17 @@ O instalador será encerrado e todas as alterações serão perdidas. Ba&tch: - Ba&tch: + Lo&te: <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> - + <html><head/><body><p>Especifique um identificador de lote aqui. Isto será armazenado no sistema de destino.</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>Configuração OEM</h1><p>O Calamares irá utilizar as definições OEM enquanto configurar o sistema de destino.</p></body></html> @@ -1961,7 +1963,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Select your preferred Region, or use the default one based on your current location. - + Selecione a sua Região preferida, ou utilize a predefinida baseada na sua localização atual. @@ -1973,17 +1975,17 @@ O instalador será encerrado e todas as alterações serão perdidas. Select your preferred Zone within your Region. - + Selecione a sua Zona preferida dentro da sua Região. Zones - + Zonas You can fine-tune Language and Locale settings below. - + Pode ajustar as definições de Idioma e Localização abaixo. @@ -2061,9 +2063,9 @@ O instalador será encerrado e todas as alterações serão perdidas. The password contains fewer than %n lowercase letters - - - + + A palavra-passe contém menos que %n letra minúscula + A palavra-passe contém menos que %n letras minúsculas @@ -2074,7 +2076,7 @@ O instalador será encerrado e todas as alterações serão perdidas. The password contains too few non-alphanumeric characters - A palavra-passe contém muito pouco carateres não alfa-numéricos + A palavra-passe contém muito poucos caracteres não alfanuméricos @@ -2099,76 +2101,76 @@ O instalador será encerrado e todas as alterações serão perdidas. The password contains fewer than %n digits - - - + + A palavra-passe contém menos do que %n dígito + A palavra-passe contém menos do que %n dígitos The password contains fewer than %n uppercase letters - - - + + A palavra-passe contém menos do que %n caracter em maiúscula + A palavra-passe contém menos do que %n caracteres em maiúsculas The password contains fewer than %n non-alphanumeric characters - - - + + A palavra-passe contém menos do que %n caracter não alfanumérico + A palavra-passe contém menos do que %n caracteres não alfanuméricos The password is shorter than %n characters - - - + + A palavra-passe é menor do que %n caracter + A palavra-passe é menor do que %n caracteres The password is a rotated version of the previous one - + A palavra-passe é uma versão alternada da anterior The password contains fewer than %n character classes - - - + + A palavra-passe contém menos do que %n classe de caracter + A palavra-passe contém menos do que %n classes de caracteres The password contains more than %n same characters consecutively - - - + + A palavra-passe contém mais do que %n caracter igual consecutivamente + A palavra-passe contém mais do que %n caracteres iguais consecutivamente The password contains more than %n characters of the same class consecutively - - - + + A palavra-passe contém mais do que %n caracter da mesma classe consecutivamente + A palavra-passe contém mais do que %n caracteres da mesma classe consecutivamente The password contains monotonic sequence longer than %n characters - - - + + A palavra-passe contém uma sequência monotónica maior do que %n caracter + A palavra-passe contém uma sequência monotónica maior do que %n caracteres The password contains too long of a monotonic character sequence - A palavra-passe contém uma sequência mono tónica de carateres demasiado longa + A palavra-passe contém uma sequência monotónica de carateres demasiado longa @@ -2291,7 +2293,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Please pick a product from the list. The selected product will be installed. - + Por favor, escolha um produto da lista. O produto selecionado será instalado. @@ -2384,7 +2386,7 @@ O instalador será encerrado e todas as alterações serão perdidas. <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>Digite a mesma palavra-passe duas vezes, de modo a que possam ser verificados erros de digitação. Uma boa palavra-passe contém uma mistura de letras, números e sinais de pontuação, deve ter pelo menos oito caracteres de comprimento, e deve ser alterada em intervalos regulares.</small> + <small>Introduza a mesma palavra-passe duas vezes, de modo a que possam ser verificados erros de escrita. Uma boa palavra-passe contém uma mistura de letras, números e sinais de pontuação, deve ter pelo menos oito caracteres de comprimento, e deve ser alterada em intervalos regulares.</small> @@ -2401,7 +2403,7 @@ O instalador será encerrado e todas as alterações serão perdidas. When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Quando esta caixa estiver marcada, será feita a verificação da força da palavra-passe e não poderá usar uma palavra-passe fraca. @@ -2662,12 +2664,12 @@ O instalador será encerrado e todas as alterações serão perdidas. An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + É necessário uma partição de sistema EFI para iniciar %1.<br/><br/>Para configurar uma partição de sistema EFI, volte atrás e faça a seleção ou crie um sistema de ficheiros FAT32 com a flag <strong>%3</strong> ativada e o ponto de montagem <strong>%2</strong>.<br/><br/>Pode continuar sem definir uma partição de sistema EFI, mas o seu sistema poderá falhar ao iniciar. An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + É necessário uma partição de sistema EFI para iniciar %1.<br/><br/>Uma partição foi configurada com o ponto de montagem <strong>%2</strong>, mas não foi definida a flag <strong>%3</strong>.<br/>Para definir a flag, volte atrás e edite a partição.<br/><br/>Pode continuar sem definir a flag, mas o seu sistema poderá falhar ao iniciar. @@ -2677,12 +2679,12 @@ O instalador será encerrado e todas as alterações serão perdidas. 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>bios_grub</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>bios_grub</strong> ativado.<br/><br/>Uma partição não formatada de 8 MB é necessária para iniciar %1 num sistema BIOS com o GPT. @@ -2702,7 +2704,7 @@ O instalador será encerrado e todas as alterações serão perdidas. There are no partitions to install on. - + Não há partições para instalar. @@ -2847,7 +2849,7 @@ Saída de Dados: extended - estendido + estendida @@ -2876,18 +2878,18 @@ Saída de Dados: Path <pre>%1</pre> must be an absolute path. - + O caminho <pre>%1</pre> deve ser absoluto. Directory not found - + Diretório não encontrado Could not create new random file <pre>%1</pre>. - + Não foi possível criar um novo ficheiro aleatório <pre>%1</pre>. @@ -2916,7 +2918,8 @@ Saída de Dados: <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>Este computador não satisfaz alguns dos requisitos recomendados para configurar %1.<br/> + A configuração pode continuar, mas alguns recursos podem ser desativados.</p> @@ -2971,7 +2974,7 @@ Saída de Dados: %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - %1 não pode ser instalado numa partição estendida. Por favor selecione uma partição primária ou partição lógica. + %1 não pode ser instalado numa partição estendida. Por favor selecione uma partição primária ou lógica existente. @@ -3027,13 +3030,15 @@ Saída de Dados: <p>This computer does not satisfy the minimum requirements for installing %1.<br/> Installation cannot continue.</p> - + <p>Este computador não satisfaz os requisitos mínimos para instalar o %1.<br/> + A instalação não pode continuar.</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>Este computador não satisfaz alguns dos requisitos recomendados para configurar o %1.<br/> + A configuração pode continuar, mas alguns recursos podem ser desativados.</p> @@ -3294,7 +3299,7 @@ Saída de Dados: Clear flags on %1MiB <strong>%2</strong> partition. - + Limpar flags na partição de %1MiB <strong>%2</strong>. @@ -3309,7 +3314,7 @@ Saída de Dados: Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Marcar partição de %1MiB <strong>%2</strong> como <strong>%3</strong>. @@ -3324,7 +3329,7 @@ Saída de Dados: Clearing flags on %1MiB <strong>%2</strong> partition. - + A limpar flags na partição de %1MiB <strong>%2</strong>. @@ -3339,7 +3344,7 @@ Saída de Dados: Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + A definir flags <strong>%3</strong> na partição de %1MiB <strong>%2</strong>. @@ -3438,18 +3443,18 @@ Saída de Dados: Preparing groups. - + A preparar grupos. Could not create groups in target system - + Não foi possível criar grupos no sistema de destino These groups are missing in the target system: %1 - + Estes grupos estão em falta no sistema de destino: %1 @@ -3457,7 +3462,7 @@ Saída de Dados: Configure <pre>sudo</pre> users. - + Configurar utilizadores <pre>sudo</pre>. @@ -3536,28 +3541,28 @@ Saída de Dados: KDE user feedback - + Feedback de utilizador KDE Configuring KDE user feedback. - + A configurar feedback de utilizador KDE. Error in KDE user feedback configuration. - + Erro na configuração do feedback de utilizador KDE. Could not configure KDE user feedback correctly, script error %1. - + Não foi possível configurar o feedback de utilizador KDE corretamente, erro de script %1. Could not configure KDE user feedback correctly, Calamares error %1. - + Não foi possível configurar o feedback de utilizadoro KDE corretamente, erro do Calamares %1. @@ -3586,7 +3591,7 @@ Saída de Dados: Could not configure machine feedback correctly, Calamares error %1. - Não foi possível configurar corretamente o relatório da máquina, erro do Calamares %1. + Não foi possível configurar corretamente o relatório da máquina, erro do Calamares %1. @@ -3604,7 +3609,7 @@ Saída de Dados: <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>Clique aqui para não enviar <span style=" font-weight:600;">qualquer tipo de informação</span> sobre a sua instalação.</p></body></html> @@ -3614,22 +3619,22 @@ Saída de Dados: 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. - + O rastreio ajuda %1 a ver quão frequentemente ele é instalado, em qual hardware ele é instalado e quais aplicações são utilizadas. Para ver o que será enviado, por favor, clique no ícone de ajuda próximo a cada área. 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. - + Ao selecionar isto irá enviar informações sobre a sua instalação e hardware. Esta informação será enviada apenas <b>uma vez</b> depois que a instalação terminar. By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + Ao selecionar isto irá enviar periodicamente informações sobre a instalação da sua <b>máquina</b>, hardware e aplicações para %1. By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. - + Ao selecionar isto irá enviar periodicamente informações sobre a instalação do seu <b>utilizador</b>, hardware, aplicações e padrões de utilização das aplicações para %1. @@ -3833,7 +3838,7 @@ Saída de Dados: <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.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. - + <h1>%1</h1><br/><strong>%2<br/>para %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Obrigado à <a href="https://calamares.io/team/">equipa Calamares</a> e à <a href="https://www.transifex.com/calamares/calamares/">equipa de tradutores do Calamares</a>.<br/><br/>O desenvolvimento do <a href="https://calamares.io/">Calamares</a> é patrocinado pela <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. @@ -3868,12 +3873,23 @@ Saída de Dados: development is sponsored by <br/> <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/> + <strong>%2<br/> + para %3</strong><br/><br/> + Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + Obrigado à <a href='https://calamares.io/team/'>equipa Calamares</a> + e à <a href='https://www.transifex.com/calamares/calamares/'>equipa de + tradutores do Calamares</a>.<br/><br/> + O desenvolvimento do <a href='https://calamares.io/'>Calamares</a> + é patrocinado pela <br/> + <a href='http://www.blue-systems.com/'>Blue Systems</a> - + Liberating Software. Back - + Voltar @@ -3882,18 +3898,20 @@ Saída de Dados: <h1>Languages</h1> </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>. - + <h1>Idiomas</h1> </br> + A definição de localização do sistema afeta o idioma e o conjunto de caracteres para alguns elementos da interface de utilizador de linha de comando. A definição atual é <strong>%1</strong>. <h1>Locales</h1> </br> The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>. - + <h1>Localização</h1> </br> + A definição de localização do sistema afeta os formatos de números e datas. A definição atual é <strong>%1</strong>. Back - + Voltar @@ -3901,42 +3919,42 @@ Saída de Dados: Keyboard Model - + Modelo de teclado Layouts - + Disposições Keyboard Layout - + Disposição do teclado Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. - + Clique no seu modelo de teclado preferido para selecionar a disposição e a variante, ou utilize o padrão baseado no hardware detectado. Models - + Modelos Variants - + Variantes Keyboard Variant - + Variante do teclado Test your keyboard - + Teste o seu teclado @@ -3944,7 +3962,7 @@ Saída de Dados: Change - + Alterar @@ -3953,7 +3971,8 @@ Saída de Dados: <h3>%1</h3> <p>These are example release notes.</p> - + <h3>%1</h3> + <p>Estes são exemplos de notas de lançamento.</p> @@ -3981,12 +4000,32 @@ Saída de Dados: </ul> <p>The vertical scrollbar is adjustable, current width set to 10.</p> - + <h3>%1</h3> + <p>Este é um exemplo de ficheiro QML, a mostrar as opções em RichText com conteúdo Flickable.</p> + + <p>QML com RichText pode utilizar tags HTML, conteúdo Flickable é útil para ecrãs sensíveis ao toque.</p> + + <p><b>Este é um texto em negrito</b></p> + <p><i>Este é um texto em itálico</i></p> + <p><u>Este é um texto sublinhado</u></p> + <p><center>Este texto será centrado.</center></p> + <p><s>Isto é riscado</s></p> + + <p>Código-exemplo: + <code>ls -l /home</code></p> + + <p><b>Listas:</b></p> + <ul> + <li>Sistemas de CPU Intel</li> + <li>Sistemas de CPU AMD</li> + </ul> + + <p>A barra de deslocamento vertical é ajustável e a largura atual está definida como 10.</p> Back - + Voltar @@ -3994,7 +4033,7 @@ Saída de Dados: Pick your user name and credentials to login and perform admin tasks - + Escolha o seu nome de utilizador e credenciais para iniciar sessão e executar tarefas de administrador @@ -4014,12 +4053,12 @@ Saída de Dados: Login Name - + Nome de utilizador If more than one person will use this computer, you can create multiple accounts after installation. - + Se mais do que uma pessoa utilizar este computador, poderá criar várias contas após a instalação. @@ -4034,7 +4073,7 @@ Saída de Dados: This name will be used if you make the computer visible to others on a network. - + Este nome será utilizado se tornar o computador visível a outros numa rede. @@ -4054,27 +4093,27 @@ Saída de Dados: 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. - + Introduzir a mesma palavra-passe duas vezes, para que possa ser verificada a existência de erros de escrita. Uma boa palavra-passe conterá uma mistura de letras, números e pontuação, deve ter pelo menos oito caracteres, e deve ser alterada a intervalos regulares. Validate passwords quality - + Validar qualidade das palavras-passe When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Quando esta caixa é assinalada, a verificação da força da palavra-passe é feita e não será possível utilizar uma palavra-passe fraca. Log in automatically without asking for the password - + Iniciar sessão automaticamente sem pedir a palavra-passe Reuse user password as root password - + Reutilizar palavra-passe de utilizador como palavra-passe de root @@ -4084,22 +4123,22 @@ Saída de Dados: Choose a root password to keep your account safe. - + Escolha uma palavra-passe de root para manter a sua conta segura. Root Password - + Palavra-passe de root Repeat Root Password - + Repetir palavra-passe de root Enter the same password twice, so that it can be checked for typing errors. - + Introduzir a mesma palavra-passe duas vezes, para que possa ser verificada a existência de erros de escrita. @@ -4108,32 +4147,33 @@ Saída de Dados: <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>Bem-vindo ao %1 instalador <quote>%2</quote></h3> + <p>Este programa irá fazer-lhe algumas perguntas e configurar o %1 no seu computador.</p> About - + Sobre Support - + Suporte Known issues - + Problemas conhecidos Release notes - + Notas de lançamento Donate - + Doar diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts index a7c9bf1256..7909483f21 100644 --- a/lang/calamares_sk.ts +++ b/lang/calamares_sk.ts @@ -1041,7 +1041,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Creating user %1 - Vytvára sa používateľ %1. + Vytvára sa používateľ %1 @@ -3895,7 +3895,17 @@ Výstup: development is sponsored by <br/> <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/> + <strong>%2<br/> + pre distribúciu %3</strong><br/><br/> + Autorské práva 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Autorské práva 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + Poďakovanie patrí <a href='https://calamares.io/team/'>tímu inštalátora Calamares</a> + a <a href='https://www.transifex.com/calamares/calamares/'>prekladateľskému tímu inštalátora Calamares</a>.<br/><br/> + Vývoj inštalátora <a href='https://calamares.io/'>Calamares</a> + je podporovaný spoločnosťou <br/> + <a href='http://www.blue-systems.com/'>Blue Systems</a> - + oslobodzujúci softvér. diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts index 4398cf9509..a24410640e 100644 --- a/lang/calamares_sq.ts +++ b/lang/calamares_sq.ts @@ -1036,7 +1036,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Creating user %1 - Po krijohet përdoruesi %1. + Po krijohet përdoruesi %1 diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index 06e65fa518..a583bf156d 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -1035,7 +1035,7 @@ Alla ändringar kommer att gå förlorade. Creating user %1 - Skapar användare %1. + Skapar användare %1 diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index fbe1e39a7a..e69766fff1 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -1039,7 +1039,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Creating user %1 - %1 kullanıcısı oluşturuluyor. + %1 kullanıcısı oluşturuluyor @@ -2067,9 +2067,9 @@ Sistem güç kaynağına bağlı değil. 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 diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts index bb87e22f3f..6b687aaba4 100644 --- a/lang/calamares_uk.ts +++ b/lang/calamares_uk.ts @@ -1040,7 +1040,7 @@ The installer will quit and all changes will be lost. Creating user %1 - Створюємо запис користувача %1. + Створення запису користувача %1 diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts index c26fac43d4..c01659a58b 100644 --- a/lang/calamares_vi.ts +++ b/lang/calamares_vi.ts @@ -1028,23 +1028,23 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Preserving home directory - + Giữ lại thư mục home Creating user %1 - + Đang tạo người dùng %1 Configuring user %1 - + Đang cấu hình cho người dùng %1 Setting file permissions - + Đang thiết lập quyền hạn với tập tin @@ -2061,8 +2061,8 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< The password contains fewer than %n lowercase letters - - + + Mật khẩu chứa ít hơn %n chữ cái thường @@ -2098,62 +2098,62 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< The password contains fewer than %n digits - - + + Mật khẩu chứa ít hơn %n chữ số The password contains fewer than %n uppercase letters - - + + Mật khẩu chứa ít hơn %n chữ in hoa The password contains fewer than %n non-alphanumeric characters - - + + Mật khẩu chứa ít hơn %n kí tự không phải là chữ và số The password is shorter than %n characters - - + + Mật khẩu ngắn hơn %n kí tự The password is a rotated version of the previous one - + Mật khẩu là phiên bản đảo chiều của mật khẩu trước đó The password contains fewer than %n character classes - - + + Mật khẩu chứ ít hơn %n lớp kí tự The password contains more than %n same characters consecutively - - + + Mật khẩu chứa nhiều hơn %n kí tự giống nhau liên tiếp The password contains more than %n characters of the same class consecutively - - + + Mật khẩu chứa nhiều hơn %n kí tự của cùng một lớp liên tiếp The password contains monotonic sequence longer than %n characters - - + + Mật khẩu chứa chuỗi kí tự dài hơn %n kí tự @@ -3432,18 +3432,18 @@ Output: Preparing groups. - + Đang chuẩn bị các nhóm Could not create groups in target system - + Không thể tạo các nhóm trên hệ thống đích These groups are missing in the target system: %1 - + Có vài nhóm đang bị thiếu trong hệ thống đích: %1 @@ -3451,7 +3451,7 @@ Output: Configure <pre>sudo</pre> users. - + Cấu hình <pre>sudo</pre>cho người dùng. diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts index cf90e76dac..bf07ffb42b 100644 --- a/lang/calamares_zh_CN.ts +++ b/lang/calamares_zh_CN.ts @@ -1037,7 +1037,7 @@ The installer will quit and all changes will be lost. Creating user %1 - 正在创建用户 %1. + 创建用户 %1 @@ -2852,7 +2852,7 @@ Output: swap - 临时存储空间 + 交换分区 diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts index 6c41e45b20..6e06682d86 100644 --- a/lang/calamares_zh_TW.ts +++ b/lang/calamares_zh_TW.ts @@ -1034,7 +1034,7 @@ The installer will quit and all changes will be lost. Creating user %1 - 正在建立使用者 %1。 + 正在建立使用者 %1 From d15aa2bfc347cfad1ee060eef3e2d503fcb4a801 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Wed, 13 Jan 2021 01:03:42 +0100 Subject: [PATCH 028/318] i18n: [python] Automatic merge of Transifex translations --- lang/python.pot | 2 +- lang/python/ar/LC_MESSAGES/python.po | 2 +- lang/python/as/LC_MESSAGES/python.po | 2 +- lang/python/ast/LC_MESSAGES/python.po | 2 +- lang/python/az/LC_MESSAGES/python.po | 6 +++--- lang/python/az_AZ/LC_MESSAGES/python.po | 6 +++--- lang/python/be/LC_MESSAGES/python.po | 6 +++--- lang/python/bg/LC_MESSAGES/python.po | 2 +- lang/python/bn/LC_MESSAGES/python.po | 2 +- lang/python/ca/LC_MESSAGES/python.po | 2 +- lang/python/ca@valencia/LC_MESSAGES/python.po | 2 +- lang/python/cs_CZ/LC_MESSAGES/python.po | 2 +- lang/python/da/LC_MESSAGES/python.po | 2 +- lang/python/de/LC_MESSAGES/python.po | 2 +- lang/python/el/LC_MESSAGES/python.po | 2 +- lang/python/en_GB/LC_MESSAGES/python.po | 2 +- lang/python/eo/LC_MESSAGES/python.po | 2 +- lang/python/es/LC_MESSAGES/python.po | 2 +- lang/python/es_MX/LC_MESSAGES/python.po | 2 +- lang/python/es_PR/LC_MESSAGES/python.po | 2 +- lang/python/et/LC_MESSAGES/python.po | 2 +- lang/python/eu/LC_MESSAGES/python.po | 2 +- lang/python/fa/LC_MESSAGES/python.po | 2 +- lang/python/fi_FI/LC_MESSAGES/python.po | 2 +- lang/python/fr/LC_MESSAGES/python.po | 2 +- lang/python/fr_CH/LC_MESSAGES/python.po | 2 +- lang/python/fur/LC_MESSAGES/python.po | 2 +- lang/python/gl/LC_MESSAGES/python.po | 2 +- lang/python/gu/LC_MESSAGES/python.po | 2 +- lang/python/he/LC_MESSAGES/python.po | 2 +- lang/python/hi/LC_MESSAGES/python.po | 2 +- lang/python/hr/LC_MESSAGES/python.po | 2 +- lang/python/hu/LC_MESSAGES/python.po | 2 +- lang/python/id/LC_MESSAGES/python.po | 7 ++++--- lang/python/ie/LC_MESSAGES/python.po | 2 +- lang/python/is/LC_MESSAGES/python.po | 2 +- lang/python/it_IT/LC_MESSAGES/python.po | 2 +- lang/python/ja/LC_MESSAGES/python.po | 2 +- lang/python/kk/LC_MESSAGES/python.po | 2 +- lang/python/kn/LC_MESSAGES/python.po | 2 +- lang/python/ko/LC_MESSAGES/python.po | 6 +++--- lang/python/lo/LC_MESSAGES/python.po | 2 +- lang/python/lt/LC_MESSAGES/python.po | 2 +- lang/python/lv/LC_MESSAGES/python.po | 2 +- lang/python/mk/LC_MESSAGES/python.po | 2 +- lang/python/ml/LC_MESSAGES/python.po | 2 +- lang/python/mr/LC_MESSAGES/python.po | 2 +- lang/python/nb/LC_MESSAGES/python.po | 2 +- lang/python/ne_NP/LC_MESSAGES/python.po | 2 +- lang/python/nl/LC_MESSAGES/python.po | 2 +- lang/python/pl/LC_MESSAGES/python.po | 2 +- lang/python/pt_BR/LC_MESSAGES/python.po | 2 +- lang/python/pt_PT/LC_MESSAGES/python.po | 2 +- lang/python/ro/LC_MESSAGES/python.po | 2 +- lang/python/ru/LC_MESSAGES/python.po | 2 +- lang/python/sk/LC_MESSAGES/python.po | 2 +- lang/python/sl/LC_MESSAGES/python.po | 2 +- lang/python/sq/LC_MESSAGES/python.po | 2 +- lang/python/sr/LC_MESSAGES/python.po | 2 +- lang/python/sr@latin/LC_MESSAGES/python.po | 2 +- lang/python/sv/LC_MESSAGES/python.po | 2 +- lang/python/te/LC_MESSAGES/python.po | 2 +- lang/python/tg/LC_MESSAGES/python.po | 2 +- lang/python/th/LC_MESSAGES/python.po | 2 +- lang/python/tr_TR/LC_MESSAGES/python.po | 2 +- lang/python/uk/LC_MESSAGES/python.po | 4 ++-- lang/python/ur/LC_MESSAGES/python.po | 2 +- lang/python/uz/LC_MESSAGES/python.po | 2 +- lang/python/vi/LC_MESSAGES/python.po | 2 +- lang/python/zh_CN/LC_MESSAGES/python.po | 2 +- lang/python/zh_TW/LC_MESSAGES/python.po | 2 +- 71 files changed, 83 insertions(+), 82 deletions(-) diff --git a/lang/python.pot b/lang/python.pot index d7ee53d53a..af652f0938 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po index 944d8f6aa6..90be91e0b9 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: aboodilankaboot, 2019\n" "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n" diff --git a/lang/python/as/LC_MESSAGES/python.po b/lang/python/as/LC_MESSAGES/python.po index b6751bef11..950ae66e52 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Deep Jyoti Choudhury , 2020\n" "Language-Team: Assamese (https://www.transifex.com/calamares/teams/20061/as/)\n" diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po index 5be0cc906d..ee640c712c 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: enolp , 2020\n" "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n" diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po index e017105cdf..5a03b748d6 100644 --- a/lang/python/az/LC_MESSAGES/python.po +++ b/lang/python/az/LC_MESSAGES/python.po @@ -4,16 +4,16 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Xəyyam Qocayev , 2020 +# xxmn77 , 2020 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Xəyyam Qocayev , 2020\n" +"Last-Translator: xxmn77 , 2020\n" "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po index ae1c18ee19..027e819d5f 100644 --- a/lang/python/az_AZ/LC_MESSAGES/python.po +++ b/lang/python/az_AZ/LC_MESSAGES/python.po @@ -4,16 +4,16 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Xəyyam Qocayev , 2020 +# xxmn77 , 2020 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Xəyyam Qocayev , 2020\n" +"Last-Translator: xxmn77 , 2020\n" "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po index 46050a1619..49e6423e67 100644 --- a/lang/python/be/LC_MESSAGES/python.po +++ b/lang/python/be/LC_MESSAGES/python.po @@ -4,16 +4,16 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Zmicer Turok , 2020 +# Źmicier Turok , 2020 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Zmicer Turok , 2020\n" +"Last-Translator: Źmicier Turok , 2020\n" "Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po index fc0fb55093..37a2ce7a8c 100644 --- a/lang/python/bg/LC_MESSAGES/python.po +++ b/lang/python/bg/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Georgi Georgiev (Жоро) , 2020\n" "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n" diff --git a/lang/python/bn/LC_MESSAGES/python.po b/lang/python/bn/LC_MESSAGES/python.po index 373a16f435..bc8b6fc1aa 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 508a8b0ef95404aa3dc5178f0ccada5e_017b8a4 , 2020\n" "Language-Team: Bengali (https://www.transifex.com/calamares/teams/20061/bn/)\n" diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po index 2c509b4258..adaf50b332 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Davidmp , 2020\n" "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n" diff --git a/lang/python/ca@valencia/LC_MESSAGES/python.po b/lang/python/ca@valencia/LC_MESSAGES/python.po index 325327b61d..f4d8c444ff 100644 --- a/lang/python/ca@valencia/LC_MESSAGES/python.po +++ b/lang/python/ca@valencia/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Catalan (Valencian) (https://www.transifex.com/calamares/teams/20061/ca@valencia/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po index 37d5e0c509..0de915a1a3 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Pavel Borecki , 2020\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n" diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po index 16b8ff2a2c..6187e31b99 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: scootergrisen, 2020\n" "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n" diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po index 8af510b335..cb7264aedb 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Andreas Eitel , 2020\n" "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n" diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po index c659083f15..742f337a6e 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Efstathios Iosifidis , 2017\n" "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n" diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po index 40ddfa38d4..3e84dc7dc0 100644 --- a/lang/python/en_GB/LC_MESSAGES/python.po +++ b/lang/python/en_GB/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Jason Collins , 2018\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n" diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po index 95fb6f6c02..7cc9bfc850 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kurt Ankh Phoenix , 2018\n" "Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n" diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po index c143d525b8..a33951bb22 100644 --- a/lang/python/es/LC_MESSAGES/python.po +++ b/lang/python/es/LC_MESSAGES/python.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Pier Jose Gotta Perez , 2020\n" "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n" diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po index dd141461fa..14297508ef 100644 --- a/lang/python/es_MX/LC_MESSAGES/python.po +++ b/lang/python/es_MX/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Logan 8192 , 2018\n" "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n" diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po index edd859d4bb..36aee838f0 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po index 72eed6d3a0..84b937110c 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Madis Otenurm, 2019\n" "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n" diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po index 878e322aa1..92215fb2db 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Ander Elortondo, 2019\n" "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n" diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po index 8b8d78d9ad..859496b544 100644 --- a/lang/python/fa/LC_MESSAGES/python.po +++ b/lang/python/fa/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: alireza jamshidi , 2020\n" "Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n" diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po index d0404d39c1..051b1582ab 100644 --- a/lang/python/fi_FI/LC_MESSAGES/python.po +++ b/lang/python/fi_FI/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kimmo Kujansuu , 2020\n" "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n" diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po index cbc3f35bac..95f04d4715 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Arnaud Ferraris , 2019\n" "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n" diff --git a/lang/python/fr_CH/LC_MESSAGES/python.po b/lang/python/fr_CH/LC_MESSAGES/python.po index 859f4181ef..06e78d855d 100644 --- a/lang/python/fr_CH/LC_MESSAGES/python.po +++ b/lang/python/fr_CH/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: French (Switzerland) (https://www.transifex.com/calamares/teams/20061/fr_CH/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/fur/LC_MESSAGES/python.po b/lang/python/fur/LC_MESSAGES/python.po index 80e2b2fa92..d7735d883a 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Fabio Tomat , 2020\n" "Language-Team: Friulian (https://www.transifex.com/calamares/teams/20061/fur/)\n" diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po index 0a20ffa620..0cf230c2fc 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Xosé, 2018\n" "Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n" diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po index ac3d083d57..c5de4c5295 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po index 785e41e4f2..459e858b32 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Yaron Shahrabani , 2020\n" "Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n" diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po index ff04b2b551..4b06e51214 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Panwar108 , 2020\n" "Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n" diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po index 59225161a7..ebb1b31b56 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Lovro Kudelić , 2020\n" "Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n" diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po index 188f5babfa..5a6f163979 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Lajos Pasztor , 2019\n" "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n" diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po index c0b15d618e..c316ef562f 100644 --- a/lang/python/id/LC_MESSAGES/python.po +++ b/lang/python/id/LC_MESSAGES/python.po @@ -7,15 +7,16 @@ # Choiril Abdul, 2018 # harsxv , 2018 # Wantoyèk , 2018 +# Drajat Hasan , 2021 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Wantoyèk , 2018\n" +"Last-Translator: Drajat Hasan , 2021\n" "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,7 +42,7 @@ msgstr "" #: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" -msgstr "" +msgstr "Kesalahan Konfigurasi" #: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 diff --git a/lang/python/ie/LC_MESSAGES/python.po b/lang/python/ie/LC_MESSAGES/python.po index f750b493d2..bed8a60f6f 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Caarmi, 2020\n" "Language-Team: Interlingue (https://www.transifex.com/calamares/teams/20061/ie/)\n" diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po index 938c6b646a..e16bdf652d 100644 --- a/lang/python/is/LC_MESSAGES/python.po +++ b/lang/python/is/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kristján Magnússon, 2018\n" "Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n" diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po index 62d005b3d8..c44b547246 100644 --- a/lang/python/it_IT/LC_MESSAGES/python.po +++ b/lang/python/it_IT/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Saverio , 2020\n" "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n" diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po index e92effe83b..fbc9e50e07 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: UTUMI Hirosi , 2020\n" "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n" diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po index 0dc5686d79..ee07acf3eb 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po index 2e7e3a7cc9..9b70d0a974 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Kannada (https://www.transifex.com/calamares/teams/20061/kn/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po index c928da2ff0..0e54afa7d8 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 , 2020 +# Bruce Lee , 2020 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: JungHee Lee , 2020\n" +"Last-Translator: Bruce Lee , 2020\n" "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po index c6e9d73957..3ea4b76c1f 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po index f7dbce9e25..6eb6d82cb0 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Moo, 2020\n" "Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n" diff --git a/lang/python/lv/LC_MESSAGES/python.po b/lang/python/lv/LC_MESSAGES/python.po index 7ff2eea9c2..09a8a92d9f 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Latvian (https://www.transifex.com/calamares/teams/20061/lv/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po index b127945c0d..9c761a0bda 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Martin Ristovski , 2018\n" "Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n" diff --git a/lang/python/ml/LC_MESSAGES/python.po b/lang/python/ml/LC_MESSAGES/python.po index 9be593485c..fe9ef95440 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Balasankar C , 2019\n" "Language-Team: Malayalam (https://www.transifex.com/calamares/teams/20061/ml/)\n" diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po index acaffbf555..ec4c3ff70b 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po index bf65e9366d..53e91b22f8 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\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://www.transifex.com/calamares/teams/20061/nb/)\n" diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po index aa8a221551..9e7a074948 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Nepali (Nepal) (https://www.transifex.com/calamares/teams/20061/ne_NP/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po index 477dfd9bfd..1694f3e991 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Adriaan de Groot , 2020\n" "Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n" diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po index 8e2dede8b8..0022ca568c 100644 --- a/lang/python/pl/LC_MESSAGES/python.po +++ b/lang/python/pl/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Piotr Strębski , 2020\n" "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n" diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po index d63342e2dc..d03394be12 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Guilherme, 2020\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n" diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po index 0948b0b3f1..2b492a4feb 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Hugo Carvalho , 2020\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n" diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po index cc73509bf7..40ab5198bc 100644 --- a/lang/python/ro/LC_MESSAGES/python.po +++ b/lang/python/ro/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Sebastian Brici , 2018\n" "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n" diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po index 11aa996e76..4fee3f3d89 100644 --- a/lang/python/ru/LC_MESSAGES/python.po +++ b/lang/python/ru/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: ZIzA, 2020\n" "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n" diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po index 3b7b49cfd3..94b05a6e72 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Dušan Kazik , 2020\n" "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n" diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po index 1bb38ff1ba..9d99bcc23a 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po index 54bfcb6a9f..57647c7e94 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Besnik Bleta , 2020\n" "Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n" diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po index e837052ec8..5cfb7e7b2e 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Slobodan Simić , 2020\n" "Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n" diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po index b246c57358..b24ee6c150 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po index e3ac0509cc..002b8d523b 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Luna Jernberg , 2020\n" "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n" diff --git a/lang/python/te/LC_MESSAGES/python.po b/lang/python/te/LC_MESSAGES/python.po index dd63edc125..1713b5fa68 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Telugu (https://www.transifex.com/calamares/teams/20061/te/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/tg/LC_MESSAGES/python.po b/lang/python/tg/LC_MESSAGES/python.po index 90b2983427..2032d929c9 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Victor Ibragimov , 2020\n" "Language-Team: Tajik (https://www.transifex.com/calamares/teams/20061/tg/)\n" diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po index d9eec9f3ae..352e885b51 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po index a29d922ae0..1b07518a8d 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Demiray Muhterem , 2020\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n" diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po index 35022be5d2..6ea133537c 100644 --- a/lang/python/uk/LC_MESSAGES/python.po +++ b/lang/python/uk/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # Володимир Братко , 2018 -# Paul S , 2019 +# Paul S <204@tuta.io>, 2019 # Yuri Chornoivan , 2020 # #, fuzzy @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Yuri Chornoivan , 2020\n" "Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n" diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po index 6d7a1c4704..8c71d0c6d1 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po index 15f3ce1c67..88dd3a1b51 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n" "MIME-Version: 1.0\n" diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po index bde6eacee1..e6989fb298 100644 --- a/lang/python/vi/LC_MESSAGES/python.po +++ b/lang/python/vi/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: T. Tran , 2020\n" "Language-Team: Vietnamese (https://www.transifex.com/calamares/teams/20061/vi/)\n" diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po index 99dd6b45c3..67c0163cb6 100644 --- a/lang/python/zh_CN/LC_MESSAGES/python.po +++ b/lang/python/zh_CN/LC_MESSAGES/python.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 玉堂白鹤 , 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n" diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po index 584d1e05a9..6c497b8bc6 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: 2020-12-04 22:26+0100\n" +"POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 黃柏諺 , 2020\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n" From a9539018e968a535557c604f4bdb0165d701287c Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Wed, 13 Jan 2021 22:15:22 +0530 Subject: [PATCH 029/318] [fixed] backAndNextVisbility logic --- src/libcalamaresui/ViewManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index a661c37501..f43152209b 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -369,7 +369,7 @@ ViewManager::next() UPDATE_BUTTON_PROPERTY( backEnabled, false ) } updateCancelEnabled( !settings->disableCancel() && !( executing && settings->disableCancelDuringExec() ) ); - updateBackAndNextVisibility( !( executing && !settings->hideBackAndNextDuringExec() ) ); + updateBackAndNextVisibility( !( executing && settings->hideBackAndNextDuringExec() ) ); } else { From 0ff32784d11f1100305180d36eeabb955a0cb5bb Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Wed, 13 Jan 2021 22:41:25 +0530 Subject: [PATCH 030/318] hooked backAndNextVisible signal to nonQML navigation --- src/calamares/CalamaresWindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index 103b69a907..0d425d9299 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -162,6 +162,7 @@ CalamaresWindow::getWidgetNavigation( QWidget* parent ) connect( m_viewManager, &Calamares::ViewManager::backIconChanged, this, [=]( QString n ) { setButtonIcon( back, n ); } ); + connect( m_viewManager, &Calamares::ViewManager::backAndNextVisibleChanged, back, &QPushButton::setVisible ); bottomLayout->addWidget( back ); } { @@ -174,6 +175,7 @@ CalamaresWindow::getWidgetNavigation( QWidget* parent ) connect( m_viewManager, &Calamares::ViewManager::nextIconChanged, this, [=]( QString n ) { setButtonIcon( next, n ); } ); + connect( m_viewManager, &Calamares::ViewManager::backAndNextVisibleChanged, next, &QPushButton::setVisible ); bottomLayout->addWidget( next ); } bottomLayout->addSpacing( 12 ); From 1ec886e8cbe82ba1102844e44e32e433e6ac5275 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 18 Jan 2021 16:44:23 +0100 Subject: [PATCH 031/318] Changes: document newly-merged --- CHANGES | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index b3bf7f53da..c0c141b0d5 100644 --- a/CHANGES +++ b/CHANGES @@ -10,13 +10,23 @@ website will have to do for older versions. # 3.2.36 (unreleased) # This release contains contributions from (alphabetically by first name): - - No external contributors yet + - Anubhav Choudhary + - Gaël PORTAY ## Core ## - - No core changes yet + - It is now possible to hide the *next* and *back* buttons during + the "exec" phase of installation. THanks Anubhav. ## Modules ## - - No module changes yet + - *partition* includes more information about what it will do, including + GPT partition types (in human-readable format, if possible). Thanks Gaël. + - Some edge-cases with overlay filesystems have been resolved in the + *partition* module. Thanks Gaël. + - During the creation of filesystems and partitions, automounting is + turned off (if DBus is available, and the host system supports + Freedesktop automount control). This should reduce the number of + failed installations if automount grabs partitions while they are + being created. # 3.2.35.1 (2020-12-07) # From 31bf38977ec7e0c392957884ba1a1c0ec9aee4ac Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 20 Jan 2021 14:48:44 +0100 Subject: [PATCH 032/318] [partition] Refactor partition-labeling --- src/modules/partition/jobs/CreatePartitionJob.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index 301edbfce8..948c31902d 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -71,6 +71,12 @@ prettyGptType( const QString& type ) return gptTypePrettyStrings.value( type.toLower(), type ); } +static QString +prettyGptType( const Partition* partition ) +{ + return prettyGptType( partition->type() ); +} + static QString prettyGptEntries( const Partition* partition ) { @@ -86,7 +92,7 @@ prettyGptEntries( const Partition* partition ) list += partition->label(); } - QString type = prettyGptType( partition->type() ); + QString type = prettyGptType( partition ); if ( !type.isEmpty() ) { list += type; @@ -166,7 +172,7 @@ CreatePartitionJob::prettyStatusMessage() const const PartitionTable* table = CalamaresUtils::Partition::getPartitionTable( m_partition ); if ( table && table->type() == PartitionTable::TableType::gpt ) { - QString type = prettyGptType( m_partition->type() ); + QString type = prettyGptType( m_partition ); if ( type.isEmpty() ) { type = m_partition->label(); From 520f08bbbaae4d715bbfc2a0b81e2b71ea013b45 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 20 Jan 2021 14:54:12 +0100 Subject: [PATCH 033/318] [partition] Fix build with legacy kpmcore --- src/modules/partition/jobs/CreatePartitionJob.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index 948c31902d..2b6451c3e0 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -74,7 +74,11 @@ prettyGptType( const QString& type ) static QString prettyGptType( const Partition* partition ) { +#ifdef WITH_KPMCORE42API return prettyGptType( partition->type() ); +#else + return QString(); +#endif } static QString From 6978ce3cb43c2d79c7f1546453bb8f6622acd07e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 20 Jan 2021 14:56:34 +0100 Subject: [PATCH 034/318] [partition] Collect more kpmcore 4.2 code --- src/modules/partition/jobs/FillGlobalStorageJob.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index bda5365c3f..1660dbb540 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -84,14 +84,14 @@ mapForPartition( Partition* partition, const QString& uuid ) map[ "device" ] = partition->partitionPath(); map[ "partlabel" ] = partition->label(); map[ "partuuid" ] = partition->uuid(); -#ifdef WITH_KPMCORE42API - map[ "parttype" ] = partition->type(); - map[ "partattrs" ] = partition->attributes(); -#endif map[ "mountPoint" ] = PartitionInfo::mountPoint( partition ); map[ "fsName" ] = userVisibleFS( partition->fileSystem() ); map[ "fs" ] = untranslatedFS( partition->fileSystem() ); +#ifdef WITH_KPMCORE42API + map[ "parttype" ] = partition->type(); + map[ "partattrs" ] = partition->attributes(); map[ "features" ] = partition->fileSystem().features(); +#endif if ( partition->fileSystem().type() == FileSystem::Luks && dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() ) { From 2a3e616b0e88a923aecb2d7690a27be6056993bd Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 20 Jan 2021 15:08:06 +0100 Subject: [PATCH 035/318] Changes: correct description of automount (thanks Kevin) --- CHANGES | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index c0c141b0d5..d112470b4b 100644 --- a/CHANGES +++ b/CHANGES @@ -24,9 +24,10 @@ This release contains contributions from (alphabetically by first name): *partition* module. Thanks Gaël. - During the creation of filesystems and partitions, automounting is turned off (if DBus is available, and the host system supports - Freedesktop automount control). This should reduce the number of + KDE Solid automount control). This should reduce the number of failed installations if automount grabs partitions while they are - being created. + being created. The code is prepared to handle other ways to control + automount-behavior as well. # 3.2.35.1 (2020-12-07) # From 9a4c599e22928bdbc246804d8e5ef3032578d3fb Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 22 Jan 2021 14:49:20 +0100 Subject: [PATCH 036/318] [libcalamares] Tidy logging a little for Python errors --- src/libcalamares/PythonJob.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp index 6944f38e59..98f284ecc3 100644 --- a/src/libcalamares/PythonJob.cpp +++ b/src/libcalamares/PythonJob.cpp @@ -261,12 +261,12 @@ PythonJob::exec() { m_description.truncate( i_newline ); } - cDebug() << "Job description from __doc__" << prettyName() << '=' << m_description; + cDebug() << Logger::SubEntry << "Job description from __doc__" << prettyName() << '=' << m_description; } } else { - cDebug() << "Job description from pretty_name" << prettyName() << '=' << m_description; + cDebug() << Logger::SubEntry << "Job description from pretty_name" << prettyName() << '=' << m_description; } emit progress( 0 ); From f6cb8799298070d28941ad6dd08449db58a0e7f2 Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Sat, 23 Jan 2021 20:43:55 +0530 Subject: [PATCH 037/318] branding.desc updated --- src/branding/default/branding.desc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index 5a8dd3f493..cb24181494 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -219,3 +219,16 @@ slideshow: "show.qml" slideshowAPI: 2 +# These options are to customize online uploading of logs to pastebins: +# - style : Defines the kind of pastebin service to be used. Takes +# string as input +# - url : Defines the address of pastebin service to be used. +# Takes string as input +# - port : Defines the port number to be used to send logs. Takes +# integer as input +# - enable : Defines if the functionality is to be used or not. Takes +# bool as input +logUpload.style : "fische" +logUpload.url : "termbin.com" +logUpload.port : 9999 +logUpload.enable : true From ff66e4b3d5c38933dee8043c0259622ba8f98e05 Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Sat, 23 Jan 2021 20:47:33 +0530 Subject: [PATCH 038/318] Redirecting logUpload vars to pasteUtility --- src/libcalamaresui/Branding.cpp | 6 ++++++ src/libcalamaresui/Branding.h | 13 +++++++++++++ src/libcalamaresui/ViewManager.cpp | 7 ++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 8145ad57c1..320dccc932 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -86,6 +86,7 @@ const QStringList Branding::s_styleEntryStrings = "sidebarTextSelect", "sidebarTextHighlight" }; + // clang-format on // *INDENT-ON* @@ -510,6 +511,11 @@ Branding::initSimpleSettings( const YAML::Node& doc ) { m_windowHeight = WindowDimension( CalamaresUtils::windowPreferredHeight, WindowDimensionUnit::Pixies ); } + + m_logUploadEnable = doc[ "logUpload.enable" ].as< bool >( false ); + m_logUploadURL = getString( doc, "logUpload.url") ; + m_logUploadPort = doc[ "logUpload.port" ].as< int >(); + m_logUploadStyle= getString(doc, "logUpload.style" ); } void diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index b03df3acd0..f5c8fb78e2 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -42,6 +42,7 @@ class UIDLLEXPORT Branding : public QObject * e.g. *Branding::ProductName to get the string value for * the product name. */ + enum StringEntry { ProductName, @@ -214,6 +215,13 @@ class UIDLLEXPORT Branding : public QObject */ void setGlobals( GlobalStorage* globalStorage ) const; + + //Paste functionality related + bool logUploadEnable() { return m_logUploadEnable; }; + QString logUploadURL() { return m_logUploadURL; }; + int logUploadPort() { return m_logUploadPort; }; + QString logUploadStyle() { return m_logUploadStyle; }; + public slots: QString string( StringEntry stringEntry ) const; QString versionedName() const { return string( VersionedName ); } @@ -261,6 +269,11 @@ public slots: bool m_welcomeStyleCalamares; bool m_welcomeExpandingLogo; + bool m_logUploadEnable; + QString m_logUploadURL; + int m_logUploadPort; + QString m_logUploadStyle; + WindowExpansion m_windowExpansion; WindowDimension m_windowHeight, m_windowWidth; WindowPlacement m_windowPlacement; diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index f43152209b..770d79d892 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -140,7 +140,7 @@ ViewManager::insertViewStep( int before, ViewStep* step ) void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { - bool shouldOfferWebPaste = false; // TODO: config var + bool shouldOfferWebPaste = Calamares::Branding::instance()->logUploadEnable(); // TODO: config var cError() << "Installation failed:"; cDebug() << "- message:" << message; @@ -183,8 +183,9 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail connect( msgBox, &QMessageBox::buttonClicked, [msgBox]( QAbstractButton* button ) { if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole ) { - // TODO: host and port should be configurable - QString pasteUrlMsg = CalamaresUtils::sendLogToPastebin( msgBox, QStringLiteral( "termbin.com" ), 9999 ); + QString pasteURLHost = Calamares::Branding::instance()->logUploadURL(); + int pasteURLPort = Calamares::Branding::instance()->logUploadPort(); + QString pasteUrlMsg = CalamaresUtils::sendLogToPastebin( msgBox, pasteURLHost, pasteURLPort ); QString pasteUrlTitle = tr( "Install Log Paste URL" ); if ( pasteUrlMsg.isEmpty() ) From a2c930a714e460900039a54c9fd268fe94dfc39a Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Sat, 23 Jan 2021 21:16:32 +0530 Subject: [PATCH 039/318] Code-formatted and Copyright-text added --- src/branding/default/branding.desc | 8 +++++--- src/libcalamaresui/Branding.cpp | 5 +++-- src/libcalamaresui/Branding.h | 11 ++++++----- src/libcalamaresui/ViewManager.cpp | 11 ++++------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index cb24181494..8325dd17f1 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -220,15 +220,17 @@ slideshowAPI: 2 # These options are to customize online uploading of logs to pastebins: -# - style : Defines the kind of pastebin service to be used. Takes -# string as input +# - style : Defines the kind of pastebin service to be used. ie it can +# provide the functionality of controlling privacy of +# paste (in future).Currently only "fiche" servers +# are supported. Takes string as input # - url : Defines the address of pastebin service to be used. # Takes string as input # - port : Defines the port number to be used to send logs. Takes # integer as input # - enable : Defines if the functionality is to be used or not. Takes # bool as input -logUpload.style : "fische" +logUpload.style : "fiche" logUpload.url : "termbin.com" logUpload.port : 9999 logUpload.enable : true diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 320dccc932..c08fd732e8 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -4,6 +4,7 @@ * SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot * SPDX-FileCopyrightText: 2018 Raul Rodrigo Segura (raurodse) * SPDX-FileCopyrightText: 2019 Camilo Higuita + * SPDX-FileCopyrightText: 2021 Anubhav Choudhary * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is Free Software: see the License-Identifier above. @@ -513,9 +514,9 @@ Branding::initSimpleSettings( const YAML::Node& doc ) } m_logUploadEnable = doc[ "logUpload.enable" ].as< bool >( false ); - m_logUploadURL = getString( doc, "logUpload.url") ; + m_logUploadURL = getString( doc, "logUpload.url" ); m_logUploadPort = doc[ "logUpload.port" ].as< int >(); - m_logUploadStyle= getString(doc, "logUpload.style" ); + m_logUploadStyle = getString( doc, "logUpload.style" ); } void diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index f5c8fb78e2..d273c81c6a 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -4,6 +4,7 @@ * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot * SPDX-FileCopyrightText: 2018 Raul Rodrigo Segura (raurodse) * SPDX-FileCopyrightText: 2019 Camilo Higuita + * SPDX-FileCopyrightText: 2021 Anubhav Choudhary * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is Free Software: see the License-Identifier above. @@ -216,11 +217,11 @@ class UIDLLEXPORT Branding : public QObject void setGlobals( GlobalStorage* globalStorage ) const; - //Paste functionality related - bool logUploadEnable() { return m_logUploadEnable; }; - QString logUploadURL() { return m_logUploadURL; }; - int logUploadPort() { return m_logUploadPort; }; - QString logUploadStyle() { return m_logUploadStyle; }; + //Paste functionality related + bool logUploadEnable() { return m_logUploadEnable; }; + QString logUploadURL() { return m_logUploadURL; }; + int logUploadPort() { return m_logUploadPort; }; + QString logUploadStyle() { return m_logUploadStyle; }; public slots: QString string( StringEntry stringEntry ) const; diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 770d79d892..5786c44a55 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -4,6 +4,7 @@ * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot * SPDX-FileCopyrightText: 2019 Dominic Hayes * SPDX-FileCopyrightText: 2019 Gabriel Craciunescu + * SPDX-FileCopyrightText: 2021 Anubhav Choudhary * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is Free Software: see the License-Identifier above. @@ -140,7 +141,7 @@ ViewManager::insertViewStep( int before, ViewStep* step ) void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { - bool shouldOfferWebPaste = Calamares::Branding::instance()->logUploadEnable(); // TODO: config var + bool shouldOfferWebPaste = Calamares::Branding::instance()->logUploadEnable(); cError() << "Installation failed:"; cDebug() << "- message:" << message; @@ -531,13 +532,9 @@ ViewManager::updateCancelEnabled( bool enabled ) } void -ViewManager::updateBackAndNextVisibility( bool visible) -{ - UPDATE_BUTTON_PROPERTY( backAndNextVisible, visible ) -} +ViewManager::updateBackAndNextVisibility( bool visible ) { UPDATE_BUTTON_PROPERTY( backAndNextVisible, visible ) } -QVariant -ViewManager::data( const QModelIndex& index, int role ) const +QVariant ViewManager::data( const QModelIndex& index, int role ) const { if ( !index.isValid() ) { From 186c065b4cba56359e0b938208e2ab08834a0806 Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Sat, 23 Jan 2021 22:49:23 +0530 Subject: [PATCH 040/318] PasteURL sent to clipboard --- src/libcalamaresui/utils/Paste.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 8099d90249..a48a7c0979 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -15,6 +15,8 @@ #include #include #include +#include +#include namespace CalamaresUtils { @@ -22,7 +24,8 @@ namespace CalamaresUtils QString sendLogToPastebin( QObject* parent, const QString& ficheHost, quint16 fichePort ) { - QString pasteUrlFmt = parent->tr( "Install log posted to:\n%1" ); + QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); + QFile pasteSourceFile( Logger::logFile() ); if ( !pasteSourceFile.open( QIODevice::ReadOnly | QIODevice::Text ) ) { @@ -78,6 +81,14 @@ sendLogToPastebin( QObject* parent, const QString& ficheHost, quint16 fichePort QRegularExpression pasteUrlRegex( "^http[s]?://" + ficheHost ); QString pasteUrlMsg = QString( pasteUrlFmt ).arg( pasteUrlStr ); + QClipboard* clipboard = QApplication::clipboard(); + clipboard->setText(pasteUrlStr, QClipboard::Clipboard); + + if (clipboard->supportsSelection()) + { + clipboard->setText(pasteUrlStr, QClipboard::Selection); + } + if ( nBytesRead < 8 || !pasteUrl.isValid() || !pasteUrlRegex.match( pasteUrlStr ).hasMatch() ) { cError() << "No data from paste server"; From b4078f36342638165651a95ad43dae2e98a2017b Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Mon, 25 Jan 2021 01:09:20 +0530 Subject: [PATCH 041/318] Changed branding keynames + minor fixes --- src/branding/default/branding.desc | 17 +++++++---------- src/libcalamaresui/Branding.cpp | 8 +++----- src/libcalamaresui/Branding.h | 14 ++++++-------- src/libcalamaresui/ViewManager.cpp | 24 ++++++++++++++++++------ src/libcalamaresui/utils/Paste.cpp | 30 ++++++++++++++++++++++-------- src/libcalamaresui/utils/Paste.h | 6 ++++-- 6 files changed, 60 insertions(+), 39 deletions(-) diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index 8325dd17f1..92d0bba10c 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -220,17 +220,14 @@ slideshowAPI: 2 # These options are to customize online uploading of logs to pastebins: -# - style : Defines the kind of pastebin service to be used. ie it can -# provide the functionality of controlling privacy of -# paste (in future).Currently only "fiche" servers -# are supported. Takes string as input +# - type : Defines the kind of pastebin service to be used.Currently +# it accepts two values: +# - none : disables the pastebin functionality +# - fiche : use fiche pastebin server # - url : Defines the address of pastebin service to be used. # Takes string as input # - port : Defines the port number to be used to send logs. Takes # integer as input -# - enable : Defines if the functionality is to be used or not. Takes -# bool as input -logUpload.style : "fiche" -logUpload.url : "termbin.com" -logUpload.port : 9999 -logUpload.enable : true +uploadServer.type : "fiche" +uploadServer.url : "termbin.com" +uploadServer.port : 9999 diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index c08fd732e8..40383c9928 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -87,7 +87,6 @@ const QStringList Branding::s_styleEntryStrings = "sidebarTextSelect", "sidebarTextHighlight" }; - // clang-format on // *INDENT-ON* @@ -513,10 +512,9 @@ Branding::initSimpleSettings( const YAML::Node& doc ) m_windowHeight = WindowDimension( CalamaresUtils::windowPreferredHeight, WindowDimensionUnit::Pixies ); } - m_logUploadEnable = doc[ "logUpload.enable" ].as< bool >( false ); - m_logUploadURL = getString( doc, "logUpload.url" ); - m_logUploadPort = doc[ "logUpload.port" ].as< int >(); - m_logUploadStyle = getString( doc, "logUpload.style" ); + m_uploadServerURL = getString( doc, "uploadServer.url" ); + m_uploadServerPort = doc[ "uploadServer.port" ].as< int >(); + m_uploadServerType = getString( doc, "uploadServer.type" ); } void diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index d273c81c6a..493579a34f 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -218,10 +218,9 @@ class UIDLLEXPORT Branding : public QObject //Paste functionality related - bool logUploadEnable() { return m_logUploadEnable; }; - QString logUploadURL() { return m_logUploadURL; }; - int logUploadPort() { return m_logUploadPort; }; - QString logUploadStyle() { return m_logUploadStyle; }; + QString uploadServerType() { return m_uploadServerType; }; + QString uploadServerURL() { return m_uploadServerURL; }; + int uploadServerPort() { return m_uploadServerPort; }; public slots: QString string( StringEntry stringEntry ) const; @@ -270,10 +269,9 @@ public slots: bool m_welcomeStyleCalamares; bool m_welcomeExpandingLogo; - bool m_logUploadEnable; - QString m_logUploadURL; - int m_logUploadPort; - QString m_logUploadStyle; + QString m_uploadServerType; + QString m_uploadServerURL; + int m_uploadServerPort; WindowExpansion m_windowExpansion; WindowDimension m_windowHeight, m_windowWidth; diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 5786c44a55..ae2460c37d 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -141,7 +141,8 @@ ViewManager::insertViewStep( int before, ViewStep* step ) void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { - bool shouldOfferWebPaste = Calamares::Branding::instance()->logUploadEnable(); + QString UploadServerType = Calamares::Branding::instance()->uploadServerType(); + bool shouldOfferWebPaste = CalamaresUtils::UploadServersList.contains( UploadServerType ); cError() << "Installation failed:"; cDebug() << "- message:" << message; @@ -184,9 +185,16 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail connect( msgBox, &QMessageBox::buttonClicked, [msgBox]( QAbstractButton* button ) { if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole ) { - QString pasteURLHost = Calamares::Branding::instance()->logUploadURL(); - int pasteURLPort = Calamares::Branding::instance()->logUploadPort(); - QString pasteUrlMsg = CalamaresUtils::sendLogToPastebin( msgBox, pasteURLHost, pasteURLPort ); + QString pasteUrlMsg; + QString UploadServerType = Calamares::Branding::instance()->uploadServerType(); + if ( UploadServerType == "fiche" ) + { + pasteUrlMsg = CalamaresUtils::sendLogToPastebin( msgBox ); + } + else + { + pasteUrlMsg = QString(); + } QString pasteUrlTitle = tr( "Install Log Paste URL" ); if ( pasteUrlMsg.isEmpty() ) @@ -532,9 +540,13 @@ ViewManager::updateCancelEnabled( bool enabled ) } void -ViewManager::updateBackAndNextVisibility( bool visible ) { UPDATE_BUTTON_PROPERTY( backAndNextVisible, visible ) } +ViewManager::updateBackAndNextVisibility( bool visible ) +{ + UPDATE_BUTTON_PROPERTY( backAndNextVisible, visible ) +} -QVariant ViewManager::data( const QModelIndex& index, int role ) const +QVariant +ViewManager::data( const QModelIndex& index, int role ) const { if ( !index.isValid() ) { diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index a48a7c0979..269876017c 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -9,6 +9,7 @@ #include "Paste.h" +#include "Branding.h" #include "utils/Logger.h" #include @@ -17,13 +18,24 @@ #include #include #include +#include namespace CalamaresUtils { +QStringList UploadServersList = { + "fiche" + // In future more serverTypes can be added as Calamares support them + // "none" serverType is explicitly not mentioned here +}; + QString -sendLogToPastebin( QObject* parent, const QString& ficheHost, quint16 fichePort ) +sendLogToPastebin( QObject* parent ) { + + const QString& ficheHost = Calamares::Branding::instance()->uploadServerURL(); + quint16 fichePort = Calamares::Branding::instance()->uploadServerPort(); + QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); QFile pasteSourceFile( Logger::logFile() ); @@ -81,15 +93,17 @@ sendLogToPastebin( QObject* parent, const QString& ficheHost, quint16 fichePort QRegularExpression pasteUrlRegex( "^http[s]?://" + ficheHost ); QString pasteUrlMsg = QString( pasteUrlFmt ).arg( pasteUrlStr ); - QClipboard* clipboard = QApplication::clipboard(); - clipboard->setText(pasteUrlStr, QClipboard::Clipboard); - - if (clipboard->supportsSelection()) + if ( nBytesRead >= 8 && pasteUrl.isValid() && pasteUrlRegex.match( pasteUrlStr ).hasMatch() ) { - clipboard->setText(pasteUrlStr, QClipboard::Selection); - } + QClipboard* clipboard = QApplication::clipboard(); + clipboard->setText(pasteUrlStr, QClipboard::Clipboard); - if ( nBytesRead < 8 || !pasteUrl.isValid() || !pasteUrlRegex.match( pasteUrlStr ).hasMatch() ) + if (clipboard->supportsSelection()) + { + clipboard->setText(pasteUrlStr, QClipboard::Selection); + } + } + else { cError() << "No data from paste server"; return QString(); diff --git a/src/libcalamaresui/utils/Paste.h b/src/libcalamaresui/utils/Paste.h index f802dfe2e7..69adfa99c1 100644 --- a/src/libcalamaresui/utils/Paste.h +++ b/src/libcalamaresui/utils/Paste.h @@ -10,7 +10,7 @@ #ifndef UTILS_PASTE_H #define UTILS_PASTE_H -#include // for quint16 +#include class QObject; class QString; @@ -22,7 +22,9 @@ namespace CalamaresUtils * * Returns the (string) URL that the pastebin gives us. */ -QString sendLogToPastebin( QObject* parent, const QString& ficheHost, quint16 fichePort ); +QString sendLogToPastebin( QObject* parent ); + +extern QStringList UploadServersList; } // namespace CalamaresUtils From 7c175f5005da2163bd13df816abb68aad0d18d28 Mon Sep 17 00:00:00 2001 From: Jonas Strassel Date: Fri, 22 Jan 2021 22:15:49 +0100 Subject: [PATCH 042/318] ci(gh): add basic workflow installing dependencies --- .github/workflows/ci.yml | 79 +++++++++++++++++++ ci/{travis-config.sh => ci-config.sh} | 0 ci/{travis-continuous.sh => ci-continuous.sh} | 2 +- ci/{travis-coverity.sh => ci-coverity.sh} | 2 +- 4 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/ci.yml rename ci/{travis-config.sh => ci-config.sh} (100%) rename ci/{travis-continuous.sh => ci-continuous.sh} (96%) rename ci/{travis-coverity.sh => ci-coverity.sh} (97%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000000..af57fcfccf --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,79 @@ +name: ci + +on: + push: + workflow_dispatch: + #schedule: + # - cron: '30 * * * *' + +env: + BUILDDIR: /build + SRCDIR: /src + +jobs: + build: + runs-on: ubuntu-latest + container: + image: docker://kdeneon/plasma:user + options: --tmpfs /build:rw,size=500M --user 0:0 + steps: + - + name: prepare + run: | + sudo apt-get update + sudo apt-get -y install git-core + - + name: checkout + uses: actions/checkout@v2 + - + name: install dependencies + run: | + sudo apt-get -y install \ + build-essential \ + cmake \ + extra-cmake-modules \ + gettext \ + kio-dev \ + libatasmart-dev \ + libboost-python-dev \ + libkf5config-dev \ + libkf5coreaddons-dev \ + libkf5i18n-dev \ + libkf5iconthemes-dev \ + libkf5parts-dev \ + libkf5service-dev \ + libkf5solid-dev \ + libkpmcore-dev \ + libparted-dev \ + libpolkit-qt5-1-dev \ + libqt5svg5-dev \ + libqt5webkit5-dev \ + libyaml-cpp-dev \ + os-prober \ + pkg-config \ + python3-dev \ + qtbase5-dev \ + qtdeclarative5-dev \ + qttools5-dev \ + qttools5-dev-tools + - + name: config + run: | + test -f "ci/ci-config.sh" && . "ci/ci-config.sh" + - + name: continuous + env: + SRCDIR: ${{ github.workspace }} + run: | + test -x "ci/ci-continuous.sh" || { echo "! Missing ci-continuous.sh" ; exit 1 ; } + exec "ci/ci-continuous.sh" + + # - name: irc push + # uses: rectalogic/notify-irc@v1 + # if: github.event_name == 'push' + # with: + # channel: "#mychannel" + # nickname: my-github-notifier + # message: | + # ${{ github.actor }} pushed ${{ github.event.ref }} ${{ github.event.compare }} + # ${{ join(github.event.commits.*.message) }} \ No newline at end of file diff --git a/ci/travis-config.sh b/ci/ci-config.sh similarity index 100% rename from ci/travis-config.sh rename to ci/ci-config.sh diff --git a/ci/travis-continuous.sh b/ci/ci-continuous.sh similarity index 96% rename from ci/travis-continuous.sh rename to ci/ci-continuous.sh index ceb80df9bc..b99786c70a 100755 --- a/ci/travis-continuous.sh +++ b/ci/ci-continuous.sh @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2017 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -# Travis CI script for use on every-commit: +# CI script for use on every-commit: # - build and install Calamares # test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } diff --git a/ci/travis-coverity.sh b/ci/ci-coverity.sh similarity index 97% rename from ci/travis-coverity.sh rename to ci/ci-coverity.sh index 5ec73568ab..d714ca946d 100755 --- a/ci/travis-coverity.sh +++ b/ci/ci-coverity.sh @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2017 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -# Travis CI script for weekly (cron) use: +# CI script for weekly (cron) use: # - use the coverity tool to build and and upload results # test -n "$COVERITY_SCAN_TOKEN" || { echo "! Missing Coverity token" ; exit 1 ; } From 9dd58b9a22935f27c5d686584abe1e0e725b730d Mon Sep 17 00:00:00 2001 From: Jonas Strassel Date: Mon, 25 Jan 2021 00:51:09 +0100 Subject: [PATCH 043/318] refactor: move ci-config into workflow --- .github/workflows/ci.yml | 26 ++++++++++++-------------- .travis.yml | 23 ----------------------- Dockerfile | 5 ----- ci/ci-config.sh | 16 ---------------- ci/travis.sh | 24 ------------------------ 5 files changed, 12 insertions(+), 82 deletions(-) delete mode 100644 .travis.yml delete mode 100644 Dockerfile delete mode 100644 ci/ci-config.sh delete mode 100755 ci/travis.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af57fcfccf..0d36461e20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,13 +9,18 @@ on: env: BUILDDIR: /build SRCDIR: /src + CMAKE_ARGS: | + -DCMAKE_BUILD_TYPE=Release + -DWEBVIEW_FORCE_WEBKIT=1 + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON + -DWITH_PYTHONQT=OFF" jobs: build: runs-on: ubuntu-latest container: image: docker://kdeneon/plasma:user - options: --tmpfs /build:rw,size=500M --user 0:0 + options: --tmpfs /build:rw,size=512M --user 0:0 steps: - name: prepare @@ -59,21 +64,14 @@ jobs: - name: config run: | - test -f "ci/ci-config.sh" && . "ci/ci-config.sh" + test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } + test -n "$SRCDIR" || { echo "! \$SRCDIR not set" ; exit 1 ; } + mkdir -p $SRCDIR $BUILDDIR + test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } + test -n "$COVERITY_SCAN_TOKEN" || { echo "! Missing Coverity token" ; exit 1 ; } - name: continuous - env: - SRCDIR: ${{ github.workspace }} run: | test -x "ci/ci-continuous.sh" || { echo "! Missing ci-continuous.sh" ; exit 1 ; } exec "ci/ci-continuous.sh" - - # - name: irc push - # uses: rectalogic/notify-irc@v1 - # if: github.event_name == 'push' - # with: - # channel: "#mychannel" - # nickname: my-github-notifier - # message: | - # ${{ github.actor }} pushed ${{ github.event.ref }} ${{ github.event.compare }} - # ${{ join(github.event.commits.*.message) }} \ No newline at end of file + # irc notification to chat.freenode.net#calamares \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7a1ba094db..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-FileCopyrightText: no -# SPDX-License-Identifier: CC0-1.0 -# -language: cpp - -python: - - 3.5 - -sudo: required - -services: - - docker - -notifications: - irc: - - "chat.freenode.net#calamares" - -install: - - docker build -t calamares . - -script: - - docker run -v $PWD:/src --tmpfs /build:rw,size=112M -e SRCDIR=/src -e BUILDDIR=/build calamares "/src/ci/travis.sh" - diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 7a1cad92af..0000000000 --- a/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-FileCopyrightText: 2017 Rohan Garg -# SPDX-License-Identifier: BSD-2-Clause - -FROM kdeneon/all:user -RUN sudo apt-get update && sudo apt-get -y install build-essential cmake extra-cmake-modules gettext kio-dev libatasmart-dev libboost-python-dev libkf5config-dev libkf5coreaddons-dev libkf5i18n-dev libkf5iconthemes-dev libkf5parts-dev libkf5service-dev libkf5solid-dev libkpmcore-dev libparted-dev libpolkit-qt5-1-dev libqt5svg5-dev libqt5webkit5-dev libyaml-cpp-dev os-prober pkg-config python3-dev qtbase5-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools diff --git a/ci/ci-config.sh b/ci/ci-config.sh deleted file mode 100644 index 15163cc99b..0000000000 --- a/ci/ci-config.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Build configuration on Travis. -# -# SPDX-FileCopyrightText: 2018 Adriaan de Groot -# SPDX-License-Identifier: BSD-2-Clause -# -# Defines a CMAKE_ARGS variable for use with cmake -# -# This file is sourced by travis.sh, and exports the variables -# to the environment. -CMAKE_ARGS="\ - -DCMAKE_BUILD_TYPE=Release \ - -DWEBVIEW_FORCE_WEBKIT=1 \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DWITH_PYTHONQT=OFF" - -export CMAKE_ARGS diff --git a/ci/travis.sh b/ci/travis.sh deleted file mode 100755 index e182e48bb3..0000000000 --- a/ci/travis.sh +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh -# -# SPDX-FileCopyrightText: 2017 Adriaan de Groot -# SPDX-License-Identifier: BSD-2-Clause -# -# Travis build driver script: -# - the regular CI runs, triggered by commits, run a script that builds -# and installs calamares, and then runs the tests. -# - the cronjob CI runs, triggered weekly, run a script that uses the -# coverity tools to submit a build. This is slightly more resource- -# intensive than the coverity add-on, but works on master. -# -D=`dirname "$0"` -test -d "$D" || { echo "! No directory $D" ; exit 1 ; } -test -x "$D/travis-continuous.sh" || { echo "! Missing -continuous" ; exit 1 ; } -test -x "$D/travis-coverity.sh" || { echo "! Missing -coverity" ; exit 1 ; } - -test -f "$D/travis-config.sh" && . "$D/travis-config.sh" - -if test "$TRAVIS_EVENT_TYPE" = "cron" ; then - exec "$D/travis-coverity.sh" -else - exec "$D/travis-continuous.sh" -fi From 58afa92298d12c730ddf7ba29653d07252cdeeeb Mon Sep 17 00:00:00 2001 From: Jonas Strassel Date: Mon, 25 Jan 2021 01:56:54 +0100 Subject: [PATCH 044/318] refactor: move coverage and script steps into gh ci --- .github/workflows/ci.yml | 65 ++++++++++++++++++++++++++++++++-------- ci/ci-continuous.sh | 58 ----------------------------------- ci/ci-coverity.sh | 37 ----------------------- 3 files changed, 53 insertions(+), 107 deletions(-) delete mode 100755 ci/ci-continuous.sh delete mode 100755 ci/ci-coverity.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d36461e20..25e27b431b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,18 +2,25 @@ name: ci on: push: + branches: + - calamares + pull_request: + types: + - opened + - reopened + - synchronize workflow_dispatch: - #schedule: - # - cron: '30 * * * *' env: BUILDDIR: /build - SRCDIR: /src + SRCDIR: ${{ github.workspace }} + DESTDIR: /INSTALL_ROOT CMAKE_ARGS: | -DCMAKE_BUILD_TYPE=Release -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DWITH_PYTHONQT=OFF" + -DCMAKE_BUILD_TYPE=Debug jobs: build: @@ -24,9 +31,18 @@ jobs: steps: - name: prepare + env: + COVERITY_SCAN_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }} run: | sudo apt-get update sudo apt-get -y install git-core + if [ -n "$COVERITY_SCAN_TOKEN" ]; then + curl -k -o coverity_tool.tar.gz \ + -d "token=$COVERITY_SCAN_TOKEN&project=calamares%2Fcalamares" \ + https://scan.coverity.com/download/cxx/linux64 + mkdir "$BUILDDIR/coveritytool" + tar xvf coverity_tool.tar.gz -C "$BUILDDIR/coveritytool" --strip-components 2 + fi - name: checkout uses: actions/checkout@v2 @@ -62,16 +78,41 @@ jobs: qttools5-dev \ qttools5-dev-tools - - name: config + name: check environment run: | + test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } test -n "$SRCDIR" || { echo "! \$SRCDIR not set" ; exit 1 ; } - mkdir -p $SRCDIR $BUILDDIR - test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } - test -n "$COVERITY_SCAN_TOKEN" || { echo "! Missing Coverity token" ; exit 1 ; } - - - name: continuous + mkdir -p $BUILDDIR $SRCDIR $DESTDIR + - + name: cmake + run: cmake $CMAKE_ARGS $SRCDIR + - + name: generate coverage report + env: + COVERITY_SCAN_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }} run: | - test -x "ci/ci-continuous.sh" || { echo "! Missing ci-continuous.sh" ; exit 1 ; } - exec "ci/ci-continuous.sh" - # irc notification to chat.freenode.net#calamares \ No newline at end of file + if [ -n "$COVERITY_SCAN_TOKEN" ]; then + $BUILDDIR/coveritytool/bin/cov-build --dir cov-int make -j2 + tar caf calamares-ci.tar.xz cov-int + curl -k --form token=$COVERITY_SCAN_TOKEN \ + --form email=groot@kde.org \ + --form file=@calamares-ci.tar.xz \ + --form version="calamares-`date -u +%Y%m%d`" \ + --form description="calamares on `date -u`" \ + https://scan.coverity.com/builds?project=calamares%2Fcalamares + fi + - + name: make + run: make -j2 VERBOSE=1 + - + name: build results + run: ls -la $( find "$BUILDDIR" -type f -name '*.so' ) + - + name: install + id: install + run: make install VERBOSE=1 + - + name: debug install + if: ${{ failure() && steps.install.outcome == 'failure' }} + run: ls -la $( find "$DESTDIR" -type f -name '*.so' ) \ No newline at end of file diff --git a/ci/ci-continuous.sh b/ci/ci-continuous.sh deleted file mode 100755 index b99786c70a..0000000000 --- a/ci/ci-continuous.sh +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/sh -# -# SPDX-FileCopyrightText: 2017 Adriaan de Groot -# SPDX-License-Identifier: BSD-2-Clause -# -# CI script for use on every-commit: -# - build and install Calamares -# -test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } -test -n "$SRCDIR" || { echo "! \$SRCDIR not set" ; exit 1 ; } - -test -d $BUILDDIR || { echo "! $BUILDDIR not a directory" ; exit 1 ; } -test -d $SRCDIR || { echo "! $SRCDIR not a directory" ; exit 1 ; } -test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } - -cd $BUILDDIR || exit 1 - -section() { -echo "###" -echo "### $1" -echo "###" -pwd -P -df -h -} - -section "cmake $CMAKE_ARGS $SRCDIR" -cmake $CMAKE_ARGS $SRCDIR || { echo "! CMake failed" ; exit 1 ; } - -section "make" -make -j2 VERBOSE=1 || { echo "! Make recheck" ; pwd -P ; df -h ; make -j1 VERBOSE=1 ; echo "! Make failed" ; exit 1 ; } - -section "make install" - -install_debugging() { - ls -la $( find "$1" -type f -name '*.so' ) -} - -echo "# Build results" -install_debugging "$BUILDDIR" - -echo "# Install" -DESTDIR=/build/INSTALL_ROOT -mkdir -p "$DESTDIR" - -if make install VERBOSE=1 DESTDIR="$DESTDIR" ; -then - echo "# .. install OK" - result=true -else - echo "# .. install failed" - result=false -fi - - -section "Install results" -install_debugging "$DESTDIR" - -$result || { echo "! Install failed" ; exit 1 ; } # Result of make install, above diff --git a/ci/ci-coverity.sh b/ci/ci-coverity.sh deleted file mode 100755 index d714ca946d..0000000000 --- a/ci/ci-coverity.sh +++ /dev/null @@ -1,37 +0,0 @@ -#! /bin/sh -# -# SPDX-FileCopyrightText: 2017 Adriaan de Groot -# SPDX-License-Identifier: BSD-2-Clause -# -# CI script for weekly (cron) use: -# - use the coverity tool to build and and upload results -# -test -n "$COVERITY_SCAN_TOKEN" || { echo "! Missing Coverity token" ; exit 1 ; } -test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } -test -n "$SRCDIR" || { echo "! \$SRCDIR not set" ; exit 1 ; } - -test -d $BUILDDIR || { echo "! $BUILDDIR not a directory" ; exit 1 ; } -test -d $SRCDIR || { echo "! $SRCDIR not a directory" ; exit 1 ; } -test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } - -cd $BUILDDIR || exit 1 - -curl -k -o coverity_tool.tar.gz \ - -d "token=$COVERITY_SCAN_TOKEN&project=calamares%2Fcalamares" \ - https://scan.coverity.com/download/cxx/linux64 || exit 1 -mkdir "$BUILDDIR/coveritytool" -tar xvf coverity_tool.tar.gz -C "$BUILDDIR/coveritytool" --strip-components 2 -export PATH="$BUILDDIR/coveritytool/bin:$PATH" - -echo "# cmake -DCMAKE_BUILD_TYPE=Debug $CMAKE_ARGS $SRCDIR" -cmake -DCMAKE_BUILD_TYPE=Debug $CMAKE_ARGS $SRCDIR || exit 1 -cov-build --dir cov-int make -j2 - -tar caf calamares-ci.tar.xz cov-int - -curl -k --form token=$COVERITY_SCAN_TOKEN \ - --form email=groot@kde.org \ - --form file=@calamares-ci.tar.xz \ - --form version="calamares-`date -u +%Y%m%d`" \ - --form description="calamares on `date -u`" \ - https://scan.coverity.com/builds?project=calamares%2Fcalamares From 3cc50d8ac4f0b049328413d3ff260d6228e96f60 Mon Sep 17 00:00:00 2001 From: Jonas Strassel Date: Mon, 25 Jan 2021 12:25:35 +0100 Subject: [PATCH 045/318] chore: remove disfunct coverity checks --- .github/workflows/ci.yml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25e27b431b..046afd166c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,18 +31,9 @@ jobs: steps: - name: prepare - env: - COVERITY_SCAN_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }} run: | sudo apt-get update sudo apt-get -y install git-core - if [ -n "$COVERITY_SCAN_TOKEN" ]; then - curl -k -o coverity_tool.tar.gz \ - -d "token=$COVERITY_SCAN_TOKEN&project=calamares%2Fcalamares" \ - https://scan.coverity.com/download/cxx/linux64 - mkdir "$BUILDDIR/coveritytool" - tar xvf coverity_tool.tar.gz -C "$BUILDDIR/coveritytool" --strip-components 2 - fi - name: checkout uses: actions/checkout@v2 @@ -87,21 +78,6 @@ jobs: - name: cmake run: cmake $CMAKE_ARGS $SRCDIR - - - name: generate coverage report - env: - COVERITY_SCAN_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }} - run: | - if [ -n "$COVERITY_SCAN_TOKEN" ]; then - $BUILDDIR/coveritytool/bin/cov-build --dir cov-int make -j2 - tar caf calamares-ci.tar.xz cov-int - curl -k --form token=$COVERITY_SCAN_TOKEN \ - --form email=groot@kde.org \ - --form file=@calamares-ci.tar.xz \ - --form version="calamares-`date -u +%Y%m%d`" \ - --form description="calamares on `date -u`" \ - https://scan.coverity.com/builds?project=calamares%2Fcalamares - fi - name: make run: make -j2 VERBOSE=1 From dbd8f361d1fe49677552fe618fbc1bdf7ee2190e Mon Sep 17 00:00:00 2001 From: Jonas Strassel Date: Mon, 25 Jan 2021 15:54:40 +0100 Subject: [PATCH 046/318] chore: remove unused DESTDIR and superfluous test cmd --- .github/workflows/ci.yml | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 046afd166c..c05f063f96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,7 @@ on: env: BUILDDIR: /build SRCDIR: ${{ github.workspace }} - DESTDIR: /INSTALL_ROOT CMAKE_ARGS: | - -DCMAKE_BUILD_TYPE=Release -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DWITH_PYTHONQT=OFF" @@ -27,10 +25,10 @@ jobs: runs-on: ubuntu-latest container: image: docker://kdeneon/plasma:user - options: --tmpfs /build:rw,size=512M --user 0:0 + options: --tmpfs /build:rw --user 0:0 steps: - - name: prepare + name: prepare env run: | sudo apt-get update sudo apt-get -y install git-core @@ -69,26 +67,21 @@ jobs: qttools5-dev \ qttools5-dev-tools - - name: check environment + name: prepare build run: | - test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } - test -n "$SRCDIR" || { echo "! \$SRCDIR not set" ; exit 1 ; } - mkdir -p $BUILDDIR $SRCDIR $DESTDIR + mkdir -p $BUILDDIR + test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } - name: cmake + working-directory: ${{ env.BUILDDIR }} run: cmake $CMAKE_ARGS $SRCDIR - name: make + working-directory: ${{ env.BUILDDIR }} run: make -j2 VERBOSE=1 - - - name: build results - run: ls -la $( find "$BUILDDIR" -type f -name '*.so' ) - name: install - id: install - run: make install VERBOSE=1 - - - name: debug install - if: ${{ failure() && steps.install.outcome == 'failure' }} - run: ls -la $( find "$DESTDIR" -type f -name '*.so' ) \ No newline at end of file + working-directory: ${{ env.BUILDDIR }} + run: | + make install VERBOSE=1 \ No newline at end of file From f0fd47eeb31de923cc6bad6384d888c26f17e5ec Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 26 Jan 2021 00:13:10 +0100 Subject: [PATCH 047/318] [libcalamares] Simplify logging-manipulators Writing `Logger::NoQuote{}`` has annoyed me for a while, so switch it to a constant, like SubEntry, so it looks more like a regular manipulator object. --- src/libcalamares/utils/CalamaresUtilsSystem.cpp | 8 ++++---- src/libcalamares/utils/Logger.cpp | 2 ++ src/libcalamares/utils/Logger.h | 12 +++++++----- src/libcalamaresui/Branding.cpp | 2 +- src/libcalamaresui/ViewManager.cpp | 6 +++--- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp index 841d529694..29f743743e 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp +++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp @@ -188,7 +188,7 @@ System::runCommand( System::RunLocation location, : -1 ) ) { cWarning() << "Process" << args.first() << "timed out after" << timeoutSec.count() << "s. Output so far:\n" - << Logger::NoQuote {} << process.readAllStandardOutput(); + << Logger::NoQuote << process.readAllStandardOutput(); return ProcessResult::Code::TimedOut; } @@ -196,7 +196,7 @@ System::runCommand( System::RunLocation location, if ( process.exitStatus() == QProcess::CrashExit ) { - cWarning() << "Process" << args.first() << "crashed. Output so far:\n" << Logger::NoQuote {} << output; + cWarning() << "Process" << args.first() << "crashed. Output so far:\n" << Logger::NoQuote << output; return ProcessResult::Code::Crashed; } @@ -206,7 +206,7 @@ System::runCommand( System::RunLocation location, { if ( showDebug && !output.isEmpty() ) { - cDebug() << Logger::SubEntry << "Finished. Exit code:" << r << "output:\n" << Logger::NoQuote {} << output; + cDebug() << Logger::SubEntry << "Finished. Exit code:" << r << "output:\n" << Logger::NoQuote << output; } else { @@ -218,7 +218,7 @@ System::runCommand( System::RunLocation location, if ( !output.isEmpty() ) { cDebug() << Logger::SubEntry << "Target cmd:" << RedactedList( args ) << "Exit code:" << r << "output:\n" - << Logger::NoQuote {} << output; + << Logger::NoQuote << output; } else { diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp index 0a7dcefd0c..262ff59e17 100644 --- a/src/libcalamares/utils/Logger.cpp +++ b/src/libcalamares/utils/Logger.cpp @@ -207,6 +207,8 @@ constexpr FuncSuppressor::FuncSuppressor( const char s[] ) const constexpr FuncSuppressor Continuation( s_Continuation ); const constexpr FuncSuppressor SubEntry( s_SubEntry ); +const constexpr NoQuote_t NoQuote {}; +const constexpr Quote_t Quote {}; QString toString( const QVariant& v ) diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h index 58603c82d2..a53ab7e19e 100644 --- a/src/libcalamares/utils/Logger.h +++ b/src/libcalamares/utils/Logger.h @@ -25,15 +25,17 @@ struct FuncSuppressor const char* m_s; }; -struct NoQuote +struct NoQuote_t { }; -struct Quote +struct Quote_t { }; DLLEXPORT extern const FuncSuppressor Continuation; DLLEXPORT extern const FuncSuppressor SubEntry; +DLLEXPORT extern const NoQuote_t NoQuote; +DLLEXPORT extern const Quote_t Quote; enum { @@ -74,13 +76,13 @@ operator<<( QDebug& s, const FuncSuppressor& f ) } inline QDebug& -operator<<( QDebug& s, const NoQuote& ) +operator<<( QDebug& s, const NoQuote_t& ) { return s.noquote().nospace(); } inline QDebug& -operator<<( QDebug& s, const Quote& ) +operator<<( QDebug& s, const Quote_t& ) { return s.quote().space(); } @@ -254,7 +256,7 @@ operator<<( QDebug& s, const DebugMap& t ) inline QDebug& operator<<( QDebug& s, const Pointer& p ) { - s << NoQuote {} << '@' << p.ptr << Quote {}; + s << NoQuote << '@' << p.ptr << Quote; return s; } } // namespace Logger diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 8145ad57c1..a5038d7eec 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -35,7 +35,7 @@ [[noreturn]] static void bail( const QString& descriptorPath, const QString& message ) { - cError() << "FATAL in" << descriptorPath << Logger::Continuation << Logger::NoQuote {} << message; + cError() << "FATAL in" << descriptorPath << Logger::Continuation << Logger::NoQuote << message; ::exit( EXIT_FAILURE ); } diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index f43152209b..0614c786fb 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -142,9 +142,9 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail { bool shouldOfferWebPaste = false; // TODO: config var - cError() << "Installation failed:"; - cDebug() << "- message:" << message; - cDebug() << "- details:" << details; + cError() << "Installation failed:" << message; + cDebug() << Logger::SubEntry << "- message:" << message; + cDebug() << Logger::SubEntry << "- details:" << Logger::NoQuote << details; QString heading = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Failed" ) : tr( "Installation Failed" ); From 4f78afe67e6b71ec16ece4810826c04e6a75fd5d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 26 Jan 2021 00:37:08 +0100 Subject: [PATCH 048/318] [libcalamaresui] Display a reduced amount of details Cut the error message from down to a maximum of 8 lines so that the messagebox does not hopelessly overflow. --- src/libcalamaresui/ViewManager.cpp | 36 +++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 0614c786fb..a34c557410 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -136,6 +136,40 @@ ViewManager::insertViewStep( int before, ViewStep* step ) emit endInsertRows(); } +/** Makes a long details message suitable for display + * + * @returns a (possibly shortened) version of @p text that + * will fit sensibly in a messagebox. + */ +static QString +simplifyText( const QString& text ) +{ + constexpr const int maxLines = 8; + constexpr const int maxChars = 640; + QString shorter = text.simplified(); + if ( shorter.count( '\n' ) >= maxLines ) + { + int from = -1; + for ( int i = 0; i < maxLines; ++i ) + { + from = shorter.indexOf( '\n', from + 1 ); + if ( from < 0 ) + { + // That's odd, we counted at least maxLines newlines before + break; + } + } + if ( from > 0 ) + { + shorter.truncate( from ); + } + } + if ( shorter.length() > maxChars ) + { + shorter.truncate( maxChars ); + } + return shorter; +} void ViewManager::onInstallationFailed( const QString& message, const QString& details ) @@ -152,7 +186,7 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail QString text = "

" + message + "

"; if ( !details.isEmpty() ) { - text += "

" + details + "

"; + text += "

" + simplifyText( details ) + "

"; } if ( shouldOfferWebPaste ) { From 4ab30569c2dc21e6c528edfb86eb26069b66632a Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Tue, 26 Jan 2021 21:31:33 +0200 Subject: [PATCH 049/318] Add default configuration --- src/modules/mount/mount.conf | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf index 3a117d32c0..19732b4d3a 100644 --- a/src/modules/mount/mount.conf +++ b/src/modules/mount/mount.conf @@ -19,6 +19,10 @@ # The device is not mounted if the mountPoint is unset or if the fs is # set to unformatted. # +--- +# Btrfs subvolumes to create if root filesystem is on btrfs volume. +# If mountpoint is mounted already to another partition, it is ignored. +# Separate subvolume for swapfile is handled separately and automatically. extraMounts: - device: proc fs: proc @@ -40,3 +44,13 @@ extraMountsEfi: - device: efivarfs fs: efivarfs mountPoint: /sys/firmware/efi/efivars + +btrfsSubvolumes: + - mountPoint: / + subvolume: @ + - mountPoint: /home + subvolume: @home + - mountPoint: /var/cache + subvolume: @cache + - mountPoint: /var/log + subvolume: @log \ No newline at end of file From b5cfa5109ecc81d0b7671d7b65494cf9f6dafdfc Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Tue, 26 Jan 2021 21:34:11 +0200 Subject: [PATCH 050/318] Add schema definition --- src/modules/mount/mount.schema.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/modules/mount/mount.schema.yaml b/src/modules/mount/mount.schema.yaml index 2d5e4d4a09..fb5dfb69c7 100644 --- a/src/modules/mount/mount.schema.yaml +++ b/src/modules/mount/mount.schema.yaml @@ -29,3 +29,12 @@ properties: mountPoint: { type: string } options: { type: string } required: [ device, mountPoint ] + btrfsSubvolumes: + type: array + items: + type: object + additionalProperties: false + properties: + mountPoint: { type: string } + subvolume: { type: string } + required: [ subvolume, mountPoint ] From 945effb048102d2b6dc6ea763b554e889a9e85ab Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Tue, 26 Jan 2021 22:13:29 +0200 Subject: [PATCH 051/318] Amend subvolumes to include path --- src/modules/mount/mount.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf index 19732b4d3a..b96d4576a0 100644 --- a/src/modules/mount/mount.conf +++ b/src/modules/mount/mount.conf @@ -47,10 +47,10 @@ extraMountsEfi: btrfsSubvolumes: - mountPoint: / - subvolume: @ + subvolume: /@ - mountPoint: /home - subvolume: @home + subvolume: /@home - mountPoint: /var/cache - subvolume: @cache + subvolume: /@cache - mountPoint: /var/log - subvolume: @log \ No newline at end of file + subvolume: /@log \ No newline at end of file From 942221c764a8622c9b23d29b1db291404af0f63b Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Tue, 26 Jan 2021 22:24:50 +0200 Subject: [PATCH 052/318] Generalize subvolume handling --- src/modules/mount/main.py | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 3982176df5..4b0e911e3c 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -81,26 +81,29 @@ def mount_partition(root_mount_point, partition, partitions): # If a swapfile is used, we also create a subvolume "@swap". # Finally we remount all of the above on the correct paths. if fstype == "btrfs" and partition["mountPoint"] == '/': - has_home_mount_point = False + # Root has been mounted to btrfs volume -> create subvolumes from configuration + btrfs_subvolumes = libcalamares.job.configuration.get("btrfsSubvolumes") or [] + subvolume_mountpoints = [d['mountPoint'] for d in btrfs_subvolumes] + # Check if listed mountpoints besides / are already present and don't create subvolume for those for p in partitions: if "mountPoint" not in p or not p["mountPoint"]: continue - if p["mountPoint"] == "/home": - has_home_mount_point = True - break + if p["mountpoint"] in subvolume_mountpoints and p["mountpoint"] != '/': + # mountpoint is already define, remove subvolume from the list + btrfs_subvolumes = [d for d in btrfs_subvolumes if d['mountPoint'] != p["mountpoint"]] + # Now we shouold have a valid list of needed subvolumes, so all subvolumes can be created and mounted + for s in btrfs_subvolumes: + # Create the subvolume + subprocess.check_call(['btrfs', 'subvolume', 'create', + root_mount_point + s['subvolume']]) + + # Handle swap subvolume separately needs_swap_subvolume = False swap_choice = global_storage.value( "partitionChoices" ) if swap_choice: swap_choice = swap_choice.get( "swap", None ) if swap_choice and swap_choice == "file": needs_swap_subvolume = True - - subprocess.check_call(['btrfs', 'subvolume', 'create', - root_mount_point + '/@']) - - if not has_home_mount_point: - subprocess.check_call(['btrfs', 'subvolume', 'create', - root_mount_point + '/@home']) if needs_swap_subvolume: subprocess.check_call(['btrfs', 'subvolume', 'create', root_mount_point + '/@swap']) @@ -112,17 +115,13 @@ def mount_partition(root_mount_point, partition, partitions): if "luksMapperName" in partition: device = os.path.join("/dev/mapper", partition["luksMapperName"]) - if libcalamares.utils.mount(device, + # Mount the subvolumes + for s in btrfs_subvolumes: + mount_option = f"subvol={s[subvolume]}" + if libcalamares.utils.mount(device, mount_point, fstype, - ",".join(["subvol=@", partition.get("options", "")])) != 0: - libcalamares.utils.warning("Cannot mount {}".format(device)) - - if not has_home_mount_point: - if libcalamares.utils.mount(device, - root_mount_point + "/home", - fstype, - ",".join(["subvol=@home", partition.get("options", "")])) != 0: + ",".join([mount_option, partition.get("options", "")])) != 0: libcalamares.utils.warning("Cannot mount {}".format(device)) if needs_swap_subvolume: From 4b6718b354d1831b8336946798b6113e0aebc71f Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Tue, 26 Jan 2021 22:35:42 +0200 Subject: [PATCH 053/318] Further generalize subvolume handling --- src/modules/mount/main.py | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 4b0e911e3c..9e7be8a68e 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -89,24 +89,19 @@ def mount_partition(root_mount_point, partition, partitions): if "mountPoint" not in p or not p["mountPoint"]: continue if p["mountpoint"] in subvolume_mountpoints and p["mountpoint"] != '/': - # mountpoint is already define, remove subvolume from the list + # mountpoint is already defined, remove subvolume from the list btrfs_subvolumes = [d for d in btrfs_subvolumes if d['mountPoint'] != p["mountpoint"]] - # Now we shouold have a valid list of needed subvolumes, so all subvolumes can be created and mounted - for s in btrfs_subvolumes: - # Create the subvolume - subprocess.check_call(['btrfs', 'subvolume', 'create', - root_mount_point + s['subvolume']]) - - # Handle swap subvolume separately + # Check if we need a subvolume for swap file needs_swap_subvolume = False swap_choice = global_storage.value( "partitionChoices" ) if swap_choice: swap_choice = swap_choice.get( "swap", None ) if swap_choice and swap_choice == "file": - needs_swap_subvolume = True - if needs_swap_subvolume: + btrfs_subvolumes.append({'mountPoint': '/swap', 'subvolume': '/@swap'}) + # Create the subvolumes that are in the completed list + for s in btrfs_subvolumes: subprocess.check_call(['btrfs', 'subvolume', 'create', - root_mount_point + '/@swap']) + root_mount_point + s['subvolume']]) subprocess.check_call(["umount", "-v", root_mount_point]) @@ -122,14 +117,7 @@ def mount_partition(root_mount_point, partition, partitions): mount_point, fstype, ",".join([mount_option, partition.get("options", "")])) != 0: - libcalamares.utils.warning("Cannot mount {}".format(device)) - - if needs_swap_subvolume: - if libcalamares.utils.mount(device, - root_mount_point + "/swap", - fstype, - ",".join(["subvol=@swap", partition.get("options", "")])) != 0: - libcalamares.utils.warning("Cannot mount {}".format(device)) + libcalamares.utils.warning(f"Cannot mount {device}") def run(): From f53f43ad03b955d43be16158912540c6d82d3025 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Tue, 26 Jan 2021 22:42:35 +0200 Subject: [PATCH 054/318] Remove some unnecessary bits --- src/modules/mount/main.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 9e7be8a68e..17041fdc5f 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -89,10 +89,8 @@ def mount_partition(root_mount_point, partition, partitions): if "mountPoint" not in p or not p["mountPoint"]: continue if p["mountpoint"] in subvolume_mountpoints and p["mountpoint"] != '/': - # mountpoint is already defined, remove subvolume from the list btrfs_subvolumes = [d for d in btrfs_subvolumes if d['mountPoint'] != p["mountpoint"]] # Check if we need a subvolume for swap file - needs_swap_subvolume = False swap_choice = global_storage.value( "partitionChoices" ) if swap_choice: swap_choice = swap_choice.get( "swap", None ) From 092374d08ce67bdb21d77bcc02c4ad052828c302 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Tue, 26 Jan 2021 22:48:02 +0200 Subject: [PATCH 055/318] Add modified list to global storage --- src/modules/mount/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 17041fdc5f..7a6c1f176b 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -96,6 +96,8 @@ def mount_partition(root_mount_point, partition, partitions): swap_choice = swap_choice.get( "swap", None ) if swap_choice and swap_choice == "file": btrfs_subvolumes.append({'mountPoint': '/swap', 'subvolume': '/@swap'}) + # Store created list in global storage so it can be used in the fstab module + libcalamares.globalstorage.insert("btrfsSubvolumes", btrfs_subvolumes) # Create the subvolumes that are in the completed list for s in btrfs_subvolumes: subprocess.check_call(['btrfs', 'subvolume', 'create', From 14fbbd92dc367f56ce85c619165421e307093e84 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Tue, 26 Jan 2021 22:56:31 +0200 Subject: [PATCH 056/318] Get configured subvolumes from the global storage --- src/modules/fstab/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index 6977ccad18..ed73f2f0f9 100644 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -192,7 +192,9 @@ def generate_fstab(self): 'list', self.root_mount_point]) output_lines = output.splitlines() + btrfs_subvolumes = libcalamares.globalstorage.value("btrfsSubvolumes") for line in output_lines: + # This is where changes need to go if line.endswith(b'path @'): root_entry = partition root_entry["subvol"] = "@" From 938edf5bd62fb7746c9b24fb525cc1b09f06b2db Mon Sep 17 00:00:00 2001 From: benne-dee <78043691+benne-dee@users.noreply.github.com> Date: Wed, 27 Jan 2021 11:41:53 +0530 Subject: [PATCH 057/318] Create shellprocess.schema.yaml --- .../shellprocess/shellprocess.schema.yaml | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 src/modules/shellprocess/shellprocess.schema.yaml diff --git a/src/modules/shellprocess/shellprocess.schema.yaml b/src/modules/shellprocess/shellprocess.schema.yaml new file mode 100644 index 0000000000..d92ebfc83d --- /dev/null +++ b/src/modules/shellprocess/shellprocess.schema.yaml @@ -0,0 +1,54 @@ +$schema: http://json-schema.org/draft-07/schema# +$id: https://calamares.io/schemas/shellprocess +definitions: + command: + $id: '#definitions/command' + type: string + description: This is one command that is executed. If a command starts with '-' + (a single minus sign), then the return value of the command following the - + is ignored; otherwise, a failing command will abort the installation. + commandObj: + $id: '#definitions/commandObj' + type: object + properties: + command: + $ref: '#definitions/command' + timeout: + type: number + description: the (optional) timeout for this specific command (differently + from the global setting) + required: + - command +type: object +description: Configuration for the shell process job. +properties: + dontChroot: + type: boolean + description: If the top-level key *dontChroot* is true, then the commands are + executed in the context of the live system, otherwise in the context of the + target system. + timeout: + type: number + description: The (global) timeout for the command list in seconds. If unset, defaults + to 30 seconds. + script: + anyOf: + - $ref: '#definitions/command' + - $ref: '#definitions/commandObj' + - type: array + description: these commands are executed one at a time, by separate shells (/bin/sh + -c is invoked for each command). + items: + anyOf: + - $ref: '#definitions/command' + - $ref: '#definitions/commandObj' + i18n: + type: object + description: To change description of the job (as it is displayed in the progress + bar during installation) use *name* field and optionally, translations as *name[lang]*. + Without a translation, the default name from the source code is used, "Shell Processes Job". + properties: + name: + type: string + required: + - name From 8c0c84f162c77c440b16cee784513237288f3b2e Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Wed, 27 Jan 2021 15:41:01 +0200 Subject: [PATCH 058/318] Create all fstab entries one way instead of having special handling --- src/modules/fstab/main.py | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index ed73f2f0f9..c2e221c37f 100644 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -183,39 +183,19 @@ def generate_fstab(self): print(FSTAB_HEADER, file=fstab_file) for partition in self.partitions: - # Special treatment for a btrfs root with @, @home and @swap - # subvolumes + # Special treatment for a btrfs subvolumes if (partition["fs"] == "btrfs" and partition["mountPoint"] == "/"): - output = subprocess.check_output(['btrfs', - 'subvolume', - 'list', - self.root_mount_point]) - output_lines = output.splitlines() + # Subvolume list has been created in mount.conf and curated in mount module, + # so all subvolumes here should be safe to add to fstab btrfs_subvolumes = libcalamares.globalstorage.value("btrfsSubvolumes") - for line in output_lines: - # This is where changes need to go - if line.endswith(b'path @'): - root_entry = partition - root_entry["subvol"] = "@" - dct = self.generate_fstab_line_info(root_entry) - if dct: + for s in btrfs_subvolumes: + mount_entry = partition + mount_entry["mountPoint"] = s["mountPoint"] + home_entry["subvol"] = s["subvolume"] + dct = self.generate_fstab_line_info(mount_entry) + if dct: self.print_fstab_line(dct, file=fstab_file) - elif line.endswith(b'path @home'): - home_entry = partition - home_entry["mountPoint"] = "/home" - home_entry["subvol"] = "@home" - dct = self.generate_fstab_line_info(home_entry) - if dct: - self.print_fstab_line(dct, file=fstab_file) - elif line.endswith(b'path @swap'): - swap_part_entry = partition - swap_part_entry["mountPoint"] = "/swap" - swap_part_entry["subvol"] = "@swap" - dct = self.generate_fstab_line_info(swap_part_entry) - if dct: - self.print_fstab_line(dct, file=fstab_file) - else: dct = self.generate_fstab_line_info(partition) if dct: From 13181a52ee1931a0e21cb7c546d53249d6429891 Mon Sep 17 00:00:00 2001 From: benne-dee <78043691+benne-dee@users.noreply.github.com> Date: Wed, 27 Jan 2021 22:38:40 +0530 Subject: [PATCH 059/318] Define schema for groups in netinstall.schema.yaml --- src/modules/netinstall/netinstall.schema.yaml | 60 ++++++++++++++++++- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/src/modules/netinstall/netinstall.schema.yaml b/src/modules/netinstall/netinstall.schema.yaml index a66c877d16..61ab1c8f4f 100644 --- a/src/modules/netinstall/netinstall.schema.yaml +++ b/src/modules/netinstall/netinstall.schema.yaml @@ -1,8 +1,64 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: GPL-3.0-or-later --- -$schema: https://json-schema.org/schema# +$schema: http://json-schema.org/draft-07/schema# $id: https://calamares.io/schemas/netinstall +definitions: + package: + $id: '#definitions/package' + oneOf: + - + type: string + description: bare package - actual package name as passed to the package manager + (e.g. `qt5-creator-dev`). + - + type: object + description: rich package - one with a package-name (for the package-manager) and + a description (for the human). + properties: + name: { type: string } + description: { type: string } + group: + $id: '#definitions/group' + type: object + description: Longer discussion in `netinstall.conf` file under 'Groups Format' + properties: + name: { type: string } + description: { type: string } + packages: + type: array + items: { $ref: '#definitions/package' } + hidden: { type: boolean, default: false } + selected: { type: boolean } + critical: { type: boolean, default: false } + immutable: { type: boolean } + expanded: { type: boolean } + subgroups: + type: array + items: { $ref: '#definitions/group' } + pre-install: + type: string + description: an optional command to run within the new system before the group's + packages are installed. It will run before **each** package in the group + is installed. + post-install: + type: string + description: an optional command to run within the new system after the group's + packages are installed. It will run after **each** package in the group + is installed. + required: [name, description] # Always required, at any level in the subgroups hirearchy + if: + properties: + subgroups: + maxItems: 0 + then: + required: [name, description, packages] # bottom-most (sub)group requires some package (otherwise, why bother?) + # This should validate `netinstall.yaml` also. + groups: + $id: '#definitions/groups' + type: array + items: { $ref: '#definitions/group' } + additionalProperties: false type: object properties: @@ -14,5 +70,5 @@ properties: properties: sidebar: { type: string } title: { type: string } - groups: { type: array } # TODO: the schema for the whole groups file + groups: { $ref: '#definitions/groups' } # DONE: the schema for groups required: [ groupsUrl ] From f8385d2cb8912f9cdcf5cdebd52a002535a7016a Mon Sep 17 00:00:00 2001 From: benne-dee <78043691+benne-dee@users.noreply.github.com> Date: Wed, 27 Jan 2021 23:12:29 +0530 Subject: [PATCH 060/318] Fix https in URL --- src/modules/netinstall/netinstall.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/netinstall/netinstall.schema.yaml b/src/modules/netinstall/netinstall.schema.yaml index 61ab1c8f4f..e1db5715ec 100644 --- a/src/modules/netinstall/netinstall.schema.yaml +++ b/src/modules/netinstall/netinstall.schema.yaml @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: GPL-3.0-or-later --- -$schema: http://json-schema.org/draft-07/schema# +$schema: https://json-schema.org/draft-07/schema# $id: https://calamares.io/schemas/netinstall definitions: package: From 8cc114bf2c77566020c6cf78ca6aa1e1e70550ba Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 27 Jan 2021 23:51:03 +0100 Subject: [PATCH 061/318] [libcalamares] Move smart-string-truncation to library Expand the API a little to support first-lines, last-lines, and something of both. Use strong types to make the names clear for each. --- src/libcalamares/utils/String.cpp | 49 ++++++++++++++++++++++++++++++ src/libcalamares/utils/String.h | 30 ++++++++++++++++++ src/libcalamaresui/ViewManager.cpp | 38 ++--------------------- 3 files changed, 81 insertions(+), 36 deletions(-) diff --git a/src/libcalamares/utils/String.cpp b/src/libcalamares/utils/String.cpp index 34a7038e3f..e2409d3c09 100644 --- a/src/libcalamares/utils/String.cpp +++ b/src/libcalamares/utils/String.cpp @@ -121,4 +121,53 @@ obscure( const QString& string ) return result; } + +QString +truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, CalamaresUtils::CharCount chars ) +{ + const int maxLines = lines.atStart + lines.atEnd; + if ( ( string.length() <= chars.total ) && ( string.count( '\n' ) <= maxLines ) ) + { + return string; + } + + QString shorter = string.simplified(); + QString front, back; + if ( shorter.count( '\n' ) >= maxLines ) + { + int from = -1; + for ( int i = 0; i < lines.atStart; ++i ) + { + from = shorter.indexOf( '\n', from + 1 ); + if ( from < 0 ) + { + // That's strange, we counted at least maxLines newlines before + break; + } + } + if ( from > 0 ) + { + front = shorter.left( from ); + } + + int lastNewLine = -1; + int lastCount = 0; + for ( auto i = shorter.rbegin(); i != shorter.rend() && lastCount < lines.atEnd; ++i ) + { + if ( *i == '\n' ) + { + ++lastCount; + lastNewLine = shorter.length() - int( i - shorter.rbegin() ); + } + } + if ( ( lastNewLine >= 0 ) && ( lastCount >= lines.atEnd ) ) + { + back = shorter.right( lastNewLine ); + } + } + + return front + back; +} + + } // namespace CalamaresUtils diff --git a/src/libcalamares/utils/String.h b/src/libcalamares/utils/String.h index 48bb17aac4..405c6caad4 100644 --- a/src/libcalamares/utils/String.h +++ b/src/libcalamares/utils/String.h @@ -61,6 +61,36 @@ DLLEXPORT QString removeDiacritics( const QString& string ); * @return the obfuscated string. */ DLLEXPORT QString obscure( const QString& string ); + +struct LinesStartEnd +{ + int atStart; + int atEnd; +}; + +struct CharCount +{ + int total; +}; + +/** @brief Truncate a string to some reasonable length for display + * + * Keep the first few, or last few (or both) lines of a possibly lengthy + * message @p string and reduce it to a displayable size (e.g. for + * pop-up windows that display the message). If the message is longer + * than @p chars, then characters are removed from the front (if + * @p lines.atStart is zero) or end (if @p lines.atEnd is zero) or in the middle + * (if both are nonzero). + * + * @param string the input string. + * @param lines number of lines to preserve. + * @param chars maximum number of characters in the returned string. + * @return a string built from parts of the input string. + */ +DLLEXPORT QString truncateMultiLine( const QString& string, + LinesStartEnd lines = LinesStartEnd { 3, 5 }, + CharCount chars = CharCount { 812 } ); + } // namespace CalamaresUtils #endif diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index a34c557410..aaa55059ed 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -19,6 +19,7 @@ #include "utils/Logger.h" #include "utils/Paste.h" #include "utils/Retranslator.h" +#include "utils/String.h" #include "viewpages/BlankViewStep.h" #include "viewpages/ExecutionViewStep.h" #include "viewpages/ViewStep.h" @@ -136,41 +137,6 @@ ViewManager::insertViewStep( int before, ViewStep* step ) emit endInsertRows(); } -/** Makes a long details message suitable for display - * - * @returns a (possibly shortened) version of @p text that - * will fit sensibly in a messagebox. - */ -static QString -simplifyText( const QString& text ) -{ - constexpr const int maxLines = 8; - constexpr const int maxChars = 640; - QString shorter = text.simplified(); - if ( shorter.count( '\n' ) >= maxLines ) - { - int from = -1; - for ( int i = 0; i < maxLines; ++i ) - { - from = shorter.indexOf( '\n', from + 1 ); - if ( from < 0 ) - { - // That's odd, we counted at least maxLines newlines before - break; - } - } - if ( from > 0 ) - { - shorter.truncate( from ); - } - } - if ( shorter.length() > maxChars ) - { - shorter.truncate( maxChars ); - } - return shorter; -} - void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { @@ -186,7 +152,7 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail QString text = "

" + message + "

"; if ( !details.isEmpty() ) { - text += "

" + simplifyText( details ) + "

"; + text += "

" + CalamaresUtils::truncateMultiLine( details, CalamaresUtils::LinesStartEnd{8, 0}) + "

"; } if ( shouldOfferWebPaste ) { From 3be360e433f24da4220cc6a8441e73ea453932d6 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 28 Jan 2021 00:23:13 +0100 Subject: [PATCH 062/318] [libcalamares] Add tests to string truncation - check that basic manipulations succeed - trailing-lines selection fails, though --- src/libcalamares/utils/String.cpp | 7 ++++ src/libcalamares/utils/String.h | 13 +++++-- src/libcalamares/utils/Tests.cpp | 64 +++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 3 deletions(-) diff --git a/src/libcalamares/utils/String.cpp b/src/libcalamares/utils/String.cpp index e2409d3c09..f032fa61b7 100644 --- a/src/libcalamares/utils/String.cpp +++ b/src/libcalamares/utils/String.cpp @@ -126,6 +126,13 @@ QString truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, CalamaresUtils::CharCount chars ) { const int maxLines = lines.atStart + lines.atEnd; + if ( maxLines < 1 ) + { + QString shorter( string ); + shorter.truncate( chars.total ); + return shorter; + } + if ( ( string.length() <= chars.total ) && ( string.count( '\n' ) <= maxLines ) ) { return string; diff --git a/src/libcalamares/utils/String.h b/src/libcalamares/utils/String.h index 405c6caad4..43e0474fae 100644 --- a/src/libcalamares/utils/String.h +++ b/src/libcalamares/utils/String.h @@ -62,15 +62,22 @@ DLLEXPORT QString removeDiacritics( const QString& string ); */ DLLEXPORT QString obscure( const QString& string ); +/** @brief Parameter for counting lines at beginning and end of string + * + * This is used by truncateMultiLine() to indicate how many lines from + * the beginning and how many from the end should be kept. + */ struct LinesStartEnd { - int atStart; - int atEnd; + int atStart = 0; + int atEnd = 0; }; +/** @brief Parameter for counting characters in truncateMultiLine() + */ struct CharCount { - int total; + int total = 0; }; /** @brief Truncate a string to some reasonable length for display diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index 6d4f5b2656..ffeec1078d 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -13,6 +13,7 @@ #include "Entropy.h" #include "Logger.h" #include "RAII.h" +#include "String.h" #include "Traits.h" #include "UMask.h" #include "Variant.h" @@ -63,6 +64,8 @@ private Q_SLOTS: void testVariantStringListYAMLDashed(); void testVariantStringListYAMLBracketed(); + /** @brief Test smart string truncation. */ + void testStringTruncation(); private: void recursiveCompareMap( const QVariantMap& a, const QVariantMap& b, int depth ); @@ -495,6 +498,67 @@ strings: [ aap, noot, mies ] QVERIFY( !getStringList( m, key ).contains( "lam" ) ); } +void +LibCalamaresTests::testStringTruncation() +{ + using namespace CalamaresUtils; + + const QString longString( R"(--- +--- src/libcalamares/utils/String.h ++++ src/libcalamares/utils/String.h +@@ -62,15 +62,22 @@ DLLEXPORT QString removeDiacritics( const QString& string ); + */ + DLLEXPORT QString obscure( const QString& string ); + ++/** @brief Parameter for counting lines at beginning and end of string ++ * ++ * This is used by truncateMultiLine() to indicate how many lines from ++ * the beginning and how many from the end should be kept. ++ */ + struct LinesStartEnd + { +- int atStart; +- int atEnd; ++ int atStart = 0; ++ int atEnd = 0; +)" ); + + const int sufficientLength = 812; + // There's 18 lines in all + QCOMPARE( longString.count( '\n' ), 18 ); + QVERIFY( longString.length() < sufficientLength ); + + // If we ask for more, we get everything back + QCOMPARE( longString, truncateMultiLine( longString, LinesStartEnd { 20, 0 }, CharCount { sufficientLength } ) ); + QCOMPARE( longString, truncateMultiLine( longString, LinesStartEnd { 0, 20 }, CharCount { sufficientLength } ) ); + + // If we ask for no lines, only characters, we get that + { + auto s = truncateMultiLine( longString, LinesStartEnd { 0, 0 }, CharCount { 4 } ); + QCOMPARE( s.length(), 4 ); + QCOMPARE( s, QString( "---\n" ) ); + } + { + auto s = truncateMultiLine( longString, LinesStartEnd { 0, 0 }, CharCount { sufficientLength } ); + QCOMPARE( s, longString ); + } + + // Lines at the start + { + auto s = truncateMultiLine( longString, LinesStartEnd { 4, 0 }, CharCount { sufficientLength } ); + QVERIFY( longString.startsWith( s ) ); + QCOMPARE( s.count( '\n' ), 4 ); + } + + // Lines at the end + { + auto s = truncateMultiLine( longString, LinesStartEnd { 0, 4 }, CharCount { sufficientLength } ); + QVERIFY( longString.endsWith( s ) ); + QCOMPARE( s.count( '\n' ), 4 ); + } +} + + QTEST_GUILESS_MAIN( LibCalamaresTests ) #include "utils/moc-warnings.h" From b144d819797a50084a1e0403c59ff9d64d2442c3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 28 Jan 2021 01:02:46 +0100 Subject: [PATCH 063/318] [libcalamares] Fix up smart-string-truncation - off-by-one when source ends with a newline - lastNewLine was being calculated as a left-index into the string, then used as a count-from-right --- src/libcalamares/utils/String.cpp | 9 +++++---- src/libcalamares/utils/Tests.cpp | 6 ++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/libcalamares/utils/String.cpp b/src/libcalamares/utils/String.cpp index f032fa61b7..c2a9f7bf71 100644 --- a/src/libcalamares/utils/String.cpp +++ b/src/libcalamares/utils/String.cpp @@ -15,6 +15,7 @@ */ #include "String.h" +#include "Logger.h" #include @@ -138,7 +139,7 @@ truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, C return string; } - QString shorter = string.simplified(); + QString shorter = string; QString front, back; if ( shorter.count( '\n' ) >= maxLines ) { @@ -154,17 +155,17 @@ truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, C } if ( from > 0 ) { - front = shorter.left( from ); + front = shorter.left( from + 1 ); } int lastNewLine = -1; - int lastCount = 0; + int lastCount = shorter.endsWith( '\n' ) ? -1 : 0; for ( auto i = shorter.rbegin(); i != shorter.rend() && lastCount < lines.atEnd; ++i ) { if ( *i == '\n' ) { ++lastCount; - lastNewLine = shorter.length() - int( i - shorter.rbegin() ); + lastNewLine = int( i - shorter.rbegin() ); } } if ( ( lastNewLine >= 0 ) && ( lastCount >= lines.atEnd ) ) diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index ffeec1078d..84449bdb9d 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -501,6 +501,8 @@ strings: [ aap, noot, mies ] void LibCalamaresTests::testStringTruncation() { + Logger::setupLogLevel( Logger::LOGDEBUG ); + using namespace CalamaresUtils; const QString longString( R"(--- @@ -546,14 +548,18 @@ LibCalamaresTests::testStringTruncation() // Lines at the start { auto s = truncateMultiLine( longString, LinesStartEnd { 4, 0 }, CharCount { sufficientLength } ); + QVERIFY( s.length() > 1 ); QVERIFY( longString.startsWith( s ) ); + cDebug() << "Result-line" << Logger::Quote << s; QCOMPARE( s.count( '\n' ), 4 ); } // Lines at the end { auto s = truncateMultiLine( longString, LinesStartEnd { 0, 4 }, CharCount { sufficientLength } ); + QVERIFY( s.length() > 1 ); QVERIFY( longString.endsWith( s ) ); + cDebug() << "Result-line" << Logger::Quote << s; QCOMPARE( s.count( '\n' ), 4 ); } } From 319a720d1b78439082463358d2496eacf653999a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 28 Jan 2021 01:06:09 +0100 Subject: [PATCH 064/318] [libcalamares Expand tests --- src/libcalamares/utils/Tests.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index 84449bdb9d..3493f95793 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -562,6 +562,20 @@ LibCalamaresTests::testStringTruncation() cDebug() << "Result-line" << Logger::Quote << s; QCOMPARE( s.count( '\n' ), 4 ); } + + // Lines at both ends + { + auto s = truncateMultiLine( longString, LinesStartEnd { 2, 2 }, CharCount { sufficientLength } ); + QVERIFY( s.length() > 1 ); + cDebug() << "Result-line" << Logger::Quote << s; + QCOMPARE( s.count( '\n' ), 4 ); + + auto firsttwo = truncateMultiLine( s, LinesStartEnd { 2, 0 }, CharCount { sufficientLength } ); + auto lasttwo = truncateMultiLine( s, LinesStartEnd { 0, 2 }, CharCount { sufficientLength } ); + QCOMPARE( firsttwo + lasttwo, s ); + QVERIFY( longString.startsWith( firsttwo ) ); + QVERIFY( longString.endsWith( lasttwo ) ); + } } From b85e5b52c2e2fabd3c92be0a8bc3dd62f513b7a3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 28 Jan 2021 13:52:48 +0100 Subject: [PATCH 065/318] [libcalamaresui] Apply coding style - Some minor bits snuck in with the string-truncation code - While here, make UPDATE_BUTTON_PROPERTY more statement-like so it doesn't confuse code-formatters. --- src/libcalamaresui/ViewManager.cpp | 51 +++++++++++++++--------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index aaa55059ed..39f0bb9024 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -31,10 +31,11 @@ #include #define UPDATE_BUTTON_PROPERTY( name, value ) \ + do \ { \ m_##name = value; \ emit name##Changed( m_##name ); \ - } + } while ( false ) namespace Calamares { @@ -152,7 +153,7 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail QString text = "

" + message + "

"; if ( !details.isEmpty() ) { - text += "

" + CalamaresUtils::truncateMultiLine( details, CalamaresUtils::LinesStartEnd{8, 0}) + "

"; + text += "

" + CalamaresUtils::truncateMultiLine( details, CalamaresUtils::LinesStartEnd { 8, 0 } ) + "

"; } if ( shouldOfferWebPaste ) { @@ -365,8 +366,8 @@ ViewManager::next() { // Reached the end in a weird state (e.g. no finished step after an exec) executing = false; - UPDATE_BUTTON_PROPERTY( nextEnabled, false ) - UPDATE_BUTTON_PROPERTY( backEnabled, false ) + UPDATE_BUTTON_PROPERTY( nextEnabled, false ); + UPDATE_BUTTON_PROPERTY( backEnabled, false ); } updateCancelEnabled( !settings->disableCancel() && !( executing && settings->disableCancelDuringExec() ) ); updateBackAndNextVisibility( !( executing && settings->hideBackAndNextDuringExec() ) ); @@ -378,8 +379,8 @@ ViewManager::next() if ( m_currentStep < m_steps.count() ) { - UPDATE_BUTTON_PROPERTY( nextEnabled, !executing && m_steps.at( m_currentStep )->isNextEnabled() ) - UPDATE_BUTTON_PROPERTY( backEnabled, !executing && m_steps.at( m_currentStep )->isBackEnabled() ) + UPDATE_BUTTON_PROPERTY( nextEnabled, !executing && m_steps.at( m_currentStep )->isNextEnabled() ); + UPDATE_BUTTON_PROPERTY( backEnabled, !executing && m_steps.at( m_currentStep )->isBackEnabled() ); } updateButtonLabels(); @@ -401,26 +402,26 @@ ViewManager::updateButtonLabels() // If we're going into the execution step / install phase, other message if ( stepIsExecute( m_steps, m_currentStep + 1 ) ) { - UPDATE_BUTTON_PROPERTY( nextLabel, nextIsInstallationStep ) - UPDATE_BUTTON_PROPERTY( nextIcon, "run-install" ) + UPDATE_BUTTON_PROPERTY( nextLabel, nextIsInstallationStep ); + UPDATE_BUTTON_PROPERTY( nextIcon, "run-install" ); } else { - UPDATE_BUTTON_PROPERTY( nextLabel, tr( "&Next" ) ) - UPDATE_BUTTON_PROPERTY( nextIcon, "go-next" ) + UPDATE_BUTTON_PROPERTY( nextLabel, tr( "&Next" ) ); + UPDATE_BUTTON_PROPERTY( nextIcon, "go-next" ); } // Going back is always simple - UPDATE_BUTTON_PROPERTY( backLabel, tr( "&Back" ) ) - UPDATE_BUTTON_PROPERTY( backIcon, "go-previous" ) + UPDATE_BUTTON_PROPERTY( backLabel, tr( "&Back" ) ); + UPDATE_BUTTON_PROPERTY( backIcon, "go-previous" ); // Cancel button changes label at the end if ( isAtVeryEnd( m_steps, m_currentStep ) ) { - UPDATE_BUTTON_PROPERTY( quitLabel, tr( "&Done" ) ) - UPDATE_BUTTON_PROPERTY( quitTooltip, quitOnCompleteTooltip ) - UPDATE_BUTTON_PROPERTY( quitVisible, true ) - UPDATE_BUTTON_PROPERTY( quitIcon, "dialog-ok-apply" ) + UPDATE_BUTTON_PROPERTY( quitLabel, tr( "&Done" ) ); + UPDATE_BUTTON_PROPERTY( quitTooltip, quitOnCompleteTooltip ); + UPDATE_BUTTON_PROPERTY( quitVisible, true ); + UPDATE_BUTTON_PROPERTY( quitIcon, "dialog-ok-apply" ); updateCancelEnabled( true ); if ( settings->quitAtEnd() ) { @@ -431,14 +432,14 @@ ViewManager::updateButtonLabels() { if ( settings->disableCancel() ) { - UPDATE_BUTTON_PROPERTY( quitVisible, false ) + UPDATE_BUTTON_PROPERTY( quitVisible, false ); } updateCancelEnabled( !settings->disableCancel() && !( stepIsExecute( m_steps, m_currentStep ) && settings->disableCancelDuringExec() ) ); - UPDATE_BUTTON_PROPERTY( quitLabel, tr( "&Cancel" ) ) - UPDATE_BUTTON_PROPERTY( quitTooltip, cancelBeforeInstallationTooltip ) - UPDATE_BUTTON_PROPERTY( quitIcon, "dialog-cancel" ) + UPDATE_BUTTON_PROPERTY( quitLabel, tr( "&Cancel" ) ); + UPDATE_BUTTON_PROPERTY( quitTooltip, cancelBeforeInstallationTooltip ); + UPDATE_BUTTON_PROPERTY( quitIcon, "dialog-cancel" ); } } @@ -468,11 +469,11 @@ ViewManager::back() return; } - UPDATE_BUTTON_PROPERTY( nextEnabled, m_steps.at( m_currentStep )->isNextEnabled() ) + UPDATE_BUTTON_PROPERTY( nextEnabled, m_steps.at( m_currentStep )->isNextEnabled() ); UPDATE_BUTTON_PROPERTY( backEnabled, ( m_currentStep == 0 && m_steps.first()->isAtBeginning() ) ? false - : m_steps.at( m_currentStep )->isBackEnabled() ) + : m_steps.at( m_currentStep )->isBackEnabled() ); updateButtonLabels(); } @@ -525,14 +526,14 @@ ViewManager::confirmCancelInstallation() void ViewManager::updateCancelEnabled( bool enabled ) { - UPDATE_BUTTON_PROPERTY( quitEnabled, enabled ) + UPDATE_BUTTON_PROPERTY( quitEnabled, enabled ); emit cancelEnabled( enabled ); } void -ViewManager::updateBackAndNextVisibility( bool visible) +ViewManager::updateBackAndNextVisibility( bool visible ) { - UPDATE_BUTTON_PROPERTY( backAndNextVisible, visible ) + UPDATE_BUTTON_PROPERTY( backAndNextVisible, visible ); } QVariant From 88128e91fe9b941f2af8b59e123b44e7ea15e927 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 28 Jan 2021 14:11:21 +0100 Subject: [PATCH 066/318] CI: try IRC notifications --- .github/workflows/ci.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c05f063f96..7b0c35b5b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,15 +27,15 @@ jobs: image: docker://kdeneon/plasma:user options: --tmpfs /build:rw --user 0:0 steps: - - + - name: prepare env run: | sudo apt-get update sudo apt-get -y install git-core - - + - name: checkout uses: actions/checkout@v2 - - + - name: install dependencies run: | sudo apt-get -y install \ @@ -80,8 +80,17 @@ jobs: name: make working-directory: ${{ env.BUILDDIR }} run: make -j2 VERBOSE=1 - - + - name: install working-directory: ${{ env.BUILDDIR }} run: | - make install VERBOSE=1 \ No newline at end of file + make install VERBOSE=1 + - + name: notify + uses: rectalogic/notify-irc@v1 + with: + server: char.freenode.net + channel: #calamares + nickname: ircalamares + message: | + ${{ github.actor }} pushed ${{ github.event.ref }} CI ${{ steps.install.conclusion }} From 67e96d2ce6bc114d2c1c7a7a0bc7710957f9df84 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 28 Jan 2021 14:21:57 +0100 Subject: [PATCH 067/318] CI: show badge of recent build --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d3db390899..21c393e294 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ --------- [![GitHub release](https://img.shields.io/github/release/calamares/calamares.svg)](https://github.com/calamares/calamares/releases) +[![GitHub Build Status](https://img.shields.io/github/workflow/status/calamares/calamares/ci?label=GH%20build)](https://github.com/calamares/calamares/actions?query=workflow%3Aci) [![Travis Build Status](https://travis-ci.org/calamares/calamares.svg?branch=calamares)](https://travis-ci.org/calamares/calamares) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5389/badge.svg)](https://scan.coverity.com/projects/5389) [![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/calamares/LICENSE) From 3623e9aefc0864ca8be7ba384340845aa06558c3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 28 Jan 2021 14:47:03 +0100 Subject: [PATCH 068/318] [libcalamares] Extend tests of string-truncation --- src/libcalamares/utils/Tests.cpp | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index 3493f95793..539113d917 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -66,6 +66,7 @@ private Q_SLOTS: /** @brief Test smart string truncation. */ void testStringTruncation(); + void testStringTruncationShorter(); private: void recursiveCompareMap( const QVariantMap& a, const QVariantMap& b, int depth ); @@ -573,11 +574,41 @@ LibCalamaresTests::testStringTruncation() auto firsttwo = truncateMultiLine( s, LinesStartEnd { 2, 0 }, CharCount { sufficientLength } ); auto lasttwo = truncateMultiLine( s, LinesStartEnd { 0, 2 }, CharCount { sufficientLength } ); QCOMPARE( firsttwo + lasttwo, s ); + QCOMPARE( firsttwo.count( '\n' ), 2 ); QVERIFY( longString.startsWith( firsttwo ) ); QVERIFY( longString.endsWith( lasttwo ) ); } } +void +LibCalamaresTests::testStringTruncationShorter() +{ + Logger::setupLogLevel( Logger::LOGDEBUG ); + + using namespace CalamaresUtils; + + const QString longString( R"(Some strange string artifacts appeared, leading to `{1?}` being +displayed in various user-facing messages. These have been removed +and the translations updated.)" ); + const char NEWLINE = '\n'; + + const int insufficientLength = 42; + // There's 2 newlines in all, no trailing newline + QVERIFY( !longString.endsWith( NEWLINE ) ); + QCOMPARE( longString.count( NEWLINE ), 2 ); + QVERIFY( longString.length() > insufficientLength ); + + // Grab first line, untruncated + { + + auto s = truncateMultiLine( longString, LinesStartEnd { 1, 0 } ); + QVERIFY( s.length() > 1 ); + QVERIFY( longString.startsWith( s ) ); + QVERIFY( s.endsWith( NEWLINE ) ); + QVERIFY( s.endsWith( "being\n" ) ); + } +} + QTEST_GUILESS_MAIN( LibCalamaresTests ) From 721748bed39c7bccf78e9367d199ca27db1ff522 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 28 Jan 2021 15:00:45 +0100 Subject: [PATCH 069/318] CI: extend the jobs, also notify for issues --- .github/workflows/ci.yml | 4 ++-- .github/workflows/issues.yml | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/issues.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b0c35b5b1..0c19330b61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,8 +89,8 @@ jobs: name: notify uses: rectalogic/notify-irc@v1 with: - server: char.freenode.net + server: chat.freenode.net channel: #calamares nickname: ircalamares message: | - ${{ github.actor }} pushed ${{ github.event.ref }} CI ${{ steps.install.conclusion }} + ${{ github.actor }} pushed ${{ github.event.ref }} CI ${{ steps.install.conclusion }} JOB ${{ github.job }} RUN ${{ github.run_id }} diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml new file mode 100644 index 0000000000..9693af1c48 --- /dev/null +++ b/.github/workflows/issues.yml @@ -0,0 +1,17 @@ +name: issues + +on: issues + +jobs: + irc: + runs-on: ubuntu-latest + steps: + - + name: notify + uses: rectalogic/notify-irc@v1 + with: + server: chat.freenode.net + channel: #calamares + nickname: ircalamares + message: | + ${{ github.actor }} issue ${{ github.event.issue.title }} From 8e3ed3c93349e90f24903c795da2d5d22e042bb4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 28 Jan 2021 15:24:05 +0100 Subject: [PATCH 070/318] [libcalamares] Remove redundant variable, use NEWLINE instead of character-literal --- src/libcalamares/utils/String.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libcalamares/utils/String.cpp b/src/libcalamares/utils/String.cpp index c2a9f7bf71..570e2800d8 100644 --- a/src/libcalamares/utils/String.cpp +++ b/src/libcalamares/utils/String.cpp @@ -126,6 +126,7 @@ obscure( const QString& string ) QString truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, CalamaresUtils::CharCount chars ) { + const char NEWLINE = '\n'; const int maxLines = lines.atStart + lines.atEnd; if ( maxLines < 1 ) { @@ -134,19 +135,18 @@ truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, C return shorter; } - if ( ( string.length() <= chars.total ) && ( string.count( '\n' ) <= maxLines ) ) + if ( ( string.length() <= chars.total ) && ( string.count( NEWLINE ) <= maxLines ) ) { return string; } - QString shorter = string; QString front, back; - if ( shorter.count( '\n' ) >= maxLines ) + if ( string.count( NEWLINE ) >= maxLines ) { int from = -1; for ( int i = 0; i < lines.atStart; ++i ) { - from = shorter.indexOf( '\n', from + 1 ); + from = string.indexOf( NEWLINE, from + 1 ); if ( from < 0 ) { // That's strange, we counted at least maxLines newlines before @@ -155,22 +155,22 @@ truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, C } if ( from > 0 ) { - front = shorter.left( from + 1 ); + front = string.left( from + 1 ); } int lastNewLine = -1; - int lastCount = shorter.endsWith( '\n' ) ? -1 : 0; - for ( auto i = shorter.rbegin(); i != shorter.rend() && lastCount < lines.atEnd; ++i ) + int lastCount = string.endsWith( NEWLINE ) ? -1 : 0; + for ( auto i = string.rbegin(); i != string.rend() && lastCount < lines.atEnd; ++i ) { - if ( *i == '\n' ) + if ( *i == NEWLINE ) { ++lastCount; - lastNewLine = int( i - shorter.rbegin() ); + lastNewLine = int( i - string.rbegin() ); } } if ( ( lastNewLine >= 0 ) && ( lastCount >= lines.atEnd ) ) { - back = shorter.right( lastNewLine ); + back = string.right( lastNewLine ); } } From 9b15df595eca25fd913a8684c393e01eedc6a644 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 28 Jan 2021 15:29:44 +0100 Subject: [PATCH 071/318] CI: update IRC notifications --- .github/workflows/ci.yml | 4 ++-- .github/workflows/issues.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c19330b61..c2699507dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,7 @@ jobs: uses: rectalogic/notify-irc@v1 with: server: chat.freenode.net - channel: #calamares - nickname: ircalamares + channel: "#calamares" + nickname: gh-notify message: | ${{ github.actor }} pushed ${{ github.event.ref }} CI ${{ steps.install.conclusion }} JOB ${{ github.job }} RUN ${{ github.run_id }} diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 9693af1c48..c647936d73 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -11,7 +11,7 @@ jobs: uses: rectalogic/notify-irc@v1 with: server: chat.freenode.net - channel: #calamares - nickname: ircalamares + channel: "#calamares" + nickname: gh-issues message: | ${{ github.actor }} issue ${{ github.event.issue.title }} From 1542bad224d5562f29e60f358ebfa5939af3ca61 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 28 Jan 2021 15:30:00 +0100 Subject: [PATCH 072/318] [libcalamares] Truncate strings without trailing newline properly --- src/libcalamares/utils/String.cpp | 3 ++- src/libcalamares/utils/Tests.cpp | 26 +++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/utils/String.cpp b/src/libcalamares/utils/String.cpp index 570e2800d8..0c7bf8fb5a 100644 --- a/src/libcalamares/utils/String.cpp +++ b/src/libcalamares/utils/String.cpp @@ -135,7 +135,8 @@ truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, C return shorter; } - if ( ( string.length() <= chars.total ) && ( string.count( NEWLINE ) <= maxLines ) ) + const int linesInString = string.count( NEWLINE ) + ( string.endsWith( NEWLINE ) ? 0 : 1 ); + if ( ( string.length() <= chars.total ) && ( linesInString <= maxLines ) ) { return string; } diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index 539113d917..3992fe78a7 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -600,13 +600,37 @@ and the translations updated.)" ); // Grab first line, untruncated { - auto s = truncateMultiLine( longString, LinesStartEnd { 1, 0 } ); QVERIFY( s.length() > 1 ); QVERIFY( longString.startsWith( s ) ); QVERIFY( s.endsWith( NEWLINE ) ); QVERIFY( s.endsWith( "being\n" ) ); + QVERIFY( s.startsWith( "Some " ) ); } + + // Grab last line, untruncated + { + auto s = truncateMultiLine( longString, LinesStartEnd { 0, 1 } ); + QVERIFY( s.length() > 1 ); + QVERIFY( longString.endsWith( s ) ); + QVERIFY( !s.endsWith( NEWLINE ) ); + QVERIFY( s.endsWith( "updated." ) ); + QCOMPARE( s.count( NEWLINE ), 0 ); // Because last line doesn't end with a newline + QVERIFY( s.startsWith( "and the " ) ); + } + + // Grab last two lines, untruncated + { + auto s = truncateMultiLine( longString, LinesStartEnd { 0, 2 } ); + QVERIFY( s.length() > 1 ); + QVERIFY( longString.endsWith( s ) ); + QVERIFY( !s.endsWith( NEWLINE ) ); + QVERIFY( s.endsWith( "updated." ) ); + cDebug() << "Result-line" << Logger::Quote << s; + QCOMPARE( s.count( NEWLINE ), 1 ); // Because last line doesn't end with a newline + QVERIFY( s.startsWith( "displayed in " ) ); + } + } From 5c402ffd66db3fd92378646fa8701d9d2c6eba0d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 28 Jan 2021 22:12:19 +0100 Subject: [PATCH 073/318] [libcalamares] Truncate to a character count as well --- src/libcalamares/utils/String.cpp | 31 +++++++++++++++++++++- src/libcalamares/utils/Tests.cpp | 44 ++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/utils/String.cpp b/src/libcalamares/utils/String.cpp index 0c7bf8fb5a..02b41f1c0e 100644 --- a/src/libcalamares/utils/String.cpp +++ b/src/libcalamares/utils/String.cpp @@ -175,7 +175,36 @@ truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, C } } - return front + back; + if ( front.length() + back.length() <= chars.total ) + { + return front + back; + } + + // We need to cut off some bits, preserving whether there are + // newlines present at the end of the string. Go case-by-case: + if ( !front.isEmpty() && back.isEmpty() ) + { + // Truncate towards the front + bool needsNewline = front.endsWith( NEWLINE ); + front.truncate( chars.total ); + if ( !front.endsWith( NEWLINE ) && needsNewline ) + { + front.append( NEWLINE ); + } + return front; + } + if ( front.isEmpty() && !back.isEmpty() ) + { + // Truncate towards the tail + return back.right( chars.total ); + } + // Both are non-empty, so nibble away at both of them + front.truncate( chars.total / 2 ); + if ( !front.endsWith( NEWLINE ) ) + { + front.append( NEWLINE ); + } + return front + back.right( chars.total / 2 ); } diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index 3992fe78a7..d8abd9c5f0 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -597,6 +597,8 @@ and the translations updated.)" ); QVERIFY( !longString.endsWith( NEWLINE ) ); QCOMPARE( longString.count( NEWLINE ), 2 ); QVERIFY( longString.length() > insufficientLength ); + // Even the first line must be more than the insufficientLength + QVERIFY( longString.indexOf( NEWLINE ) > insufficientLength ); // Grab first line, untruncated { @@ -626,11 +628,51 @@ and the translations updated.)" ); QVERIFY( longString.endsWith( s ) ); QVERIFY( !s.endsWith( NEWLINE ) ); QVERIFY( s.endsWith( "updated." ) ); - cDebug() << "Result-line" << Logger::Quote << s; QCOMPARE( s.count( NEWLINE ), 1 ); // Because last line doesn't end with a newline QVERIFY( s.startsWith( "displayed in " ) ); } + // First line, truncated + { + auto s = truncateMultiLine( longString, LinesStartEnd { 1, 0 }, CharCount { insufficientLength } ); + cDebug() << "Result-line" << Logger::Quote << s; + QVERIFY( s.length() > 1 ); + QVERIFY( s.endsWith( NEWLINE ) ); + QVERIFY( s.startsWith( "Some " ) ); + // Because the first line has a newline, the truncated version does too, + // but that makes it one longer than requested. + QCOMPARE( s.length(), insufficientLength + 1 ); + QVERIFY( longString.startsWith( s.left( insufficientLength ) ) ); + } + + // Last line, truncated; this line is quite short + { + const int quiteShort = 8; + QVERIFY( longString.lastIndexOf( NEWLINE ) < longString.length() - quiteShort ); + + auto s = truncateMultiLine( longString, LinesStartEnd { 0, 1 }, CharCount { quiteShort } ); + cDebug() << "Result-line" << Logger::Quote << s; + QVERIFY( s.length() > 1 ); + QVERIFY( !s.endsWith( NEWLINE ) ); // Because the original doesn't either + QVERIFY( s.startsWith( "upda" ) ); + QCOMPARE( s.length(), quiteShort ); // No extra newlines + QVERIFY( longString.endsWith( s ) ); + } + + // First and last, but both truncated + { + const int quiteShort = 16; + QVERIFY( longString.indexOf( NEWLINE ) > quiteShort ); + QVERIFY( longString.lastIndexOf( NEWLINE ) < longString.length() - quiteShort ); + + auto s = truncateMultiLine( longString, LinesStartEnd { 1, 1 }, CharCount { quiteShort } ); + cDebug() << "Result-line" << Logger::Quote << s; + QVERIFY( s.length() > 1 ); + QVERIFY( !s.endsWith( NEWLINE ) ); // Because the original doesn't either + QVERIFY( s.startsWith( "Some " ) ); + QVERIFY( s.endsWith( "updated." ) ); + QCOMPARE( s.length(), quiteShort + 1 ); // Newline between front and back part + } } From 7ab9c63903f8a09d1b90a96851fc2759f8744987 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 29 Jan 2021 11:53:36 +0100 Subject: [PATCH 074/318] [libcalamares] Extend test with some degenerate cases --- src/libcalamares/utils/Tests.cpp | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index d8abd9c5f0..3ee48890e9 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -67,6 +67,7 @@ private Q_SLOTS: /** @brief Test smart string truncation. */ void testStringTruncation(); void testStringTruncationShorter(); + void testStringTruncationDegenerate(); private: void recursiveCompareMap( const QVariantMap& a, const QVariantMap& b, int depth ); @@ -675,6 +676,36 @@ and the translations updated.)" ); } } +void LibCalamaresTests::testStringTruncationDegenerate() +{ + Logger::setupLogLevel( Logger::LOGDEBUG ); + + using namespace CalamaresUtils; + + // This is quite long, 1 line only, with no newlines + const QString longString( + "The portscout new distfile checker has detected that one or more of your" + "ports appears to be out of date. Please take the opportunity to check" + "each of the ports listed below, and if possible and appropriate," + "submit/commit an update. If any ports have already been updated, you can" + "safely ignore the entry." ); + + const char NEWLINE = '\n'; + const int quiteShort = 16; + QVERIFY( longString.length() > quiteShort); + QVERIFY( !longString.contains(NEWLINE)); + QVERIFY( longString.indexOf(NEWLINE) < 0); + + { + auto s = truncateMultiLine( longString, LinesStartEnd { 1, 0 }, CharCount { quiteShort } ); + cDebug() << "Result-line" << Logger::Quote << s; + QVERIFY( s.length() > 1 ); + QCOMPARE( s.length(), quiteShort); // Newline between front and back part + QVERIFY( s.startsWith( "The " ) ); + QVERIFY( s.endsWith( "entry." ) ); + } +} + QTEST_GUILESS_MAIN( LibCalamaresTests ) From e56bdd019f8eca7e37319f86d2db4a6510a41fb6 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 30 Jan 2021 05:37:41 -0500 Subject: [PATCH 075/318] modules/bootloader: Use the correct names for the shim binaries Ever since signed shim binaries for multiple architectures became available, the shim binaries installed in Linux distributions have been renamed to include the EFI architecture in the binary names. This started in Fedora, but is now used in openSUSE and Ubuntu too. Reference for shim binary names comes from shim spec in Fedora: https://src.fedoraproject.org/rpms/shim/blob/d8c3c8e39235507feb17b4e81851da087ae83c77/f/shim.spec#_23-32 --- AUTHORS | 1 + src/modules/bootloader/main.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index 912d48da70..1c4d7aa24f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -38,6 +38,7 @@ and moral support from (alphabetically by first name or nickname): - Kevin Kofler - Kyle Robertze - Lisa Vitolo + - Neal Gompa - n3rdopolis - Philip Müller - Ramon Buldó diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index ec9a6f2e6b..03fdb0c5b5 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -14,6 +14,7 @@ # SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot # SPDX-FileCopyrightText: 2017 Gabriel Craciunescu # SPDX-FileCopyrightText: 2017 Ben Green +# SPDX-FileCopyrightText: 2021 Neal Gompa # SPDX-License-Identifier: GPL-3.0-or-later # # Calamares is Free Software: see the License-Identifier above. @@ -372,9 +373,9 @@ def install_secureboot(efi_directory): install_efi_directory = install_path + efi_directory if efi_word_size() == "64": - install_efi_bin = "shim64.efi" - else: - install_efi_bin = "shim.efi" + install_efi_bin = "shimx64.efi" + elif efi_word_size() == "32": + install_efi_bin = "shimia32.efi" # Copied, roughly, from openSUSE's install script, # and pythonified. *disk* is something like /dev/sda, From 0d44d2838fdc0c63e3d65d909b6e5b2a77e01127 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 31 Jan 2021 00:54:48 +0100 Subject: [PATCH 076/318] Changes: document Neal Gompa's fix from #1628 --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index d112470b4b..187ec76e41 100644 --- a/CHANGES +++ b/CHANGES @@ -12,6 +12,7 @@ website will have to do for older versions. This release contains contributions from (alphabetically by first name): - Anubhav Choudhary - Gaël PORTAY + - Neal Gompa ## Core ## - It is now possible to hide the *next* and *back* buttons during @@ -28,6 +29,8 @@ This release contains contributions from (alphabetically by first name): failed installations if automount grabs partitions while they are being created. The code is prepared to handle other ways to control automount-behavior as well. + - *bootloader* now uses the current file names for the UEFI Secure Boot + shim instead of obsolete ones. # 3.2.35.1 (2020-12-07) # From caff0176b160883167a7438c188fc03df7297ed2 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 31 Jan 2021 21:40:41 +0100 Subject: [PATCH 077/318] [libcalamares] Need for unique_ptr FIXES #1631 --- src/libcalamares/JobQueue.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libcalamares/JobQueue.cpp b/src/libcalamares/JobQueue.cpp index b66be7ebe0..a975c2c910 100644 --- a/src/libcalamares/JobQueue.cpp +++ b/src/libcalamares/JobQueue.cpp @@ -19,6 +19,8 @@ #include #include +#include + namespace Calamares { From 0592d40bc26842ede3ab21f4648039aa0f3532d5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 31 Jan 2021 21:50:33 +0100 Subject: [PATCH 078/318] CI: rename neon build (to make it obvious there are other possibilities) --- .github/workflows/{ci.yml => ci-neon.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{ci.yml => ci-neon.yml} (99%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci-neon.yml similarity index 99% rename from .github/workflows/ci.yml rename to .github/workflows/ci-neon.yml index c2699507dd..0c691dbd31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci-neon.yml @@ -1,4 +1,4 @@ -name: ci +name: ci-neon on: push: From a289518a8a1dcc50e0958e1bc7f3ce1d242f641d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 31 Jan 2021 22:01:41 +0100 Subject: [PATCH 079/318] CI: munge the issues-notifications --- .github/workflows/issues.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index c647936d73..e1d41e3efe 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -1,17 +1,28 @@ name: issues -on: issues +on: + issues: + types: [opened, reopened, closed] jobs: irc: runs-on: ubuntu-latest steps: - - name: notify + name: notify-new uses: rectalogic/notify-irc@v1 + if: ${{ github.event.issue.state }} == "open" with: server: chat.freenode.net channel: "#calamares" nickname: gh-issues - message: | - ${{ github.actor }} issue ${{ github.event.issue.title }} + message: "New issue [${{ github.event.issue.title }}](${{ github.event.issue.url }})" + - + name: notify-closed + uses: rectalogic/notify-irc@v1 + if: ${{ github.event.issue.state }} != "open" + with: + server: chat.freenode.net + channel: "#calamares" + nickname: gh-issues + message: "Closed issue [${{ github.event.issue.title }}](${{ github.event.issue.url }})" From 413614e14bf701d8fe7f4757f6213f45aed48f14 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 31 Jan 2021 23:07:48 +0100 Subject: [PATCH 080/318] CI: massage the issues-messages a little more, fix logic --- .github/workflows/issues.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index e1d41e3efe..d98230d912 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -11,18 +11,18 @@ jobs: - name: notify-new uses: rectalogic/notify-irc@v1 - if: ${{ github.event.issue.state }} == "open" + if: github.event.issue.state == "open" with: server: chat.freenode.net channel: "#calamares" nickname: gh-issues - message: "New issue [${{ github.event.issue.title }}](${{ github.event.issue.url }})" + message: "[${{ github.event.issue.title }}](${{ github.event.issue.url }}) opened by ${{ github.actor }}" - name: notify-closed uses: rectalogic/notify-irc@v1 - if: ${{ github.event.issue.state }} != "open" + if: github.event.issue.state != "open" with: server: chat.freenode.net channel: "#calamares" nickname: gh-issues - message: "Closed issue [${{ github.event.issue.title }}](${{ github.event.issue.url }})" + message: "[${{ github.event.issue.title }}](${{ github.event.issue.url }}) closed by ${{ github.actor }}" From 3ca770aa631dbdbfeca81d6fb33246e59295fb59 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 13:27:33 +0100 Subject: [PATCH 081/318] CI: another round of CI-wrangling --- .github/workflows/ci-neon.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index 0c691dbd31..95fbd52302 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -85,12 +85,23 @@ jobs: working-directory: ${{ env.BUILDDIR }} run: | make install VERBOSE=1 + - + name: Dump steps context + env: + JOBS_CONTEXT: ${{ toJSON(job) }} + STEPS_CONTEXT: ${{ toJSON(steps) }} + run: | + echo "STEPS" + echo "$STEPS_CONTEXT" + echo "JOB" + echo "$JOB_CONTEXT" - name: notify uses: rectalogic/notify-irc@v1 + if: always() with: server: chat.freenode.net channel: "#calamares" nickname: gh-notify message: | - ${{ github.actor }} pushed ${{ github.event.ref }} CI ${{ steps.install.conclusion }} JOB ${{ github.job }} RUN ${{ github.run_id }} + ${{ github.actor }} result ${{ steps.install.conclusion }} - ${{ steps.install.outcome }} - ${{ job.status }} RUN ${{ github.run_id }} From bd6aa58322baecf70e4ed70e634ad3117b91ffc5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 13:52:55 +0100 Subject: [PATCH 082/318] CI: another try at notification on build --- .github/workflows/ci-neon.yml | 45 ++++++++++++++++------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index 95fbd52302..37eee1dcd7 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -27,16 +27,13 @@ jobs: image: docker://kdeneon/plasma:user options: --tmpfs /build:rw --user 0:0 steps: - - - name: prepare env + - name: prepare env run: | sudo apt-get update sudo apt-get -y install git-core - - - name: checkout + - name: checkout uses: actions/checkout@v2 - - - name: install dependencies + - name: install dependencies run: | sudo apt-get -y install \ build-essential \ @@ -66,27 +63,15 @@ jobs: qtdeclarative5-dev \ qttools5-dev \ qttools5-dev-tools - - - name: prepare build + - name: prepare build run: | test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } mkdir -p $BUILDDIR test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } - - - name: cmake + - name: Calamares: cmake working-directory: ${{ env.BUILDDIR }} run: cmake $CMAKE_ARGS $SRCDIR - - - name: make - working-directory: ${{ env.BUILDDIR }} - run: make -j2 VERBOSE=1 - - - name: install - working-directory: ${{ env.BUILDDIR }} - run: | - make install VERBOSE=1 - - - name: Dump steps context + - name: Dump steps context env: JOBS_CONTEXT: ${{ toJSON(job) }} STEPS_CONTEXT: ${{ toJSON(steps) }} @@ -94,9 +79,8 @@ jobs: echo "STEPS" echo "$STEPS_CONTEXT" echo "JOB" - echo "$JOB_CONTEXT" - - - name: notify + echo "$JOBS_CONTEXT" + - name: notify uses: rectalogic/notify-irc@v1 if: always() with: @@ -104,4 +88,15 @@ jobs: channel: "#calamares" nickname: gh-notify message: | - ${{ github.actor }} result ${{ steps.install.conclusion }} - ${{ steps.install.outcome }} - ${{ job.status }} RUN ${{ github.run_id }} + ${{ github.actor }} $${ github.sha }} on ${{ github.ref }} + result ${{ steps.checkout.conclusion }} - ${{ steps.checkout.outcome }} - ${{ job.status }} RUN ${{ github.run_id }} ${{ github.job_id }} + +# Unused while we figure out notifications. +# - name: make +# working-directory: ${{ env.BUILDDIR }} +# run: make -j2 VERBOSE=1 +# - name: install +# working-directory: ${{ env.BUILDDIR }} +# run: | +# make install VERBOSE=1 +# From c5729b861f3cef0944a2a04eb7143b71a58ac5e8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 13:57:28 +0100 Subject: [PATCH 083/318] CI: fix YAML typo --- .github/workflows/ci-neon.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index 37eee1dcd7..d33cc24f21 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -27,13 +27,13 @@ jobs: image: docker://kdeneon/plasma:user options: --tmpfs /build:rw --user 0:0 steps: - - name: prepare env + - name: "prepare env" run: | sudo apt-get update sudo apt-get -y install git-core - - name: checkout + - name: "checkout" uses: actions/checkout@v2 - - name: install dependencies + - name: "install dependencies" run: | sudo apt-get -y install \ build-essential \ @@ -63,15 +63,15 @@ jobs: qtdeclarative5-dev \ qttools5-dev \ qttools5-dev-tools - - name: prepare build + - name: "prepare build" run: | test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } mkdir -p $BUILDDIR test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } - - name: Calamares: cmake + - name: "Calamares: cmake" working-directory: ${{ env.BUILDDIR }} run: cmake $CMAKE_ARGS $SRCDIR - - name: Dump steps context + - name: "dump context" env: JOBS_CONTEXT: ${{ toJSON(job) }} STEPS_CONTEXT: ${{ toJSON(steps) }} @@ -80,7 +80,7 @@ jobs: echo "$STEPS_CONTEXT" echo "JOB" echo "$JOBS_CONTEXT" - - name: notify + - name: "notify" uses: rectalogic/notify-irc@v1 if: always() with: @@ -92,10 +92,10 @@ jobs: result ${{ steps.checkout.conclusion }} - ${{ steps.checkout.outcome }} - ${{ job.status }} RUN ${{ github.run_id }} ${{ github.job_id }} # Unused while we figure out notifications. -# - name: make +# - name: "Calamares: make" # working-directory: ${{ env.BUILDDIR }} # run: make -j2 VERBOSE=1 -# - name: install +# - name: "Calamares: install" # working-directory: ${{ env.BUILDDIR }} # run: | # make install VERBOSE=1 From 5643c5cdc75c160a443d80a81bcba5075365974e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 14:09:52 +0100 Subject: [PATCH 084/318] CI: another try at notification on build --- .github/workflows/ci-neon.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index d33cc24f21..b255adebd1 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -75,11 +75,14 @@ jobs: env: JOBS_CONTEXT: ${{ toJSON(job) }} STEPS_CONTEXT: ${{ toJSON(steps) }} + EVENT_CONTEXT: ${{ toJSON(github.event) }} run: | echo "STEPS" echo "$STEPS_CONTEXT" echo "JOB" echo "$JOBS_CONTEXT" + echo "EVENT" + echo "$EVENT_CONTEXT" - name: "notify" uses: rectalogic/notify-irc@v1 if: always() @@ -88,8 +91,8 @@ jobs: channel: "#calamares" nickname: gh-notify message: | - ${{ github.actor }} $${ github.sha }} on ${{ github.ref }} - result ${{ steps.checkout.conclusion }} - ${{ steps.checkout.outcome }} - ${{ job.status }} RUN ${{ github.run_id }} ${{ github.job_id }} + ${{ github.actor }} ${{ github.sha }} on ${{ github.ref }} + result ${{ job.status }} RUN ${{ github.run_id }} ${{ github.job }} # Unused while we figure out notifications. # - name: "Calamares: make" From 9af44a3c8d70293a4604d064889ce736c6c039a5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 14:25:02 +0100 Subject: [PATCH 085/318] CI: one more with shorter notifications --- .github/workflows/ci-neon.yml | 16 ++++++++++++---- .github/workflows/issues.yml | 6 ++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index b255adebd1..c7bf22f779 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -83,16 +83,24 @@ jobs: echo "$JOBS_CONTEXT" echo "EVENT" echo "$EVENT_CONTEXT" - - name: "notify" + - name: "notify: ok" uses: rectalogic/notify-irc@v1 - if: always() + if: ${{ success() }} + with: + server: chat.freenode.net + channel: "#calamares" + nickname: gh-notify + message: "CI OK for '${{ github.event.head_commit.message }}'" + - name: "notify: fail" + uses: rectalogic/notify-irc@v1 + if: ${{ failure() }} with: server: chat.freenode.net channel: "#calamares" nickname: gh-notify message: | - ${{ github.actor }} ${{ github.sha }} on ${{ github.ref }} - result ${{ job.status }} RUN ${{ github.run_id }} ${{ github.job }} + CI FAIL for '${{ github.event.head_commit.message }}' + .. DIFF ${{ github.event.compare }} # Unused while we figure out notifications. # - name: "Calamares: make" diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index d98230d912..9ceb5315cd 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -8,8 +8,7 @@ jobs: irc: runs-on: ubuntu-latest steps: - - - name: notify-new + - name: "notify: new" uses: rectalogic/notify-irc@v1 if: github.event.issue.state == "open" with: @@ -17,8 +16,7 @@ jobs: channel: "#calamares" nickname: gh-issues message: "[${{ github.event.issue.title }}](${{ github.event.issue.url }}) opened by ${{ github.actor }}" - - - name: notify-closed + - name: "notify: closed" uses: rectalogic/notify-irc@v1 if: github.event.issue.state != "open" with: From 1da84ca09ba904eec55db57896624a6564a3acd9 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 14:41:07 +0100 Subject: [PATCH 086/318] CI: restore full build, restrict to 'our' repo - this should prevent forks from duplicate-reporting builds --- .github/workflows/ci-neon.yml | 31 ++++++++----------------------- .github/workflows/issues.yml | 5 +++-- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index c7bf22f779..0cb51e01a8 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -26,6 +26,7 @@ jobs: container: image: docker://kdeneon/plasma:user options: --tmpfs /build:rw --user 0:0 + if: github.repository == "calamares/calamares" steps: - name: "prepare env" run: | @@ -71,18 +72,12 @@ jobs: - name: "Calamares: cmake" working-directory: ${{ env.BUILDDIR }} run: cmake $CMAKE_ARGS $SRCDIR - - name: "dump context" - env: - JOBS_CONTEXT: ${{ toJSON(job) }} - STEPS_CONTEXT: ${{ toJSON(steps) }} - EVENT_CONTEXT: ${{ toJSON(github.event) }} - run: | - echo "STEPS" - echo "$STEPS_CONTEXT" - echo "JOB" - echo "$JOBS_CONTEXT" - echo "EVENT" - echo "$EVENT_CONTEXT" + - name: "Calamares: make" + working-directory: ${{ env.BUILDDIR }} + run: make -j2 VERBOSE=1 + - name: "Calamares: install" + working-directory: ${{ env.BUILDDIR }} + run: make install VERBOSE=1 - name: "notify: ok" uses: rectalogic/notify-irc@v1 if: ${{ success() }} @@ -90,7 +85,7 @@ jobs: server: chat.freenode.net channel: "#calamares" nickname: gh-notify - message: "CI OK for '${{ github.event.head_commit.message }}'" + message: "CI OK for '${{ github.event.head_commit.message }}' in ${{ github.repository }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() }} @@ -101,13 +96,3 @@ jobs: message: | CI FAIL for '${{ github.event.head_commit.message }}' .. DIFF ${{ github.event.compare }} - -# Unused while we figure out notifications. -# - name: "Calamares: make" -# working-directory: ${{ env.BUILDDIR }} -# run: make -j2 VERBOSE=1 -# - name: "Calamares: install" -# working-directory: ${{ env.BUILDDIR }} -# run: | -# make install VERBOSE=1 -# diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 9ceb5315cd..87ba94d705 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -7,6 +7,7 @@ on: jobs: irc: runs-on: ubuntu-latest + if: github.repository == "calamares/calamares" steps: - name: "notify: new" uses: rectalogic/notify-irc@v1 @@ -15,7 +16,7 @@ jobs: server: chat.freenode.net channel: "#calamares" nickname: gh-issues - message: "[${{ github.event.issue.title }}](${{ github.event.issue.url }}) opened by ${{ github.actor }}" + message: "[${{ github.event.issue.title }}](${{ github.event.issue.html_url }}) opened by ${{ github.actor }}" - name: "notify: closed" uses: rectalogic/notify-irc@v1 if: github.event.issue.state != "open" @@ -23,4 +24,4 @@ jobs: server: chat.freenode.net channel: "#calamares" nickname: gh-issues - message: "[${{ github.event.issue.title }}](${{ github.event.issue.url }}) closed by ${{ github.actor }}" + message: "[${{ github.event.issue.title }}](${{ github.event.issue.html_url }}) closed by ${{ github.actor }}" From eee5674f6d3e5a0b2f7257a609fd3af3904c7b01 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 15:04:13 +0100 Subject: [PATCH 087/318] CI: remove if-expression, it triggers a syntax error - unclear why this wasn't evaluated in expression context before --- .github/workflows/ci-neon.yml | 4 ++-- .github/workflows/issues.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index 0cb51e01a8..32399d20cd 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -26,7 +26,7 @@ jobs: container: image: docker://kdeneon/plasma:user options: --tmpfs /build:rw --user 0:0 - if: github.repository == "calamares/calamares" + if: ${{ github.repository == "calamares/calamares" }} steps: - name: "prepare env" run: | @@ -94,5 +94,5 @@ jobs: channel: "#calamares" nickname: gh-notify message: | - CI FAIL for '${{ github.event.head_commit.message }}' + CI FAIL for '${{ github.event.head_commit.message }}' in ${{ github.repository }} .. DIFF ${{ github.event.compare }} diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 87ba94d705..1d039795cd 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -7,7 +7,6 @@ on: jobs: irc: runs-on: ubuntu-latest - if: github.repository == "calamares/calamares" steps: - name: "notify: new" uses: rectalogic/notify-irc@v1 From 1742c10f7d58bf1bf1498009656351280afa6399 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 15:05:33 +0100 Subject: [PATCH 088/318] CI: remove if entirely - expression context is not enough --- .github/workflows/ci-neon.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index 32399d20cd..a0b596928f 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -26,7 +26,6 @@ jobs: container: image: docker://kdeneon/plasma:user options: --tmpfs /build:rw --user 0:0 - if: ${{ github.repository == "calamares/calamares" }} steps: - name: "prepare env" run: | From f2bd956b89ff868955f62c0c75c931f1e20748aa Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 16:28:20 +0100 Subject: [PATCH 089/318] CI: try a different form of if() --- .github/workflows/ci-neon.yml | 1 + .github/workflows/issues.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index a0b596928f..3e090b2839 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -26,6 +26,7 @@ jobs: container: image: docker://kdeneon/plasma:user options: --tmpfs /build:rw --user 0:0 + if: ${{ github.repository == 'calamares/calamares' }} steps: - name: "prepare env" run: | diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 1d039795cd..698f0d7339 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -10,7 +10,7 @@ jobs: steps: - name: "notify: new" uses: rectalogic/notify-irc@v1 - if: github.event.issue.state == "open" + if: github.event.issue.state == 'open' with: server: chat.freenode.net channel: "#calamares" @@ -18,7 +18,7 @@ jobs: message: "[${{ github.event.issue.title }}](${{ github.event.issue.html_url }}) opened by ${{ github.actor }}" - name: "notify: closed" uses: rectalogic/notify-irc@v1 - if: github.event.issue.state != "open" + if: github.event.issue.state != 'open' with: server: chat.freenode.net channel: "#calamares" From 3692988b1716245ff8fcc9883956ed2c3e44b595 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 16:57:05 +0100 Subject: [PATCH 090/318] CI: cut down expression context --- .github/workflows/ci-neon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index 3e090b2839..bad6ead1ec 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -26,7 +26,7 @@ jobs: container: image: docker://kdeneon/plasma:user options: --tmpfs /build:rw --user 0:0 - if: ${{ github.repository == 'calamares/calamares' }} + if: github.repository == 'calamares/calamares' steps: - name: "prepare env" run: | From 2f18921db9901625d64074321095c4f2f98f1259 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 17:09:50 +0100 Subject: [PATCH 091/318] CI: compress steps - don't need multiple prepare steps - try to use git output for SHA and log message --- .github/workflows/ci-neon.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index bad6ead1ec..d7da036b14 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -32,10 +32,6 @@ jobs: run: | sudo apt-get update sudo apt-get -y install git-core - - name: "checkout" - uses: actions/checkout@v2 - - name: "install dependencies" - run: | sudo apt-get -y install \ build-essential \ cmake \ @@ -64,11 +60,15 @@ jobs: qtdeclarative5-dev \ qttools5-dev \ qttools5-dev-tools + - name: "prepare source" + uses: actions/checkout@v2 - name: "prepare build" + id: pre_build run: | test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } mkdir -p $BUILDDIR test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } + echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }} - name: "Calamares: cmake" working-directory: ${{ env.BUILDDIR }} run: cmake $CMAKE_ARGS $SRCDIR @@ -85,7 +85,7 @@ jobs: server: chat.freenode.net channel: "#calamares" nickname: gh-notify - message: "CI OK for '${{ github.event.head_commit.message }}' in ${{ github.repository }}" + message: "CI OK ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() }} @@ -94,5 +94,5 @@ jobs: channel: "#calamares" nickname: gh-notify message: | - CI FAIL for '${{ github.event.head_commit.message }}' in ${{ github.repository }} - .. DIFF ${{ github.event.compare }} + CI FAIL ${{ github.repository }} ${{ steps.pre_build.outputs.message }} + .. DIFF ${{ github.event.compare }} From 14dcbb94a34492b0319d4ade289d5d1449644f92 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 17:18:44 +0100 Subject: [PATCH 092/318] CI: fix typo, tighten up messages --- .github/workflows/ci-neon.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index d7da036b14..753bffd581 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -68,7 +68,7 @@ jobs: test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } mkdir -p $BUILDDIR test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } - echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }} + echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}` - name: "Calamares: cmake" working-directory: ${{ env.BUILDDIR }} run: cmake $CMAKE_ARGS $SRCDIR @@ -85,7 +85,7 @@ jobs: server: chat.freenode.net channel: "#calamares" nickname: gh-notify - message: "CI OK ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" + message: "${{ github.workflow }} OK ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() }} @@ -94,5 +94,5 @@ jobs: channel: "#calamares" nickname: gh-notify message: | - CI FAIL ${{ github.repository }} ${{ steps.pre_build.outputs.message }} + ${{ github.workflow }} FAIL ${{ github.repository }} ${{ steps.pre_build.outputs.message }} .. DIFF ${{ github.event.compare }} From 7a0e91f0763eaebc8b365b70a5039faa0d1f81e4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 23:12:14 +0100 Subject: [PATCH 093/318] CI: shorten the notification stanzas --- .github/workflows/ci-neon.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index 753bffd581..751d210cf7 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -82,17 +82,14 @@ jobs: uses: rectalogic/notify-irc@v1 if: ${{ success() }} with: - server: chat.freenode.net channel: "#calamares" - nickname: gh-notify message: "${{ github.workflow }} OK ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() }} with: - server: chat.freenode.net channel: "#calamares" - nickname: gh-notify message: | ${{ github.workflow }} FAIL ${{ github.repository }} ${{ steps.pre_build.outputs.message }} .. DIFF ${{ github.event.compare }} +# END From a34ca69d52aa6542b4197feb3e88344c32b83c51 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 23:14:06 +0100 Subject: [PATCH 094/318] CI: run CI everywhere, but notify us only when building the upstream version --- .github/workflows/ci-neon.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index 751d210cf7..422287dec0 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -26,7 +26,6 @@ jobs: container: image: docker://kdeneon/plasma:user options: --tmpfs /build:rw --user 0:0 - if: github.repository == 'calamares/calamares' steps: - name: "prepare env" run: | @@ -80,13 +79,13 @@ jobs: run: make install VERBOSE=1 - name: "notify: ok" uses: rectalogic/notify-irc@v1 - if: ${{ success() }} + if: ${{ success() && github.repository == 'calamares/calamares' }} with: channel: "#calamares" message: "${{ github.workflow }} OK ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 - if: ${{ failure() }} + if: ${{ failure() && github.repository == 'calamares/calamares' }} with: channel: "#calamares" message: | From 343f4cefc88ed8352984cac6ec83d470a9851ce3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 23:15:15 +0100 Subject: [PATCH 095/318] CI: build on older Debian on a schedule --- .github/workflows/ci-debian.yml | 87 +++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 .github/workflows/ci-debian.yml diff --git a/.github/workflows/ci-debian.yml b/.github/workflows/ci-debian.yml new file mode 100644 index 0000000000..1fa4135ef4 --- /dev/null +++ b/.github/workflows/ci-debian.yml @@ -0,0 +1,87 @@ +name: ci-debian-9 + +on: + schedule: + - cron: "12 23 * * *" + +env: + BUILDDIR: /build + SRCDIR: ${{ github.workspace }} + CMAKE_ARGS: | + -DWEBVIEW_FORCE_WEBKIT=1 + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON + -DWITH_PYTHONQT=OFF" + -DCMAKE_BUILD_TYPE=Debug + +jobs: + build: + runs-on: ubuntu-latest + container: + image: docker://debian:9 + options: --tmpfs /build:rw --user 0:0 + steps: + - name: "prepare env" + run: | + sudo apt-get update + sudo apt-get -y install git-core + sudo apt-get -y install \ + build-essential \ + cmake \ + extra-cmake-modules \ + gettext \ + kio-dev \ + libatasmart-dev \ + libboost-python-dev \ + libkf5config-dev \ + libkf5coreaddons-dev \ + libkf5i18n-dev \ + libkf5iconthemes-dev \ + libkf5parts-dev \ + libkf5service-dev \ + libkf5solid-dev \ + libkpmcore-dev \ + libparted-dev \ + libpolkit-qt5-1-dev \ + libqt5svg5-dev \ + libqt5webkit5-dev \ + libyaml-cpp-dev \ + os-prober \ + pkg-config \ + python3-dev \ + qtbase5-dev \ + qtdeclarative5-dev \ + qttools5-dev \ + qttools5-dev-tools + - name: "prepare source" + uses: actions/checkout@v2 + - name: "prepare build" + id: pre_build + run: | + test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } + mkdir -p $BUILDDIR + test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } + echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}` + - name: "Calamares: cmake" + working-directory: ${{ env.BUILDDIR }} + run: cmake $CMAKE_ARGS $SRCDIR + - name: "Calamares: make" + working-directory: ${{ env.BUILDDIR }} + run: make -j2 VERBOSE=1 + - name: "Calamares: install" + working-directory: ${{ env.BUILDDIR }} + run: make install VERBOSE=1 + - name: "notify: ok" + uses: rectalogic/notify-irc@v1 + if: ${{ success() && github.repository == 'calamares/calamares' }} + with: + channel: "#calamares" + message: "${{ github.workflow }} OK ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" + - name: "notify: fail" + uses: rectalogic/notify-irc@v1 + if: ${{ failure() && github.repository == 'calamares/calamares' }} + with: + channel: "#calamares" + message: | + ${{ github.workflow }} FAIL ${{ github.repository }} ${{ steps.pre_build.outputs.message }} + .. DIFF ${{ github.event.compare }} +# END From 73ab41c5722ac8fde55d69c7ba1d3ff6f8c22018 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 23:42:10 +0100 Subject: [PATCH 096/318] CI: partial back-out to chase IRC message failure --- .github/workflows/ci-neon.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index 422287dec0..c069337155 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -82,7 +82,8 @@ jobs: if: ${{ success() && github.repository == 'calamares/calamares' }} with: channel: "#calamares" - message: "${{ github.workflow }} OK ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" + message: | + ${{ github.workflow }} OK ${{ github.repository }} ${{ steps.pre_build.outputs.message }} - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} @@ -91,4 +92,3 @@ jobs: message: | ${{ github.workflow }} FAIL ${{ github.repository }} ${{ steps.pre_build.outputs.message }} .. DIFF ${{ github.event.compare }} -# END From 6743de076f07e8ae155a3752cd339424a7878a5f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Feb 2021 23:56:42 +0100 Subject: [PATCH 097/318] CI: frustrated by weird Python failures now --- .github/workflows/ci-neon.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index c069337155..91f79eb9f4 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -68,19 +68,21 @@ jobs: mkdir -p $BUILDDIR test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}` - - name: "Calamares: cmake" - working-directory: ${{ env.BUILDDIR }} - run: cmake $CMAKE_ARGS $SRCDIR - - name: "Calamares: make" - working-directory: ${{ env.BUILDDIR }} - run: make -j2 VERBOSE=1 - - name: "Calamares: install" - working-directory: ${{ env.BUILDDIR }} - run: make install VERBOSE=1 +# - name: "Calamares: cmake" +# working-directory: ${{ env.BUILDDIR }} +# run: cmake $CMAKE_ARGS $SRCDIR +# - name: "Calamares: make" +# working-directory: ${{ env.BUILDDIR }} +# run: make -j2 VERBOSE=1 +# - name: "Calamares: install" +# working-directory: ${{ env.BUILDDIR }} +# run: make install VERBOSE=1 - name: "notify: ok" uses: rectalogic/notify-irc@v1 if: ${{ success() && github.repository == 'calamares/calamares' }} with: + server: chat.freenode.net + nickname: cala-notify channel: "#calamares" message: | ${{ github.workflow }} OK ${{ github.repository }} ${{ steps.pre_build.outputs.message }} @@ -88,6 +90,8 @@ jobs: uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} with: + server: chat.freenode.net + nickname: cala-notify channel: "#calamares" message: | ${{ github.workflow }} FAIL ${{ github.repository }} ${{ steps.pre_build.outputs.message }} From fa258e3100faca36d18ba1164c4d7244cd0e3079 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 00:04:33 +0100 Subject: [PATCH 098/318] CI: try again to avoid trailing blank lines --- .github/workflows/ci-neon.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index 91f79eb9f4..d21a9f518b 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -84,8 +84,7 @@ jobs: server: chat.freenode.net nickname: cala-notify channel: "#calamares" - message: | - ${{ github.workflow }} OK ${{ github.repository }} ${{ steps.pre_build.outputs.message }} + message: "${{ github.workflow }} OK ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} @@ -93,6 +92,4 @@ jobs: server: chat.freenode.net nickname: cala-notify channel: "#calamares" - message: | - ${{ github.workflow }} FAIL ${{ github.repository }} ${{ steps.pre_build.outputs.message }} - .. DIFF ${{ github.event.compare }} + message: "${{ github.workflow }} FAIL ${{ github.repository }} ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" From 455cc29bc360525049d38fd4fababb0f20560ebc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 00:11:50 +0100 Subject: [PATCH 099/318] CI: restore build steps --- .github/workflows/ci-neon.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index d21a9f518b..bccdbd71e6 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -68,15 +68,15 @@ jobs: mkdir -p $BUILDDIR test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}` -# - name: "Calamares: cmake" -# working-directory: ${{ env.BUILDDIR }} -# run: cmake $CMAKE_ARGS $SRCDIR -# - name: "Calamares: make" -# working-directory: ${{ env.BUILDDIR }} -# run: make -j2 VERBOSE=1 -# - name: "Calamares: install" -# working-directory: ${{ env.BUILDDIR }} -# run: make install VERBOSE=1 + - name: "Calamares: cmake" + working-directory: ${{ env.BUILDDIR }} + run: cmake $CMAKE_ARGS $SRCDIR + - name: "Calamares: make" + working-directory: ${{ env.BUILDDIR }} + run: make -j2 VERBOSE=1 + - name: "Calamares: install" + working-directory: ${{ env.BUILDDIR }} + run: make install VERBOSE=1 - name: "notify: ok" uses: rectalogic/notify-irc@v1 if: ${{ success() && github.repository == 'calamares/calamares' }} From 81e5bf4e6e0e0e566c3c9648dd43e88c58c956d7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 00:13:07 +0100 Subject: [PATCH 100/318] CI: update Debian-build notifications, too --- .github/workflows/ci-debian.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-debian.yml b/.github/workflows/ci-debian.yml index 1fa4135ef4..b60ce29e6f 100644 --- a/.github/workflows/ci-debian.yml +++ b/.github/workflows/ci-debian.yml @@ -74,14 +74,15 @@ jobs: uses: rectalogic/notify-irc@v1 if: ${{ success() && github.repository == 'calamares/calamares' }} with: + server: chat.freenode.net + nickname: cala-notify channel: "#calamares" message: "${{ github.workflow }} OK ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} with: + server: chat.freenode.net + nickname: cala-notify channel: "#calamares" - message: | - ${{ github.workflow }} FAIL ${{ github.repository }} ${{ steps.pre_build.outputs.message }} - .. DIFF ${{ github.event.compare }} -# END + message: "${{ github.workflow }} FAIL ${{ github.repository }} ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" From 74eada048b903d42d7ca251a2fd425f8cf950a17 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 00:33:01 +0100 Subject: [PATCH 101/318] CI: allow manually starting Debian builds, too --- .github/workflows/ci-debian.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-debian.yml b/.github/workflows/ci-debian.yml index b60ce29e6f..b5fd428221 100644 --- a/.github/workflows/ci-debian.yml +++ b/.github/workflows/ci-debian.yml @@ -3,6 +3,7 @@ name: ci-debian-9 on: schedule: - cron: "12 23 * * *" + workflow_dispatch: env: BUILDDIR: /build From a215871da87abe87b4154479b954420aecc973d3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 00:39:45 +0100 Subject: [PATCH 102/318] CI: Debian doesn't come with sudo pre-installed --- .github/workflows/ci-debian.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-debian.yml b/.github/workflows/ci-debian.yml index b5fd428221..039a2cc297 100644 --- a/.github/workflows/ci-debian.yml +++ b/.github/workflows/ci-debian.yml @@ -23,9 +23,9 @@ jobs: steps: - name: "prepare env" run: | - sudo apt-get update - sudo apt-get -y install git-core - sudo apt-get -y install \ + apt-get update + apt-get -y install git-core + apt-get -y install \ build-essential \ cmake \ extra-cmake-modules \ From 3d72fb1bbebfc4ccb7633112508627be0914a1c8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 00:49:38 +0100 Subject: [PATCH 103/318] CI: notify about issues consistently with CI-builds --- .github/workflows/issues.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 698f0d7339..ed71847892 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -13,14 +13,14 @@ jobs: if: github.event.issue.state == 'open' with: server: chat.freenode.net + nickname: cala-notify channel: "#calamares" - nickname: gh-issues message: "[${{ github.event.issue.title }}](${{ github.event.issue.html_url }}) opened by ${{ github.actor }}" - name: "notify: closed" uses: rectalogic/notify-irc@v1 if: github.event.issue.state != 'open' with: server: chat.freenode.net + nickname: cala-notify channel: "#calamares" - nickname: gh-issues message: "[${{ github.event.issue.title }}](${{ github.event.issue.html_url }}) closed by ${{ github.actor }}" From 45fb77fbf30b8856eba548606a7531e0c713fabe Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 00:49:58 +0100 Subject: [PATCH 104/318] CI: split Debian package installation --- .github/workflows/ci-debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-debian.yml b/.github/workflows/ci-debian.yml index 039a2cc297..1e7a0484f7 100644 --- a/.github/workflows/ci-debian.yml +++ b/.github/workflows/ci-debian.yml @@ -40,7 +40,6 @@ jobs: libkf5parts-dev \ libkf5service-dev \ libkf5solid-dev \ - libkpmcore-dev \ libparted-dev \ libpolkit-qt5-1-dev \ libqt5svg5-dev \ @@ -53,6 +52,7 @@ jobs: qtdeclarative5-dev \ qttools5-dev \ qttools5-dev-tools + apt-get -y install libkpmcore-dev - name: "prepare source" uses: actions/checkout@v2 - name: "prepare build" From 4acf0d4d3420668267b754ab2f9976071a45b836 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 12:04:45 +0100 Subject: [PATCH 105/318] CI: show slightly more information on neon CI runs --- .github/workflows/ci-neon.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index bccdbd71e6..eee870b1ad 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -84,7 +84,7 @@ jobs: server: chat.freenode.net nickname: cala-notify channel: "#calamares" - message: "${{ github.workflow }} OK ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" + message: "${{ github.workflow }} OK ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} @@ -92,4 +92,4 @@ jobs: server: chat.freenode.net nickname: cala-notify channel: "#calamares" - message: "${{ github.workflow }} FAIL ${{ github.repository }} ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" + message: "${{ github.workflow }} FAIL ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" From d4a564044642d5dd2a905888d993bb241a339c67 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 12:13:45 +0100 Subject: [PATCH 106/318] CI: Debian 9 is too old, stick with 10, update dependencies --- .github/workflows/ci-debian.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-debian.yml b/.github/workflows/ci-debian.yml index 1e7a0484f7..6992b0a7fe 100644 --- a/.github/workflows/ci-debian.yml +++ b/.github/workflows/ci-debian.yml @@ -1,4 +1,4 @@ -name: ci-debian-9 +name: ci-debian-10 on: schedule: @@ -18,7 +18,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: docker://debian:9 + image: docker://debian:10 options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare env" @@ -52,7 +52,18 @@ jobs: qtdeclarative5-dev \ qttools5-dev \ qttools5-dev-tools + # Same name as on KDE neon, different version apt-get -y install libkpmcore-dev + # Additional dependencies + apt-get -y install \ + libappstreamqt-dev \ + libicu-dev \ + libkf5crash-dev \ + libkf5package-dev \ + libkf5plasma-dev \ + libpwquality-dev \ + libqt5webenginewidgets5 \ + qtwebengine5-dev - name: "prepare source" uses: actions/checkout@v2 - name: "prepare build" @@ -78,7 +89,7 @@ jobs: server: chat.freenode.net nickname: cala-notify channel: "#calamares" - message: "${{ github.workflow }} OK ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" + message: "${{ github.workflow }} OK ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} @@ -86,4 +97,4 @@ jobs: server: chat.freenode.net nickname: cala-notify channel: "#calamares" - message: "${{ github.workflow }} FAIL ${{ github.repository }} ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" + message: "${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" From 18cc4b5c6f2870fe7fbe6c36d3c0a7fc45642945 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 12:52:12 +0100 Subject: [PATCH 107/318] CI: add a scheduled openSUSE build, too --- .github/workflows/ci-opensuse.yml | 98 +++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 .github/workflows/ci-opensuse.yml diff --git a/.github/workflows/ci-opensuse.yml b/.github/workflows/ci-opensuse.yml new file mode 100644 index 0000000000..dbf7ce15c0 --- /dev/null +++ b/.github/workflows/ci-opensuse.yml @@ -0,0 +1,98 @@ +name: ci-opensuse-leap + +on: + schedule: + - cron: "32 23 * * *" + workflow_dispatch: + +env: + BUILDDIR: /build + SRCDIR: ${{ github.workspace }} + CMAKE_ARGS: | + -DWEBVIEW_FORCE_WEBKIT=1 + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON + -DWITH_PYTHONQT=OFF" + -DCMAKE_BUILD_TYPE=Debug + +jobs: + build: + runs-on: ubuntu-latest + container: + image: docker://opensuse/leap + options: --tmpfs /build:rw --user 0:0 + steps: + - name: "prepare env" + run: | + zypper --non-interactive up + zypper --non-interactive in git-core + # From deploycala.py + zypper --non-interactive in \ + "autoconf" \ + "automake" \ + "bison" \ + "flex" \ + "git" \ + "libtool" \ + "m4" \ + "make" \ + "cmake" \ + "extra-cmake-modules" \ + "gcc-c++" \ + "libqt5-qtbase-devel" \ + "libqt5-linguist-devel" \ + "libqt5-qtsvg-devel" \ + "libqt5-qtdeclarative-devel" \ + "libqt5-qtwebengine-devel" \ + "yaml-cpp-devel" \ + "libpolkit-qt5-1-devel" \ + "kservice-devel" \ + "kpackage-devel" \ + "kparts-devel" \ + "kcrash-devel" \ + "kpmcore-devel" \ + "plasma5-workspace-devel" \ + "plasma-framework-devel" \ + "libpwquality-devel" \ + "parted-devel" \ + "python3-devel" \ + "boost-devel" \ + "libboost_python-py3-*-devel" + # Additional dependencies + zypper --non-interactive in \ + libicu-devel \ + libAppStreamQt-devel \ + libatasmart-devel + - name: "prepare source" + uses: actions/checkout@v2 + - name: "prepare build" + id: pre_build + run: | + test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } + mkdir -p $BUILDDIR + test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } + echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}` + - name: "Calamares: cmake" + working-directory: ${{ env.BUILDDIR }} + run: cmake $CMAKE_ARGS $SRCDIR + - name: "Calamares: make" + working-directory: ${{ env.BUILDDIR }} + run: make -j2 VERBOSE=1 + - name: "Calamares: install" + working-directory: ${{ env.BUILDDIR }} + run: make install VERBOSE=1 + - name: "notify: ok" + uses: rectalogic/notify-irc@v1 + if: ${{ success() && github.repository == 'calamares/calamares' }} + with: + server: chat.freenode.net + nickname: cala-notify + channel: "#calamares" + message: "${{ github.workflow }} OK ${{ steps.pre_build.outputs.message }}" + - name: "notify: fail" + uses: rectalogic/notify-irc@v1 + if: ${{ failure() && github.repository == 'calamares/calamares' }} + with: + server: chat.freenode.net + nickname: cala-notify + channel: "#calamares" + message: "${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" From e99c60728bc0ef91c1daa9d0702eee9ee314be6b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 13:36:05 +0100 Subject: [PATCH 108/318] CI: the 'DIFF' line does not make sense for scheduled builds --- .github/workflows/ci-debian.yml | 2 +- .github/workflows/ci-opensuse.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-debian.yml b/.github/workflows/ci-debian.yml index 6992b0a7fe..70697f5967 100644 --- a/.github/workflows/ci-debian.yml +++ b/.github/workflows/ci-debian.yml @@ -97,4 +97,4 @@ jobs: server: chat.freenode.net nickname: cala-notify channel: "#calamares" - message: "${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" + message: "${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}" diff --git a/.github/workflows/ci-opensuse.yml b/.github/workflows/ci-opensuse.yml index dbf7ce15c0..9e6f72002f 100644 --- a/.github/workflows/ci-opensuse.yml +++ b/.github/workflows/ci-opensuse.yml @@ -95,4 +95,4 @@ jobs: server: chat.freenode.net nickname: cala-notify channel: "#calamares" - message: "${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" + message: "${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}" From a383aa974abe8e54f886eb9c23437d2bdb05b623 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 13:38:52 +0100 Subject: [PATCH 109/318] [users] Need for unique_ptr - Although unique_ptr is only used when ICU is enabled, include it always because it is likely that we'll use more unique_ptr in the implementation at some point. --- src/modules/users/Config.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp index ba7341a9cf..165e21b9c2 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp @@ -36,6 +36,8 @@ static const char TRANSLITERATOR_ID[] = "Russian-Latin/BGN;" "Latin-ASCII"; #endif +#include + static const QRegExp USERNAME_RX( "^[a-z_][a-z0-9_-]*[$]?$" ); static constexpr const int USERNAME_MAX_LENGTH = 31; From eafb8149b356fad37c919955f6f50515b456bd17 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 15:35:53 +0100 Subject: [PATCH 110/318] [libcalamares] Test some degenerate truncation cases --- src/libcalamares/utils/String.cpp | 25 +++++++++++++++++++++---- src/libcalamares/utils/String.h | 2 ++ src/libcalamares/utils/Tests.cpp | 29 ++++++++++++++++------------- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/src/libcalamares/utils/String.cpp b/src/libcalamares/utils/String.cpp index 02b41f1c0e..615d30309c 100644 --- a/src/libcalamares/utils/String.cpp +++ b/src/libcalamares/utils/String.cpp @@ -135,14 +135,15 @@ truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, C return shorter; } - const int linesInString = string.count( NEWLINE ) + ( string.endsWith( NEWLINE ) ? 0 : 1 ); - if ( ( string.length() <= chars.total ) && ( linesInString <= maxLines ) ) + const int physicalLinesInString = string.count( NEWLINE ); + const int logicalLinesInString = physicalLinesInString + ( string.endsWith( NEWLINE ) ? 0 : 1 ); + if ( ( string.length() <= chars.total ) && ( logicalLinesInString <= maxLines ) ) { return string; } QString front, back; - if ( string.count( NEWLINE ) >= maxLines ) + if ( physicalLinesInString >= maxLines ) { int from = -1; for ( int i = 0; i < lines.atStart; ++i ) @@ -174,6 +175,22 @@ truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, C back = string.right( lastNewLine ); } } + else + { + // We have: <= maxLines and longer than chars.total, so: + // - carve out a chunk in the middle, based a little on + // how the balance of atStart and atEnd is + const int charsToChop = string.length() - chars.total; + if ( charsToChop < 1 ) + { + // That's strange, again + return string; + } + const int startPortion = charsToChop * lines.atStart / maxLines; + const int endPortion = charsToChop * lines.atEnd / maxLines; + front = string.left( string.length() / 2 - startPortion ); + back = string.right( string.length() / 2 - endPortion ); + } if ( front.length() + back.length() <= chars.total ) { @@ -200,7 +217,7 @@ truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, C } // Both are non-empty, so nibble away at both of them front.truncate( chars.total / 2 ); - if ( !front.endsWith( NEWLINE ) ) + if ( !front.endsWith( NEWLINE ) && physicalLinesInString > 0 ) { front.append( NEWLINE ); } diff --git a/src/libcalamares/utils/String.h b/src/libcalamares/utils/String.h index 43e0474fae..e08255f86f 100644 --- a/src/libcalamares/utils/String.h +++ b/src/libcalamares/utils/String.h @@ -89,6 +89,8 @@ struct CharCount * @p lines.atStart is zero) or end (if @p lines.atEnd is zero) or in the middle * (if both are nonzero). * + * Asking for 0 lines will make this behave like QString::truncate(). + * * @param string the input string. * @param lines number of lines to preserve. * @param chars maximum number of characters in the returned string. diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index 3ee48890e9..cdb37f20d8 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -676,33 +676,36 @@ and the translations updated.)" ); } } -void LibCalamaresTests::testStringTruncationDegenerate() +void +LibCalamaresTests::testStringTruncationDegenerate() { Logger::setupLogLevel( Logger::LOGDEBUG ); using namespace CalamaresUtils; // This is quite long, 1 line only, with no newlines - const QString longString( - "The portscout new distfile checker has detected that one or more of your" - "ports appears to be out of date. Please take the opportunity to check" - "each of the ports listed below, and if possible and appropriate," - "submit/commit an update. If any ports have already been updated, you can" - "safely ignore the entry." ); + const QString longString( "The portscout new distfile checker has detected that one or more of your " + "ports appears to be out of date. Please take the opportunity to check " + "each of the ports listed below, and if possible and appropriate, " + "submit/commit an update. If any ports have already been updated, you can " + "safely ignore the entry." ); const char NEWLINE = '\n'; const int quiteShort = 16; - QVERIFY( longString.length() > quiteShort); - QVERIFY( !longString.contains(NEWLINE)); - QVERIFY( longString.indexOf(NEWLINE) < 0); + QVERIFY( longString.length() > quiteShort ); + QVERIFY( !longString.contains( NEWLINE ) ); + QVERIFY( longString.indexOf( NEWLINE ) < 0 ); { auto s = truncateMultiLine( longString, LinesStartEnd { 1, 0 }, CharCount { quiteShort } ); cDebug() << "Result-line" << Logger::Quote << s; QVERIFY( s.length() > 1 ); - QCOMPARE( s.length(), quiteShort); // Newline between front and back part - QVERIFY( s.startsWith( "The " ) ); - QVERIFY( s.endsWith( "entry." ) ); + QCOMPARE( s.length(), quiteShort ); // No newline between front and back part + QVERIFY( s.startsWith( "The port" ) ); // 8, which is quiteShort / 2 + QVERIFY( s.endsWith( "e entry." ) ); // also 8 chars + + auto t = truncateMultiLine( longString, LinesStartEnd { 2, 2 }, CharCount { quiteShort } ); + QCOMPARE( s, t ); } } From c3d27be103c46e7873bb9df04853960756bf578b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 16:36:56 +0100 Subject: [PATCH 111/318] Changes: patch up the credits --- CHANGES | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 187ec76e41..21324721fe 100644 --- a/CHANGES +++ b/CHANGES @@ -11,7 +11,11 @@ website will have to do for older versions. This release contains contributions from (alphabetically by first name): - Anubhav Choudhary + - benne-dee - Gaël PORTAY + - Jonas Strassel + - Kevin Kofler + - Matti Hyttinen - Neal Gompa ## Core ## @@ -19,6 +23,8 @@ This release contains contributions from (alphabetically by first name): the "exec" phase of installation. THanks Anubhav. ## Modules ## + - *bootloader* now uses the current file names for the UEFI Secure Boot + shim instead of obsolete ones. - *partition* includes more information about what it will do, including GPT partition types (in human-readable format, if possible). Thanks Gaël. - Some edge-cases with overlay filesystems have been resolved in the @@ -29,8 +35,6 @@ This release contains contributions from (alphabetically by first name): failed installations if automount grabs partitions while they are being created. The code is prepared to handle other ways to control automount-behavior as well. - - *bootloader* now uses the current file names for the UEFI Secure Boot - shim instead of obsolete ones. # 3.2.35.1 (2020-12-07) # From f3752e200ad299f7021b40d3e615cb056bc5a534 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 16:40:01 +0100 Subject: [PATCH 112/318] [libcalamaresui] Display first 6, last 2 lines of long error messages, preserve newlines --- src/libcalamaresui/ViewManager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 39f0bb9024..d25b7cdeed 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -153,7 +153,10 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail QString text = "

" + message + "

"; if ( !details.isEmpty() ) { - text += "

" + CalamaresUtils::truncateMultiLine( details, CalamaresUtils::LinesStartEnd { 8, 0 } ) + "

"; + text += "

" + + CalamaresUtils::truncateMultiLine( details, CalamaresUtils::LinesStartEnd { 6, 2 } ) + .replace( '\n', QStringLiteral( "
" ) ) + + "

"; } if ( shouldOfferWebPaste ) { From 1704ad597795d3142627e2fc3119fae3dab621a8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 19:18:19 +0100 Subject: [PATCH 113/318] [partition] Add a job to handle automount behavior - while here, nudge CalamaresUtils automount API a little, since it doesn't really need an rvalue-ref. --- src/libcalamares/partition/AutoMount.cpp | 2 +- src/libcalamares/partition/AutoMount.h | 2 +- src/modules/partition/CMakeLists.txt | 1 + .../partition/jobs/AutoMountManagementJob.cpp | 39 +++++++++++++++++ .../partition/jobs/AutoMountManagementJob.h | 42 +++++++++++++++++++ 5 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 src/modules/partition/jobs/AutoMountManagementJob.cpp create mode 100644 src/modules/partition/jobs/AutoMountManagementJob.h diff --git a/src/libcalamares/partition/AutoMount.cpp b/src/libcalamares/partition/AutoMount.cpp index 0fc2530678..0edc89bf46 100644 --- a/src/libcalamares/partition/AutoMount.cpp +++ b/src/libcalamares/partition/AutoMount.cpp @@ -79,7 +79,7 @@ automountDisable( bool disable ) void -automountRestore( std::shared_ptr< AutoMountInfo >&& t ) +automountRestore( const std::shared_ptr< AutoMountInfo >& t ) { QDBusConnection dbus = QDBusConnection::sessionBus(); enableSolidAutoMount( dbus, t->wasSolidModuleAutoLoaded ); diff --git a/src/libcalamares/partition/AutoMount.h b/src/libcalamares/partition/AutoMount.h index a9a88e3205..c792eeb99e 100644 --- a/src/libcalamares/partition/AutoMount.h +++ b/src/libcalamares/partition/AutoMount.h @@ -43,7 +43,7 @@ DLLEXPORT std::shared_ptr< AutoMountInfo > automountDisable( bool disable = true * Pass the value returned from automountDisable() to restore the * previous settings. */ -DLLEXPORT void automountRestore( std::shared_ptr< AutoMountInfo >&& t ); +DLLEXPORT void automountRestore( const std::shared_ptr< AutoMountInfo >& t ); } // namespace Partition } // namespace CalamaresUtils diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt index b623309c59..ac47714cea 100644 --- a/src/modules/partition/CMakeLists.txt +++ b/src/modules/partition/CMakeLists.txt @@ -79,6 +79,7 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND gui/ScanningDialog.cpp gui/ReplaceWidget.cpp gui/VolumeGroupBaseDialog.cpp + jobs/AutoMountManagementJob.cpp jobs/ClearMountsJob.cpp jobs/ClearTempMountsJob.cpp jobs/CreatePartitionJob.cpp diff --git a/src/modules/partition/jobs/AutoMountManagementJob.cpp b/src/modules/partition/jobs/AutoMountManagementJob.cpp new file mode 100644 index 0000000000..2ea23666c9 --- /dev/null +++ b/src/modules/partition/jobs/AutoMountManagementJob.cpp @@ -0,0 +1,39 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "AutoMountManagementJob.h" + +#include "utils/Logger.h" + +AutoMountManagementJob::AutoMountManagementJob( bool disable ) + : m_disable( disable ) +{ +} + +QString +AutoMountManagementJob::prettyName() const +{ + return tr( "Manage auto-mount settings" ); +} + +Calamares::JobResult +AutoMountManagementJob::exec() +{ + cDebug() << "this" << Logger::Pointer( this ) << "value" << Logger::Pointer( m_stored.get() ); + if ( m_stored ) + { + CalamaresUtils::Partition::automountRestore( m_stored ); + m_stored.reset(); + } + else + { + m_stored = CalamaresUtils::Partition::automountDisable( m_disable ); + } + return Calamares::JobResult::ok(); +} diff --git a/src/modules/partition/jobs/AutoMountManagementJob.h b/src/modules/partition/jobs/AutoMountManagementJob.h new file mode 100644 index 0000000000..e1dcf16dc9 --- /dev/null +++ b/src/modules/partition/jobs/AutoMountManagementJob.h @@ -0,0 +1,42 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef PARTITION_AUTOMOUNTMANAGEMENTJOB_H +#define PARTITION_AUTOMOUNTMANAGEMENTJOB_H + +#include "Job.h" + +#include "partition/AutoMount.h" + +/** + * This job sets automounting to a specific value, and when run a + * second time, **re**sets to the original value. See the documentation + * for CalamaresUtils::Partition::automountDisable() for details. + * Use @c true to **disable** automounting. + * + * Effectively: queue the **same** job twice; the first time it runs + * it will set the automount behavior, and the second time it + * restores the original. + * + */ +class AutoMountManagementJob : public Calamares::Job +{ + Q_OBJECT +public: + AutoMountManagementJob( bool disable = true ); + + QString prettyName() const override; + Calamares::JobResult exec() override; + +private: + bool m_disable; + decltype( CalamaresUtils::Partition::automountDisable( true ) ) m_stored; +}; + +#endif /* PARTITION_AUTOMOUNTMANAGEMENTJOB_H */ From fcf6e2fb25fded1c0b849094dbe2632ab121d09b Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Tue, 2 Feb 2021 23:07:35 +0200 Subject: [PATCH 114/318] fix typos --- src/modules/mount/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 7a6c1f176b..d12f88d717 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -88,7 +88,7 @@ def mount_partition(root_mount_point, partition, partitions): for p in partitions: if "mountPoint" not in p or not p["mountPoint"]: continue - if p["mountpoint"] in subvolume_mountpoints and p["mountpoint"] != '/': + if p["mountPoint"] in subvolume_mountpoints and p["mountPoint"] != '/': btrfs_subvolumes = [d for d in btrfs_subvolumes if d['mountPoint'] != p["mountpoint"]] # Check if we need a subvolume for swap file swap_choice = global_storage.value( "partitionChoices" ) From aae815cf3bc081c72936571761d46df5c02e0b8e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 2 Feb 2021 23:01:59 +0100 Subject: [PATCH 115/318] [partition] Add trivial test for automount management job --- .../partition/tests/AutoMountTests.cpp | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 src/modules/partition/tests/AutoMountTests.cpp diff --git a/src/modules/partition/tests/AutoMountTests.cpp b/src/modules/partition/tests/AutoMountTests.cpp new file mode 100644 index 0000000000..b31b8cbc54 --- /dev/null +++ b/src/modules/partition/tests/AutoMountTests.cpp @@ -0,0 +1,58 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2020 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "jobs/AutoMountManagementJob.h" + +#include "utils/Logger.h" + +#include +#include + +class AutoMountJobTests : public QObject +{ + Q_OBJECT +public: + AutoMountJobTests(); + +private Q_SLOTS: + void testRunThrice(); +}; + +AutoMountJobTests::AutoMountJobTests() {} + +/* This doesn't really test anything, since automount management + * is supposed to be opaque: the job always returns true. What + * is interesting is the debug output, where the job informs + * about the pointer it holds. + * + * That should output 0, then non-zero, then 0 again. + * + */ +void +AutoMountJobTests::testRunThrice() +{ + Logger::setupLogLevel( Logger::LOGDEBUG ); + + auto original = CalamaresUtils::Partition::automountDisable( true ); + cDebug() << "Got automount info" << Logger::Pointer( original.get() ); + + AutoMountManagementJob j( false ); + QVERIFY( j.exec() ); + QVERIFY( j.exec() ); + QVERIFY( j.exec() ); + + CalamaresUtils::Partition::automountRestore( original ); +} + + +QTEST_GUILESS_MAIN( AutoMountJobTests ) + +#include "utils/moc-warnings.h" + +#include "AutoMountTests.moc" From c98a330bf96449baf45ce206df8e45924e4c3d0c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 3 Feb 2021 00:46:00 +0100 Subject: [PATCH 116/318] [libcalamares] Store DBus reply value, drop debug-logging --- src/libcalamares/partition/AutoMount.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/partition/AutoMount.cpp b/src/libcalamares/partition/AutoMount.cpp index 0edc89bf46..adc8448160 100644 --- a/src/libcalamares/partition/AutoMount.cpp +++ b/src/libcalamares/partition/AutoMount.cpp @@ -12,6 +12,8 @@ #include +#include + namespace CalamaresUtils { namespace Partition @@ -58,13 +60,21 @@ querySolidAutoMount( QDBusConnection& dbus, AutoMountInfo& info ) // Find previous setting; this **does** need to block auto msg = kdedCall( QStringLiteral( "isModuleAutoloaded" ) ); msg.setArguments( { moduleName } ); + std::optional< bool > result; QDBusMessage r = dbus.call( msg, QDBus::Block ); if ( r.type() == QDBusMessage::ReplyMessage ) { auto arg = r.arguments(); - cDebug() << arg; - info.wasSolidModuleAutoLoaded = false; + if ( arg.length() == 1 ) + { + auto v = arg.at( 0 ); + if ( v.isValid() && v.type() == QVariant::Bool ) + { + result = v.toBool(); + } + } } + info.wasSolidModuleAutoLoaded = result.has_value() ? result.value() : false; } std::shared_ptr< AutoMountInfo > From c43a6ab86630c77bc3187f59b4be4c6b180f5a8b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 3 Feb 2021 00:46:34 +0100 Subject: [PATCH 117/318] [partition] Improve logging in automount test - switch logging in job to VERBOSE because we don't want to be printing pointers to the regular session log - switch logging in test to VERBOSE to actually see the messages from the Job - hook the test into the build --- src/modules/partition/jobs/AutoMountManagementJob.cpp | 2 +- src/modules/partition/tests/AutoMountTests.cpp | 2 +- src/modules/partition/tests/CMakeLists.txt | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/jobs/AutoMountManagementJob.cpp b/src/modules/partition/jobs/AutoMountManagementJob.cpp index 2ea23666c9..7ce3ac930d 100644 --- a/src/modules/partition/jobs/AutoMountManagementJob.cpp +++ b/src/modules/partition/jobs/AutoMountManagementJob.cpp @@ -25,7 +25,7 @@ AutoMountManagementJob::prettyName() const Calamares::JobResult AutoMountManagementJob::exec() { - cDebug() << "this" << Logger::Pointer( this ) << "value" << Logger::Pointer( m_stored.get() ); + Logger::CDebug(Logger::LOGVERBOSE) << "this" << Logger::Pointer( this ) << "value" << Logger::Pointer( m_stored.get() ); if ( m_stored ) { CalamaresUtils::Partition::automountRestore( m_stored ); diff --git a/src/modules/partition/tests/AutoMountTests.cpp b/src/modules/partition/tests/AutoMountTests.cpp index b31b8cbc54..f09cd3d974 100644 --- a/src/modules/partition/tests/AutoMountTests.cpp +++ b/src/modules/partition/tests/AutoMountTests.cpp @@ -37,7 +37,7 @@ AutoMountJobTests::AutoMountJobTests() {} void AutoMountJobTests::testRunThrice() { - Logger::setupLogLevel( Logger::LOGDEBUG ); + Logger::setupLogLevel( Logger::LOGVERBOSE ); auto original = CalamaresUtils::Partition::automountDisable( true ); cDebug() << "Got automount info" << Logger::Pointer( original.get() ); diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt index f16435230a..8edef484c3 100644 --- a/src/modules/partition/tests/CMakeLists.txt +++ b/src/modules/partition/tests/CMakeLists.txt @@ -58,3 +58,11 @@ calamares_add_test( DEFINITIONS ${_partition_defs} ) +calamares_add_test( + automounttests + SOURCES + ${PartitionModule_SOURCE_DIR}/jobs/AutoMountManagementJob.cpp + AutoMountTests.cpp + LIBRARIES + calamares +) From 38fa1d95674eb1371b01f1c3892ff9691013dda4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 3 Feb 2021 00:54:38 +0100 Subject: [PATCH 118/318] [libcalamares] Distinguish logging raw, shared and unique pointers - It shouldn't be necessary to explicitly .get() pointers for logging, and it's convenient to know when a pointer is smart. * no annotation means raw (e.g. @0x0) * S means shared * U means unique --- src/libcalamares/utils/Logger.h | 30 +++++++++++++++++-- .../partition/jobs/AutoMountManagementJob.cpp | 2 +- .../partition/tests/AutoMountTests.cpp | 2 +- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h index a53ab7e19e..f318c78a6a 100644 --- a/src/libcalamares/utils/Logger.h +++ b/src/libcalamares/utils/Logger.h @@ -13,9 +13,12 @@ #ifndef UTILS_LOGGER_H #define UTILS_LOGGER_H +#include "DllMacro.h" + #include +#include -#include "DllMacro.h" +#include namespace Logger { @@ -206,16 +209,34 @@ struct DebugMap * Pointers are printed as void-pointer, so just an address (unlike, say, * QObject pointers which show an address and some metadata) preceded * by an '@'. This avoids C-style (void*) casts in the code. + * + * Shared pointers are indicated by 'S@' and unique pointers by 'U@'. */ struct Pointer { public: explicit Pointer( const void* p ) : ptr( p ) + , kind( 0 ) + { + } + + template < typename T > + explicit Pointer( const std::shared_ptr< T >& p ) + : ptr( p.get() ) + , kind( 'S' ) + { + } + + template < typename T > + explicit Pointer( const std::unique_ptr< T >& p ) + : ptr( p.get() ) + , kind( 'U' ) { } const void* const ptr; + const char kind; }; /** @brief output operator for DebugRow */ @@ -256,7 +277,12 @@ operator<<( QDebug& s, const DebugMap& t ) inline QDebug& operator<<( QDebug& s, const Pointer& p ) { - s << NoQuote << '@' << p.ptr << Quote; + s << NoQuote; + if ( p.kind ) + { + s << p.kind; + } + s << '@' << p.ptr << Quote; return s; } } // namespace Logger diff --git a/src/modules/partition/jobs/AutoMountManagementJob.cpp b/src/modules/partition/jobs/AutoMountManagementJob.cpp index 7ce3ac930d..8078c17d58 100644 --- a/src/modules/partition/jobs/AutoMountManagementJob.cpp +++ b/src/modules/partition/jobs/AutoMountManagementJob.cpp @@ -25,7 +25,7 @@ AutoMountManagementJob::prettyName() const Calamares::JobResult AutoMountManagementJob::exec() { - Logger::CDebug(Logger::LOGVERBOSE) << "this" << Logger::Pointer( this ) << "value" << Logger::Pointer( m_stored.get() ); + Logger::CDebug(Logger::LOGVERBOSE) << "this" << Logger::Pointer( this ) << "value" << Logger::Pointer( m_stored ); if ( m_stored ) { CalamaresUtils::Partition::automountRestore( m_stored ); diff --git a/src/modules/partition/tests/AutoMountTests.cpp b/src/modules/partition/tests/AutoMountTests.cpp index f09cd3d974..87b6d5d4a7 100644 --- a/src/modules/partition/tests/AutoMountTests.cpp +++ b/src/modules/partition/tests/AutoMountTests.cpp @@ -40,7 +40,7 @@ AutoMountJobTests::testRunThrice() Logger::setupLogLevel( Logger::LOGVERBOSE ); auto original = CalamaresUtils::Partition::automountDisable( true ); - cDebug() << "Got automount info" << Logger::Pointer( original.get() ); + cDebug() << "Got automount info" << Logger::Pointer( original ); AutoMountManagementJob j( false ); QVERIFY( j.exec() ); From 17f73b1294aec3d82f4efef035a1bf0e6ce2703f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 3 Feb 2021 01:26:49 +0100 Subject: [PATCH 119/318] [partition] Test automount job in a queue --- .../partition/jobs/AutoMountManagementJob.cpp | 3 +- .../partition/tests/AutoMountTests.cpp | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/jobs/AutoMountManagementJob.cpp b/src/modules/partition/jobs/AutoMountManagementJob.cpp index 8078c17d58..9472eae9c3 100644 --- a/src/modules/partition/jobs/AutoMountManagementJob.cpp +++ b/src/modules/partition/jobs/AutoMountManagementJob.cpp @@ -25,7 +25,8 @@ AutoMountManagementJob::prettyName() const Calamares::JobResult AutoMountManagementJob::exec() { - Logger::CDebug(Logger::LOGVERBOSE) << "this" << Logger::Pointer( this ) << "value" << Logger::Pointer( m_stored ); + Logger::CDebug( Logger::LOGVERBOSE ) << "this" << Logger::Pointer( this ) << "value" << Logger::Pointer( m_stored ) + << ( m_stored ? "restore" : m_disable ? "disable" : "enable" ); if ( m_stored ) { CalamaresUtils::Partition::automountRestore( m_stored ); diff --git a/src/modules/partition/tests/AutoMountTests.cpp b/src/modules/partition/tests/AutoMountTests.cpp index 87b6d5d4a7..fcebe02bd2 100644 --- a/src/modules/partition/tests/AutoMountTests.cpp +++ b/src/modules/partition/tests/AutoMountTests.cpp @@ -10,6 +10,7 @@ #include "jobs/AutoMountManagementJob.h" #include "utils/Logger.h" +#include "JobQueue.h" #include #include @@ -22,6 +23,7 @@ class AutoMountJobTests : public QObject private Q_SLOTS: void testRunThrice(); + void testRunQueue(); }; AutoMountJobTests::AutoMountJobTests() {} @@ -50,6 +52,33 @@ AutoMountJobTests::testRunThrice() CalamaresUtils::Partition::automountRestore( original ); } +void AutoMountJobTests::testRunQueue() +{ + Calamares::JobQueue q; + Calamares::job_ptr jp( new AutoMountManagementJob( false ) ); + QSignalSpy progress( &q, &Calamares::JobQueue::progress ); + QSignalSpy finish( &q, &Calamares::JobQueue::finished ); + QSignalSpy fail( &q, &Calamares::JobQueue::failed ); + + Logger::setupLogLevel( Logger::LOGVERBOSE ); + cDebug() << "Got automount job" << jp; + + QVERIFY( !q.isRunning() ); + q.enqueue( 2, { jp, jp } ); + QVERIFY( !q.isRunning() ); + + QEventLoop loop; + QTimer::singleShot( std::chrono::milliseconds( 100 ), [&q](){ q.start(); } ); + QTimer::singleShot( std::chrono::milliseconds( 5000 ), [&loop](){ loop.quit(); } ); + connect( &q, &Calamares::JobQueue::finished, &loop, &QEventLoop::quit ); + loop.exec(); + + QCOMPARE( fail.count(), 0 ); + QCOMPARE( finish.count(), 1 ); + // 5 progress: 0% and 100% for each *job* and then 100% overall + QCOMPARE( progress.count(), 5 ); +} + QTEST_GUILESS_MAIN( AutoMountJobTests ) From 144b51f00ea4a04c4cbf2db45e2abf556eab5f6a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 3 Feb 2021 01:31:37 +0100 Subject: [PATCH 120/318] [partition] Use automount control FIXES #1604 (Admittedly, this fixes the problem only when there's Plasma Solid automount present, and not any of the other kinds; but none of those have been reported yet, and adding them into AutoMount.cpp is opaque to the rest of the system) --- src/modules/partition/core/PartitionCoreModule.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 254d007c16..f99c78745e 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -21,6 +21,7 @@ #include "core/PartUtils.h" #include "core/PartitionInfo.h" #include "core/PartitionModel.h" +#include "jobs/AutoMountManagementJob.h" #include "jobs/ClearMountsJob.h" #include "jobs/ClearTempMountsJob.h" #include "jobs/CreatePartitionJob.h" @@ -576,6 +577,11 @@ PartitionCoreModule::jobs( const Config* config ) const #endif #endif + // The automountControl job goes in the list twice: the first + // time it runs, it disables automount and remembers the old setting + // for automount; the second time it restores that old setting. + Calamares::job_ptr automountControl( new AutoMountManagementJob( true /* disable automount */ ) ); + lst << automountControl; lst << Calamares::job_ptr( new ClearTempMountsJob() ); for ( auto info : m_deviceInfos ) @@ -592,6 +598,7 @@ PartitionCoreModule::jobs( const Config* config ) const devices << info->device.data(); } lst << Calamares::job_ptr( new FillGlobalStorageJob( config, devices, m_bootLoaderInstallPath ) ); + lst << automountControl; return lst; } From 3fbca3ab4c03f8c30fd6f253b780d274e5d8a0ed Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 20 Jan 2021 23:49:09 +0100 Subject: [PATCH 121/318] Changes: pre-release housekeeping --- CHANGES | 7 +++++-- CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 21324721fe..d83e1b4e52 100644 --- a/CHANGES +++ b/CHANGES @@ -7,7 +7,7 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. -# 3.2.36 (unreleased) # +# 3.2.36 (2021-02-03) # This release contains contributions from (alphabetically by first name): - Anubhav Choudhary @@ -20,11 +20,14 @@ This release contains contributions from (alphabetically by first name): ## Core ## - It is now possible to hide the *next* and *back* buttons during - the "exec" phase of installation. THanks Anubhav. + the "exec" phase of installation. Thanks Anubhav. + - The Calamares CI has migrated to GitHub actions. Thanks Jonas. ## Modules ## - *bootloader* now uses the current file names for the UEFI Secure Boot shim instead of obsolete ones. + - The *mount* module creates swap in its own subvolume, if btrfs is used. + Thanks Matti. - *partition* includes more information about what it will do, including GPT partition types (in human-readable format, if possible). Thanks Gaël. - Some edge-cases with overlay filesystems have been resolved in the diff --git a/CMakeLists.txt b/CMakeLists.txt index 9768238054..775b42bc5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ project( CALAMARES LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development ### OPTIONS # From 39cae1f0fbc79cf4774c5d7d2d002a533c03ec14 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 3 Feb 2021 11:57:24 +0100 Subject: [PATCH 122/318] CI: change notification usernames and messages a little --- .github/workflows/ci-debian.yml | 8 ++++---- .github/workflows/ci-neon.yml | 8 ++++---- .github/workflows/ci-opensuse.yml | 10 +++++----- .github/workflows/issues.yml | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci-debian.yml b/.github/workflows/ci-debian.yml index 70697f5967..26f58f5949 100644 --- a/.github/workflows/ci-debian.yml +++ b/.github/workflows/ci-debian.yml @@ -87,14 +87,14 @@ jobs: if: ${{ success() && github.repository == 'calamares/calamares' }} with: server: chat.freenode.net - nickname: cala-notify + nickname: cala-ci channel: "#calamares" - message: "${{ github.workflow }} OK ${{ steps.pre_build.outputs.message }}" + message: "SCHEDULED ${{ github.workflow }} OK ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} with: server: chat.freenode.net - nickname: cala-notify + nickname: cala-ci channel: "#calamares" - message: "${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}" + message: "SCHEDULED ${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}" diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index eee870b1ad..eb59042093 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -82,14 +82,14 @@ jobs: if: ${{ success() && github.repository == 'calamares/calamares' }} with: server: chat.freenode.net - nickname: cala-notify + nickname: cala-ci channel: "#calamares" - message: "${{ github.workflow }} OK ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}" + message: "PUSH ${{ github.workflow }} OK ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} with: server: chat.freenode.net - nickname: cala-notify + nickname: cala-ci channel: "#calamares" - message: "${{ github.workflow }} FAIL ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" + message: "PUSH ${{ github.workflow }} FAIL ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" diff --git a/.github/workflows/ci-opensuse.yml b/.github/workflows/ci-opensuse.yml index 9e6f72002f..c9098dbc1f 100644 --- a/.github/workflows/ci-opensuse.yml +++ b/.github/workflows/ci-opensuse.yml @@ -1,4 +1,4 @@ -name: ci-opensuse-leap +name: ci-opensuse on: schedule: @@ -85,14 +85,14 @@ jobs: if: ${{ success() && github.repository == 'calamares/calamares' }} with: server: chat.freenode.net - nickname: cala-notify + nickname: cala-ci channel: "#calamares" - message: "${{ github.workflow }} OK ${{ steps.pre_build.outputs.message }}" + message: "SCHEDULED ${{ github.workflow }} OK ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} with: server: chat.freenode.net - nickname: cala-notify + nickname: cala-ci channel: "#calamares" - message: "${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}" + message: "SCHEDULED ${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}" diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index ed71847892..e8d2821aeb 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -13,14 +13,14 @@ jobs: if: github.event.issue.state == 'open' with: server: chat.freenode.net - nickname: cala-notify + nickname: cala-issues channel: "#calamares" - message: "[${{ github.event.issue.title }}](${{ github.event.issue.html_url }}) opened by ${{ github.actor }}" + message: "OPENED ${{ github.event.issue.html_url }} by ${{ github.actor }} ${{ github.event.issue.title }}" - name: "notify: closed" uses: rectalogic/notify-irc@v1 if: github.event.issue.state != 'open' with: server: chat.freenode.net - nickname: cala-notify + nickname: cala-issues channel: "#calamares" - message: "[${{ github.event.issue.title }}](${{ github.event.issue.html_url }}) closed by ${{ github.actor }}" + message: "CLOSED ${{ github.event.issue.html_url }} by ${{ github.actor }} ${{ github.event.issue.title }}" From 0d1355d4577ffbd4f6f5a616bfbdfee2c464ca02 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Wed, 3 Feb 2021 12:05:46 +0100 Subject: [PATCH 123/318] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_he.ts | 8 +++--- lang/calamares_id.ts | 34 +++++++++++------------ lang/calamares_ne_NP.ts | 60 ++++++++++++++++++++--------------------- lang/calamares_pt_BR.ts | 10 +++---- lang/calamares_tr_TR.ts | 2 +- 5 files changed, 57 insertions(+), 57 deletions(-) diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index 7e8ae9cdb4..97683a19a3 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -495,7 +495,7 @@ The installer will quit and all changes will be lost. %1 Installer - תכנית התקנת %1 + אשף התקנת %1 @@ -539,7 +539,7 @@ The installer will quit and all changes will be lost. Reuse %1 as home partition for %2. - להשתמש ב־%1 כמחיצת הבית (home) עבור %2. + שימוש ב־%1 כמחיצת הבית (home) עבור %2. @@ -3341,7 +3341,7 @@ Output: Flag new partition as <strong>%1</strong>. - סמן מחיצה חדשה כ <strong>%1</strong>. + סימון המחיצה החדשה בתור <strong>%1</strong>. @@ -4065,7 +4065,7 @@ Output: Your Full Name - שם המלא + שמך המלא diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index 33966e696f..b790ef61bf 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -11,12 +11,12 @@ 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. - Sistem ini telah dimulai dengan lingkungan boot <strong>EFI</strong>.<br><br>Untuk mengkonfigurasi startup dari lingkungan EFI, installer ini seharusnya memaparkan sebuah aplikasi boot loader, seperti <strong>GRUB</strong> atau <strong>systemd-boot</strong> pada sebuah <strong>EFI System Partition</strong>. Ini adalah otomatis, kecuali kalau kamu memilih pemartisian manual, dalam beberapa kasus kamu harus memilihnya atau menciptakannya pada milikmu. + Sistem ini telah dimulai dengan lingkungan boot <strong>EFI</strong>.<br><br>Untuk mengkonfigurasi startup dari lingkungan EFI, installer ini seharusnya memaparkan sebuah aplikasi boot loader, seperti <strong>GRUB</strong> atau <strong>systemd-boot</strong> pada sebuah <strong>EFI System Partition</strong>. Ini adalah otomatis, kecuali kalau kamu memilih pemartisian manual, dalam kasus ini kamu harus memilihnya atau menciptakannya sendiri. 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. - Sistem ini dimulai dengan sebuah lingkungan boot <strong>BIOS</strong>.<br><br>Untuk mengkonfigurasi startup dari sebuah lingkungan BIOS, installer ini seharusnya memasang sebuah boot loader, seperti <strong>GRUB</strong>, baik di awal partisi atau pada <strong>Master Boot Record</strong> di dekat awalan tabel partisi (yang disukai). Ini adalah otomatis, kecuali kalau kamu memilih pemartisian manual, dalam beberapa kasus kamu harus menyetelnya pada milikmu. + Sistem ini dimulai dengan sebuah lingkungan boot <strong>BIOS</strong>.<br><br>Untuk mengkonfigurasi startup dari sebuah lingkungan BIOS, installer ini harus memasang sebuah boot loader, seperti <strong>GRUB</strong>, baik di awal partisi atau pada <strong>Master Boot Record</strong> di dekat awalan tabel partisi (yang disukai). Ini adalah otomatis, kecuali kalau kamu memilih pemartisian manual, dalam beberapa kasus kamu harus menyetelnya sendiri. @@ -101,7 +101,7 @@ Reload Stylesheet - + Muat ulang Lembar gaya @@ -235,8 +235,8 @@ Waiting for %n module(s). - - + + Menunggu %n modul(). @@ -267,7 +267,7 @@ Would you like to paste the install log to the web? - Maukah anda untuk menempelkan log pemasangan ke situs? + Maukah anda untuk menempelkan log instalasi ke situs? @@ -324,7 +324,7 @@ Continue with installation? - + Lanjutkan instalasi? @@ -454,7 +454,8 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Install log posted to: %1 - + Log instalasi terunggah ke: +%1 @@ -630,7 +631,7 @@ Instalasi akan ditutup dan semua perubahan akan hilang. No Swap - Tidak perlu SWAP + Tidak pakai SWAP @@ -640,7 +641,7 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Swap (no Hibernate) - Swap (tidak hibernasi) + Swap (tanpa hibernasi) @@ -768,8 +769,7 @@ Instalasi akan ditutup dan semua perubahan akan hilang. This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - Komputer ini tidak memenuhi syarat minimum untuk memasang %1. -Installer tidak dapat dilanjutkan. <a href=" + Komputer ini tidak memenuhi syarat minimum untuk memasang %1.<br/>Instalasi tidak dapat dilanjutkan. <a href="#details">Lebih rinci...</a> @@ -790,7 +790,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Selamat datang ke program Calamares untuk %1</h1> @@ -815,12 +815,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. '%1' is not allowed as username. - + '%1' tidak diperbolehkan sebagai nama pengguna. Your username must start with a lowercase letter or underscore. - + Nama penggunamu harus diawali dengan huruf kecil atau garis bawah. @@ -840,12 +840,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. '%1' is not allowed as hostname. - + '%1' tidak diperbolehkan sebagai hostname. Only letters, numbers, underscore and hyphen are allowed. - + Hanya huruf, angka, garis bawah, dan tanda penghubung yang diperbolehkan. diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts index 13990c0860..6cd62c736a 100644 --- a/lang/calamares_ne_NP.ts +++ b/lang/calamares_ne_NP.ts @@ -39,7 +39,7 @@ Do not install a boot loader - + बूट लोडर install नगर्ने @@ -52,7 +52,7 @@ Blank Page - + खाली पृष्ठ @@ -60,7 +60,7 @@ Form - + फारम @@ -80,7 +80,7 @@ Type: - + प्रकार @@ -96,7 +96,7 @@ Tools - + औजारहरु @@ -145,7 +145,7 @@ Done - + सकियो @@ -153,7 +153,7 @@ Example job (%1) - + उदाहरण कार्य (%1) @@ -212,7 +212,7 @@ Loading ... - + लोड हुँदैछ ... @@ -222,7 +222,7 @@ Loading failed. - + लोड भएन । @@ -366,7 +366,7 @@ Setup is complete. Close the setup program. - + सेटअप सकियो । सेटअप प्रोग्राम बन्द गर्नु होस  @@ -504,7 +504,7 @@ The installer will quit and all changes will be lost. Form - + फारम @@ -547,7 +547,7 @@ The installer will quit and all changes will be lost. Boot loader location: - + बूट लोडरको स्थान @@ -631,12 +631,12 @@ The installer will quit and all changes will be lost. No Swap - + swap छैन Reuse Swap - + swap पुनः प्रयोग गर्नुहोस @@ -789,22 +789,22 @@ The installer will quit and all changes will be lost. <h1>Welcome to the Calamares setup program for %1</h1> - + %1 को लागि Calamares Setup Programमा स्वागत छ । <h1>Welcome to %1 setup</h1> - + %1 को Setupमा स्वागत छ । <h1>Welcome to the Calamares installer for %1</h1> - + %1 को लागि Calamares Installerमा स्वागत छ । <h1>Welcome to the %1 installer</h1> - + %1 को Installerमा स्वागत छ । @@ -849,7 +849,7 @@ The installer will quit and all changes will be lost. Your passwords do not match! - + पासवर्डहरू मिलेन ।  @@ -1256,7 +1256,7 @@ The installer will quit and all changes will be lost. Form - + फारम @@ -1323,7 +1323,7 @@ The installer will quit and all changes will be lost. Form - + फारम @@ -1605,7 +1605,7 @@ The installer will quit and all changes will be lost. Form - + फारम @@ -2263,7 +2263,7 @@ The installer will quit and all changes will be lost. Form - + फारम @@ -2317,7 +2317,7 @@ The installer will quit and all changes will be lost. Form - + फारम @@ -2335,7 +2335,7 @@ The installer will quit and all changes will be lost. Form - + फारम @@ -2511,7 +2511,7 @@ The installer will quit and all changes will be lost. Form - + फारम @@ -2721,7 +2721,7 @@ The installer will quit and all changes will be lost. Form - + फारम @@ -2945,7 +2945,7 @@ Output: Form - + फारम @@ -3588,7 +3588,7 @@ Output: Form - + फारम @@ -3736,7 +3736,7 @@ Output: Form - + फारम diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index 563fa29825..9ce469a7dd 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -291,7 +291,7 @@ &Close - Fe&char + &Fechar @@ -396,7 +396,7 @@ &Done - Concluí&do + &Concluído @@ -512,7 +512,7 @@ O instalador será fechado e todas as alterações serão perdidas. Select storage de&vice: - Selecione o dispositi&vo de armazenamento: + Selecione o dispositivo de armazenamento: @@ -898,7 +898,7 @@ O instalador será fechado e todas as alterações serão perdidas. Fi&le System: - Sistema de &Arquivos: + Sistema de Arquivos: @@ -908,7 +908,7 @@ O instalador será fechado e todas as alterações serão perdidas. &Mount Point: - Ponto de &Montagem: + Ponto de Montagem: diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index e69766fff1..0df78b0c75 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -3845,7 +3845,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.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. - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Telif Hakkı 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Telif Hakkı 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Teşekkrürler <a href="https://calamares.io/team/">Calamares takımı</a> ve <a href="https://www.transifex.com/calamares/calamares/">Calamares çeviri ekibi</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 + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Telif Hakkı 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Telif Hakkı 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Teşekkürler <a href="https://calamares.io/team/">Calamares takımı</a> ve <a href="https://www.transifex.com/calamares/calamares/">Calamares çeviri ekibi</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 From 2f7790d691bc617081642500c21c82a51a6ba3db Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Wed, 3 Feb 2021 12:05:46 +0100 Subject: [PATCH 124/318] i18n: [python] Automatic merge of Transifex translations --- lang/python/az/LC_MESSAGES/python.po | 4 ++-- lang/python/az_AZ/LC_MESSAGES/python.po | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po index 5a03b748d6..1b6dc24444 100644 --- a/lang/python/az/LC_MESSAGES/python.po +++ b/lang/python/az/LC_MESSAGES/python.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# xxmn77 , 2020 +# Xəyyam Qocayev , 2020 # #, fuzzy msgid "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: xxmn77 , 2020\n" +"Last-Translator: Xəyyam Qocayev , 2020\n" "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po index 027e819d5f..546cd56c1f 100644 --- a/lang/python/az_AZ/LC_MESSAGES/python.po +++ b/lang/python/az_AZ/LC_MESSAGES/python.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# xxmn77 , 2020 +# Xəyyam Qocayev , 2020 # #, fuzzy msgid "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: xxmn77 , 2020\n" +"Last-Translator: Xəyyam Qocayev , 2020\n" "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From b8a9c4c3b78aa58e289dd9212f399e3f6af690b0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 3 Feb 2021 13:48:01 +0100 Subject: [PATCH 125/318] [users] Be more forgiving in tests - the host system's /etc/group is being read, and that varies between host OS versions; since I was doing today's release on KaOS, the test was failing because of arbitrary differences between the default groups on each Linux flavor. --- src/modules/users/TestGroupInformation.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/users/TestGroupInformation.cpp b/src/modules/users/TestGroupInformation.cpp index 21b8d47ce7..31ca032c7e 100644 --- a/src/modules/users/TestGroupInformation.cpp +++ b/src/modules/users/TestGroupInformation.cpp @@ -64,10 +64,9 @@ GroupTests::testReadGroup() #else QVERIFY( groups.contains( QStringLiteral( "root" ) ) ); #endif - // openSUSE doesn't have "sys" - // QVERIFY( groups.contains( QStringLiteral( "sys" ) ) ); - QVERIFY( groups.contains( QStringLiteral( "nogroup" ) ) ); QVERIFY( groups.contains( QStringLiteral( "tty" ) ) ); + // openSUSE doesn't have "sys", KaOS doesn't have "nogroup" + QVERIFY( groups.contains( QStringLiteral( "sys" ) ) || groups.contains( QStringLiteral( "nogroup" ) ) ); for ( const QString& s : groups ) { From 4ae3a7af617dfe6272558cc39c94a4c2dbde6bb8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 3 Feb 2021 16:54:18 +0100 Subject: [PATCH 126/318] [finished] Start Config-ification - Introduce a Config class with suitable properties for use in QML, read configuration; this is unused right now. --- src/modules/finished/CMakeLists.txt | 1 + src/modules/finished/Config.cpp | 84 +++++++++++++++++++++++++++++ src/modules/finished/Config.h | 53 ++++++++++++++++++ 3 files changed, 138 insertions(+) create mode 100644 src/modules/finished/Config.cpp create mode 100644 src/modules/finished/Config.h diff --git a/src/modules/finished/CMakeLists.txt b/src/modules/finished/CMakeLists.txt index 21eb1ad187..b4d59db8ff 100644 --- a/src/modules/finished/CMakeLists.txt +++ b/src/modules/finished/CMakeLists.txt @@ -11,6 +11,7 @@ calamares_add_plugin( finished TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES + Config.cpp FinishedViewStep.cpp FinishedPage.cpp UI diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp new file mode 100644 index 0000000000..7a84e8f22e --- /dev/null +++ b/src/modules/finished/Config.cpp @@ -0,0 +1,84 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "Config.h" + +#include "utils/Logger.h" +#include "utils/Variant.h" + +const NamedEnumTable< Config::RestartMode >& +restartModes() +{ + using M = Config::RestartMode; + static const NamedEnumTable< M > table { { "never", M::Never }, + { "user-unchecked", M::UserDefaultUnchecked }, + { "unchecked", M::UserDefaultUnchecked }, + { "user-checked", M::UserDefaultChecked }, + { "checked", M::UserDefaultChecked }, + { "always", M::Always } + + }; + return table; +} + + +Config::Config( QObject* parent ) + : QObject( parent ) +{ +} + +void +Config::setConfigurationMap( const QVariantMap& configurationMap ) +{ + RestartMode mode = RestartMode::Never; + + QString restartMode = CalamaresUtils::getString( configurationMap, "restartNowMode" ); + if ( restartMode.isEmpty() ) + { + if ( configurationMap.contains( "restartNowEnabled" ) ) + { + cWarning() << "Configuring the finished module with deprecated restartNowEnabled settings"; + } + + bool restartNowEnabled = CalamaresUtils::getBool( configurationMap, "restartNowEnabled", false ); + bool restartNowChecked = CalamaresUtils::getBool( configurationMap, "restartNowChecked", false ); + + if ( !restartNowEnabled ) + { + mode = RestartMode::Never; + } + else + { + mode = restartNowChecked ? RestartMode::UserDefaultChecked : RestartMode::UserDefaultUnchecked; + } + } + else + { + bool ok = false; + mode = restartModes().find( restartMode, ok ); + if ( !ok ) + { + cWarning() << "Configuring the finished module with bad restartNowMode" << restartMode; + } + } + + m_restartNowMode = mode; + + if ( mode != RestartMode::Never ) + { + QString restartNowCommand = CalamaresUtils::getString( configurationMap, "restartNowCommand" ); + if ( restartNowCommand.isEmpty() ) + { + restartNowCommand = QStringLiteral( "shutdown -r now" ); + } + m_restartNowCommand = restartNowCommand; + } + + m_notifyOnFinished = CalamaresUtils::getBool( configurationMap, "notifyOnFinished", false ); +} diff --git a/src/modules/finished/Config.h b/src/modules/finished/Config.h new file mode 100644 index 0000000000..9b8c5d8d38 --- /dev/null +++ b/src/modules/finished/Config.h @@ -0,0 +1,53 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef FINISHED_CONFIG_H +#define FINISHED_CONFIG_H + +#include "utils/NamedEnum.h" + +#include + +#include + +class Config : public QObject +{ + Q_OBJECT + + Q_PROPERTY( QString restartNowCommand READ restartNowCommand CONSTANT FINAL ) + Q_PROPERTY( RestartMode restartNowMode READ restartNowMode CONSTANT FINAL ) + Q_PROPERTY( bool notifyOnFinished READ notifyOnFinished CONSTANT FINAL ) + +public: + Config( QObject* parent = nullptr ); + + enum class RestartMode + { + Never, + UserDefaultUnchecked, + UserDefaultChecked, + Always + }; + Q_ENUM( RestartMode ) + + QString restartNowCommand() const { return m_restartNowCommand; } + RestartMode restartNowMode() const { return m_restartNowMode; } + bool notifyOnFinished() const { return m_notifyOnFinished; } + + void setConfigurationMap( const QVariantMap& configurationMap ); + +private: + QString m_restartNowCommand; + RestartMode m_restartNowMode = RestartMode::Never; + bool m_notifyOnFinished = false; +}; + +const NamedEnumTable< Config::RestartMode >& restartModes(); + +#endif From c82b802f4ed6f41d3da8a9febb9bf1eb68680412 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 3 Feb 2021 17:12:33 +0100 Subject: [PATCH 127/318] [libcalamares] Typo in documentation --- src/libcalamares/utils/NamedEnum.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcalamares/utils/NamedEnum.h b/src/libcalamares/utils/NamedEnum.h index cf56a26f23..1ac6c67b55 100644 --- a/src/libcalamares/utils/NamedEnum.h +++ b/src/libcalamares/utils/NamedEnum.h @@ -98,7 +98,7 @@ struct NamedEnumTable /** @brief Find a value @p s in the table and return its name. * - * Returns emptry string if the value is not found. + * Returns empty string if the value is not found. */ string_t find( enum_t s ) const { From cb4248e56d8f3b8a770c71ec511ebd29faf2d6c3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 3 Feb 2021 17:14:49 +0100 Subject: [PATCH 128/318] [finished] Move config from viewstep to config object - the configuration is still duplicated in the widget, and functionality still needs to move to the Config object - the ViewStep is cut down to almost nothing --- src/modules/finished/FinishedPage.cpp | 18 +++--- src/modules/finished/FinishedPage.h | 9 +-- src/modules/finished/FinishedViewStep.cpp | 71 ++--------------------- src/modules/finished/FinishedViewStep.h | 18 ++---- 4 files changed, 25 insertions(+), 91 deletions(-) diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp index 23f09df99c..618efa02ec 100644 --- a/src/modules/finished/FinishedPage.cpp +++ b/src/modules/finished/FinishedPage.cpp @@ -10,10 +10,12 @@ */ #include "FinishedPage.h" +#include "ui_FinishedPage.h" +#include "Branding.h" +#include "Settings.h" #include "CalamaresVersion.h" #include "ViewManager.h" -#include "ui_FinishedPage.h" #include "utils/CalamaresUtilsGui.h" #include "utils/Logger.h" #include "utils/Retranslator.h" @@ -24,13 +26,11 @@ #include #include -#include "Branding.h" -#include "Settings.h" FinishedPage::FinishedPage( QWidget* parent ) : QWidget( parent ) , ui( new Ui::FinishedPage ) - , m_mode( FinishedViewStep::RestartMode::UserUnchecked ) + , m_mode( Config::RestartMode::UserDefaultUnchecked ) { ui->setupUi( this ); @@ -66,15 +66,15 @@ FinishedPage::FinishedPage( QWidget* parent ) void -FinishedPage::setRestart( FinishedViewStep::RestartMode mode ) +FinishedPage::setRestart( Config::RestartMode mode ) { - using Mode = FinishedViewStep::RestartMode; + using Mode = Config::RestartMode; m_mode = mode; ui->restartCheckBox->setVisible( mode != Mode::Never ); ui->restartCheckBox->setEnabled( mode != Mode::Always ); - ui->restartCheckBox->setChecked( ( mode == Mode::Always ) || ( mode == Mode::UserChecked ) ); + ui->restartCheckBox->setChecked( ( mode == Mode::Always ) || ( mode == Mode::UserDefaultChecked ) ); } @@ -89,7 +89,7 @@ void FinishedPage::setUpRestart() { cDebug() << "FinishedPage::setUpRestart(), Quit button" - << "setup=" << FinishedViewStep::modeName( m_mode ) << "command=" << m_restartNowCommand; + << "setup=" << restartModes().find( m_mode ) << "command=" << m_restartNowCommand; connect( qApp, &QApplication::aboutToQuit, [this]() { if ( ui->restartCheckBox->isVisible() && ui->restartCheckBox->isChecked() ) @@ -124,5 +124,5 @@ FinishedPage::onInstallationFailed( const QString& message, const QString& detai "The error message was: %2." ) .arg( branding->versionedName() ) .arg( message ) ); - setRestart( FinishedViewStep::RestartMode::Never ); + setRestart( Config::RestartMode::Never ); } diff --git a/src/modules/finished/FinishedPage.h b/src/modules/finished/FinishedPage.h index 1df022f582..30df5f8c36 100644 --- a/src/modules/finished/FinishedPage.h +++ b/src/modules/finished/FinishedPage.h @@ -11,9 +11,10 @@ #ifndef FINISHEDPAGE_H #define FINISHEDPAGE_H -#include -#include "FinishedViewStep.h" +#include "Config.h" + +#include namespace Ui { @@ -26,7 +27,7 @@ class FinishedPage : public QWidget public: explicit FinishedPage( QWidget* parent = nullptr ); - void setRestart( FinishedViewStep::RestartMode mode ); + void setRestart( Config::RestartMode mode ); void setRestartNowCommand( const QString& command ); void setUpRestart(); @@ -40,7 +41,7 @@ public slots: private: Ui::FinishedPage* ui; - FinishedViewStep::RestartMode m_mode; + Config::RestartMode m_mode; QString m_restartNowCommand; }; diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index 525108dc73..cd7fcc0d0c 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -25,24 +25,11 @@ #include #include -static const NamedEnumTable< FinishedViewStep::RestartMode >& -modeNames() -{ - using Mode = FinishedViewStep::RestartMode; - - static const NamedEnumTable< Mode > names { { QStringLiteral( "never" ), Mode::Never }, - { QStringLiteral( "user-unchecked" ), Mode::UserUnchecked }, - { QStringLiteral( "user-checked" ), Mode::UserChecked }, - { QStringLiteral( "always" ), Mode::Always } }; - - return names; -} - FinishedViewStep::FinishedViewStep( QObject* parent ) : Calamares::ViewStep( parent ) + , m_config( new Config( this )) , m_widget( new FinishedPage() ) , installFailed( false ) - , m_notifyOnFinished( false ) { auto jq = Calamares::JobQueue::instance(); connect( jq, &Calamares::JobQueue::failed, m_widget, &FinishedPage::onInstallationFailed ); @@ -146,7 +133,7 @@ FinishedViewStep::onActivate() { m_widget->setUpRestart(); - if ( m_notifyOnFinished ) + if ( m_config->notifyOnFinished() ) { sendNotification(); } @@ -170,59 +157,13 @@ FinishedViewStep::onInstallationFailed( const QString& message, const QString& d void FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { - RestartMode mode = RestartMode::Never; - - QString restartMode = CalamaresUtils::getString( configurationMap, "restartNowMode" ); - if ( restartMode.isEmpty() ) - { - if ( configurationMap.contains( "restartNowEnabled" ) ) - { - cWarning() << "Configuring the finished module with deprecated restartNowEnabled settings"; - } - - bool restartNowEnabled = CalamaresUtils::getBool( configurationMap, "restartNowEnabled", false ); - bool restartNowChecked = CalamaresUtils::getBool( configurationMap, "restartNowChecked", false ); - - if ( !restartNowEnabled ) - { - mode = RestartMode::Never; - } - else - { - mode = restartNowChecked ? RestartMode::UserChecked : RestartMode::UserUnchecked; - } - } - else - { - bool ok = false; - mode = modeNames().find( restartMode, ok ); - if ( !ok ) - { - cWarning() << "Configuring the finished module with bad restartNowMode" << restartMode; - } - } + m_config->setConfigurationMap(configurationMap); + m_widget->setRestart( m_config->restartNowMode() ); - m_widget->setRestart( mode ); - - if ( mode != RestartMode::Never ) + if ( m_config->restartNowMode() != Config::RestartMode::Never ) { - QString restartNowCommand = CalamaresUtils::getString( configurationMap, "restartNowCommand" ); - if ( restartNowCommand.isEmpty() ) - { - restartNowCommand = QStringLiteral( "shutdown -r now" ); - } - m_widget->setRestartNowCommand( restartNowCommand ); + m_widget->setRestartNowCommand( m_config->restartNowCommand() ); } - - m_notifyOnFinished = CalamaresUtils::getBool( configurationMap, "notifyOnFinished", false ); } -QString -FinishedViewStep::modeName( FinishedViewStep::RestartMode m ) -{ - bool ok = false; - return modeNames().find( m, ok ); // May be QString() -} - - CALAMARES_PLUGIN_FACTORY_DEFINITION( FinishedViewStepFactory, registerPlugin< FinishedViewStep >(); ) diff --git a/src/modules/finished/FinishedViewStep.h b/src/modules/finished/FinishedViewStep.h index 729f9126d9..aa71ab38ae 100644 --- a/src/modules/finished/FinishedViewStep.h +++ b/src/modules/finished/FinishedViewStep.h @@ -11,12 +11,14 @@ #ifndef FINISHEDVIEWSTEP_H #define FINISHEDVIEWSTEP_H -#include +#include "Config.h" +#include "DllMacro.h" #include "utils/PluginFactory.h" #include "viewpages/ViewStep.h" -#include "DllMacro.h" + +#include class FinishedPage; @@ -25,16 +27,6 @@ class PLUGINDLLEXPORT FinishedViewStep : public Calamares::ViewStep Q_OBJECT public: - enum class RestartMode - { - Never = 0, ///< @brief Don't show button, just exit - UserUnchecked, ///< @brief Show button, starts unchecked - UserChecked, ///< @brief Show button, starts checked - Always ///< @brief Show button, can't change, checked - }; - /// @brief Returns the config-name of the given restart-mode @p m - static QString modeName( RestartMode m ); - explicit FinishedViewStep( QObject* parent = nullptr ); ~FinishedViewStep() override; @@ -58,6 +50,7 @@ public slots: void onInstallationFailed( const QString& message, const QString& details ); private: + Config* m_config; FinishedPage* m_widget; /** @@ -67,7 +60,6 @@ public slots: void sendNotification(); bool installFailed; - bool m_notifyOnFinished; }; CALAMARES_PLUGIN_FACTORY_DECLARATION( FinishedViewStepFactory ) From 84240683f5591a9fe6b6ba7069851f105e89927d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 3 Feb 2021 17:16:22 +0100 Subject: [PATCH 129/318] [finished] Apply coding style --- src/modules/finished/FinishedPage.cpp | 2 +- src/modules/finished/FinishedViewStep.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp index 618efa02ec..118ee96bf7 100644 --- a/src/modules/finished/FinishedPage.cpp +++ b/src/modules/finished/FinishedPage.cpp @@ -13,8 +13,8 @@ #include "ui_FinishedPage.h" #include "Branding.h" -#include "Settings.h" #include "CalamaresVersion.h" +#include "Settings.h" #include "ViewManager.h" #include "utils/CalamaresUtilsGui.h" #include "utils/Logger.h" diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index cd7fcc0d0c..310dda25ae 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -27,7 +27,7 @@ FinishedViewStep::FinishedViewStep( QObject* parent ) : Calamares::ViewStep( parent ) - , m_config( new Config( this )) + , m_config( new Config( this ) ) , m_widget( new FinishedPage() ) , installFailed( false ) { @@ -157,7 +157,7 @@ FinishedViewStep::onInstallationFailed( const QString& message, const QString& d void FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { - m_config->setConfigurationMap(configurationMap); + m_config->setConfigurationMap( configurationMap ); m_widget->setRestart( m_config->restartNowMode() ); if ( m_config->restartNowMode() != Config::RestartMode::Never ) From 1e0295dc652ec2166a7f2acee1fcb38868c2f1e1 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Wed, 3 Feb 2021 22:55:11 +0200 Subject: [PATCH 130/318] Fix name error --- src/modules/mount/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index d12f88d717..5bab086a74 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -112,7 +112,7 @@ def mount_partition(root_mount_point, partition, partitions): # Mount the subvolumes for s in btrfs_subvolumes: - mount_option = f"subvol={s[subvolume]}" + mount_option = f"subvol={s['subvolume']}" if libcalamares.utils.mount(device, mount_point, fstype, From fc034828c71eeb8f2881adb692298aa42169fb13 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 5 Feb 2021 13:10:12 +0100 Subject: [PATCH 131/318] Changes: post-release housekeeping --- CHANGES | 12 ++++++++++++ CMakeLists.txt | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index d83e1b4e52..aa5dba2062 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,18 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. +# 3.2.37 (unreleased) # + +This release contains contributions from (alphabetically by first name): + - No external contributors yet + +## Core ## + - No core changes yet + +## Modules ## + - No module changes yet + + # 3.2.36 (2021-02-03) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index 775b42bc5c..108549a8a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,11 +41,11 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.36 + VERSION 3.2.37 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development ### OPTIONS # From 1896a38cccdbaab6650b69e115adb93443159346 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Sat, 6 Feb 2021 01:38:03 +0200 Subject: [PATCH 132/318] Fix a typo --- src/modules/mount/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 5bab086a74..eb2614caaf 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -89,7 +89,7 @@ def mount_partition(root_mount_point, partition, partitions): if "mountPoint" not in p or not p["mountPoint"]: continue if p["mountPoint"] in subvolume_mountpoints and p["mountPoint"] != '/': - btrfs_subvolumes = [d for d in btrfs_subvolumes if d['mountPoint'] != p["mountpoint"]] + btrfs_subvolumes = [d for d in btrfs_subvolumes if d['mountPoint'] != p["mountPoint"]] # Check if we need a subvolume for swap file swap_choice = global_storage.value( "partitionChoices" ) if swap_choice: From 16bf7925a2524c81cc0bdd2fc28109cd5ea17ec0 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Sat, 6 Feb 2021 19:48:09 +0200 Subject: [PATCH 133/318] Adjust comments --- src/modules/mount/main.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index eb2614caaf..50e72b3169 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -74,12 +74,7 @@ def mount_partition(root_mount_point, partition, partitions): partition.get("options", "")) != 0: libcalamares.utils.warning("Cannot mount {}".format(device)) - # If the root partition is btrfs, we create a subvolume "@" - # for the root mount point. - # If a separate /home partition isn't defined, we also create - # a subvolume "@home". - # If a swapfile is used, we also create a subvolume "@swap". - # Finally we remount all of the above on the correct paths. + # Special handling for btrfs subvolumes. Create the subvolumes listed in mount.conf if fstype == "btrfs" and partition["mountPoint"] == '/': # Root has been mounted to btrfs volume -> create subvolumes from configuration btrfs_subvolumes = libcalamares.job.configuration.get("btrfsSubvolumes") or [] From 67aedd5582c3c1426331e49ed0e8768000dfd3c3 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Sat, 6 Feb 2021 19:54:29 +0200 Subject: [PATCH 134/318] Move comments closer to where they are used --- src/modules/mount/mount.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf index b96d4576a0..6168e97ccd 100644 --- a/src/modules/mount/mount.conf +++ b/src/modules/mount/mount.conf @@ -19,10 +19,6 @@ # The device is not mounted if the mountPoint is unset or if the fs is # set to unformatted. # ---- -# Btrfs subvolumes to create if root filesystem is on btrfs volume. -# If mountpoint is mounted already to another partition, it is ignored. -# Separate subvolume for swapfile is handled separately and automatically. extraMounts: - device: proc fs: proc @@ -45,6 +41,10 @@ extraMountsEfi: fs: efivarfs mountPoint: /sys/firmware/efi/efivars +# Btrfs subvolumes to create if root filesystem is on btrfs volume. +# If mountpoint is mounted already to another partition, it is ignored. +# Separate subvolume for swapfile is handled separately and automatically. + btrfsSubvolumes: - mountPoint: / subvolume: /@ From b16bd6bb23a0bf4775e2626765f3166d1a820b23 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Sat, 6 Feb 2021 20:03:30 +0200 Subject: [PATCH 135/318] Fix name error --- src/modules/fstab/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index c2e221c37f..b6d7a4b2a3 100644 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -192,7 +192,7 @@ def generate_fstab(self): for s in btrfs_subvolumes: mount_entry = partition mount_entry["mountPoint"] = s["mountPoint"] - home_entry["subvol"] = s["subvolume"] + mount_entry["subvol"] = s["subvolume"] dct = self.generate_fstab_line_info(mount_entry) if dct: self.print_fstab_line(dct, file=fstab_file) From 6d55005da07dcac8baced60c591bb6b5ee32ed2f Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Sun, 7 Feb 2021 00:16:26 +0200 Subject: [PATCH 136/318] Mount subvolumes to correct mountpoints --- src/modules/mount/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 50e72b3169..27df309a30 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -108,8 +108,9 @@ def mount_partition(root_mount_point, partition, partitions): # Mount the subvolumes for s in btrfs_subvolumes: mount_option = f"subvol={s['subvolume']}" + subvolume_mountpoint = mount_point[:-1] + s['mountPoint'] if libcalamares.utils.mount(device, - mount_point, + subvolume_mountpoint, fstype, ",".join([mount_option, partition.get("options", "")])) != 0: libcalamares.utils.warning(f"Cannot mount {device}") From 0c92a36a5393114a2bafd3af654954bdb1ae9bd9 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Sun, 7 Feb 2021 15:29:30 +0200 Subject: [PATCH 137/318] Remove unnecessary comment --- src/modules/mount/main.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 27df309a30..69c994efc8 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -32,9 +32,6 @@ def pretty_name(): def mount_partition(root_mount_point, partition, partitions): """ Do a single mount of @p partition inside @p root_mount_point. - - The @p partitions are used to handle btrfs special-cases: - then subvolumes are created for root and home. """ # Create mount point with `+` rather than `os.path.join()` because # `partition["mountPoint"]` starts with a '/'. From 16eff98a0653807d5a38a06cc4ccba7983c6ee10 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Sun, 7 Feb 2021 15:39:38 +0200 Subject: [PATCH 138/318] Don't use f-strings yet. --- src/modules/mount/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 69c994efc8..07166dd75e 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -104,13 +104,13 @@ def mount_partition(root_mount_point, partition, partitions): # Mount the subvolumes for s in btrfs_subvolumes: - mount_option = f"subvol={s['subvolume']}" + mount_option = "subvol={}".format(s['subvolume']) subvolume_mountpoint = mount_point[:-1] + s['mountPoint'] if libcalamares.utils.mount(device, subvolume_mountpoint, fstype, ",".join([mount_option, partition.get("options", "")])) != 0: - libcalamares.utils.warning(f"Cannot mount {device}") + libcalamares.utils.warning("Cannot mount {}".format(device)) def run(): From f045e4f00e3e45bf977a8a1cbf048aab617ae95c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 7 Feb 2021 22:35:32 +0100 Subject: [PATCH 139/318] [libcalamares] Switch default language in Belarus *If* the distro has GeoIP enabled and auto-selects the language for Calamares, then Belarus now selects Russian, rather the Belarusian. This is based on some personal input, mostly, and Wikipedia census data. FIXES #1634 --- src/libcalamares/locale/CountryData_p.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/locale/CountryData_p.cpp b/src/libcalamares/locale/CountryData_p.cpp index 932a1996d5..f439de27c4 100644 --- a/src/libcalamares/locale/CountryData_p.cpp +++ b/src/libcalamares/locale/CountryData_p.cpp @@ -29,7 +29,8 @@ /* MODIFICATIONS * * Edited anyway: - * 20191211 India changed to AnyLanguage, since Hindi doesn't make sense. #1284 + * 20191211 India (IN) changed to AnyLanguage, since Hindi doesn't make sense. #1284 + * 20210207 Belarus (BY) changed to Russian, as the more-common-language. #1634 * */ @@ -77,7 +78,7 @@ static const CountryData country_data_table[] = { { QLocale::Language::Portuguese, QLocale::Country::Brazil, 'B', 'R' }, { QLocale::Language::Dzongkha, QLocale::Country::Bhutan, 'B', 'T' }, { QLocale::Language::AnyLanguage, QLocale::Country::BouvetIsland, 'B', 'V' }, -{ QLocale::Language::Belarusian, QLocale::Country::Belarus, 'B', 'Y' }, +{ QLocale::Language::Russian, QLocale::Country::Belarus, 'B', 'Y' }, { QLocale::Language::Swahili, QLocale::Country::CongoKinshasa, 'C', 'D' }, { QLocale::Language::French, QLocale::Country::CentralAfricanRepublic, 'C', 'F' }, { QLocale::Language::French, QLocale::Country::CongoBrazzaville, 'C', 'G' }, From dd8b893ee87a8c76e9579872920b4f54084bedec Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 8 Feb 2021 15:36:27 +0100 Subject: [PATCH 140/318] Changes: mention what this branch is for --- CHANGES | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index aa5dba2062..1750c1e6eb 100644 --- a/CHANGES +++ b/CHANGES @@ -16,7 +16,11 @@ This release contains contributions from (alphabetically by first name): - No core changes yet ## Modules ## - - No module changes yet + - *netinstall* now supports fallbacks for the groups data. + Instead of a single URL, multiple URLs may be specified in + a list and Calamares goes through them until one is successfully + retrieved. Older configurations with a single string are + treated like a one-item list. #1579 # 3.2.36 (2021-02-03) # From cf7391696e6f11c2a5ccba993c6b6917697cdad7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 8 Feb 2021 22:57:38 +0100 Subject: [PATCH 141/318] [netinstall] Continue moving settings to the Config object --- src/modules/netinstall/Config.cpp | 49 +++++++++++++++++++ src/modules/netinstall/Config.h | 19 ++++++- src/modules/netinstall/NetInstallViewStep.cpp | 27 +--------- src/modules/netinstall/NetInstallViewStep.h | 2 - 4 files changed, 69 insertions(+), 28 deletions(-) diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index e69b3c2a4a..99fe28eb07 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -12,9 +12,12 @@ #include "Config.h" +#include "GlobalStorage.h" +#include "JobQueue.h" #include "network/Manager.h" #include "utils/Logger.h" #include "utils/RAII.h" +#include "utils/Variant.h" #include "utils/Yaml.h" #include @@ -54,6 +57,19 @@ Config::setStatus( Status s ) emit statusChanged( status() ); } +QString +Config::sidebarLabel() const +{ + return m_sidebarLabel ? m_sidebarLabel->get() : tr( "Package selection" ); +} + +QString +Config::titleLabel() const +{ + return m_titleLabel ? m_titleLabel->get() : QString(); +} + + void Config::loadGroupList( const QVariantList& groupData ) { @@ -143,3 +159,36 @@ Config::receivedGroupData() setStatus( Status::FailedBadData ); } } + +void +Config::setConfigurationMap( const QVariantMap& configurationMap ) +{ + setRequired( CalamaresUtils::getBool( configurationMap, "required", false ) ); + + // Get the translations, if any + bool bogus = false; + auto label = CalamaresUtils::getSubMap( configurationMap, "label", bogus ); + + if ( label.contains( "sidebar" ) ) + { + m_sidebarLabel = new CalamaresUtils::Locale::TranslatedString( label, "sidebar", metaObject()->className() ); + } + + // Lastly, load the groups data + QString groupsUrl = CalamaresUtils::getString( configurationMap, "groupsUrl" ); + if ( !groupsUrl.isEmpty() ) + { + // Keep putting groupsUrl into the global storage, + // even though it's no longer used for in-module data-passing. + Calamares::JobQueue::instance()->globalStorage()->insert( "groupsUrl", groupsUrl ); + if ( groupsUrl == QStringLiteral( "local" ) ) + { + QVariantList l = configurationMap.value( "groups" ).toList(); + loadGroupList( l ); + } + else + { + loadGroupList( groupsUrl ); + } + } +} diff --git a/src/modules/netinstall/Config.h b/src/modules/netinstall/Config.h index 13eb098c68..24c5e6b685 100644 --- a/src/modules/netinstall/Config.h +++ b/src/modules/netinstall/Config.h @@ -14,8 +14,11 @@ #include "PackageModel.h" +#include "locale/TranslatableConfiguration.h" + #include #include +#include class QNetworkReply; @@ -26,10 +29,16 @@ class Config : public QObject Q_PROPERTY( PackageModel* packageModel MEMBER m_model FINAL ) Q_PROPERTY( QString status READ status NOTIFY statusChanged FINAL ) + // Translations, of the module name (for sidebar) and above the list + Q_PROPERTY( QString sidebarLabel READ sidebarLabel NOTIFY sidebarLabelChanged FINAL ) + Q_PROPERTY( QString titleLabel READ titleLabel NOTIFY titleLabelChanged FINAL ) + public: Config( QObject* parent = nullptr ); ~Config() override; + void setConfigurationMap( const QVariantMap& configurationMap ); + enum class Status { Ok, @@ -45,6 +54,11 @@ class Config : public QObject bool required() const { return m_required; } void setRequired( bool r ) { m_required = r; } + PackageModel* model() const { return m_model; } + + QString sidebarLabel() const; + QString titleLabel() const; + /** @brief Retrieves the groups, with name, description and packages * * Loads data from the given URL. Once done, the data is parsed @@ -59,16 +73,19 @@ class Config : public QObject */ void loadGroupList( const QVariantList& groupData ); - PackageModel* model() const { return m_model; } signals: void statusChanged( QString status ); ///< Something changed + void sidebarLabelChanged( QString label ); + void titleLabelChanged( QString label ); void statusReady(); ///< Loading groups is complete private slots: void receivedGroupData(); ///< From async-loading group data private: + CalamaresUtils::Locale::TranslatedString* m_sidebarLabel = nullptr; // As it appears in the sidebar + CalamaresUtils::Locale::TranslatedString* m_titleLabel = nullptr; PackageModel* m_model = nullptr; QNetworkReply* m_reply = nullptr; // For fetching data Status m_status = Status::Ok; diff --git a/src/modules/netinstall/NetInstallViewStep.cpp b/src/modules/netinstall/NetInstallViewStep.cpp index d92058e510..2e035a8aa8 100644 --- a/src/modules/netinstall/NetInstallViewStep.cpp +++ b/src/modules/netinstall/NetInstallViewStep.cpp @@ -24,7 +24,6 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( NetInstallViewStepFactory, registerPlugin< NetInstallViewStep::NetInstallViewStep( QObject* parent ) : Calamares::ViewStep( parent ) , m_widget( new NetInstallPage( &m_config ) ) - , m_sidebarLabel( nullptr ) , m_nextEnabled( false ) { connect( &m_config, &Config::statusReady, this, &NetInstallViewStep::nextIsReady ); @@ -37,14 +36,13 @@ NetInstallViewStep::~NetInstallViewStep() { m_widget->deleteLater(); } - delete m_sidebarLabel; } QString NetInstallViewStep::prettyName() const { - return m_sidebarLabel ? m_sidebarLabel->get() : tr( "Package selection" ); + return m_config.sidebarLabel(); #if defined( TABLE_OF_TRANSLATIONS ) __builtin_unreachable(); @@ -201,32 +199,11 @@ NetInstallViewStep::nextIsReady() void NetInstallViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { - m_config.setRequired( CalamaresUtils::getBool( configurationMap, "required", false ) ); - - QString groupsUrl = CalamaresUtils::getString( configurationMap, "groupsUrl" ); - if ( !groupsUrl.isEmpty() ) - { - // Keep putting groupsUrl into the global storage, - // even though it's no longer used for in-module data-passing. - Calamares::JobQueue::instance()->globalStorage()->insert( "groupsUrl", groupsUrl ); - if ( groupsUrl == QStringLiteral( "local" ) ) - { - QVariantList l = configurationMap.value( "groups" ).toList(); - m_config.loadGroupList( l ); - } - else - { - m_config.loadGroupList( groupsUrl ); - } - } + m_config.setConfigurationMap( configurationMap ); bool bogus = false; auto label = CalamaresUtils::getSubMap( configurationMap, "label", bogus ); - if ( label.contains( "sidebar" ) ) - { - m_sidebarLabel = new CalamaresUtils::Locale::TranslatedString( label, "sidebar", metaObject()->className() ); - } if ( label.contains( "title" ) ) { m_widget->setPageTitle( diff --git a/src/modules/netinstall/NetInstallViewStep.h b/src/modules/netinstall/NetInstallViewStep.h index c500cbcd93..8949632c1a 100644 --- a/src/modules/netinstall/NetInstallViewStep.h +++ b/src/modules/netinstall/NetInstallViewStep.h @@ -14,7 +14,6 @@ #include "Config.h" #include "DllMacro.h" -#include "locale/TranslatableConfiguration.h" #include "utils/PluginFactory.h" #include "viewpages/ViewStep.h" @@ -56,7 +55,6 @@ public slots: Config m_config; NetInstallPage* m_widget; - CalamaresUtils::Locale::TranslatedString* m_sidebarLabel; // As it appears in the sidebar bool m_nextEnabled = false; }; From 335ccbc14913be47a33a626eef098ab90f1fa80b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Feb 2021 10:58:11 +0100 Subject: [PATCH 142/318] [netinstall] Move other translation parts to Config --- src/modules/netinstall/Config.cpp | 10 ++++- src/modules/netinstall/NetInstallPage.cpp | 43 +++++++------------ src/modules/netinstall/NetInstallPage.h | 15 +------ src/modules/netinstall/NetInstallViewStep.cpp | 12 ++---- 4 files changed, 28 insertions(+), 52 deletions(-) diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 99fe28eb07..022e6fcd75 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -168,10 +168,18 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) // Get the translations, if any bool bogus = false; auto label = CalamaresUtils::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. + static const char className[] = "NetInstallViewStep"; if ( label.contains( "sidebar" ) ) { - m_sidebarLabel = new CalamaresUtils::Locale::TranslatedString( label, "sidebar", metaObject()->className() ); + m_sidebarLabel = new CalamaresUtils::Locale::TranslatedString( label, "sidebar", className ); + } + if ( label.contains( "title" ) ) + { + m_titleLabel = new CalamaresUtils::Locale::TranslatedString( label, "title", className ); } // Lastly, load the groups data diff --git a/src/modules/netinstall/NetInstallPage.cpp b/src/modules/netinstall/NetInstallPage.cpp index 75175a9412..0dfb810b5a 100644 --- a/src/modules/netinstall/NetInstallPage.cpp +++ b/src/modules/netinstall/NetInstallPage.cpp @@ -34,39 +34,12 @@ NetInstallPage::NetInstallPage( Config* c, QWidget* parent ) ui->groupswidget->header()->setSectionResizeMode( QHeaderView::ResizeToContents ); ui->groupswidget->setModel( c->model() ); connect( c, &Config::statusChanged, this, &NetInstallPage::setStatus ); + connect( c, &Config::titleLabelChanged, this, &NetInstallPage::setTitle ); connect( c, &Config::statusReady, this, &NetInstallPage::expandGroups ); - - setPageTitle( nullptr ); - CALAMARES_RETRANSLATE_SLOT( &NetInstallPage::retranslate ) } NetInstallPage::~NetInstallPage() {} -void -NetInstallPage::setPageTitle( CalamaresUtils::Locale::TranslatedString* t ) -{ - m_title.reset( t ); - if ( !m_title ) - { - ui->label->hide(); - } - else - { - ui->label->show(); - } - retranslate(); -} - -void -NetInstallPage::retranslate() -{ - if ( m_title ) - { - ui->label->setText( m_title->get() ); // That's get() on the TranslatedString - } - ui->netinst_status->setText( m_config->status() ); -} - void NetInstallPage::expandGroups() { @@ -88,6 +61,20 @@ NetInstallPage::setStatus( QString s ) ui->netinst_status->setText( s ); } +void +NetInstallPage::setTitle( QString title ) +{ + if ( title.isEmpty() ) + { + ui->label->hide(); + } + else + { + ui->label->setText( title ); // That's get() on the TranslatedString + ui->label->show(); + } +} + void NetInstallPage::onActivate() { diff --git a/src/modules/netinstall/NetInstallPage.h b/src/modules/netinstall/NetInstallPage.h index 1c97423da1..e58a7dd8c3 100644 --- a/src/modules/netinstall/NetInstallPage.h +++ b/src/modules/netinstall/NetInstallPage.h @@ -37,22 +37,11 @@ class NetInstallPage : public QWidget NetInstallPage( Config* config, QWidget* parent = nullptr ); ~NetInstallPage() override; - /** @brief Sets the page title - * - * In situations where there is more than one netinstall page, - * or you want some explanatory title above the treeview, - * set the page title. This page takes ownership of the - * TranslatedString object. - * - * Set to nullptr to remove the title. - */ - void setPageTitle( CalamaresUtils::Locale::TranslatedString* ); - void onActivate(); public slots: - void retranslate(); void setStatus( QString s ); + void setTitle( QString title ); /** @brief Expand entries that should be pre-expanded. * @@ -64,8 +53,6 @@ public slots: private: Config* m_config; Ui::Page_NetInst* ui; - - std::unique_ptr< CalamaresUtils::Locale::TranslatedString > m_title; // Above the treeview }; #endif // NETINSTALLPAGE_H diff --git a/src/modules/netinstall/NetInstallViewStep.cpp b/src/modules/netinstall/NetInstallViewStep.cpp index 2e035a8aa8..a8ce1e3114 100644 --- a/src/modules/netinstall/NetInstallViewStep.cpp +++ b/src/modules/netinstall/NetInstallViewStep.cpp @@ -49,6 +49,9 @@ NetInstallViewStep::prettyName() const // This is a table of "standard" labels for this module. If you use them // in the label: sidebar: section of the config file, the existing // translations can be used. + // + // These translations still live here, even though the lookup + // code is in the Config class. tr( "Package selection" ); tr( "Office software" ); tr( "Office package" ); @@ -200,13 +203,4 @@ void NetInstallViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { m_config.setConfigurationMap( configurationMap ); - - bool bogus = false; - auto label = CalamaresUtils::getSubMap( configurationMap, "label", bogus ); - - if ( label.contains( "title" ) ) - { - m_widget->setPageTitle( - new CalamaresUtils::Locale::TranslatedString( label, "title", metaObject()->className() ) ); - } } From ca1ae6fd1d5276a9dd44f90108053368ecaeb9a2 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Feb 2021 11:06:59 +0100 Subject: [PATCH 143/318] [netinstall] Support retranslation in the Config object --- src/modules/netinstall/Config.cpp | 14 ++++++++++++-- src/modules/netinstall/Config.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 022e6fcd75..2327a732c0 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -17,6 +17,7 @@ #include "network/Manager.h" #include "utils/Logger.h" #include "utils/RAII.h" +#include "utils/Retranslator.h" #include "utils/Variant.h" #include "utils/Yaml.h" @@ -24,11 +25,20 @@ Config::Config( QObject* parent ) : QObject( parent ) - , m_model( new PackageModel( this ) ) + , m_model( new PackageModel( this ) ) { CALAMARES_RETRANSLATE_SLOT( &Config::retranslate ) } + + Config::~Config() +{ +} + +void +Config::retranslate() { + emit statusChanged( status() ); + emit sidebarLabelChanged( sidebarLabel() ); + emit titleLabelChanged( titleLabel() ); } -Config::~Config() {} QString Config::status() const diff --git a/src/modules/netinstall/Config.h b/src/modules/netinstall/Config.h index 24c5e6b685..f5f76f35f1 100644 --- a/src/modules/netinstall/Config.h +++ b/src/modules/netinstall/Config.h @@ -82,6 +82,7 @@ class Config : public QObject private slots: void receivedGroupData(); ///< From async-loading group data + void retranslate(); private: CalamaresUtils::Locale::TranslatedString* m_sidebarLabel = nullptr; // As it appears in the sidebar From 04f4441182e8acad8f5cd2515f8d60c6d4804563 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Feb 2021 15:06:53 +0100 Subject: [PATCH 144/318] [netinstall] Build up a list of urls, rather than just one - the list is unused, and doesn't drive the loading of groups either; the existing one-string entry is used. --- src/modules/netinstall/Config.cpp | 27 +++++++++++++++++++++++++++ src/modules/netinstall/Config.h | 18 ++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 2327a732c0..6b1daaa074 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -170,6 +170,19 @@ Config::receivedGroupData() } } +Config::SourceItem Config::SourceItem::makeSourceItem(const QVariantMap& configurationMap, const QString& groupsUrl) +{ + if ( groupsUrl == QStringLiteral( "local" ) ) + { + return SourceItem{ QUrl(), configurationMap.value( "groups" ).toList() }; + } + else + { + return SourceItem{ QUrl{ groupsUrl }, QVariantList() }; + } +} + + void Config::setConfigurationMap( const QVariantMap& configurationMap ) { @@ -193,6 +206,20 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) } // Lastly, load the groups data + const QString key = QStringLiteral( "groupsUrl" ); + const auto& groupsUrlVariant = configurationMap.value( key ); + if ( groupsUrlVariant.type() == QVariant::String ) + { + m_urls.append( SourceItem::makeSourceItem( configurationMap, groupsUrlVariant.toString() ) ); + } + else if ( groupsUrlVariant.type() == QVariant::StringList ) + { + for ( const auto& s : groupsUrlVariant.toStringList() ) + { + m_urls.append( SourceItem::makeSourceItem( configurationMap, s ) ); + } + } + QString groupsUrl = CalamaresUtils::getString( configurationMap, "groupsUrl" ); if ( !groupsUrl.isEmpty() ) { diff --git a/src/modules/netinstall/Config.h b/src/modules/netinstall/Config.h index f5f76f35f1..554b4ce7dd 100644 --- a/src/modules/netinstall/Config.h +++ b/src/modules/netinstall/Config.h @@ -18,6 +18,7 @@ #include #include +#include #include class QNetworkReply; @@ -85,6 +86,23 @@ private slots: void retranslate(); private: + /** @brief Data about an entry in *groupsUrl* + * + * This can be a specific URL, or "local" which uses data stored + * in the configuration file itself. + */ + struct SourceItem + { + QUrl url; + QVariantList data; + + bool isUrl() const { return url.isValid(); } + bool isLocal() const { return !data.isEmpty(); } + bool isValid() const { return isUrl() || isLocal(); } + static SourceItem makeSourceItem( const QVariantMap& configurationMap, const QString& groupsUrl); + }; + + QQueue< SourceItem > m_urls; CalamaresUtils::Locale::TranslatedString* m_sidebarLabel = nullptr; // As it appears in the sidebar CalamaresUtils::Locale::TranslatedString* m_titleLabel = nullptr; PackageModel* m_model = nullptr; From e49f0cf3bac8135465bb1258b72065f738650e18 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Feb 2021 17:03:19 +0100 Subject: [PATCH 145/318] [libcalamares] Document NamedEnum in much more detail --- src/libcalamares/utils/NamedEnum.h | 155 ++++++++++++++++++++++++++--- 1 file changed, 140 insertions(+), 15 deletions(-) diff --git a/src/libcalamares/utils/NamedEnum.h b/src/libcalamares/utils/NamedEnum.h index cf56a26f23..1d839ddc46 100644 --- a/src/libcalamares/utils/NamedEnum.h +++ b/src/libcalamares/utils/NamedEnum.h @@ -11,11 +11,13 @@ /** @brief Support for "named" enumerations * - * For tables which map string names to enum values, provide a NamedEnumTable - * which hangs on to an initializer_list of pairs of names and values. - * This table can be used with find() to map names to values, or - * values to names. A convenience function smash() is provided to help - * in printing integer (underlying) values of an enum. + * When a string needs to be one specific string out of a set of + * alternatives -- one "name" from an enumerated set -- then it + * is useful to have an **enum type** for the enumeration so that + * C++ code can work with the (strong) type of the enum, while + * the string can be used for human-readable interaction. + * The `NamedEnumTable` template provides support for naming + * values of an enum. */ #ifndef UTILS_NAMEDENUM_H @@ -27,7 +29,100 @@ #include #include -/** @brief Type for collecting parts of a named enum. */ +/** @brief Type for collecting parts of a named enum. + * + * The `NamedEnumTable` template provides support for naming + * values of an enum. It supports mapping strings to enum values + * and mapping enum values to strings. + * + * ## Example + * + * Suppose we have code where there are three alternatives; it is + * useful to have a strong type to make the alternatives visible + * in that code, so the compiler can help check: + * + * ``` + * enum class MilkshakeSize { None, Small, Large }; + * ``` + * + * In a switch() statement, the compiler will check that all kinds + * of milkshakes are dealt with; we can pass a MilkshakeSize to + * a function and rest assured that nobody will call that function + * with a silly value, like `1`. + * + * There is no relation between the C++ identifiers used, and + * any I/O related to that enumeration. In other words, + * + * ``` + * std::cout << MilkshakeSize::Small; + * ``` + * + * Will **not** print out "Small", or "small", or 1. It won't even + * compile, because there is no mapping of the enum values to + * something that can be output. + * + * By making a `NamedEnumTable` we can define a mapping + * between strings (names) and enum values, so that we can easily + * output the human-readable name, and also take string input + * and convert it to an enum value. Suppose we have a function + * `milkshakeSizeNames()` that returns a reference to such a table, + * then we can use `find()` to map enums-to-names and names-to-enums. + * + * ``` + * const auto& names = milkshakeSizeNames(); + * MilkshakeSize sz{ MilkshakeSize::Large }; + * std::cout << names.find(sz); // Probably "large" + * + * bool ok; + * sz = names.find( "small", ok ); // Probably MilkshakeSize::Small + * ``` + * + * ## Usage + * + * It is recommended to use a static const declaration for the table; + * typical use will define a function that returns a reference to + * the table, for shared use. + * + * The constructor for a table takes an initializer_list; each element + * of the initializer_list is a **pair** consisting of a name and + * an associated enum value. The names should be QStrings. For each enum + * value that is listed, the canonical name should come **first** in the + * table, so that printing the enum values gives the canonical result. + * + * ``` + * static const NamedEnumTable& milkshakeSizeNames() + * { + * static NamedEnumTable n { // Initializer list for n + * { "large", MilkshakeSize::Large }, // One pair of name-and-value + * { "small", MilkshakeSize::Small }, + * { "big", MilkshakeSize::Large } + * }; + * return n; + * } + * ``` + * + * The function `eNames()`, above, returns a reference to a name table + * for the enum (presumably an enum class) `E`. It is possible to have + * more than one table for an enum, or to make the table locally, + * but **usually** you want one definitive table of names and values. + * The `eNames()` function gives you that definitive table. In Calamres + * code, such functions are usually named after the underlying enum. + * + * Using this particular table, looking up "large" will return `MilkshakeSize::Large`, + * looking up "big" will **also** return `MilkshakeSize::Large`, looking up "derp" + * will return `MilkshakeSize::Large` (because that is the first value in the table) + * but will set the boolean `ok` parameter to false. Conversely, looking + * up `MilkshakeSize::Large` will return "large" (never "big"). + * + * Note that this particular table does **not** name MilkshakeSize::None, + * so it is probably wrong: you can't get a string for that enum + * value, and no string will map to MilkshakeSize::None either. + * In general, tables should cover all of the enum values. + * + * Passing an empty initializer_list to the constructor is supported, + * but will cause UB if the table is ever used for looking up a string. + * + */ template < typename T > struct NamedEnumTable { @@ -43,7 +138,9 @@ struct NamedEnumTable * Use braced-initialisation for NamedEnum, and remember that the * elements of the list are **pairs**, e.g. * + * ``` * static const NamedEnumTable c{ {"red", Colors::Red } }; + * ``` */ NamedEnumTable( const std::initializer_list< pair_t >& v ) : table( v ) @@ -55,10 +152,12 @@ struct NamedEnumTable * * Searches case-insensitively. * - * If the name @p s is not found, @p ok is set to false and + * If the name @p s is not found, @p ok is set to @c false and * the first enum value in the table is returned. Otherwise, - * @p ok is set to true and the corresponding value is returned. - * + * @p ok is set to @c true and the corresponding value is returned. + * Use the output value of @p ok to determine if the lookup was + * successful: there is otherwise no sensible way to distinguish + * found-the-name-of-the-first-item from not-found. */ enum_t find( const string_t& s, bool& ok ) const { @@ -75,11 +174,17 @@ struct NamedEnumTable return table.begin()->second; } - /** @brief Find a value @p s in the table. + /** @brief Find a value @p s in the table and return its name. * - * If the value @p s is not found, @p ok is set to false and - * an empty string is returned. Otherwise, @p is set to true - * and the corresponding name is returned. + * If @p s is an enum value in the table, return the corresponding + * name (the first name with that value, if there are aliases) + * and set @p ok to @c true. + * + * If the value @p s is not found, @p ok is set to @c false and + * an empty string is returned. This indicates that the table does + * not cover all of the values * in `enum_t` (and @p s is one + * of them), **or** that the passed-in value of @p s is + * not a legal value, e.g. via a static_cast. */ string_t find( enum_t s, bool& ok ) const { @@ -98,7 +203,10 @@ struct NamedEnumTable /** @brief Find a value @p s in the table and return its name. * - * Returns emptry string if the value is not found. + * Returns an empty string if the value @p s is not found (this + * indicates that the table does not cover all of the values + * in `enum_t`, **or** that the passed-in value of @p s is + * not a legal value, e.g. via a static_cast). */ string_t find( enum_t s ) const { @@ -107,7 +215,24 @@ struct NamedEnumTable } }; -/** @brief Smashes an enum value to its underlying type. */ +/** @brief Smashes an enum value to its underlying type. + * + * While an enum **class** is not an integral type, and its values can't be + * printed or treated like an integer (like an old-style enum can), + * the underlying type **is** integral. This template function + * returns the value of an enum value, in its underlying type. + * This can be useful for debugging purposes, e.g. + * + * ``` + * MilkshakeSize sz{ MilkshakeSize::None }; + * std::cout << milkshakeSizeNames().find( sz ) << smash( sz ); + * ``` + * + * This will print both the name and the underlying integer for the + * value; assuming the table from the example is used, there is + * no name for MilkshakeSize::None, so it will print an empty string, + * followed by the integral representation -- probably a 0. + */ template < typename E > constexpr typename std::underlying_type< E >::type smash( const E e ) From 7057081bdff9fa1110f9abca9b28360462836972 Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Wed, 10 Feb 2021 14:38:26 +0530 Subject: [PATCH 146/318] QUrl for serverURL + renames --- src/libcalamaresui/Branding.h | 5 +++-- src/libcalamaresui/ViewManager.cpp | 12 ++++++------ src/libcalamaresui/utils/Paste.cpp | 4 ++-- src/libcalamaresui/utils/Paste.h | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index 493579a34f..2afb8edc2a 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -23,6 +23,7 @@ #include #include #include +#include namespace YAML { @@ -219,7 +220,7 @@ class UIDLLEXPORT Branding : public QObject //Paste functionality related QString uploadServerType() { return m_uploadServerType; }; - QString uploadServerURL() { return m_uploadServerURL; }; + QUrl uploadServerURL() { return m_uploadServerURL; }; int uploadServerPort() { return m_uploadServerPort; }; public slots: @@ -270,7 +271,7 @@ public slots: bool m_welcomeExpandingLogo; QString m_uploadServerType; - QString m_uploadServerURL; + QUrl m_uploadServerURL; int m_uploadServerPort; WindowExpansion m_windowExpansion; diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index ae2460c37d..3ffd3b43ca 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -141,8 +141,8 @@ ViewManager::insertViewStep( int before, ViewStep* step ) void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { - QString UploadServerType = Calamares::Branding::instance()->uploadServerType(); - bool shouldOfferWebPaste = CalamaresUtils::UploadServersList.contains( UploadServerType ); + QString serverType = Calamares::Branding::instance()->uploadServerType(); + bool shouldOfferWebPaste = CalamaresUtils::UploadServersList.contains( serverType ); cError() << "Installation failed:"; cDebug() << "- message:" << message; @@ -186,10 +186,10 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole ) { QString pasteUrlMsg; - QString UploadServerType = Calamares::Branding::instance()->uploadServerType(); - if ( UploadServerType == "fiche" ) + QString serverType = Calamares::Branding::instance()->uploadServerType(); + if ( serverType == "fiche" ) { - pasteUrlMsg = CalamaresUtils::sendLogToPastebin( msgBox ); + pasteUrlMsg = CalamaresUtils::ficheLogUpload( msgBox ); } else { @@ -545,7 +545,7 @@ ViewManager::updateBackAndNextVisibility( bool visible ) UPDATE_BUTTON_PROPERTY( backAndNextVisible, visible ) } -QVariant +QVariant ViewManager::data( const QModelIndex& index, int role ) const { if ( !index.isValid() ) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 269876017c..2fea0806ee 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -30,10 +30,10 @@ QStringList UploadServersList = { }; QString -sendLogToPastebin( QObject* parent ) +ficheLogUpload( QObject* parent ) { - const QString& ficheHost = Calamares::Branding::instance()->uploadServerURL(); + const QString& ficheHost = Calamares::Branding::instance()->uploadServerURL().toString(); quint16 fichePort = Calamares::Branding::instance()->uploadServerPort(); QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); diff --git a/src/libcalamaresui/utils/Paste.h b/src/libcalamaresui/utils/Paste.h index 69adfa99c1..29e73fc1cc 100644 --- a/src/libcalamaresui/utils/Paste.h +++ b/src/libcalamaresui/utils/Paste.h @@ -22,7 +22,7 @@ namespace CalamaresUtils * * Returns the (string) URL that the pastebin gives us. */ -QString sendLogToPastebin( QObject* parent ); +QString ficheLogUpload( QObject* parent ); extern QStringList UploadServersList; From 97388512616b82e9a39021c30b50d70b8829d0e3 Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Mon, 15 Feb 2021 20:51:41 +0530 Subject: [PATCH 147/318] YAML list for uploadServer key --- src/branding/default/branding.desc | 7 ++++--- src/libcalamaresui/Branding.cpp | 22 ++++++++++++++++++---- src/libcalamaresui/Branding.h | 21 +++++++++++---------- src/libcalamaresui/ViewManager.cpp | 4 ++-- src/libcalamaresui/utils/Paste.cpp | 4 ++-- 5 files changed, 37 insertions(+), 21 deletions(-) diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index 92d0bba10c..cd83b02f18 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -228,6 +228,7 @@ slideshowAPI: 2 # Takes string as input # - port : Defines the port number to be used to send logs. Takes # integer as input -uploadServer.type : "fiche" -uploadServer.url : "termbin.com" -uploadServer.port : 9999 +uploadServer : + type : "fiche" + url : "termbin.com" + port : 9999 diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 40383c9928..25024368f3 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -87,6 +87,13 @@ const QStringList Branding::s_styleEntryStrings = "sidebarTextSelect", "sidebarTextHighlight" }; + +const QStringList Branding::s_uploadServerStrings = +{ + "type", + "url", + "port" +}; // clang-format on // *INDENT-ON* @@ -219,6 +226,12 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent ) return imageFi.absoluteFilePath(); } ); loadStrings( m_style, doc, "style", []( const QString& s ) -> QString { return s; } ); + + const QVariantMap temp = CalamaresUtils::yamlMapToVariant( doc[ "uploadServer" ] ); + for ( auto it = temp.constBegin(); it != temp.constEnd(); ++it ) + { + m_uploadServer.insert( it.key(), it.value().toString() ); + } } catch ( YAML::Exception& e ) { @@ -279,6 +292,11 @@ Branding::imagePath( Branding::ImageEntry imageEntry ) const return m_images.value( s_imageEntryStrings.value( imageEntry ) ); } +QString +Branding::uploadServer( Branding::UploadServerEntry uploadServerEntry ) const +{ + return m_uploadServer.value( s_uploadServerStrings.value( uploadServerEntry ) ); +} QPixmap Branding::image( Branding::ImageEntry imageEntry, const QSize& size ) const @@ -511,10 +529,6 @@ Branding::initSimpleSettings( const YAML::Node& doc ) { m_windowHeight = WindowDimension( CalamaresUtils::windowPreferredHeight, WindowDimensionUnit::Pixies ); } - - m_uploadServerURL = getString( doc, "uploadServer.url" ); - m_uploadServerPort = doc[ "uploadServer.port" ].as< int >(); - m_uploadServerType = getString( doc, "uploadServer.type" ); } void diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index 2afb8edc2a..87f71e862c 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -83,6 +83,14 @@ class UIDLLEXPORT Branding : public QObject }; Q_ENUM( StyleEntry ) + enum UploadServerEntry : short + { + Type, + URL, + Port + }; + Q_ENUM( UploadServerEntry ) + /** @brief Setting for how much the main window may expand. */ enum class WindowExpansion { @@ -217,12 +225,6 @@ class UIDLLEXPORT Branding : public QObject */ void setGlobals( GlobalStorage* globalStorage ) const; - - //Paste functionality related - QString uploadServerType() { return m_uploadServerType; }; - QUrl uploadServerURL() { return m_uploadServerURL; }; - int uploadServerPort() { return m_uploadServerPort; }; - public slots: QString string( StringEntry stringEntry ) const; QString versionedName() const { return string( VersionedName ); } @@ -232,6 +234,7 @@ public slots: QString styleString( StyleEntry styleEntry ) const; QString imagePath( ImageEntry imageEntry ) const; + QString uploadServer( UploadServerEntry uploadServerEntry ) const; PanelSide sidebarSide() const { return m_sidebarSide; } PanelSide navigationSide() const { return m_navigationSide; } @@ -242,12 +245,14 @@ public slots: static const QStringList s_stringEntryStrings; static const QStringList s_imageEntryStrings; static const QStringList s_styleEntryStrings; + static const QStringList s_uploadServerStrings; QString m_descriptorPath; // Path to descriptor (e.g. "/etc/calamares/default/branding.desc") QString m_componentName; // Matches last part of full path to containing directory QMap< QString, QString > m_strings; QMap< QString, QString > m_images; QMap< QString, QString > m_style; + QMap< QString, QString > m_uploadServer; /* The slideshow can be done in one of two ways: * - as a sequence of images @@ -270,10 +275,6 @@ public slots: bool m_welcomeStyleCalamares; bool m_welcomeExpandingLogo; - QString m_uploadServerType; - QUrl m_uploadServerURL; - int m_uploadServerPort; - WindowExpansion m_windowExpansion; WindowDimension m_windowHeight, m_windowWidth; WindowPlacement m_windowPlacement; diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 3ffd3b43ca..5007001238 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -141,7 +141,7 @@ ViewManager::insertViewStep( int before, ViewStep* step ) void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { - QString serverType = Calamares::Branding::instance()->uploadServerType(); + QString serverType = Calamares::Branding::instance()->uploadServer( Calamares::Branding::Type ); bool shouldOfferWebPaste = CalamaresUtils::UploadServersList.contains( serverType ); cError() << "Installation failed:"; @@ -186,7 +186,7 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole ) { QString pasteUrlMsg; - QString serverType = Calamares::Branding::instance()->uploadServerType(); + QString serverType = Calamares::Branding::instance()->uploadServer( Calamares::Branding::Type ); if ( serverType == "fiche" ) { pasteUrlMsg = CalamaresUtils::ficheLogUpload( msgBox ); diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 2fea0806ee..27ae7f8f7f 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -33,8 +33,8 @@ QString ficheLogUpload( QObject* parent ) { - const QString& ficheHost = Calamares::Branding::instance()->uploadServerURL().toString(); - quint16 fichePort = Calamares::Branding::instance()->uploadServerPort(); + const QString& ficheHost = Calamares::Branding::instance()->uploadServer( Calamares::Branding::URL ); + quint16 fichePort = Calamares::Branding::instance()->uploadServer( Calamares::Branding::Port ).toInt(); QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); From f15a599bbd82bc914e1036c54a69a9210f647754 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Feb 2021 12:45:34 +0100 Subject: [PATCH 148/318] CI: shuffle workflow naming, add a nightly neon build as well --- .github/workflows/ci-neon.yml | 2 +- .../{ci-debian.yml => scheduled-debian.yml} | 0 .github/workflows/scheduled-neon.yml | 89 +++++++++++++++++++ ...ci-opensuse.yml => scheduled-opensuse.yml} | 0 4 files changed, 90 insertions(+), 1 deletion(-) rename .github/workflows/{ci-debian.yml => scheduled-debian.yml} (100%) create mode 100644 .github/workflows/scheduled-neon.yml rename .github/workflows/{ci-opensuse.yml => scheduled-opensuse.yml} (100%) diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/ci-neon.yml index eb59042093..80b10ab534 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/ci-neon.yml @@ -1,4 +1,4 @@ -name: ci-neon +name: ci-push on: push: diff --git a/.github/workflows/ci-debian.yml b/.github/workflows/scheduled-debian.yml similarity index 100% rename from .github/workflows/ci-debian.yml rename to .github/workflows/scheduled-debian.yml diff --git a/.github/workflows/scheduled-neon.yml b/.github/workflows/scheduled-neon.yml new file mode 100644 index 0000000000..a47b8460e1 --- /dev/null +++ b/.github/workflows/scheduled-neon.yml @@ -0,0 +1,89 @@ +name: ci-neon + +on: + schedule: + - cron: "52 23 * * *" + workflow_dispatch: + +env: + BUILDDIR: /build + SRCDIR: ${{ github.workspace }} + CMAKE_ARGS: | + -DWEBVIEW_FORCE_WEBKIT=1 + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON + -DWITH_PYTHONQT=OFF" + -DCMAKE_BUILD_TYPE=Debug + +jobs: + build: + runs-on: ubuntu-latest + container: + image: docker://kdeneon/plasma:user + options: --tmpfs /build:rw --user 0:0 + steps: + - name: "prepare env" + run: | + sudo apt-get update + sudo apt-get -y install git-core + sudo apt-get -y install \ + build-essential \ + cmake \ + extra-cmake-modules \ + gettext \ + kio-dev \ + libatasmart-dev \ + libboost-python-dev \ + libkf5config-dev \ + libkf5coreaddons-dev \ + libkf5i18n-dev \ + libkf5iconthemes-dev \ + libkf5parts-dev \ + libkf5service-dev \ + libkf5solid-dev \ + libkpmcore-dev \ + libparted-dev \ + libpolkit-qt5-1-dev \ + libqt5svg5-dev \ + libqt5webkit5-dev \ + libyaml-cpp-dev \ + os-prober \ + pkg-config \ + python3-dev \ + qtbase5-dev \ + qtdeclarative5-dev \ + qttools5-dev \ + qttools5-dev-tools + - name: "prepare source" + uses: actions/checkout@v2 + - name: "prepare build" + id: pre_build + run: | + test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } + mkdir -p $BUILDDIR + test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } + echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}` + - name: "Calamares: cmake" + working-directory: ${{ env.BUILDDIR }} + run: cmake $CMAKE_ARGS $SRCDIR + - name: "Calamares: make" + working-directory: ${{ env.BUILDDIR }} + run: make -j2 VERBOSE=1 + - name: "Calamares: install" + working-directory: ${{ env.BUILDDIR }} + run: make install VERBOSE=1 + - name: "notify: ok" + uses: rectalogic/notify-irc@v1 + if: ${{ success() && github.repository == 'calamares/calamares' }} + with: + server: chat.freenode.net + nickname: cala-ci + channel: "#calamares" + message: "SCHEDULED ${{ github.workflow }} OK ${{ steps.pre_build.outputs.message }}" + - name: "notify: fail" + uses: rectalogic/notify-irc@v1 + if: ${{ failure() && github.repository == 'calamares/calamares' }} + with: + server: chat.freenode.net + nickname: cala-ci + channel: "#calamares" + message: "SCHEDULED ${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}" diff --git a/.github/workflows/ci-opensuse.yml b/.github/workflows/scheduled-opensuse.yml similarity index 100% rename from .github/workflows/ci-opensuse.yml rename to .github/workflows/scheduled-opensuse.yml From 112b51756b2c6e17de97640ab3769994e7181312 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Feb 2021 13:03:22 +0100 Subject: [PATCH 149/318] CI: keep a tarball of the scheduled neon build --- .github/workflows/scheduled-neon.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/scheduled-neon.yml b/.github/workflows/scheduled-neon.yml index a47b8460e1..4295f8025a 100644 --- a/.github/workflows/scheduled-neon.yml +++ b/.github/workflows/scheduled-neon.yml @@ -70,7 +70,17 @@ jobs: run: make -j2 VERBOSE=1 - name: "Calamares: install" working-directory: ${{ env.BUILDDIR }} - run: make install VERBOSE=1 + run: make install VERBOSE=1 DESTDIR=${{ env.BUILDDIR }}/stage + - name: "Calamares: archive" + working-directory: ${{ env.BUILDDIR }} + run: tar czf calamares.tar.gz stage + - name: "upload" + uses: actions/upload-artifact@v2 + with: + name: calamares-tarball + path: ${{ env.BUILDDIR }}/calamares.tar.gz + if-no-files-found: error + retention-days: 3 - name: "notify: ok" uses: rectalogic/notify-irc@v1 if: ${{ success() && github.repository == 'calamares/calamares' }} From d0a65641e282471ef76308662b1a104774461aa0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Feb 2021 14:25:10 +0100 Subject: [PATCH 150/318] CI: rename the scheduled, nightly builds again --- .github/workflows/{scheduled-debian.yml => nightly-debian.yml} | 2 +- .github/workflows/{scheduled-neon.yml => nightly-neon.yml} | 2 +- .../workflows/{scheduled-opensuse.yml => nightly-opensuse.yml} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename .github/workflows/{scheduled-debian.yml => nightly-debian.yml} (99%) rename .github/workflows/{scheduled-neon.yml => nightly-neon.yml} (99%) rename .github/workflows/{scheduled-opensuse.yml => nightly-opensuse.yml} (99%) diff --git a/.github/workflows/scheduled-debian.yml b/.github/workflows/nightly-debian.yml similarity index 99% rename from .github/workflows/scheduled-debian.yml rename to .github/workflows/nightly-debian.yml index 26f58f5949..4c3dc67cab 100644 --- a/.github/workflows/scheduled-debian.yml +++ b/.github/workflows/nightly-debian.yml @@ -1,4 +1,4 @@ -name: ci-debian-10 +name: nightly-debian-10 on: schedule: diff --git a/.github/workflows/scheduled-neon.yml b/.github/workflows/nightly-neon.yml similarity index 99% rename from .github/workflows/scheduled-neon.yml rename to .github/workflows/nightly-neon.yml index 4295f8025a..c20887fc3c 100644 --- a/.github/workflows/scheduled-neon.yml +++ b/.github/workflows/nightly-neon.yml @@ -1,4 +1,4 @@ -name: ci-neon +name: nightly-neon on: schedule: diff --git a/.github/workflows/scheduled-opensuse.yml b/.github/workflows/nightly-opensuse.yml similarity index 99% rename from .github/workflows/scheduled-opensuse.yml rename to .github/workflows/nightly-opensuse.yml index c9098dbc1f..0ededfaf0c 100644 --- a/.github/workflows/scheduled-opensuse.yml +++ b/.github/workflows/nightly-opensuse.yml @@ -1,4 +1,4 @@ -name: ci-opensuse +name: nightly-opensuse on: schedule: From 6bf82e9c656a73e0464b57fe99acb7eb24010372 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Feb 2021 16:32:34 +0100 Subject: [PATCH 151/318] [welcome] Update .conf documentation - fix typo - don't suggest google as internetCheckUrl - mark TODOs for #1384 --- src/modules/welcome/welcome.conf | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/modules/welcome/welcome.conf b/src/modules/welcome/welcome.conf index bd15a6f2d8..b3da8d366d 100644 --- a/src/modules/welcome/welcome.conf +++ b/src/modules/welcome/welcome.conf @@ -10,14 +10,19 @@ # can check requirements for installation. --- # Display settings for various buttons on the welcome page. -# The URLs themselves come from branding.desc is the setting -# here is "true". If the setting is false, the button is hidden. +# The URLs themselves come from `branding.desc`. Each button +# is show if the corresponding *show* setting +# here is "true". If the setting is "false", the button is hidden. +# Empty or not-set is interpreted as "false". +# +# TODO:3.3 Remove the URL fallback here; URLs only in `branding.desc` +# # The setting can also be a full URL which will then be used -# instead of the one from the branding file, or empty or not-set -# which will hide the button. +# instead of the one from the branding file. showSupportUrl: true showKnownIssuesUrl: true showReleaseNotesUrl: false +# TODO:3.3 Move to branding, keep only a bool here showDonateUrl: https://kde.org/community/donations/ # Requirements checking. These are general, generic, things @@ -26,7 +31,7 @@ showDonateUrl: https://kde.org/community/donations/ requirements: # Amount of available disk, in GiB. Floating-point is allowed here. # Note that this does not account for *usable* disk, so it is possible - # to pass this requirement, yet have no space to install to. + # to satisfy this requirement, yet have no space to install to. requiredStorage: 5.5 # Amount of available RAM, in GiB. Floating-point is allowed here. @@ -34,7 +39,10 @@ requirements: # To check for internet connectivity, Calamares does a HTTP GET # on this URL; on success (e.g. HTTP code 200) internet is OK. - internetCheckUrl: http://google.com + # Use a privacy-respecting URL here, preferably in your distro's domain. + # + # The URL is only used if "internet" is in the *check* list below. + internetCheckUrl: http://example.com # List conditions to check. Each listed condition will be # probed in some way, and yields true or false according to From ce6fae900febada1faf6285f80ca10ab60d175fa Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 17 Feb 2021 10:41:55 +0100 Subject: [PATCH 152/318] CI: massage message a bit and adjust naming scheme --- .github/workflows/nightly-debian.yml | 4 ++-- .github/workflows/nightly-neon.yml | 4 ++-- .github/workflows/nightly-opensuse.yml | 4 ++-- .github/workflows/{ci-neon.yml => push.yml} | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename .github/workflows/{ci-neon.yml => push.yml} (88%) diff --git a/.github/workflows/nightly-debian.yml b/.github/workflows/nightly-debian.yml index 4c3dc67cab..3fd558e217 100644 --- a/.github/workflows/nightly-debian.yml +++ b/.github/workflows/nightly-debian.yml @@ -89,7 +89,7 @@ jobs: server: chat.freenode.net nickname: cala-ci channel: "#calamares" - message: "SCHEDULED ${{ github.workflow }} OK ${{ steps.pre_build.outputs.message }}" + message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} @@ -97,4 +97,4 @@ jobs: server: chat.freenode.net nickname: cala-ci channel: "#calamares" - message: "SCHEDULED ${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}" + message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" diff --git a/.github/workflows/nightly-neon.yml b/.github/workflows/nightly-neon.yml index c20887fc3c..92f71c10b2 100644 --- a/.github/workflows/nightly-neon.yml +++ b/.github/workflows/nightly-neon.yml @@ -88,7 +88,7 @@ jobs: server: chat.freenode.net nickname: cala-ci channel: "#calamares" - message: "SCHEDULED ${{ github.workflow }} OK ${{ steps.pre_build.outputs.message }}" + message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} @@ -96,4 +96,4 @@ jobs: server: chat.freenode.net nickname: cala-ci channel: "#calamares" - message: "SCHEDULED ${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}" + message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml index 0ededfaf0c..c3762fb992 100644 --- a/.github/workflows/nightly-opensuse.yml +++ b/.github/workflows/nightly-opensuse.yml @@ -87,7 +87,7 @@ jobs: server: chat.freenode.net nickname: cala-ci channel: "#calamares" - message: "SCHEDULED ${{ github.workflow }} OK ${{ steps.pre_build.outputs.message }}" + message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} @@ -95,4 +95,4 @@ jobs: server: chat.freenode.net nickname: cala-ci channel: "#calamares" - message: "SCHEDULED ${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}" + message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/push.yml similarity index 88% rename from .github/workflows/ci-neon.yml rename to .github/workflows/push.yml index 80b10ab534..0889ea2788 100644 --- a/.github/workflows/ci-neon.yml +++ b/.github/workflows/push.yml @@ -84,7 +84,7 @@ jobs: server: chat.freenode.net nickname: cala-ci channel: "#calamares" - message: "PUSH ${{ github.workflow }} OK ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}" + message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} @@ -92,4 +92,4 @@ jobs: server: chat.freenode.net nickname: cala-ci channel: "#calamares" - message: "PUSH ${{ github.workflow }} FAIL ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" + message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" From 49f4e7b8e13ddedb1242f8be7e5c2a325260450f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 17 Feb 2021 14:19:45 +0100 Subject: [PATCH 153/318] [calamares] Make the widget-tree more informative, mention class name --- src/calamares/DebugWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calamares/DebugWindow.cpp b/src/calamares/DebugWindow.cpp index 4a68d4ae25..96f4fb3358 100644 --- a/src/calamares/DebugWindow.cpp +++ b/src/calamares/DebugWindow.cpp @@ -59,7 +59,7 @@ dumpWidgetTree( QDebug& deb, const QWidget* widget, int depth ) { deb << ' '; } - deb << widget->objectName(); + deb << widget->metaObject()->className() << widget->objectName(); for ( const auto* w : widget->findChildren< QWidget* >( QString(), Qt::FindDirectChildrenOnly ) ) { From 7e6c3a230942754b8da793836d1a7151d8c20dc9 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 17 Feb 2021 14:25:06 +0100 Subject: [PATCH 154/318] [libcalamaresui] Give the slideshow-widgets a name - this is the *working* part of the slideshow, not its background --- src/libcalamaresui/viewpages/Slideshow.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libcalamaresui/viewpages/Slideshow.cpp b/src/libcalamaresui/viewpages/Slideshow.cpp index 268843421e..f6df1cae42 100644 --- a/src/libcalamaresui/viewpages/Slideshow.cpp +++ b/src/libcalamaresui/viewpages/Slideshow.cpp @@ -43,6 +43,8 @@ SlideshowQML::SlideshowQML( QWidget* parent ) , m_qmlComponent( nullptr ) , m_qmlObject( nullptr ) { + m_qmlShow->setObjectName("qml"); + CalamaresUtils::registerQmlModels(); m_qmlShow->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); @@ -203,6 +205,8 @@ SlideshowPictures::SlideshowPictures( QWidget* parent ) , m_imageIndex( 0 ) , m_images( Branding::instance()->slideshowImages() ) { + m_label->setObjectName("image"); + m_label->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); m_label->setAlignment( Qt::AlignCenter ); m_timer->setInterval( std::chrono::milliseconds( 2000 ) ); From 3a4dcb691322369cdb8c49bac23b875a834fbebe Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 17 Feb 2021 14:34:33 +0100 Subject: [PATCH 155/318] [libcalamaresui] Give slideshow (ExecutionViewStep) widgets names --- src/libcalamaresui/viewpages/ExecutionViewStep.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp index bb629b217d..c5785b087a 100644 --- a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp +++ b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp @@ -62,6 +62,10 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent ) , m_label( new QLabel ) , m_slideshow( makeSlideshow( m_widget ) ) { + m_widget->setObjectName( "slideshow" ); + m_progressBar->setObjectName( "exec-progress" ); + m_label->setObjectName( "exec-message" ); + QVBoxLayout* layout = new QVBoxLayout( m_widget ); QVBoxLayout* innerLayout = new QVBoxLayout; From cdbf45b5d30f5f03d86e8fd8a558178737e7d96d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 19 Feb 2021 14:29:46 +0100 Subject: [PATCH 156/318] [libcalamaresui] Remove unused include --- src/libcalamaresui/viewpages/ExecutionViewStep.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp index c5785b087a..cac9b28be9 100644 --- a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp +++ b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp @@ -24,7 +24,6 @@ #include "utils/CalamaresUtilsGui.h" #include "utils/Dirs.h" #include "utils/Logger.h" -#include "utils/Qml.h" #include "utils/Retranslator.h" #include From 9c8194402b7180f64d1deb8a43f75d66db2f2e2c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 19 Feb 2021 14:33:38 +0100 Subject: [PATCH 157/318] [keyboard] Add ASCII mapping for Greek FIXES #1642 --- src/modules/keyboard/non-ascii-layouts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/keyboard/non-ascii-layouts b/src/modules/keyboard/non-ascii-layouts index 454278a3e4..fe3f285a29 100644 --- a/src/modules/keyboard/non-ascii-layouts +++ b/src/modules/keyboard/non-ascii-layouts @@ -6,3 +6,4 @@ #layout additional-layout additional-variant vconsole-keymap ru us - ruwin_alt_sh-UTF-8 ua us - ua-utf +gr us - gr From f0aa515c8bcd59e8bc0449dd6c29fc6cd6d8ad08 Mon Sep 17 00:00:00 2001 From: benne-dee <78043691+benne-dee@users.noreply.github.com> Date: Mon, 22 Feb 2021 22:17:06 +0530 Subject: [PATCH 158/318] [netinstall] Schema validates also groups file --- src/modules/netinstall/netinstall.schema.yaml | 45 ++++++++++++------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/src/modules/netinstall/netinstall.schema.yaml b/src/modules/netinstall/netinstall.schema.yaml index e1db5715ec..05ab4cd08a 100644 --- a/src/modules/netinstall/netinstall.schema.yaml +++ b/src/modules/netinstall/netinstall.schema.yaml @@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot +# SPDX-FileContributor: benne-dee ( worked on groups schema ) # SPDX-License-Identifier: GPL-3.0-or-later --- $schema: https://json-schema.org/draft-07/schema# @@ -7,11 +8,11 @@ definitions: package: $id: '#definitions/package' oneOf: - - + - type: string description: bare package - actual package name as passed to the package manager (e.g. `qt5-creator-dev`). - - + - type: object description: rich package - one with a package-name (for the package-manager) and a description (for the human). @@ -59,16 +60,30 @@ definitions: type: array items: { $ref: '#definitions/group' } -additionalProperties: false -type: object -properties: - groupsUrl: { type: string } - required: { type: boolean, default: false } - label: # Translatable labels - type: object - additionalProperties: true - properties: - sidebar: { type: string } - title: { type: string } - groups: { $ref: '#definitions/groups' } # DONE: the schema for groups -required: [ groupsUrl ] +oneOf: +- # netinstall.conf + type: object + description: netinstall.conf schema + additionalProperties: false + properties: + groupsUrl: { type: string } + required: { type: boolean, default: false } + label: # Translatable labels + type: object + additionalProperties: true + properties: + sidebar: { type: string } + title: { type: string } + groups: { $ref: '#definitions/groups' } + required: [ groupsUrl ] + +- # Groups file with top level *groups* key + type: object + description: Groups file with top level *groups* key + additionalProperties: false + properties: + groups: { $ref: '#definitions/groups' } + required: [ groups ] + +- # Groups file bare + { $ref: '#definitions/groups' } From 288fe5b274b59e3d3b29b364efc15a272fb204eb Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Feb 2021 12:50:52 +0100 Subject: [PATCH 159/318] [finished] Rename and document following coding style --- src/modules/finished/FinishedViewStep.cpp | 6 +++--- src/modules/finished/FinishedViewStep.h | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index 310dda25ae..1469262a09 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -29,7 +29,7 @@ FinishedViewStep::FinishedViewStep( QObject* parent ) : Calamares::ViewStep( parent ) , m_config( new Config( this ) ) , m_widget( new FinishedPage() ) - , installFailed( false ) + , m_installFailed( false ) { auto jq = Calamares::JobQueue::instance(); connect( jq, &Calamares::JobQueue::failed, m_widget, &FinishedPage::onInstallationFailed ); @@ -94,7 +94,7 @@ FinishedViewStep::sendNotification() { // If the installation failed, don't send notification popup; // there's a (modal) dialog popped up with the failure notice. - if ( installFailed ) + if ( m_installFailed ) { return; } @@ -151,7 +151,7 @@ FinishedViewStep::onInstallationFailed( const QString& message, const QString& d { Q_UNUSED( message ) Q_UNUSED( details ) - installFailed = true; + m_installFailed = true; } void diff --git a/src/modules/finished/FinishedViewStep.h b/src/modules/finished/FinishedViewStep.h index aa71ab38ae..ac54fdd35c 100644 --- a/src/modules/finished/FinishedViewStep.h +++ b/src/modules/finished/FinishedViewStep.h @@ -50,16 +50,18 @@ public slots: void onInstallationFailed( const QString& message, const QString& details ); private: - Config* m_config; - FinishedPage* m_widget; - /** - * @brief At the end of installation (when this step is activated), - * send a desktop notification via DBus that the install is done. + * @brief Send notification at the end via DBus + * + * At the end of installation (when this step is activated), + * send a desktop notification via DBus that the install is done. + * If the installation failed, no notification is sent. */ void sendNotification(); - bool installFailed; + Config* m_config; + FinishedPage* m_widget; + bool m_installFailed; // Track if onInstallationFailed() was called }; CALAMARES_PLUGIN_FACTORY_DECLARATION( FinishedViewStepFactory ) From 9d6d8ecaea64d6476776b547ad737d545419ee3c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Feb 2021 15:03:16 +0100 Subject: [PATCH 160/318] [finished] Heavy refactor - move most of the business logic to Config - make retranslate of the page more robust (e.g. changing language after failure would restore the un-failed message) There's still some bits left. --- src/modules/finished/Config.cpp | 47 ++++++++ src/modules/finished/Config.h | 17 ++- src/modules/finished/FinishedPage.cpp | 129 +++++++++++----------- src/modules/finished/FinishedPage.h | 13 +-- src/modules/finished/FinishedViewStep.cpp | 29 +++-- 5 files changed, 150 insertions(+), 85 deletions(-) diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp index 7a84e8f22e..a612661a8b 100644 --- a/src/modules/finished/Config.cpp +++ b/src/modules/finished/Config.cpp @@ -33,11 +33,55 @@ Config::Config( QObject* parent ) { } +void +Config::setRestartNowMode( Config::RestartMode m ) +{ + // Can only go "down" in state (Always > UserDefaultChecked > .. > Never) + if ( m > m_restartNowMode ) + { + return; + } + + // If changing to an unconditional mode, also set other flag + if ( m == RestartMode::Always || m == RestartMode::Never ) + { + setRestartNowWanted( m == RestartMode::Always ); + } + + if ( m != m_restartNowMode ) + { + m_restartNowMode = m; + emit restartModeChanged( m ); + } +} + +void +Config::setRestartNowWanted( bool w ) +{ + // Follow the mode which may affect @p w + if ( m_restartNowMode == RestartMode::Always ) + { + w = true; + } + if ( m_restartNowMode == RestartMode::Never ) + { + w = false; + } + + if ( w != m_userWantsRestart ) + { + m_userWantsRestart = w; + emit restartNowWantedChanged( w ); + } +} + + void Config::setConfigurationMap( const QVariantMap& configurationMap ) { RestartMode mode = RestartMode::Never; + //TODO:3.3 remove deprecated restart settings QString restartMode = CalamaresUtils::getString( configurationMap, "restartNowMode" ); if ( restartMode.isEmpty() ) { @@ -69,6 +113,9 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) } m_restartNowMode = mode; + m_userWantsRestart = ( mode == RestartMode::Always || mode == RestartMode::UserDefaultChecked ); + emit restartModeChanged( m_restartNowMode ); + emit restartNowWantedChanged( m_userWantsRestart ); if ( mode != RestartMode::Never ) { diff --git a/src/modules/finished/Config.h b/src/modules/finished/Config.h index 9b8c5d8d38..32cc7bf225 100644 --- a/src/modules/finished/Config.h +++ b/src/modules/finished/Config.h @@ -20,8 +20,10 @@ class Config : public QObject { Q_OBJECT + Q_PROPERTY( RestartMode restartNowMode READ restartNowMode WRITE setRestartNowMode NOTIFY restartModeChanged ) + Q_PROPERTY( bool restartNowWanted READ restartNowWanted WRITE setRestartNowWanted NOTIFY restartNowWantedChanged ) + Q_PROPERTY( QString restartNowCommand READ restartNowCommand CONSTANT FINAL ) - Q_PROPERTY( RestartMode restartNowMode READ restartNowMode CONSTANT FINAL ) Q_PROPERTY( bool notifyOnFinished READ notifyOnFinished CONSTANT FINAL ) public: @@ -36,15 +38,26 @@ class Config : public QObject }; Q_ENUM( RestartMode ) - QString restartNowCommand() const { return m_restartNowCommand; } RestartMode restartNowMode() const { return m_restartNowMode; } + bool restartNowWanted() const { return m_userWantsRestart; } + + QString restartNowCommand() const { return m_restartNowCommand; } bool notifyOnFinished() const { return m_notifyOnFinished; } void setConfigurationMap( const QVariantMap& configurationMap ); +public slots: + void setRestartNowMode( RestartMode m ); + void setRestartNowWanted( bool w ); + +signals: + void restartModeChanged( RestartMode m ); + void restartNowWantedChanged( bool w ); + private: QString m_restartNowCommand; RestartMode m_restartNowMode = RestartMode::Never; + bool m_userWantsRestart = false; bool m_notifyOnFinished = false; }; diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp index 118ee96bf7..5f021dd3d2 100644 --- a/src/modules/finished/FinishedPage.cpp +++ b/src/modules/finished/FinishedPage.cpp @@ -27,10 +27,9 @@ #include -FinishedPage::FinishedPage( QWidget* parent ) +FinishedPage::FinishedPage( Config* config, QWidget* parent ) : QWidget( parent ) , ui( new Ui::FinishedPage ) - , m_mode( Config::RestartMode::UserDefaultUnchecked ) { ui->setupUi( this ); @@ -38,9 +37,44 @@ FinishedPage::FinishedPage( QWidget* parent ) ui->mainText->setWordWrap( true ); ui->mainText->setOpenExternalLinks( true ); - CALAMARES_RETRANSLATE( - const auto* branding = Calamares::Branding::instance(); ui->retranslateUi( this ); - if ( Calamares::Settings::instance()->isSetupMode() ) { + connect( config, &Config::restartModeChanged, [this]( Config::RestartMode mode ) { + using Mode = Config::RestartMode; + + ui->restartCheckBox->setVisible( mode != Mode::Never ); + ui->restartCheckBox->setEnabled( mode != Mode::Always ); + } ); + connect( config, &Config::restartNowWantedChanged, ui->restartCheckBox, &QCheckBox::setChecked ); + connect( ui->restartCheckBox, &QCheckBox::stateChanged, [config]( int state ) { + config->setRestartNowWanted( state != 0 ); + } ); + + CALAMARES_RETRANSLATE_SLOT( &FinishedPage::retranslate ); +} + +void +FinishedPage::focusInEvent( QFocusEvent* e ) +{ + e->accept(); +} + +void +FinishedPage::onInstallationFailed( const QString& message, const QString& details ) +{ + m_failure = !message.isEmpty() ? message : details; + retranslate(); +} + +void +FinishedPage::retranslate() +{ + + const auto* branding = Calamares::Branding::instance(); + + ui->retranslateUi( this ); + if ( !m_failure.has_value() ) + { + if ( Calamares::Settings::instance()->isSetupMode() ) + { ui->mainText->setText( tr( "

All done.


" "%1 has been set up on your computer.
" "You may now start using your new system." ) @@ -50,7 +84,9 @@ FinishedPage::FinishedPage( QWidget* parent ) "restart immediately when you click on " "Done " "or close the setup program.

" ) ); - } else { + } + else + { ui->mainText->setText( tr( "

All done.


" "%1 has been installed on your computer.
" "You may now restart into your new system, or continue " @@ -61,68 +97,27 @@ FinishedPage::FinishedPage( QWidget* parent ) "restart immediately when you click on " "Done " "or close the installer.

" ) ); - } ) -} - - -void -FinishedPage::setRestart( Config::RestartMode mode ) -{ - using Mode = Config::RestartMode; - - m_mode = mode; - - ui->restartCheckBox->setVisible( mode != Mode::Never ); - ui->restartCheckBox->setEnabled( mode != Mode::Always ); - ui->restartCheckBox->setChecked( ( mode == Mode::Always ) || ( mode == Mode::UserDefaultChecked ) ); -} - - -void -FinishedPage::setRestartNowCommand( const QString& command ) -{ - m_restartNowCommand = command; -} - - -void -FinishedPage::setUpRestart() -{ - cDebug() << "FinishedPage::setUpRestart(), Quit button" - << "setup=" << restartModes().find( m_mode ) << "command=" << m_restartNowCommand; + } + } + else + { + const QString message = m_failure.value(); - connect( qApp, &QApplication::aboutToQuit, [this]() { - if ( ui->restartCheckBox->isVisible() && ui->restartCheckBox->isChecked() ) + if ( Calamares::Settings::instance()->isSetupMode() ) { - cDebug() << "Running restart command" << m_restartNowCommand; - QProcess::execute( "/bin/sh", { "-c", m_restartNowCommand } ); + ui->mainText->setText( tr( "

Setup Failed


" + "%1 has not been set up on your computer.
" + "The error message was: %2." ) + .arg( branding->versionedName() ) + .arg( message ) ); } - } ); -} - - -void -FinishedPage::focusInEvent( QFocusEvent* e ) -{ - e->accept(); -} - -void -FinishedPage::onInstallationFailed( const QString& message, const QString& details ) -{ - const auto* branding = Calamares::Branding::instance(); - Q_UNUSED( details ) - if ( Calamares::Settings::instance()->isSetupMode() ) - ui->mainText->setText( tr( "

Setup Failed


" - "%1 has not been set up on your computer.
" - "The error message was: %2." ) - .arg( branding->versionedName() ) - .arg( message ) ); - else - ui->mainText->setText( tr( "

Installation Failed


" - "%1 has not been installed on your computer.
" - "The error message was: %2." ) - .arg( branding->versionedName() ) - .arg( message ) ); - setRestart( Config::RestartMode::Never ); + else + { + ui->mainText->setText( tr( "

Installation Failed


" + "%1 has not been installed on your computer.
" + "The error message was: %2." ) + .arg( branding->versionedName() ) + .arg( message ) ); + } + } } diff --git a/src/modules/finished/FinishedPage.h b/src/modules/finished/FinishedPage.h index 30df5f8c36..4e312ab8b4 100644 --- a/src/modules/finished/FinishedPage.h +++ b/src/modules/finished/FinishedPage.h @@ -16,6 +16,8 @@ #include +#include + namespace Ui { class FinishedPage; @@ -25,24 +27,19 @@ class FinishedPage : public QWidget { Q_OBJECT public: - explicit FinishedPage( QWidget* parent = nullptr ); - - void setRestart( Config::RestartMode mode ); - void setRestartNowCommand( const QString& command ); + explicit FinishedPage( Config* config, QWidget* parent = nullptr ); - void setUpRestart(); public slots: void onInstallationFailed( const QString& message, const QString& details ); + void retranslate(); protected: void focusInEvent( QFocusEvent* e ) override; //choose the child widget to focus private: Ui::FinishedPage* ui; - - Config::RestartMode m_mode; - QString m_restartNowCommand; + std::optional< QString > m_failure; }; #endif // FINISHEDPAGE_H diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index 1469262a09..48e2c47d59 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -28,7 +28,7 @@ FinishedViewStep::FinishedViewStep( QObject* parent ) : Calamares::ViewStep( parent ) , m_config( new Config( this ) ) - , m_widget( new FinishedPage() ) + , m_widget( new FinishedPage( m_config ) ) , m_installFailed( false ) { auto jq = Calamares::JobQueue::instance(); @@ -128,10 +128,29 @@ FinishedViewStep::sendNotification() } +#if 0 +void +FinishedPage::setUpRestart() +{ + cDebug() << "FinishedPage::setUpRestart(), Quit button" + << "setup=" << restartModes().find( m_mode ) << "command=" << m_restartNowCommand; + + connect( qApp, &QApplication::aboutToQuit, [this]() + { + if ( ui->restartCheckBox->isVisible() && ui->restartCheckBox->isChecked() ) + { + cDebug() << "Running restart command" << m_restartNowCommand; + QProcess::execute( "/bin/sh", { "-c", m_restartNowCommand } ); + } + } ); +} +#endif + + void FinishedViewStep::onActivate() { - m_widget->setUpRestart(); + // m_widget->setUpRestart(); if ( m_config->notifyOnFinished() ) { @@ -158,12 +177,6 @@ void FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { m_config->setConfigurationMap( configurationMap ); - m_widget->setRestart( m_config->restartNowMode() ); - - if ( m_config->restartNowMode() != Config::RestartMode::Never ) - { - m_widget->setRestartNowCommand( m_config->restartNowCommand() ); - } } CALAMARES_PLUGIN_FACTORY_DEFINITION( FinishedViewStepFactory, registerPlugin< FinishedViewStep >(); ) From 7d024cf72be5a5a9d336376bcc24a1c33d550c12 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Feb 2021 15:36:44 +0100 Subject: [PATCH 161/318] [finished] Move restart handling to Config --- src/modules/finished/Config.cpp | 12 ++++++++++++ src/modules/finished/Config.h | 10 ++++++++-- src/modules/finished/FinishedViewStep.cpp | 24 ++--------------------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp index a612661a8b..b8f30be05e 100644 --- a/src/modules/finished/Config.cpp +++ b/src/modules/finished/Config.cpp @@ -12,6 +12,8 @@ #include "utils/Logger.h" #include "utils/Variant.h" +#include + const NamedEnumTable< Config::RestartMode >& restartModes() { @@ -75,6 +77,16 @@ Config::setRestartNowWanted( bool w ) } } +void +Config::doRestart() +{ + if ( restartNowMode() != RestartMode::Never && restartNowWanted() ) + { + cDebug() << "Running restart command" << m_restartNowCommand; + QProcess::execute( "/bin/sh", { "-c", m_restartNowCommand } ); + } +} + void Config::setConfigurationMap( const QVariantMap& configurationMap ) diff --git a/src/modules/finished/Config.h b/src/modules/finished/Config.h index 32cc7bf225..718a3fae27 100644 --- a/src/modules/finished/Config.h +++ b/src/modules/finished/Config.h @@ -14,8 +14,6 @@ #include -#include - class Config : public QObject { Q_OBJECT @@ -50,6 +48,14 @@ public slots: void setRestartNowMode( RestartMode m ); void setRestartNowWanted( bool w ); + /** @brief Run the restart command, if desired. + * + * This should generally not be called somewhere during the + * application's execution, but only in response to QApplication::quit() + * or something like that when the user expects the system to restart. + */ + void doRestart(); + signals: void restartModeChanged( RestartMode m ); void restartNowWantedChanged( bool w ); diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index 48e2c47d59..176b27cb4d 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -20,7 +20,7 @@ #include "utils/NamedEnum.h" #include "utils/Variant.h" -#include +#include #include #include #include @@ -128,34 +128,14 @@ FinishedViewStep::sendNotification() } -#if 0 -void -FinishedPage::setUpRestart() -{ - cDebug() << "FinishedPage::setUpRestart(), Quit button" - << "setup=" << restartModes().find( m_mode ) << "command=" << m_restartNowCommand; - - connect( qApp, &QApplication::aboutToQuit, [this]() - { - if ( ui->restartCheckBox->isVisible() && ui->restartCheckBox->isChecked() ) - { - cDebug() << "Running restart command" << m_restartNowCommand; - QProcess::execute( "/bin/sh", { "-c", m_restartNowCommand } ); - } - } ); -} -#endif - - void FinishedViewStep::onActivate() { - // m_widget->setUpRestart(); - if ( m_config->notifyOnFinished() ) { sendNotification(); } + connect( qApp, &QApplication::aboutToQuit, m_config, &Config::doRestart ); } From 76a2791b1229977c9799ef60dba80344439e3266 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Feb 2021 15:42:14 +0100 Subject: [PATCH 162/318] [finished] Clean up includes --- src/modules/finished/FinishedPage.cpp | 10 ++-------- src/modules/finished/FinishedPage.h | 3 +-- src/modules/finished/FinishedViewStep.cpp | 3 ++- src/modules/finished/FinishedViewStep.h | 6 +----- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp index 5f021dd3d2..6c5f9ad16a 100644 --- a/src/modules/finished/FinishedPage.cpp +++ b/src/modules/finished/FinishedPage.cpp @@ -10,21 +10,15 @@ */ #include "FinishedPage.h" + +#include "Config.h" #include "ui_FinishedPage.h" #include "Branding.h" -#include "CalamaresVersion.h" #include "Settings.h" -#include "ViewManager.h" -#include "utils/CalamaresUtilsGui.h" -#include "utils/Logger.h" #include "utils/Retranslator.h" -#include -#include #include -#include -#include FinishedPage::FinishedPage( Config* config, QWidget* parent ) diff --git a/src/modules/finished/FinishedPage.h b/src/modules/finished/FinishedPage.h index 4e312ab8b4..068efbdb56 100644 --- a/src/modules/finished/FinishedPage.h +++ b/src/modules/finished/FinishedPage.h @@ -12,12 +12,11 @@ #define FINISHEDPAGE_H -#include "Config.h" - #include #include +class Config; namespace Ui { class FinishedPage; diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index 176b27cb4d..146a7c215f 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -10,12 +10,13 @@ */ #include "FinishedViewStep.h" + +#include "Config.h" #include "FinishedPage.h" #include "Branding.h" #include "JobQueue.h" #include "Settings.h" - #include "utils/Logger.h" #include "utils/NamedEnum.h" #include "utils/Variant.h" diff --git a/src/modules/finished/FinishedViewStep.h b/src/modules/finished/FinishedViewStep.h index ac54fdd35c..e2ce8ba55f 100644 --- a/src/modules/finished/FinishedViewStep.h +++ b/src/modules/finished/FinishedViewStep.h @@ -11,15 +11,11 @@ #ifndef FINISHEDVIEWSTEP_H #define FINISHEDVIEWSTEP_H -#include "Config.h" - #include "DllMacro.h" #include "utils/PluginFactory.h" #include "viewpages/ViewStep.h" - -#include - +class Config; class FinishedPage; class PLUGINDLLEXPORT FinishedViewStep : public Calamares::ViewStep From ec4b6752d6fc01c8bf522e3e675f0a78a40a976d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Feb 2021 15:54:19 +0100 Subject: [PATCH 163/318] [finished] Move notification to Config --- src/modules/finished/Config.cpp | 37 ++++++++++++++++ src/modules/finished/Config.h | 11 +++++ src/modules/finished/FinishedViewStep.cpp | 52 ++--------------------- src/modules/finished/FinishedViewStep.h | 9 ---- 4 files changed, 51 insertions(+), 58 deletions(-) diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp index b8f30be05e..e382478a30 100644 --- a/src/modules/finished/Config.cpp +++ b/src/modules/finished/Config.cpp @@ -9,10 +9,15 @@ #include "Config.h" +#include "Branding.h" +#include "Settings.h" #include "utils/Logger.h" #include "utils/Variant.h" #include +#include +#include +#include const NamedEnumTable< Config::RestartMode >& restartModes() @@ -88,6 +93,38 @@ Config::doRestart() } +void +Config::doNotify() +{ + QDBusInterface notify( + "org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications" ); + if ( notify.isValid() ) + { + const auto* branding = Calamares::Branding::instance(); + QDBusReply< uint > r = notify.call( + "Notify", + QString( "Calamares" ), + QVariant( 0U ), + QString( "calamares" ), + Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Complete" ) : tr( "Installation Complete" ), + Calamares::Settings::instance()->isSetupMode() + ? tr( "The setup of %1 is complete." ).arg( branding->versionedName() ) + : tr( "The installation of %1 is complete." ).arg( branding->versionedName() ), + QStringList(), + QVariantMap(), + QVariant( 0 ) ); + if ( !r.isValid() ) + { + cWarning() << "Could not call org.freedesktop.Notifications.Notify at end of installation." << r.error(); + } + } + else + { + cWarning() << "Could not get dbus interface for notifications at end of installation." << notify.lastError(); + } +} + + void Config::setConfigurationMap( const QVariantMap& configurationMap ) { diff --git a/src/modules/finished/Config.h b/src/modules/finished/Config.h index 718a3fae27..d5335df83c 100644 --- a/src/modules/finished/Config.h +++ b/src/modules/finished/Config.h @@ -56,6 +56,17 @@ public slots: */ void doRestart(); + /** @brief Send DBus notification, if desired. + * + * This takes notifyOnFinished() into account. + * + * At the end of installation (when the FinishedViewStep is activated), + * send a desktop notification via DBus that the install is done. + * If the installation failed, don't call this method because + * the notification is a positive one. + */ + void doNotify(); + signals: void restartModeChanged( RestartMode m ); void restartNowWantedChanged( bool w ); diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index 146a7c215f..70eb4127a9 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -14,17 +14,9 @@ #include "Config.h" #include "FinishedPage.h" -#include "Branding.h" #include "JobQueue.h" -#include "Settings.h" -#include "utils/Logger.h" -#include "utils/NamedEnum.h" -#include "utils/Variant.h" #include -#include -#include -#include FinishedViewStep::FinishedViewStep( QObject* parent ) : Calamares::ViewStep( parent ) @@ -90,53 +82,15 @@ FinishedViewStep::isAtEnd() const return true; } -void -FinishedViewStep::sendNotification() -{ - // If the installation failed, don't send notification popup; - // there's a (modal) dialog popped up with the failure notice. - if ( m_installFailed ) - { - return; - } - - QDBusInterface notify( - "org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications" ); - if ( notify.isValid() ) - { - const auto* branding = Calamares::Branding::instance(); - QDBusReply< uint > r = notify.call( - "Notify", - QString( "Calamares" ), - QVariant( 0U ), - QString( "calamares" ), - Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Complete" ) : tr( "Installation Complete" ), - Calamares::Settings::instance()->isSetupMode() - ? tr( "The setup of %1 is complete." ).arg( branding->versionedName() ) - : tr( "The installation of %1 is complete." ).arg( branding->versionedName() ), - QStringList(), - QVariantMap(), - QVariant( 0 ) ); - if ( !r.isValid() ) - { - cWarning() << "Could not call org.freedesktop.Notifications.Notify at end of installation." << r.error(); - } - } - else - { - cWarning() << "Could not get dbus interface for notifications at end of installation." << notify.lastError(); - } -} - void FinishedViewStep::onActivate() { - if ( m_config->notifyOnFinished() ) + if ( !m_installFailed ) { - sendNotification(); + m_config->doNotify(); + connect( qApp, &QApplication::aboutToQuit, m_config, &Config::doRestart ); } - connect( qApp, &QApplication::aboutToQuit, m_config, &Config::doRestart ); } diff --git a/src/modules/finished/FinishedViewStep.h b/src/modules/finished/FinishedViewStep.h index e2ce8ba55f..a35d7fac81 100644 --- a/src/modules/finished/FinishedViewStep.h +++ b/src/modules/finished/FinishedViewStep.h @@ -46,15 +46,6 @@ public slots: void onInstallationFailed( const QString& message, const QString& details ); private: - /** - * @brief Send notification at the end via DBus - * - * At the end of installation (when this step is activated), - * send a desktop notification via DBus that the install is done. - * If the installation failed, no notification is sent. - */ - void sendNotification(); - Config* m_config; FinishedPage* m_widget; bool m_installFailed; // Track if onInstallationFailed() was called From 5af614daf7a9d06a0576cb0ff8b68a92039b67ba Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Feb 2021 15:59:40 +0100 Subject: [PATCH 164/318] [finished] Allow positive and negative notifications at end. --- src/modules/finished/Config.cpp | 42 +++++++++++++++++++++++---------- src/modules/finished/Config.h | 4 +--- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp index e382478a30..a749b0176f 100644 --- a/src/modules/finished/Config.cpp +++ b/src/modules/finished/Config.cpp @@ -94,25 +94,41 @@ Config::doRestart() void -Config::doNotify() +Config::doNotify( bool hasFailed ) { QDBusInterface notify( "org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications" ); if ( notify.isValid() ) { + cDebug() << "Sending notification of completion. Failed?" << hasFailed; + + QString title; + QString message; + if ( hasFailed ) + { + title = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Failed" ) : tr( "Installation Failed" ); + message = Calamares::Settings::instance()->isSetupMode() + ? tr( "The setup of %1 did not complete successfully." ) + : tr( "The installation of %1 did not complete successfully." ); + } + else + { + title = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Complete" ) + : tr( "Installation Complete" ); + message = Calamares::Settings::instance()->isSetupMode() ? tr( "The setup of %1 is complete." ) + : tr( "The installation of %1 is complete." ); + } + const auto* branding = Calamares::Branding::instance(); - QDBusReply< uint > r = notify.call( - "Notify", - QString( "Calamares" ), - QVariant( 0U ), - QString( "calamares" ), - Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Complete" ) : tr( "Installation Complete" ), - Calamares::Settings::instance()->isSetupMode() - ? tr( "The setup of %1 is complete." ).arg( branding->versionedName() ) - : tr( "The installation of %1 is complete." ).arg( branding->versionedName() ), - QStringList(), - QVariantMap(), - QVariant( 0 ) ); + QDBusReply< uint > r = notify.call( "Notify", + QString( "Calamares" ), + QVariant( 0U ), + QString( "calamares" ), + title, + message.arg( branding->versionedName() ), + QStringList(), + QVariantMap(), + QVariant( 0 ) ); if ( !r.isValid() ) { cWarning() << "Could not call org.freedesktop.Notifications.Notify at end of installation." << r.error(); diff --git a/src/modules/finished/Config.h b/src/modules/finished/Config.h index d5335df83c..78078b99bf 100644 --- a/src/modules/finished/Config.h +++ b/src/modules/finished/Config.h @@ -62,10 +62,8 @@ public slots: * * At the end of installation (when the FinishedViewStep is activated), * send a desktop notification via DBus that the install is done. - * If the installation failed, don't call this method because - * the notification is a positive one. */ - void doNotify(); + void doNotify( bool hasFailed = false ); signals: void restartModeChanged( RestartMode m ); From a4682db9872e14c953c1de3a1084a7baea816890 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Feb 2021 16:05:48 +0100 Subject: [PATCH 165/318] [finished] Tidy up notification-at-end (and allow failed notifications) --- src/modules/finished/Config.cpp | 5 +++++ src/modules/finished/FinishedViewStep.cpp | 12 ++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp index a749b0176f..5119da942a 100644 --- a/src/modules/finished/Config.cpp +++ b/src/modules/finished/Config.cpp @@ -96,6 +96,11 @@ Config::doRestart() void Config::doNotify( bool hasFailed ) { + if ( !notifyOnFinished() ) + { + return; + } + QDBusInterface notify( "org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications" ); if ( notify.isValid() ) diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index 70eb4127a9..3f9fd3aabe 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -25,7 +25,6 @@ FinishedViewStep::FinishedViewStep( QObject* parent ) , m_installFailed( false ) { auto jq = Calamares::JobQueue::instance(); - connect( jq, &Calamares::JobQueue::failed, m_widget, &FinishedPage::onInstallationFailed ); connect( jq, &Calamares::JobQueue::failed, this, &FinishedViewStep::onInstallationFailed ); emit nextStatusChanged( true ); @@ -86,11 +85,8 @@ FinishedViewStep::isAtEnd() const void FinishedViewStep::onActivate() { - if ( !m_installFailed ) - { - m_config->doNotify(); - connect( qApp, &QApplication::aboutToQuit, m_config, &Config::doRestart ); - } + m_config->doNotify( m_installFailed ); + connect( qApp, &QApplication::aboutToQuit, m_config, &Config::doRestart ); } @@ -103,9 +99,9 @@ FinishedViewStep::jobs() const void FinishedViewStep::onInstallationFailed( const QString& message, const QString& details ) { - Q_UNUSED( message ) - Q_UNUSED( details ) m_installFailed = true; + m_config->setRestartNowMode( Config::RestartMode::Never ); + m_widget->onInstallationFailed( message, details ); } void From b30bb7ae0bfc48deeda50cd437de3f526ad9fe4c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Feb 2021 16:33:38 +0100 Subject: [PATCH 166/318] CI: note Linuxisms in the script --- ci/RELEASE.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/RELEASE.sh b/ci/RELEASE.sh index 6f1b198c91..706d4c2ea7 100755 --- a/ci/RELEASE.sh +++ b/ci/RELEASE.sh @@ -7,6 +7,8 @@ # # Release script for Calamares # +# NOTE: this script contains Linuxisms (in particular, expects GNU mktemp(1)) +# # This attempts to perform the different steps of the RELEASE.md # document automatically. It's not tested on other machines or # setups other than [ade]'s development VM. From 108e227eec518fc790003766ab5dc21a95306126 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Feb 2021 16:33:47 +0100 Subject: [PATCH 167/318] Changes: pre-release housekeeping --- CHANGES | 28 ++++++++++++++++++++++++---- CMakeLists.txt | 2 +- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index aa5dba2062..471236b5fe 100644 --- a/CHANGES +++ b/CHANGES @@ -7,16 +7,36 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. -# 3.2.37 (unreleased) # +# 3.2.37 (2021-02-23) # This release contains contributions from (alphabetically by first name): - - No external contributors yet + - benne-dee ## Core ## - - No core changes yet + - Calamares has a table of 'best guess' languages for each country + and when GeoIP is enabled, it will automatically select that + country's language as default -- the user can of course pick + a different one. The 'best guess' is based on Unicode / ISO + data, which is sometimes dubious. Based on some personal notes, + the 'best guess' language for Belarus has been changed to Russian. + - Calamares has a table of 'best guess' keyboard mappings, + allowing native language input. However, usernames and + passwords should be in US-ASCII (this is a limitation of + the login system -- **some** parts of the system will support + non-ASCII input, but it's better safe than sorry). + Add Greek to the list of languages that needs US-ASCII + in addition to native input. + - The CI infrastructure now builds Calamares and Calamares-extensions + on a nightly basis. ## Modules ## - - No module changes yet + - The *netinstall* module has a YAML schema, allowing packagers + to validate and verify their netinstall configurations before + shipping an ISO (or writing bug reports). Thanks benne-dee. + - The *finished* module has been heavily refactored, opening + the way to a QML-based version of the same module. This is + also preparatory work for allowing packagers (e.g. PostmarketOS) + to customize the messages on the finished page. # 3.2.36 (2021-02-03) # diff --git a/CMakeLists.txt b/CMakeLists.txt index 108549a8a3..bcd14adb22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ project( CALAMARES LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development ### OPTIONS # From f9a8a9f58817c1ee351cfde3657613552c917fc9 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 23 Feb 2021 16:36:31 +0100 Subject: [PATCH 168/318] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_he.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index 97683a19a3..57d654e05d 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -145,7 +145,7 @@ Done - בוצע + סיום @@ -2504,7 +2504,7 @@ The installer will quit and all changes will be lost. Free Space - זכרון פנוי + שטח פנוי @@ -2931,7 +2931,7 @@ Output: Unpartitioned space or unknown partition table - הזכרון לא מחולק למחיצות או שטבלת המחיצות אינה מוכרת + השטח לא מחולק למחיצות או שטבלת המחיצות אינה מוכרת @@ -2991,7 +2991,7 @@ Output: %1 cannot be installed on empty space. Please select an existing partition. - לא ניתן להתקין את %1 על זכרון ריק. אנא בחר מחיצה קיימת. + לא ניתן להתקין את %1 על שטח ריק. נא לבחור מחיצה קיימת. From 46ab3ac27793be82574b27599ee72709b985a614 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 23 Feb 2021 16:36:31 +0100 Subject: [PATCH 169/318] i18n: [python] Automatic merge of Transifex translations --- lang/python/he/LC_MESSAGES/python.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po index 459e858b32..6f6200ac76 100644 --- a/lang/python/he/LC_MESSAGES/python.po +++ b/lang/python/he/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # Eli Shleifer , 2017 -# Omeritzics Games , 2020 +# Omer I.S. , 2020 # Yaron Shahrabani , 2020 # #, fuzzy From 0f87a4a91aa708870340f8af8d690e0490ab9434 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Feb 2021 21:32:59 +0100 Subject: [PATCH 170/318] Changes: post-release housekeeping --- CHANGES | 12 ++++++++++++ CMakeLists.txt | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 471236b5fe..e6e8de2230 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,18 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. +# 3.2.38 (unreleased) # + +This release contains contributions from (alphabetically by first name): + - No external contributors yet + +## Core ## + - No core changes yet + +## Modules ## + - No module changes yet + + # 3.2.37 (2021-02-23) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index bcd14adb22..8f28b11c23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,11 +41,11 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.37 + VERSION 3.2.38 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development ### OPTIONS # From 7acc8bcec3c5ddd1b0a17cf65be44bb885c93976 Mon Sep 17 00:00:00 2001 From: demmm Date: Sat, 27 Feb 2021 22:04:30 +0100 Subject: [PATCH 171/318] [finishedq] adding QML finished module module builds & runs, config connections are not registering no errors finishedq.qml is offering a different option though, running commands directly in qml plasma-framework executer is used for that --- src/modules/finishedq/CMakeLists.txt | 34 ++++++ src/modules/finishedq/FinishedQmlViewStep.cpp | 100 +++++++++++++++++ src/modules/finishedq/FinishedQmlViewStep.h | 60 ++++++++++ src/modules/finishedq/finishedq.conf | 34 ++++++ src/modules/finishedq/finishedq.qml | 106 ++++++++++++++++++ src/modules/finishedq/finishedq.qrc | 6 + src/modules/finishedq/seedling.svg | 1 + 7 files changed, 341 insertions(+) create mode 100644 src/modules/finishedq/CMakeLists.txt create mode 100644 src/modules/finishedq/FinishedQmlViewStep.cpp create mode 100644 src/modules/finishedq/FinishedQmlViewStep.h create mode 100644 src/modules/finishedq/finishedq.conf create mode 100644 src/modules/finishedq/finishedq.qml create mode 100644 src/modules/finishedq/finishedq.qrc create mode 100644 src/modules/finishedq/seedling.svg diff --git a/src/modules/finishedq/CMakeLists.txt b/src/modules/finishedq/CMakeLists.txt new file mode 100644 index 0000000000..e1db7c7671 --- /dev/null +++ b/src/modules/finishedq/CMakeLists.txt @@ -0,0 +1,34 @@ +# === This file is part of Calamares - === +# +# SPDX-FileCopyrightText: 2021 Anke Boersma +# SPDX-License-Identifier: BSD-2-Clause +# +if( NOT WITH_QML ) + calamares_skip_module( "finishedq (QML is not supported in this build)" ) + return() +endif() + +find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network ) + +find_package( KF5Plasma CONFIG) +set_package_properties(KF5Plasma PROPERTIES + DESCRIPTION "Used for running commands in QML" + TYPE RUNTIME +) + +set( _finished ${CMAKE_CURRENT_SOURCE_DIR}/../finished ) +include_directories( ${_finished} ) + +calamares_add_plugin( finishedq + TYPE viewmodule + EXPORT_MACRO PLUGINDLLEXPORT_PRO + SOURCES + FinishedQmlViewStep.cpp + ${_finished}/Config.cpp + RESOURCES + finishedq.qrc + LINK_PRIVATE_LIBRARIES + calamaresui + Qt5::DBus + SHARED_LIB +) diff --git a/src/modules/finishedq/FinishedQmlViewStep.cpp b/src/modules/finishedq/FinishedQmlViewStep.cpp new file mode 100644 index 0000000000..81a8004ca1 --- /dev/null +++ b/src/modules/finishedq/FinishedQmlViewStep.cpp @@ -0,0 +1,100 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017 2019, Adriaan de Groot + * SPDX-FileCopyrightText: 2019 Collabora Ltd + * SPDX-FileCopyrightText: 2021 Anke Boersma + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "FinishedQmlViewStep.h" + +#include "Config.h" + +#include "JobQueue.h" +#include + +CALAMARES_PLUGIN_FACTORY_DEFINITION( FinishedQmlViewStepFactory, registerPlugin< FinishedQmlViewStep >(); ) + +FinishedQmlViewStep::FinishedQmlViewStep( QObject* parent ) + : Calamares::QmlViewStep( parent ) + , m_config( new Config( this ) ) + , m_installFailed( false ) +{ + auto jq = Calamares::JobQueue::instance(); + connect( jq, &Calamares::JobQueue::failed, this, &FinishedQmlViewStep::onInstallationFailed ); + + emit nextStatusChanged( true ); +} + +QString +FinishedQmlViewStep::prettyName() const +{ + return tr( "Finish" ); +} + +bool +FinishedQmlViewStep::isNextEnabled() const +{ + return false; +} + + +bool +FinishedQmlViewStep::isBackEnabled() const +{ + return false; +} + + +bool +FinishedQmlViewStep::isAtBeginning() const +{ + return true; +} + + +bool +FinishedQmlViewStep::isAtEnd() const +{ + return true; +} + + +void +FinishedQmlViewStep::onActivate() +{ + m_config->doNotify( m_installFailed ); + //connect( qApp, &QApplication::aboutToQuit, m_config, &Config::doRestart ); + QmlViewStep::onActivate(); +} + + +Calamares::JobList +FinishedQmlViewStep::jobs() const +{ + return Calamares::JobList(); +} + +QObject* +FinishedQmlViewStep::getConfig() +{ + return m_config; +} + +void +FinishedQmlViewStep::onInstallationFailed( const QString& message, const QString& details ) +{ + m_installFailed = true; + m_config->setRestartNowMode( Config::RestartMode::Never ); +} + +void +FinishedQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) +{ + m_config->setConfigurationMap( configurationMap ); + Calamares::QmlViewStep::setConfigurationMap( configurationMap ); +} diff --git a/src/modules/finishedq/FinishedQmlViewStep.h b/src/modules/finishedq/FinishedQmlViewStep.h new file mode 100644 index 0000000000..e8eb58215d --- /dev/null +++ b/src/modules/finishedq/FinishedQmlViewStep.h @@ -0,0 +1,60 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2019 Adriaan de Groot + * SPDX-FileCopyrightText: 2021 Anke Boersma + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef FINISHEDQMLVIEWSTEP_H +#define FINISHEDQMLVIEWSTEP_H + +#include + +#include "Config.h" + +#include "DllMacro.h" +#include "utils/PluginFactory.h" +#include "viewpages/QmlViewStep.h" + +#include + +class Config; + +class PLUGINDLLEXPORT FinishedQmlViewStep : public Calamares::QmlViewStep +{ + Q_OBJECT + +public: + explicit FinishedQmlViewStep( QObject* parent = nullptr ); + + QString prettyName() const override; + + bool isNextEnabled() const override; + bool isBackEnabled() const override; + + bool isAtBeginning() const override; + bool isAtEnd() const override; + + void onActivate() override; + + Calamares::JobList jobs() const override; + + void setConfigurationMap( const QVariantMap& configurationMap ) override; + QObject* getConfig() override; + +public slots: + void onInstallationFailed( const QString& message, const QString& details ); + +private: + Config* m_config; + + bool m_installFailed; // Track if onInstallationFailed() was called +}; + +CALAMARES_PLUGIN_FACTORY_DECLARATION( FinishedQmlViewStepFactory ) + +#endif diff --git a/src/modules/finishedq/finishedq.conf b/src/modules/finishedq/finishedq.conf new file mode 100644 index 0000000000..9cd42b016a --- /dev/null +++ b/src/modules/finishedq/finishedq.conf @@ -0,0 +1,34 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Configuration for the "finishedq" page, which is usually shown only at +# the end of the installation (successful or not). +--- +# Behavior of the "restart system now" button. +# +# There are four usable values: +# - never +# Does not show the button and does not restart. +# This matches the old behavior with restartNowEnabled=false. +# - user-unchecked +# Shows the button, defaults to unchecked, restarts if it is checked. +# This matches the old behavior with restartNowEnabled=true and restartNowChecked=false. +# - user-checked +# Shows the button, defaults to checked, restarts if it is checked. +# This matches the old behavior with restartNowEnabled=true and restartNowChecked=true. +# - always +# Shows the button, checked, but the user cannot change it. +# This is new behavior. +# +# The three combinations of legacy values are still supported. +restartNowMode: user-unchecked + +# If the checkbox is shown, and the checkbox is checked, then when +# Calamares exits from the finished-page it will run this command. +# If not set, falls back to "shutdown -r now". +restartNowCommand: "systemctl -i reboot" + +# When the last page is (successfully) reached, send a DBus notification +# to the desktop that the installation is done. This works only if the +# user as whom Calamares is run, can reach the regular desktop session bus. +notifyOnFinished: false diff --git a/src/modules/finishedq/finishedq.qml b/src/modules/finishedq/finishedq.qml new file mode 100644 index 0000000000..215626a1c1 --- /dev/null +++ b/src/modules/finishedq/finishedq.qml @@ -0,0 +1,106 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Anke Boersma + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +import io.calamares.core 1.0 +import io.calamares.ui 1.0 + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.3 +import org.kde.kirigami 2.7 as Kirigami +import QtGraphicalEffects 1.0 +import QtQuick.Window 2.3 + +import org.kde.plasma.core 2.0 as PlasmaCore + +Page { + + id: finished + + width: parent.width + height: parent.height + + header: Kirigami.Heading { + width: parent.width + height: 100 + id: header + Layout.fillWidth: true + horizontalAlignment: Qt.AlignHCenter + color: Kirigami.Theme.textColor + level: 1 + text: qsTr("Installation Completed") + + Text { + anchors.top: header.bottom + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: Text.AlignHCenter + font.pointSize: 12 + text: qsTr("%1 has been installed on your computer.
+ You may now restart into your new system, or continue using the Live environment.").arg(Branding.string(Branding.ProductName)) + } + + Image { + source: "seedling.svg" + anchors.top: header.bottom + anchors.topMargin: 80 + anchors.horizontalCenter: parent.horizontalCenter + width: 64 + height: 64 + mipmap: true + } + } + + RowLayout { + Layout.alignment: Qt.AlignRight|Qt.AlignVCenter + anchors.centerIn: parent + spacing: 6 + + PlasmaCore.DataSource { + id: executer + engine: "executable" + onNewData: {executer.disconnectSource(sourceName);} + } + + Button { + id: button + text: qsTr("Close Installer") + icon.name: "application-exit" + onClicked: { ViewManager.quit(); } + //onClicked: console.log("close calamares"); + } + + Button { + text: qsTr("Restart System") + icon.name: "system-reboot" + //onClicked: { config.doRestart(); } + onClicked: { + executer.connectSource("systemctl -i reboot"); + } + } + } + + Item { + + Layout.fillHeight: true + Layout.fillWidth: true + anchors.bottom: parent.bottom + anchors.bottomMargin : 100 + anchors.horizontalCenter: parent.horizontalCenter + + Text { + anchors.centerIn: parent + anchors.top: parent.top + horizontalAlignment: Text.AlignHCenter + text: qsTr("

A full log of the install is available as installation.log in the home directory of the Live user.
+ This log is copied to /var/log/installation.log of the target system.

") + } + } + +} diff --git a/src/modules/finishedq/finishedq.qrc b/src/modules/finishedq/finishedq.qrc new file mode 100644 index 0000000000..e0918eb7f3 --- /dev/null +++ b/src/modules/finishedq/finishedq.qrc @@ -0,0 +1,6 @@ + + + finishedq.qml + seedling.svg + + diff --git a/src/modules/finishedq/seedling.svg b/src/modules/finishedq/seedling.svg new file mode 100644 index 0000000000..8f3501b170 --- /dev/null +++ b/src/modules/finishedq/seedling.svg @@ -0,0 +1 @@ + From 3d58127234d1b6ac20fa3aa82fbc848dd475e42b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Mar 2021 16:37:17 +0100 Subject: [PATCH 172/318] CI: enable CPack --- CMakeLists.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f28b11c23..e5e5597141 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -686,3 +686,16 @@ feature_summary( DESCRIPTION "The following REQUIRED packages were not found:" QUIET_ON_EMPTY ) + +### PACKAGING +# +# Note: most distro's will do distro-specific packaging rather than +# using CPack, and this duplicates information in the AppStream, too. +# TODO:3.3 With newer CMake, move HOMEPAGE_URL to the project()call +set(CPACK_PACKAGE_VENDOR calamares) +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A Linux system installer") +set(CPACK_PACKAGE_DESCRIPTION "Calamares is a Linux system installer, intended for Linux distributions to use on their ISOs and other bootable media to install the distribution to the end-user's computer. Calamares can also be used as an OEM configuration tool. It is modular, extensible and highly-configurable for Linux distributions from all five major Linux families.") +set(CPACK_PACKAGE_HOMEPAGE_URL "https://calamares.io") +set(CPACK_PACKAGE_ICON "data/images/squid.png") + +include(CPack) From 1496173b2c1aceaadf7ec4af63ea5b611b7d37fd Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Mar 2021 16:47:47 +0100 Subject: [PATCH 173/318] CI: Add -Og for debug builds, for better ABI checking --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5e5597141..758ae3332c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,7 +194,7 @@ include( CMakeColors ) set( CMAKE_CXX_STANDARD 17 ) set( CMAKE_CXX_STANDARD_REQUIRED ON ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror=return-type" ) -set( CMAKE_CXX_FLAGS_DEBUG "-g ${CMAKE_CXX_FLAGS_DEBUG}" ) +set( CMAKE_CXX_FLAGS_DEBUG "-Og -g ${CMAKE_CXX_FLAGS_DEBUG}" ) set( CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG" ) set( CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" ) set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" ) @@ -202,7 +202,7 @@ set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" ) set( CMAKE_C_STANDARD 99 ) set( CMAKE_C_STANDARD_REQUIRED ON ) set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" ) -set( CMAKE_C_FLAGS_DEBUG "-g" ) +set( CMAKE_C_FLAGS_DEBUG "-Og -g" ) set( CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG" ) set( CMAKE_C_FLAGS_RELEASE "-O4 -DNDEBUG" ) set( CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g" ) @@ -230,6 +230,10 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) string( APPEND CMAKE_CXX_FLAGS " ${CLANG_WARNINGS}" ) endforeach() + # The dwarf-debugging flags are slightly different, too + string( APPEND CMAKE_CXX_FLAGS_DEBUG " -gdwarf" ) + string( APPEND CMAKE_C_FLAGS_DEBUG " -gdwarf" ) + # Third-party code where we don't care so much about compiler warnings # (because it's uncomfortable to patch) get different flags; use # mark_thirdparty_code( [...] ) From c3860849c1da82918635dee147e76d2c8bc28d20 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 3 Mar 2021 15:43:11 +0100 Subject: [PATCH 174/318] [libcalamaresui] Notify step number when modules are all loaded - using the QML sidebar would not highlight the first step on startup, only after next / prev would the highlight show up. Now, notify when all the modules are loaded (and number 0 is active). --- src/libcalamaresui/ViewManager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index b229607ef4..9a3a1d0203 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -252,6 +252,8 @@ ViewManager::onInitComplete() { m_steps.first()->onActivate(); } + + emit currentStepChanged(); } void From 849da3f322fecd8a7d5c36e7877988240968a008 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 3 Mar 2021 15:54:11 +0100 Subject: [PATCH 175/318] [libcalamaresui] The ViewManager is a UI component for QML, not core --- src/libcalamaresui/utils/Qml.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcalamaresui/utils/Qml.cpp b/src/libcalamaresui/utils/Qml.cpp index 2cb13c8038..534b2d3f5d 100644 --- a/src/libcalamaresui/utils/Qml.cpp +++ b/src/libcalamaresui/utils/Qml.cpp @@ -227,7 +227,7 @@ registerQmlModels() return Calamares::Branding::instance(); } ); qmlRegisterSingletonType< Calamares::ViewManager >( - "io.calamares.core", 1, 0, "ViewManager", []( QQmlEngine*, QJSEngine* ) -> QObject* { + "io.calamares.ui", 1, 0, "ViewManager", []( QQmlEngine*, QJSEngine* ) -> QObject* { return Calamares::ViewManager::instance(); } ); qmlRegisterSingletonType< Calamares::GlobalStorage >( From 6a1e46d7f694e2773b5364cf1945c7d3033286c6 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 3 Mar 2021 16:06:53 +0100 Subject: [PATCH 176/318] [libcalamaresui] Add properties to ViewManager to expose Settings --- src/libcalamaresui/ViewManager.cpp | 21 +++++++++++++++++++++ src/libcalamaresui/ViewManager.h | 12 ++++++++++++ 2 files changed, 33 insertions(+) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 9a3a1d0203..4e53fb90b8 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -608,4 +608,25 @@ ViewManager::rowCount( const QModelIndex& parent ) const return m_steps.length(); } +bool +ViewManager::isChrootMode() const +{ + const auto* s = Settings::instance(); + return s ? s->doChroot() : true; +} + +bool +ViewManager::isDebugMode() const +{ + const auto* s = Settings::instance(); + return s ? s->debugMode() : false; +} + +bool +ViewManager::isSetupMode() const +{ + const auto* s = Settings::instance(); + return s ? s->isSetupMode() : false; +} + } // namespace Calamares diff --git a/src/libcalamaresui/ViewManager.h b/src/libcalamaresui/ViewManager.h index 4fbcda39df..9a77cbb5a9 100644 --- a/src/libcalamaresui/ViewManager.h +++ b/src/libcalamaresui/ViewManager.h @@ -50,6 +50,11 @@ class UIDLLEXPORT ViewManager : public QAbstractListModel ///@brief Sides on which the ViewManager has side-panels Q_PROPERTY( Qt::Orientations panelSides READ panelSides WRITE setPanelSides MEMBER m_panelSides ) + // Global properties, where ViewManager proxies to Settings + Q_PROPERTY( bool isDebugMode READ isDebugMode CONSTANT FINAL ) + Q_PROPERTY( bool isChrootMode READ isChrootMode CONSTANT FINAL ) + Q_PROPERTY( bool isSetupMode READ isSetupMode CONSTANT FINAL ) + public: /** * @brief instance access to the ViewManager singleton. @@ -197,6 +202,13 @@ public Q_SLOTS: /// @brief Connected to ViewStep::nextStatusChanged for all steps void updateNextStatus( bool enabled ); + /// @brief Proxy to Settings::debugMode() default @c false + bool isDebugMode() const; + /// @brief Proxy to Settings::doChroot() default @c true + bool isChrootMode() const; + /// @brief Proxy to Settings::isSetupMode() default @c false + bool isSetupMode() const; + signals: void currentStepChanged(); void ensureSize( QSize size ) const; // See ViewStep::ensureSize() From 473576991d4716241b407a65328a59ac9845114d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 5 Mar 2021 12:28:19 +0100 Subject: [PATCH 177/318] Changes: document contributors this round --- CHANGES | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index e6e8de2230..07c5c8b9c9 100644 --- a/CHANGES +++ b/CHANGES @@ -10,13 +10,18 @@ website will have to do for older versions. # 3.2.38 (unreleased) # This release contains contributions from (alphabetically by first name): - - No external contributors yet + - Anke Boersma + - Anubhav Choudhary ## Core ## - - No core changes yet + - Uploading your log files (in case of installation failure) has been + expanded and is now more + configurable. Users should still take care when uploading logs, + and distro's should configure a URL with no public viewing + for the uploading of those logs. (Thanks Anubhav) ## Modules ## - - No module changes yet + - A new QML-based *finishedq* module has been added. (Thanks Anke) # 3.2.37 (2021-02-23) # From ab7f6abf026d5480fbf699846c8428767b6430d7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 5 Mar 2021 13:20:47 +0100 Subject: [PATCH 178/318] [calamares] Decouple debug-window button - Provide slots and signals for managing the debug-window, so it can be used from QML as well. --- src/calamares/CalamaresWindow.cpp | 43 ++++++++++++++++++------------- src/calamares/CalamaresWindow.h | 13 +++++++++- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index 0d425d9299..08a75094e3 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -103,24 +103,8 @@ CalamaresWindow::getWidgetSidebar( QWidget* parent, int desiredWidth ) sideLayout->addWidget( debugWindowBtn ); debugWindowBtn->setFlat( true ); debugWindowBtn->setCheckable( true ); - connect( debugWindowBtn, &QPushButton::clicked, this, [=]( bool checked ) { - if ( checked ) - { - m_debugWindow = new Calamares::DebugWindow(); - m_debugWindow->show(); - connect( m_debugWindow.data(), &Calamares::DebugWindow::closed, this, [=]() { - m_debugWindow->deleteLater(); - debugWindowBtn->setChecked( false ); - } ); - } - else - { - if ( m_debugWindow ) - { - m_debugWindow->deleteLater(); - } - } - } ); + connect( debugWindowBtn, &QPushButton::clicked, this, &CalamaresWindow::showDebugWindow ); + connect( this, &CalamaresWindow::debugWindowShown, debugWindowBtn, &QPushButton::setChecked ); } CalamaresUtils::unmarginLayout( sideLayout ); @@ -430,6 +414,29 @@ CalamaresWindow::ensureSize( QSize size ) resize( w, h ); } +void +CalamaresWindow::showDebugWindow( bool show ) +{ + if ( show ) + { + m_debugWindow = new Calamares::DebugWindow(); + m_debugWindow->show(); + connect( m_debugWindow.data(), &Calamares::DebugWindow::closed, this, [=]() { + m_debugWindow->deleteLater(); + emit debugWindowShown( false ); + } ); + emit debugWindowShown( true ); + } + else + { + if ( m_debugWindow ) + { + m_debugWindow->deleteLater(); + } + emit debugWindowShown( false ); + } +} + void CalamaresWindow::closeEvent( QCloseEvent* event ) { diff --git a/src/calamares/CalamaresWindow.h b/src/calamares/CalamaresWindow.h index 009425aaee..4c7972f267 100644 --- a/src/calamares/CalamaresWindow.h +++ b/src/calamares/CalamaresWindow.h @@ -30,7 +30,7 @@ class CalamaresWindow : public QWidget CalamaresWindow( QWidget* parent = nullptr ); ~CalamaresWindow() override {} -public slots: +public Q_SLOTS: /** * This asks the main window to grow to accomodate @p size pixels, to accomodate * larger-than-expected window contents. The enlargement may be silently @@ -38,6 +38,17 @@ public slots: */ void ensureSize( QSize size ); + /** @brief Set visibility of debug window + * + * Shows or hides the debug window, depending on @p show. + * If Calamares is not in debug mode, nothing happens and the debug + * window remains hidden. + */ + void showDebugWindow( bool show ); + +Q_SIGNALS: + void debugWindowShown( bool show ); + protected: virtual void closeEvent( QCloseEvent* e ) override; From a8463a8763881b2903cf074c0d726c1f0546b24f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 5 Mar 2021 13:30:35 +0100 Subject: [PATCH 179/318] [calamares] Prefer to expand main panel - Don't let the navigation items grow if they are QML (the Widget ones don't either) so the main panel takes most of the space. --- src/calamares/CalamaresWindow.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index 08a75094e3..4c65989c38 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -184,10 +184,11 @@ CalamaresWindow::getWidgetNavigation( QWidget* parent ) #ifdef WITH_QML QWidget* -CalamaresWindow::getQmlSidebar( QWidget* parent, int ) +CalamaresWindow::getQmlSidebar( QWidget* parent, int desiredWidth ) { CalamaresUtils::registerQmlModels(); QQuickWidget* w = new QQuickWidget( parent ); + w->setFixedWidth( desiredWidth ); w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); w->setResizeMode( QQuickWidget::SizeRootObjectToView ); w->setSource( QUrl( @@ -200,7 +201,7 @@ CalamaresWindow::getQmlNavigation( QWidget* parent ) { CalamaresUtils::registerQmlModels(); QQuickWidget* w = new QQuickWidget( parent ); - w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); + w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::MinimumExpanding ); w->setResizeMode( QQuickWidget::SizeRootObjectToView ); w->setSource( QUrl( CalamaresUtils::searchQmlFile( CalamaresUtils::QmlSearch::Both, QStringLiteral( "calamares-navigation" ) ) ) ); @@ -208,8 +209,11 @@ CalamaresWindow::getQmlNavigation( QWidget* parent ) // If the QML itself sets a height, use that, otherwise go to 48 pixels // which seems to match what the widget navigation would use for height // (with *my* specific screen, style, etc. so YMMV). + // + // Bound between (16, 64) with a default of 48. qreal minimumHeight = qBound( qreal( 16 ), w->rootObject() ? w->rootObject()->height() : 48, qreal( 64 ) ); w->setMinimumHeight( int( minimumHeight ) ); + w->setFixedHeight( int( minimumHeight ) ); return w; } From 0f50085bb9ef6652338827522e1e8a371cb4cc8f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 5 Mar 2021 14:01:28 +0100 Subject: [PATCH 180/318] [calamares] Refactor sidebar creation - None of these need to be methods of the main window, and it can all be put tidy away as static free functions. --- src/calamares/CalamaresWindow.cpp | 151 ++++++++++++++++-------------- src/calamares/CalamaresWindow.h | 8 -- 2 files changed, 79 insertions(+), 80 deletions(-) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index 4c65989c38..16210b61d6 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -55,9 +55,25 @@ windowDimensionToPixels( const Calamares::Branding::WindowDimension& u ) return 0; } +/** @brief Get a button-sized icon. */ +static inline QPixmap +getButtonIcon( const QString& name ) +{ + return Calamares::Branding::instance()->image( name, QSize( 22, 22 ) ); +} -QWidget* -CalamaresWindow::getWidgetSidebar( QWidget* parent, int desiredWidth ) +static inline void +setButtonIcon( QPushButton* button, const QString& name ) +{ + auto icon = getButtonIcon( name ); + if ( button && !icon.isNull() ) + { + button->setIcon( icon ); + } +} + +static QWidget* +getWidgetSidebar( CalamaresWindow* window, Calamares::ViewManager* viewManager, QWidget* parent, int desiredWidth ) { const Calamares::Branding* const branding = Calamares::Branding::instance(); @@ -91,7 +107,7 @@ CalamaresWindow::getWidgetSidebar( QWidget* parent, int desiredWidth ) logoLayout->addStretch(); ProgressTreeView* tv = new ProgressTreeView( sideBox ); - tv->setModel( Calamares::ViewManager::instance() ); + tv->setModel( viewManager ); tv->setFocusPolicy( Qt::NoFocus ); sideLayout->addWidget( tv ); @@ -99,37 +115,22 @@ CalamaresWindow::getWidgetSidebar( QWidget* parent, int desiredWidth ) { QPushButton* debugWindowBtn = new QPushButton; debugWindowBtn->setObjectName( "debugButton" ); - CALAMARES_RETRANSLATE( debugWindowBtn->setText( tr( "Show debug information" ) ); ) + CALAMARES_RETRANSLATE_WIDGET( debugWindowBtn, + debugWindowBtn->setText( QCoreApplication::translate( + CalamaresWindow::staticMetaObject.className(), "Show debug information" ) ); ) sideLayout->addWidget( debugWindowBtn ); debugWindowBtn->setFlat( true ); debugWindowBtn->setCheckable( true ); - connect( debugWindowBtn, &QPushButton::clicked, this, &CalamaresWindow::showDebugWindow ); - connect( this, &CalamaresWindow::debugWindowShown, debugWindowBtn, &QPushButton::setChecked ); + QObject::connect( debugWindowBtn, &QPushButton::clicked, window, &CalamaresWindow::showDebugWindow ); + QObject::connect( window, &CalamaresWindow::debugWindowShown, debugWindowBtn, &QPushButton::setChecked ); } CalamaresUtils::unmarginLayout( sideLayout ); return sideBox; } -/** @brief Get a button-sized icon. */ -static inline QPixmap -getButtonIcon( const QString& name ) -{ - return Calamares::Branding::instance()->image( name, QSize( 22, 22 ) ); -} - -static inline void -setButtonIcon( QPushButton* button, const QString& name ) -{ - auto icon = getButtonIcon( name ); - if ( button && !icon.isNull() ) - { - button->setIcon( icon ); - } -} - -QWidget* -CalamaresWindow::getWidgetNavigation( QWidget* parent ) +static QWidget* +getWidgetNavigation( CalamaresWindow*, Calamares::ViewManager* viewManager, QWidget* parent ) { QWidget* navigation = new QWidget( parent ); QBoxLayout* bottomLayout = new QHBoxLayout; @@ -137,43 +138,51 @@ CalamaresWindow::getWidgetNavigation( QWidget* parent ) // Create buttons and sets an initial icon; the icons may change { - auto* back = new QPushButton( getButtonIcon( QStringLiteral( "go-previous" ) ), tr( "&Back" ), navigation ); + auto* back + = new QPushButton( getButtonIcon( QStringLiteral( "go-previous" ) ), + QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Back" ), + navigation ); back->setObjectName( "view-button-back" ); - back->setEnabled( m_viewManager->backEnabled() ); - connect( back, &QPushButton::clicked, m_viewManager, &Calamares::ViewManager::back ); - connect( m_viewManager, &Calamares::ViewManager::backEnabledChanged, back, &QPushButton::setEnabled ); - connect( m_viewManager, &Calamares::ViewManager::backLabelChanged, back, &QPushButton::setText ); - connect( m_viewManager, &Calamares::ViewManager::backIconChanged, this, [=]( QString n ) { - setButtonIcon( back, n ); - } ); - connect( m_viewManager, &Calamares::ViewManager::backAndNextVisibleChanged, back, &QPushButton::setVisible ); + back->setEnabled( viewManager->backEnabled() ); + QObject::connect( back, &QPushButton::clicked, viewManager, &Calamares::ViewManager::back ); + QObject::connect( viewManager, &Calamares::ViewManager::backEnabledChanged, back, &QPushButton::setEnabled ); + QObject::connect( viewManager, &Calamares::ViewManager::backLabelChanged, back, &QPushButton::setText ); + QObject::connect( + viewManager, &Calamares::ViewManager::backIconChanged, [=]( QString n ) { setButtonIcon( back, n ); } ); + QObject::connect( + viewManager, &Calamares::ViewManager::backAndNextVisibleChanged, back, &QPushButton::setVisible ); bottomLayout->addWidget( back ); } { - auto* next = new QPushButton( getButtonIcon( QStringLiteral( "go-next" ) ), tr( "&Next" ), navigation ); + auto* next + = new QPushButton( getButtonIcon( QStringLiteral( "go-next" ) ), + QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Next" ), + navigation ); next->setObjectName( "view-button-next" ); - next->setEnabled( m_viewManager->nextEnabled() ); - connect( next, &QPushButton::clicked, m_viewManager, &Calamares::ViewManager::next ); - connect( m_viewManager, &Calamares::ViewManager::nextEnabledChanged, next, &QPushButton::setEnabled ); - connect( m_viewManager, &Calamares::ViewManager::nextLabelChanged, next, &QPushButton::setText ); - connect( m_viewManager, &Calamares::ViewManager::nextIconChanged, this, [=]( QString n ) { - setButtonIcon( next, n ); - } ); - connect( m_viewManager, &Calamares::ViewManager::backAndNextVisibleChanged, next, &QPushButton::setVisible ); + next->setEnabled( viewManager->nextEnabled() ); + QObject::connect( next, &QPushButton::clicked, viewManager, &Calamares::ViewManager::next ); + QObject::connect( viewManager, &Calamares::ViewManager::nextEnabledChanged, next, &QPushButton::setEnabled ); + QObject::connect( viewManager, &Calamares::ViewManager::nextLabelChanged, next, &QPushButton::setText ); + QObject::connect( + viewManager, &Calamares::ViewManager::nextIconChanged, [=]( QString n ) { setButtonIcon( next, n ); } ); + QObject::connect( + viewManager, &Calamares::ViewManager::backAndNextVisibleChanged, next, &QPushButton::setVisible ); bottomLayout->addWidget( next ); } bottomLayout->addSpacing( 12 ); { - auto* quit = new QPushButton( getButtonIcon( QStringLiteral( "dialog-cancel" ) ), tr( "&Cancel" ), navigation ); + auto* quit + = new QPushButton( getButtonIcon( QStringLiteral( "dialog-cancel" ) ), + QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Cancel" ), + navigation ); quit->setObjectName( "view-button-cancel" ); - connect( quit, &QPushButton::clicked, m_viewManager, &Calamares::ViewManager::quit ); - connect( m_viewManager, &Calamares::ViewManager::quitEnabledChanged, quit, &QPushButton::setEnabled ); - connect( m_viewManager, &Calamares::ViewManager::quitLabelChanged, quit, &QPushButton::setText ); - connect( m_viewManager, &Calamares::ViewManager::quitIconChanged, this, [=]( QString n ) { - setButtonIcon( quit, n ); - } ); - connect( m_viewManager, &Calamares::ViewManager::quitTooltipChanged, quit, &QPushButton::setToolTip ); - connect( m_viewManager, &Calamares::ViewManager::quitVisibleChanged, quit, &QPushButton::setVisible ); + QObject::connect( quit, &QPushButton::clicked, viewManager, &Calamares::ViewManager::quit ); + QObject::connect( viewManager, &Calamares::ViewManager::quitEnabledChanged, quit, &QPushButton::setEnabled ); + QObject::connect( viewManager, &Calamares::ViewManager::quitLabelChanged, quit, &QPushButton::setText ); + QObject::connect( + viewManager, &Calamares::ViewManager::quitIconChanged, [=]( QString n ) { setButtonIcon( quit, n ); } ); + QObject::connect( viewManager, &Calamares::ViewManager::quitTooltipChanged, quit, &QPushButton::setToolTip ); + QObject::connect( viewManager, &Calamares::ViewManager::quitVisibleChanged, quit, &QPushButton::setVisible ); bottomLayout->addWidget( quit ); } @@ -183,8 +192,8 @@ CalamaresWindow::getWidgetNavigation( QWidget* parent ) } #ifdef WITH_QML -QWidget* -CalamaresWindow::getQmlSidebar( QWidget* parent, int desiredWidth ) +static QWidget* +getQmlSidebar( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, int desiredWidth ) { CalamaresUtils::registerQmlModels(); QQuickWidget* w = new QQuickWidget( parent ); @@ -196,8 +205,8 @@ CalamaresWindow::getQmlSidebar( QWidget* parent, int desiredWidth ) return w; } -QWidget* -CalamaresWindow::getQmlNavigation( QWidget* parent ) +static QWidget* +getQmlNavigation( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent ) { CalamaresUtils::registerQmlModels(); QQuickWidget* w = new QQuickWidget( parent ); @@ -219,18 +228,19 @@ CalamaresWindow::getQmlNavigation( QWidget* parent ) } #else // Bogus to keep the linker happy -QWidget* -CalamaresWindow::getQmlSidebar( QWidget*, int ) +// +// Calls to flavoredWidget() still refer to these *names* +// even if they are subsequently not used. +static QWidget* +getQmlSidebar( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, int desiredWidth ) { return nullptr; } -QWidget* -CalamaresWindow::getQmlNavigation( QWidget* ) +static QWidget* +getQmlNavigation( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent ) { return nullptr; } - - #endif /**@brief Picks one of two methods to call @@ -250,14 +260,14 @@ flavoredWidget( Calamares::Branding::PanelFlavor flavor, #ifndef WITH_QML Q_UNUSED( qml ) #endif - // Member-function calling syntax is (object.*member)(args) + auto* viewManager = Calamares::ViewManager::instance(); switch ( flavor ) { case Calamares::Branding::PanelFlavor::Widget: - return ( w->*widget )( parent, a... ); + return widget( w, viewManager, parent, a... ); #ifdef WITH_QML case Calamares::Branding::PanelFlavor::Qml: - return ( w->*qml )( parent, a... ); + return qml( w, viewManager, parent, a... ); #endif case Calamares::Branding::PanelFlavor::None: return nullptr; @@ -361,14 +371,11 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) branding->sidebarFlavor(), this, baseWidget, - &CalamaresWindow::getWidgetSidebar, - &CalamaresWindow::getQmlSidebar, + ::getWidgetSidebar, + ::getQmlSidebar, qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) ); - QWidget* navigation = flavoredWidget( branding->navigationFlavor(), - this, - baseWidget, - &CalamaresWindow::getWidgetNavigation, - &CalamaresWindow::getQmlNavigation ); + QWidget* navigation + = flavoredWidget( branding->navigationFlavor(), this, baseWidget, ::getWidgetNavigation, ::getQmlNavigation ); // Build up the contentsLayout (a VBox) top-to-bottom // .. note that the bottom is mirrored wrt. the top diff --git a/src/calamares/CalamaresWindow.h b/src/calamares/CalamaresWindow.h index 4c7972f267..713094ebe7 100644 --- a/src/calamares/CalamaresWindow.h +++ b/src/calamares/CalamaresWindow.h @@ -53,14 +53,6 @@ public Q_SLOTS: virtual void closeEvent( QCloseEvent* e ) override; private: - // Two variations on sidebar (the progress view) - QWidget* getWidgetSidebar( QWidget* parent, int desiredWidth ); - QWidget* getQmlSidebar( QWidget* parent, int desiredWidth ); - - // Two variations on navigation (buttons at bottom) - QWidget* getWidgetNavigation( QWidget* parent ); - QWidget* getQmlNavigation( QWidget* parent ); - QPointer< Calamares::DebugWindow > m_debugWindow; // Managed by self Calamares::ViewManager* m_viewManager; }; From 82223431faa78777a772fe0750bf6f71ccd8fbe7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 5 Mar 2021 14:16:51 +0100 Subject: [PATCH 181/318] [calamares] Pass orientation into panel-creation - Add function for mapping panel sides to an orientation (H/V) - Pass that into the creation functions This is prep-work for handling vertical navigation and horizontal progress reporting cleanly. --- src/calamares/CalamaresWindow.cpp | 44 ++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index 16210b61d6..9cf67e7227 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -55,6 +55,19 @@ windowDimensionToPixels( const Calamares::Branding::WindowDimension& u ) return 0; } +/** @brief Expected orientation of the panels, based on their side + * + * Panels on the left and right are expected to be "vertical" style, + * top and bottom should be "horizontal bars". This function maps + * the sides to expected orientation. + */ +static inline Qt::Orientation +orientation( const Calamares::Branding::PanelSide s ) +{ + using Side = Calamares::Branding::PanelSide; + return ( s == Side::Left || s == Side::Right ) ? Qt::Orientation::Vertical : Qt::Orientation::Horizontal; +} + /** @brief Get a button-sized icon. */ static inline QPixmap getButtonIcon( const QString& name ) @@ -73,7 +86,11 @@ setButtonIcon( QPushButton* button, const QString& name ) } static QWidget* -getWidgetSidebar( CalamaresWindow* window, Calamares::ViewManager* viewManager, QWidget* parent, int desiredWidth ) +getWidgetSidebar( CalamaresWindow* window, + Calamares::ViewManager* viewManager, + QWidget* parent, + Qt::Orientation, + int desiredWidth ) { const Calamares::Branding* const branding = Calamares::Branding::instance(); @@ -130,7 +147,7 @@ getWidgetSidebar( CalamaresWindow* window, Calamares::ViewManager* viewManager, } static QWidget* -getWidgetNavigation( CalamaresWindow*, Calamares::ViewManager* viewManager, QWidget* parent ) +getWidgetNavigation( CalamaresWindow*, Calamares::ViewManager* viewManager, QWidget* parent, Qt::Orientation, int ) { QWidget* navigation = new QWidget( parent ); QBoxLayout* bottomLayout = new QHBoxLayout; @@ -193,7 +210,7 @@ getWidgetNavigation( CalamaresWindow*, Calamares::ViewManager* viewManager, QWid #ifdef WITH_QML static QWidget* -getQmlSidebar( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, int desiredWidth ) +getQmlSidebar( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, Qt::Orientation, int desiredWidth ) { CalamaresUtils::registerQmlModels(); QQuickWidget* w = new QQuickWidget( parent ); @@ -206,7 +223,7 @@ getQmlSidebar( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, int d } static QWidget* -getQmlNavigation( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent ) +getQmlNavigation( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, Qt::Orientation, int ) { CalamaresUtils::registerQmlModels(); QQuickWidget* w = new QQuickWidget( parent ); @@ -232,12 +249,12 @@ getQmlNavigation( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent ) // Calls to flavoredWidget() still refer to these *names* // even if they are subsequently not used. static QWidget* -getQmlSidebar( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, int desiredWidth ) +getQmlSidebar( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, Qt::Orientation, int desiredWidth ) { return nullptr; } static QWidget* -getQmlNavigation( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent ) +getQmlNavigation( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, Qt::Orientation, int desiredWidth ) { return nullptr; } @@ -251,6 +268,7 @@ getQmlNavigation( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent ) template < typename widgetMaker, typename... args > QWidget* flavoredWidget( Calamares::Branding::PanelFlavor flavor, + Qt::Orientation o, CalamaresWindow* w, QWidget* parent, widgetMaker widget, @@ -264,10 +282,10 @@ flavoredWidget( Calamares::Branding::PanelFlavor flavor, switch ( flavor ) { case Calamares::Branding::PanelFlavor::Widget: - return widget( w, viewManager, parent, a... ); + return widget( w, viewManager, parent, o, a... ); #ifdef WITH_QML case Calamares::Branding::PanelFlavor::Qml: - return qml( w, viewManager, parent, a... ); + return qml( w, viewManager, parent, o, a... ); #endif case Calamares::Branding::PanelFlavor::None: return nullptr; @@ -369,13 +387,19 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) QWidget* sideBox = flavoredWidget( branding->sidebarFlavor(), + ::orientation( branding->sidebarSide() ), this, baseWidget, ::getWidgetSidebar, ::getQmlSidebar, qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) ); - QWidget* navigation - = flavoredWidget( branding->navigationFlavor(), this, baseWidget, ::getWidgetNavigation, ::getQmlNavigation ); + QWidget* navigation = flavoredWidget( branding->navigationFlavor(), + ::orientation( branding->sidebarSide() ), + this, + baseWidget, + ::getWidgetNavigation, + ::getQmlNavigation, + 64 ); // Build up the contentsLayout (a VBox) top-to-bottom // .. note that the bottom is mirrored wrt. the top From 04145f49f88b0b712a1b716f15256a02812c60e4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 5 Mar 2021 16:58:51 +0100 Subject: [PATCH 182/318] [calamares] Factor out size-setting for QML panels - Either orientation needs to have the same generic size-setting code, for both navigation and progress panels. --- src/calamares/CalamaresWindow.cpp | 46 +++++++++++++++++++------------ 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index 9cf67e7227..acfdea4e65 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -209,38 +209,50 @@ getWidgetNavigation( CalamaresWindow*, Calamares::ViewManager* viewManager, QWid } #ifdef WITH_QML + +static inline void +setDimension( QQuickWidget* w, Qt::Orientation o, int desiredWidth ) +{ + w->setSizePolicy( o == Qt::Orientation::Vertical ? QSizePolicy::MinimumExpanding : QSizePolicy::Expanding, + o == Qt::Orientation::Horizontal ? QSizePolicy::MinimumExpanding : QSizePolicy::Expanding ); + if ( o == Qt::Orientation::Vertical ) + { + w->setFixedWidth( desiredWidth ); + } + else + { + // If the QML itself sets a height, use that, otherwise go to 48 pixels + // which seems to match what the widget navigation would use for height + // (with *my* specific screen, style, etc. so YMMV). + // + // Bound between (16, 64) with a default of 48. + qreal minimumHeight = qBound( qreal( 16 ), w->rootObject() ? w->rootObject()->height() : 48, qreal( 64 ) ); + w->setMinimumHeight( int( minimumHeight ) ); + w->setFixedHeight( int( minimumHeight ) ); + } + w->setResizeMode( QQuickWidget::SizeRootObjectToView ); +} + + static QWidget* -getQmlSidebar( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, Qt::Orientation, int desiredWidth ) +getQmlSidebar( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, Qt::Orientation o, int desiredWidth ) { CalamaresUtils::registerQmlModels(); QQuickWidget* w = new QQuickWidget( parent ); - w->setFixedWidth( desiredWidth ); - w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); - w->setResizeMode( QQuickWidget::SizeRootObjectToView ); w->setSource( QUrl( CalamaresUtils::searchQmlFile( CalamaresUtils::QmlSearch::Both, QStringLiteral( "calamares-sidebar" ) ) ) ); + setDimension( w, o, desiredWidth ); return w; } static QWidget* -getQmlNavigation( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, Qt::Orientation, int ) +getQmlNavigation( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, Qt::Orientation o, int desiredWidth ) { CalamaresUtils::registerQmlModels(); QQuickWidget* w = new QQuickWidget( parent ); - w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::MinimumExpanding ); - w->setResizeMode( QQuickWidget::SizeRootObjectToView ); w->setSource( QUrl( CalamaresUtils::searchQmlFile( CalamaresUtils::QmlSearch::Both, QStringLiteral( "calamares-navigation" ) ) ) ); - - // If the QML itself sets a height, use that, otherwise go to 48 pixels - // which seems to match what the widget navigation would use for height - // (with *my* specific screen, style, etc. so YMMV). - // - // Bound between (16, 64) with a default of 48. - qreal minimumHeight = qBound( qreal( 16 ), w->rootObject() ? w->rootObject()->height() : 48, qreal( 64 ) ); - w->setMinimumHeight( int( minimumHeight ) ); - w->setFixedHeight( int( minimumHeight ) ); - + setDimension( w, o, desiredWidth ); return w; } #else From 3ad3a9adfc76d13f1ff582a5cd8649ab8e45360f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 5 Mar 2021 22:27:24 +0100 Subject: [PATCH 183/318] [finished] Move the business logic to the Configt object --- src/modules/finished/Config.cpp | 26 ++++++++++++++++ src/modules/finished/Config.h | 38 +++++++++++++++++++---- src/modules/finished/FinishedViewStep.cpp | 14 ++------- src/modules/finished/FinishedViewStep.h | 4 --- 4 files changed, 61 insertions(+), 21 deletions(-) diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp index 5119da942a..4b54988e61 100644 --- a/src/modules/finished/Config.cpp +++ b/src/modules/finished/Config.cpp @@ -82,6 +82,32 @@ Config::setRestartNowWanted( bool w ) } } +void +Config::onInstallationFailed( const QString& message, const QString& details ) +{ + const bool msgChange = message != m_failureMessage; + const bool detChange = details != m_failureDetails; + m_failureMessage = message; + m_failureDetails = details; + if ( msgChange ) + { + emit failureMessageChanged( message ); + } + if ( detChange ) + { + emit failureDetailsChanged( message ); + } + if ( ( msgChange || detChange ) ) + { + emit failureChanged( hasFailed() ); + if ( hasFailed() ) + { + setRestartNowMode( Config::RestartMode::Never ); + } + } +} + + void Config::doRestart() { diff --git a/src/modules/finished/Config.h b/src/modules/finished/Config.h index 78078b99bf..a5676990da 100644 --- a/src/modules/finished/Config.h +++ b/src/modules/finished/Config.h @@ -24,6 +24,10 @@ class Config : public QObject Q_PROPERTY( QString restartNowCommand READ restartNowCommand CONSTANT FINAL ) Q_PROPERTY( bool notifyOnFinished READ notifyOnFinished CONSTANT FINAL ) + Q_PROPERTY( QString failureMessage READ failureMessage NOTIFY failureMessageChanged ) + Q_PROPERTY( QString failureDetails READ failureDetails NOTIFY failureDetailsChanged ) + Q_PROPERTY( bool failed READ hasFailed NOTIFY failureChanged ) + public: Config( QObject* parent = nullptr ); @@ -36,17 +40,22 @@ class Config : public QObject }; Q_ENUM( RestartMode ) + void setConfigurationMap( const QVariantMap& configurationMap ); + +public Q_SLOTS: RestartMode restartNowMode() const { return m_restartNowMode; } + void setRestartNowMode( RestartMode m ); + bool restartNowWanted() const { return m_userWantsRestart; } + void setRestartNowWanted( bool w ); QString restartNowCommand() const { return m_restartNowCommand; } bool notifyOnFinished() const { return m_notifyOnFinished; } - void setConfigurationMap( const QVariantMap& configurationMap ); - -public slots: - void setRestartNowMode( RestartMode m ); - void setRestartNowWanted( bool w ); + QString failureMessage() const { return m_failureMessage; } + QString failureDetails() const { return m_failureDetails; } + /// Failure is if any of the failure messages is non-empty + bool hasFailed() const { return !m_failureMessage.isEmpty() || !m_failureDetails.isEmpty(); } /** @brief Run the restart command, if desired. * @@ -63,17 +72,34 @@ public slots: * At the end of installation (when the FinishedViewStep is activated), * send a desktop notification via DBus that the install is done. */ - void doNotify( bool hasFailed = false ); + void doNotify( bool hasFailed ); + void doNotify() { doNotify( hasFailed() ); } + + /** @brief Tell the config the install failed + * + * This should be connected to the JobQueue and is called by + * the queue when the installation fails, with a suitable message. + */ + void onInstallationFailed( const QString& message, const QString& details ); signals: void restartModeChanged( RestartMode m ); void restartNowWantedChanged( bool w ); + void failureMessageChanged( const QString& ); + void failureDetailsChanged( const QString& ); + void failureChanged( bool ); private: + // Configuration parts QString m_restartNowCommand; RestartMode m_restartNowMode = RestartMode::Never; bool m_userWantsRestart = false; bool m_notifyOnFinished = false; + + // Dynamic parts + bool m_hasFailed = false; + QString m_failureMessage; + QString m_failureDetails; }; const NamedEnumTable< Config::RestartMode >& restartModes(); diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index 3f9fd3aabe..05cac473dc 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -22,10 +22,10 @@ FinishedViewStep::FinishedViewStep( QObject* parent ) : Calamares::ViewStep( parent ) , m_config( new Config( this ) ) , m_widget( new FinishedPage( m_config ) ) - , m_installFailed( false ) { auto jq = Calamares::JobQueue::instance(); - connect( jq, &Calamares::JobQueue::failed, this, &FinishedViewStep::onInstallationFailed ); + connect( jq, &Calamares::JobQueue::failed, m_config, &Config::onInstallationFailed ); + connect( jq, &Calamares::JobQueue::failed, m_widget, &FinishedPage::onInstallationFailed ); emit nextStatusChanged( true ); } @@ -85,7 +85,7 @@ FinishedViewStep::isAtEnd() const void FinishedViewStep::onActivate() { - m_config->doNotify( m_installFailed ); + m_config->doNotify(); connect( qApp, &QApplication::aboutToQuit, m_config, &Config::doRestart ); } @@ -96,14 +96,6 @@ FinishedViewStep::jobs() const return Calamares::JobList(); } -void -FinishedViewStep::onInstallationFailed( const QString& message, const QString& details ) -{ - m_installFailed = true; - m_config->setRestartNowMode( Config::RestartMode::Never ); - m_widget->onInstallationFailed( message, details ); -} - void FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { diff --git a/src/modules/finished/FinishedViewStep.h b/src/modules/finished/FinishedViewStep.h index a35d7fac81..c0f64153d4 100644 --- a/src/modules/finished/FinishedViewStep.h +++ b/src/modules/finished/FinishedViewStep.h @@ -42,13 +42,9 @@ class PLUGINDLLEXPORT FinishedViewStep : public Calamares::ViewStep void setConfigurationMap( const QVariantMap& configurationMap ) override; -public slots: - void onInstallationFailed( const QString& message, const QString& details ); - private: Config* m_config; FinishedPage* m_widget; - bool m_installFailed; // Track if onInstallationFailed() was called }; CALAMARES_PLUGIN_FACTORY_DECLARATION( FinishedViewStepFactory ) From 5b376b41bf08f0d1a6f17cba14426795a5c06a52 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 5 Mar 2021 22:40:38 +0100 Subject: [PATCH 184/318] [finishedq] Chase business logic in Config object --- src/modules/finishedq/FinishedQmlViewStep.cpp | 13 ++----------- src/modules/finishedq/FinishedQmlViewStep.h | 3 --- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/modules/finishedq/FinishedQmlViewStep.cpp b/src/modules/finishedq/FinishedQmlViewStep.cpp index 81a8004ca1..e1a6813729 100644 --- a/src/modules/finishedq/FinishedQmlViewStep.cpp +++ b/src/modules/finishedq/FinishedQmlViewStep.cpp @@ -22,10 +22,9 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( FinishedQmlViewStepFactory, registerPlugin< FinishedQmlViewStep::FinishedQmlViewStep( QObject* parent ) : Calamares::QmlViewStep( parent ) , m_config( new Config( this ) ) - , m_installFailed( false ) { auto jq = Calamares::JobQueue::instance(); - connect( jq, &Calamares::JobQueue::failed, this, &FinishedQmlViewStep::onInstallationFailed ); + connect( jq, &Calamares::JobQueue::failed, m_config, &Config::onInstallationFailed ); emit nextStatusChanged( true ); } @@ -67,8 +66,7 @@ FinishedQmlViewStep::isAtEnd() const void FinishedQmlViewStep::onActivate() { - m_config->doNotify( m_installFailed ); - //connect( qApp, &QApplication::aboutToQuit, m_config, &Config::doRestart ); + m_config->doNotify(); QmlViewStep::onActivate(); } @@ -85,13 +83,6 @@ FinishedQmlViewStep::getConfig() return m_config; } -void -FinishedQmlViewStep::onInstallationFailed( const QString& message, const QString& details ) -{ - m_installFailed = true; - m_config->setRestartNowMode( Config::RestartMode::Never ); -} - void FinishedQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { diff --git a/src/modules/finishedq/FinishedQmlViewStep.h b/src/modules/finishedq/FinishedQmlViewStep.h index e8eb58215d..7bcf0e67f1 100644 --- a/src/modules/finishedq/FinishedQmlViewStep.h +++ b/src/modules/finishedq/FinishedQmlViewStep.h @@ -46,9 +46,6 @@ class PLUGINDLLEXPORT FinishedQmlViewStep : public Calamares::QmlViewStep void setConfigurationMap( const QVariantMap& configurationMap ) override; QObject* getConfig() override; -public slots: - void onInstallationFailed( const QString& message, const QString& details ); - private: Config* m_config; From 0d7c1ec13003c644acb456b72a69c9ce7ccd1eb8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 5 Mar 2021 22:59:04 +0100 Subject: [PATCH 185/318] [finishedq] Port QML back to using Config object --- src/modules/finishedq/finishedq.qml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/modules/finishedq/finishedq.qml b/src/modules/finishedq/finishedq.qml index 215626a1c1..92559569cc 100644 --- a/src/modules/finishedq/finishedq.qml +++ b/src/modules/finishedq/finishedq.qml @@ -18,8 +18,6 @@ import org.kde.kirigami 2.7 as Kirigami import QtGraphicalEffects 1.0 import QtQuick.Window 2.3 -import org.kde.plasma.core 2.0 as PlasmaCore - Page { id: finished @@ -62,27 +60,17 @@ Page { anchors.centerIn: parent spacing: 6 - PlasmaCore.DataSource { - id: executer - engine: "executable" - onNewData: {executer.disconnectSource(sourceName);} - } - Button { id: button text: qsTr("Close Installer") icon.name: "application-exit" onClicked: { ViewManager.quit(); } - //onClicked: console.log("close calamares"); } Button { text: qsTr("Restart System") icon.name: "system-reboot" - //onClicked: { config.doRestart(); } - onClicked: { - executer.connectSource("systemctl -i reboot"); - } + onClicked: { config.doRestart(); } } } From 075a28a06d6b71bf04733aec47b38c0201d42921 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 5 Mar 2021 22:59:53 +0100 Subject: [PATCH 186/318] [finished] Log the doRestart() attempt --- src/modules/finished/Config.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp index 4b54988e61..be2c729b10 100644 --- a/src/modules/finished/Config.cpp +++ b/src/modules/finished/Config.cpp @@ -111,6 +111,7 @@ Config::onInstallationFailed( const QString& message, const QString& details ) void Config::doRestart() { + cDebug() << "Restart requested, mode=" << restartModes().find( restartNowMode() ) << " want?" << restartNowWanted(); if ( restartNowMode() != RestartMode::Never && restartNowWanted() ) { cDebug() << "Running restart command" << m_restartNowCommand; From f94853eb28c8a2f87e132b6c15dc9795adc907a3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 5 Mar 2021 23:17:57 +0100 Subject: [PATCH 187/318] [finishedq] Always restart if possible --- src/modules/finishedq/finishedq.qml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/modules/finishedq/finishedq.qml b/src/modules/finishedq/finishedq.qml index 92559569cc..1969c4c827 100644 --- a/src/modules/finishedq/finishedq.qml +++ b/src/modules/finishedq/finishedq.qml @@ -91,4 +91,16 @@ Page { } } + function onActivate() + { + // This QML page has a **button** for restarting, + // so just pretend the setting is clicked; this is a + // poor solution, recommended is to set restartNowMode to Always + // in the config. + config.setRestartNowWanted(true); + } + + function onLeave() + { + } } From 19874ebc3a7bac09a092e5ffabd9174aadcf7045 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 5 Mar 2021 23:19:56 +0100 Subject: [PATCH 188/318] [finished] Document doRestart() better - move all the 'really want restart' logic to restartNowWanted() --- src/modules/finished/Config.cpp | 2 +- src/modules/finished/Config.h | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp index be2c729b10..bf156303da 100644 --- a/src/modules/finished/Config.cpp +++ b/src/modules/finished/Config.cpp @@ -112,7 +112,7 @@ void Config::doRestart() { cDebug() << "Restart requested, mode=" << restartModes().find( restartNowMode() ) << " want?" << restartNowWanted(); - if ( restartNowMode() != RestartMode::Never && restartNowWanted() ) + if ( restartNowWanted() ) { cDebug() << "Running restart command" << m_restartNowCommand; QProcess::execute( "/bin/sh", { "-c", m_restartNowCommand } ); diff --git a/src/modules/finished/Config.h b/src/modules/finished/Config.h index a5676990da..cf1d8eb736 100644 --- a/src/modules/finished/Config.h +++ b/src/modules/finished/Config.h @@ -46,7 +46,14 @@ public Q_SLOTS: RestartMode restartNowMode() const { return m_restartNowMode; } void setRestartNowMode( RestartMode m ); - bool restartNowWanted() const { return m_userWantsRestart; } + bool restartNowWanted() const + { + if ( restartNowMode() == RestartMode::Never ) + { + return false; + } + return ( restartNowMode() == RestartMode::Always ) || m_userWantsRestart; + } void setRestartNowWanted( bool w ); QString restartNowCommand() const { return m_restartNowCommand; } @@ -62,6 +69,10 @@ public Q_SLOTS: * This should generally not be called somewhere during the * application's execution, but only in response to QApplication::quit() * or something like that when the user expects the system to restart. + * + * The "if desired" part is: only if the restart mode allows it, + * **and** the user has checked the box (or done whatever to + * turn on restartNowWanted()). */ void doRestart(); From f8258f671b5120c014dbc7af1b62b3316cc3831f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 6 Mar 2021 13:14:40 +0100 Subject: [PATCH 189/318] [calamares] Navigation getting the wrong side --- src/calamares/CalamaresWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index acfdea4e65..470702d2a4 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -406,7 +406,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) ::getQmlSidebar, qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) ); QWidget* navigation = flavoredWidget( branding->navigationFlavor(), - ::orientation( branding->sidebarSide() ), + ::orientation( branding->navigationSide() ), this, baseWidget, ::getWidgetNavigation, From aa004503c592851472ef153e4122df82dc23be62 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 6 Mar 2021 13:38:02 +0100 Subject: [PATCH 190/318] [finished] Expand Config object's repertoire of notification-API --- src/modules/finished/Config.cpp | 5 +++-- src/modules/finished/Config.h | 15 +++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp index bf156303da..03616d05ab 100644 --- a/src/modules/finished/Config.cpp +++ b/src/modules/finished/Config.cpp @@ -121,10 +121,11 @@ Config::doRestart() void -Config::doNotify( bool hasFailed ) +Config::doNotify( bool hasFailed, bool sendAnyway ) { - if ( !notifyOnFinished() ) + if ( !sendAnyway ) { + cDebug() << "Notification failed?" << hasFailed << "not sent."; return; } diff --git a/src/modules/finished/Config.h b/src/modules/finished/Config.h index cf1d8eb736..b4f93fd91e 100644 --- a/src/modules/finished/Config.h +++ b/src/modules/finished/Config.h @@ -76,14 +76,21 @@ public Q_SLOTS: */ void doRestart(); - /** @brief Send DBus notification, if desired. - * - * This takes notifyOnFinished() into account. + /** @brief Send DBus notification * * At the end of installation (when the FinishedViewStep is activated), * send a desktop notification via DBus that the install is done. + * + * - The two-argument form sends success or failure, and can be + * forced to send by setting @p sendAnyway to @c true. + * - The one-argument form sends success or failure and takes + * the notifyOnFinished() configuration into account. + * - The no-argument form checks if a failure was signalled previously + * and uses that to decide if it was a failure. + * */ - void doNotify( bool hasFailed ); + void doNotify( bool hasFailed, bool sendAnyway ); + void doNotify( bool hasFailed ) { doNotify( hasFailed, notifyOnFinished() ); } void doNotify() { doNotify( hasFailed() ); } /** @brief Tell the config the install failed From bd775a16e27f460a6c0337df172c765a1c097729 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 6 Mar 2021 13:51:45 +0100 Subject: [PATCH 191/318] [finished] Add a restart-anyway API to Config It's possible to ignore the "user setting" for restart-now and call doRestart(true) directly. This is intended for use with specific UIs that make that choice clear for the user. Hook up both [finished] and [finishedq] to the "traditional" restart-if-the-box-is-ticked logic although the example QML doesn't expose that box. --- src/modules/finished/Config.cpp | 9 +++++---- src/modules/finished/Config.h | 7 ++++++- src/modules/finished/FinishedViewStep.cpp | 2 +- src/modules/finishedq/FinishedQmlViewStep.cpp | 1 + src/modules/finishedq/finishedq.qml | 7 +------ 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp index 03616d05ab..5d824a8f39 100644 --- a/src/modules/finished/Config.cpp +++ b/src/modules/finished/Config.cpp @@ -109,12 +109,13 @@ Config::onInstallationFailed( const QString& message, const QString& details ) void -Config::doRestart() +Config::doRestart( bool restartAnyway ) { - cDebug() << "Restart requested, mode=" << restartModes().find( restartNowMode() ) << " want?" << restartNowWanted(); - if ( restartNowWanted() ) + cDebug() << "mode=" << restartModes().find( restartNowMode() ) << " user?" << restartNowWanted() << "arg?" + << restartAnyway; + if ( restartNowMode() != RestartMode::Never && restartAnyway ) { - cDebug() << "Running restart command" << m_restartNowCommand; + cDebug() << Logger::SubEntry << "Running restart command" << m_restartNowCommand; QProcess::execute( "/bin/sh", { "-c", m_restartNowCommand } ); } } diff --git a/src/modules/finished/Config.h b/src/modules/finished/Config.h index b4f93fd91e..1349b74459 100644 --- a/src/modules/finished/Config.h +++ b/src/modules/finished/Config.h @@ -73,8 +73,13 @@ public Q_SLOTS: * The "if desired" part is: only if the restart mode allows it, * **and** the user has checked the box (or done whatever to * turn on restartNowWanted()). + * + * - The one-argument form ignores what the user wants and restarts + * if @p restartAnyway is @c true **unless** the mode is Never + * - The no-argument form uses the user setting */ - void doRestart(); + void doRestart( bool restartAnyway ); + void doRestart() { doRestart( restartNowWanted() ); } /** @brief Send DBus notification * diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index 05cac473dc..5ba9c18974 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -86,7 +86,7 @@ void FinishedViewStep::onActivate() { m_config->doNotify(); - connect( qApp, &QApplication::aboutToQuit, m_config, &Config::doRestart ); + connect( qApp, &QApplication::aboutToQuit, m_config, qOverload<>( &Config::doRestart ) ); } diff --git a/src/modules/finishedq/FinishedQmlViewStep.cpp b/src/modules/finishedq/FinishedQmlViewStep.cpp index e1a6813729..531d7380e5 100644 --- a/src/modules/finishedq/FinishedQmlViewStep.cpp +++ b/src/modules/finishedq/FinishedQmlViewStep.cpp @@ -67,6 +67,7 @@ void FinishedQmlViewStep::onActivate() { m_config->doNotify(); + connect( qApp, &QApplication::aboutToQuit, m_config, qOverload<>( &Config::doRestart ) ); QmlViewStep::onActivate(); } diff --git a/src/modules/finishedq/finishedq.qml b/src/modules/finishedq/finishedq.qml index 1969c4c827..789ac4cfbd 100644 --- a/src/modules/finishedq/finishedq.qml +++ b/src/modules/finishedq/finishedq.qml @@ -70,7 +70,7 @@ Page { Button { text: qsTr("Restart System") icon.name: "system-reboot" - onClicked: { config.doRestart(); } + onClicked: { config.doRestart(true); } } } @@ -93,11 +93,6 @@ Page { function onActivate() { - // This QML page has a **button** for restarting, - // so just pretend the setting is clicked; this is a - // poor solution, recommended is to set restartNowMode to Always - // in the config. - config.setRestartNowWanted(true); } function onLeave() From e9384deb5d0b32479e8807968312521468240732 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 6 Mar 2021 15:20:24 +0100 Subject: [PATCH 192/318] [finishedq] Document the meaningful settings of the config file --- src/modules/finishedq/finishedq.conf | 38 +++++++++++++++------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/modules/finishedq/finishedq.conf b/src/modules/finishedq/finishedq.conf index 9cd42b016a..ee226c3565 100644 --- a/src/modules/finishedq/finishedq.conf +++ b/src/modules/finishedq/finishedq.conf @@ -3,32 +3,34 @@ # # Configuration for the "finishedq" page, which is usually shown only at # the end of the installation (successful or not). +# +# See the documentation for the "finished" module for a full explanation +# of the configuration options; the description here applies primarily +# to the use that the QML makes of them. --- # Behavior of the "restart system now" button. # -# There are four usable values: +# The example QML for this module offers a "Restart Now" button, +# which the user can click on. It calls directly to the restart +# function. If the user closes the installer in some other way, +# (the "Done" button or close-window) a restart **might** happen: +# # - never -# Does not show the button and does not restart. -# This matches the old behavior with restartNowEnabled=false. +# Do not restart (this will also block the "Restart Now" button, +# so it is not very useful) # - user-unchecked -# Shows the button, defaults to unchecked, restarts if it is checked. -# This matches the old behavior with restartNowEnabled=true and restartNowChecked=false. +# Do not restart on other ways of closing the window. No checkbox +# is shown in the example QML, so there is no way for the user to +# express a choice -- except by clicking the "Restart Now" button. # - user-checked -# Shows the button, defaults to checked, restarts if it is checked. -# This matches the old behavior with restartNowEnabled=true and restartNowChecked=true. +# Do restart on other ways of closing the window. This makes close +# and "Restart Now" do the same thing. No checkbox is shown by the QML, +# so the machine will **always** restart. # - always -# Shows the button, checked, but the user cannot change it. -# This is new behavior. +# Same as above. # -# The three combinations of legacy values are still supported. +# For the **specific** example QML included with this module, only +# *user-unchecked* really makes sense. restartNowMode: user-unchecked - -# If the checkbox is shown, and the checkbox is checked, then when -# Calamares exits from the finished-page it will run this command. -# If not set, falls back to "shutdown -r now". restartNowCommand: "systemctl -i reboot" - -# When the last page is (successfully) reached, send a DBus notification -# to the desktop that the installation is done. This works only if the -# user as whom Calamares is run, can reach the regular desktop session bus. notifyOnFinished: false From 83e6476be877026564e6995590c6f7919845c171 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 6 Mar 2021 15:23:23 +0100 Subject: [PATCH 193/318] [finishedq] Tighten up requirements --- src/modules/finishedq/CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/modules/finishedq/CMakeLists.txt b/src/modules/finishedq/CMakeLists.txt index e1db7c7671..74c88e6e4a 100644 --- a/src/modules/finishedq/CMakeLists.txt +++ b/src/modules/finishedq/CMakeLists.txt @@ -8,13 +8,11 @@ if( NOT WITH_QML ) return() endif() -find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network ) - -find_package( KF5Plasma CONFIG) -set_package_properties(KF5Plasma PROPERTIES - DESCRIPTION "Used for running commands in QML" - TYPE RUNTIME -) +find_package( Qt5 ${QT_VERSION} CONFIG DBus Network ) +if ( NOT TARGET Qt5::DBus OR NOT TARGET Qt5::Network ) + calamares_skip_module( "finishedq (missing DBus or Network)" ) + return() +endif() set( _finished ${CMAKE_CURRENT_SOURCE_DIR}/../finished ) include_directories( ${_finished} ) From 44602d0237a03e97a8d9a9bab16393d768aac4b5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 6 Mar 2021 15:33:15 +0100 Subject: [PATCH 194/318] [finishedq] CMake: missing keyword --- src/modules/finishedq/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/finishedq/CMakeLists.txt b/src/modules/finishedq/CMakeLists.txt index 74c88e6e4a..5b3793a6f0 100644 --- a/src/modules/finishedq/CMakeLists.txt +++ b/src/modules/finishedq/CMakeLists.txt @@ -8,7 +8,7 @@ if( NOT WITH_QML ) return() endif() -find_package( Qt5 ${QT_VERSION} CONFIG DBus Network ) +find_package( Qt5 ${QT_VERSION} CONFIG COMPONENTS DBus Network ) if ( NOT TARGET Qt5::DBus OR NOT TARGET Qt5::Network ) calamares_skip_module( "finishedq (missing DBus or Network)" ) return() From 992c673951954101284cd5316a4e34c12b5ccabe Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 6 Mar 2021 22:08:35 +0100 Subject: [PATCH 195/318] [calamares] Document how to hide the Quit button The Quit button can have its own logic at a QML level for show/hide. It **ought** to follow the *quitVisible* property, but can do additional work. Here, document how a distro might choose to hide the Quit button on the last page (generally, that's the "finished" page). --- src/calamares/calamares-navigation.qml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/calamares/calamares-navigation.qml b/src/calamares/calamares-navigation.qml index 937e355293..becc1b47a1 100644 --- a/src/calamares/calamares-navigation.qml +++ b/src/calamares/calamares-navigation.qml @@ -46,10 +46,13 @@ Rectangle { enabled: ViewManager.nextEnabled; visible: ViewManager.backAndNextVisible; onClicked: { ViewManager.next(); } + // This margin goes in the "next" button, because the "quit" + // button can vanish and we want to keep the margin to + // the next-thing-in-the-navigation-panel around. + Layout.rightMargin: 3 * buttonBar.spacing; } Button { - Layout.leftMargin: 3 * buttonBar.spacing; // little gap from back/next Layout.rightMargin: 2 * buttonBar.spacing text: ViewManager.quitLabel; icon.name: ViewManager.quitIcon; @@ -59,6 +62,19 @@ Rectangle { ToolTip.delay: 1000 ToolTip.text: ViewManager.quitTooltip; + /* + * The ViewManager has settings -- user-controlled via the + * branding component, and party based on program state -- + * whether the quit button should be enabled and visible. + * + * QML navigation *should* follow this pattern, but can also + * add other qualifications. For instance, you may have a + * "finished" module that handles quit in its own way, and + * want to hide the quit button then. The ViewManager has a + * current step and a total count, so compare them: + * + * visible: ViewManager.quitVisible && ( ViewManager.currentStepIndex < ViewManager.rowCount()-1); + */ enabled: ViewManager.quitEnabled; visible: ViewManager.quitVisible; onClicked: { ViewManager.quit(); } From c00a382aea372fdf1b9f332c3f2b058e78be66b2 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 6 Mar 2021 22:55:48 +0100 Subject: [PATCH 196/318] [calamares] Refactor debug-window handling Move the management of the (a?) DebugWindow to a separate class, and hang on to that manager in CalamaresWindow. This is prep-work towards making it available from QML as well. --- src/calamares/CalamaresWindow.cpp | 70 +++++++++++++++---------------- src/calamares/CalamaresWindow.h | 20 +++------ src/calamares/DebugWindow.cpp | 60 +++++++++++++++++++++++--- src/calamares/DebugWindow.h | 38 +++++++++++++++++ 4 files changed, 132 insertions(+), 56 deletions(-) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index 470702d2a4..0a5014fefb 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -86,7 +86,7 @@ setButtonIcon( QPushButton* button, const QString& name ) } static QWidget* -getWidgetSidebar( CalamaresWindow* window, +getWidgetSidebar( Calamares::DebugWindowManager* debug, Calamares::ViewManager* viewManager, QWidget* parent, Qt::Orientation, @@ -128,7 +128,7 @@ getWidgetSidebar( CalamaresWindow* window, tv->setFocusPolicy( Qt::NoFocus ); sideLayout->addWidget( tv ); - if ( Calamares::Settings::instance()->debugMode() || ( Logger::logLevel() >= Logger::LOGVERBOSE ) ) + if ( debug && debug->enabled() ) { QPushButton* debugWindowBtn = new QPushButton; debugWindowBtn->setObjectName( "debugButton" ); @@ -138,8 +138,9 @@ getWidgetSidebar( CalamaresWindow* window, sideLayout->addWidget( debugWindowBtn ); debugWindowBtn->setFlat( true ); debugWindowBtn->setCheckable( true ); - QObject::connect( debugWindowBtn, &QPushButton::clicked, window, &CalamaresWindow::showDebugWindow ); - QObject::connect( window, &CalamaresWindow::debugWindowShown, debugWindowBtn, &QPushButton::setChecked ); + QObject::connect( debugWindowBtn, &QPushButton::clicked, debug, &Calamares::DebugWindowManager::show ); + QObject::connect( + debug, &Calamares::DebugWindowManager::visibleChanged, debugWindowBtn, &QPushButton::setChecked ); } CalamaresUtils::unmarginLayout( sideLayout ); @@ -147,7 +148,11 @@ getWidgetSidebar( CalamaresWindow* window, } static QWidget* -getWidgetNavigation( CalamaresWindow*, Calamares::ViewManager* viewManager, QWidget* parent, Qt::Orientation, int ) +getWidgetNavigation( Calamares::DebugWindowManager*, + Calamares::ViewManager* viewManager, + QWidget* parent, + Qt::Orientation, + int ) { QWidget* navigation = new QWidget( parent ); QBoxLayout* bottomLayout = new QHBoxLayout; @@ -235,7 +240,11 @@ setDimension( QQuickWidget* w, Qt::Orientation o, int desiredWidth ) static QWidget* -getQmlSidebar( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, Qt::Orientation o, int desiredWidth ) +getQmlSidebar( Calamares::DebugWindowManager*, + Calamares::ViewManager*, + QWidget* parent, + Qt::Orientation o, + int desiredWidth ) { CalamaresUtils::registerQmlModels(); QQuickWidget* w = new QQuickWidget( parent ); @@ -246,7 +255,11 @@ getQmlSidebar( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, Qt::O } static QWidget* -getQmlNavigation( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, Qt::Orientation o, int desiredWidth ) +getQmlNavigation( Calamares::DebugWindowManager*, + Calamares::ViewManager*, + QWidget* parent, + Qt::Orientation o, + int desiredWidth ) { CalamaresUtils::registerQmlModels(); QQuickWidget* w = new QQuickWidget( parent ); @@ -261,12 +274,20 @@ getQmlNavigation( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, Qt // Calls to flavoredWidget() still refer to these *names* // even if they are subsequently not used. static QWidget* -getQmlSidebar( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, Qt::Orientation, int desiredWidth ) +getQmlSidebar( Calamares::DebugWindowManager*, + Calamares::ViewManager*, + QWidget* parent, + Qt::Orientation, + int desiredWidth ) { return nullptr; } static QWidget* -getQmlNavigation( CalamaresWindow*, Calamares::ViewManager*, QWidget* parent, Qt::Orientation, int desiredWidth ) +getQmlNavigation( Calamares::DebugWindowManager*, + Calamares::ViewManager*, + QWidget* parent, + Qt::Orientation, + int desiredWidth ) { return nullptr; } @@ -281,7 +302,7 @@ template < typename widgetMaker, typename... args > QWidget* flavoredWidget( Calamares::Branding::PanelFlavor flavor, Qt::Orientation o, - CalamaresWindow* w, + Calamares::DebugWindowManager* w, QWidget* parent, widgetMaker widget, widgetMaker qml, // Only if WITH_QML is on @@ -321,7 +342,7 @@ insertIf( QBoxLayout* layout, CalamaresWindow::CalamaresWindow( QWidget* parent ) : QWidget( parent ) - , m_debugWindow( nullptr ) + , m_debugManager( new Calamares::DebugWindowManager( this ) ) , m_viewManager( nullptr ) { // If we can never cancel, don't show the window-close button @@ -400,14 +421,14 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) QWidget* sideBox = flavoredWidget( branding->sidebarFlavor(), ::orientation( branding->sidebarSide() ), - this, + m_debugManager, baseWidget, ::getWidgetSidebar, ::getQmlSidebar, qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) ); QWidget* navigation = flavoredWidget( branding->navigationFlavor(), ::orientation( branding->navigationSide() ), - this, + m_debugManager, baseWidget, ::getWidgetNavigation, ::getQmlNavigation, @@ -461,29 +482,6 @@ CalamaresWindow::ensureSize( QSize size ) resize( w, h ); } -void -CalamaresWindow::showDebugWindow( bool show ) -{ - if ( show ) - { - m_debugWindow = new Calamares::DebugWindow(); - m_debugWindow->show(); - connect( m_debugWindow.data(), &Calamares::DebugWindow::closed, this, [=]() { - m_debugWindow->deleteLater(); - emit debugWindowShown( false ); - } ); - emit debugWindowShown( true ); - } - else - { - if ( m_debugWindow ) - { - m_debugWindow->deleteLater(); - } - emit debugWindowShown( false ); - } -} - void CalamaresWindow::closeEvent( QCloseEvent* event ) { diff --git a/src/calamares/CalamaresWindow.h b/src/calamares/CalamaresWindow.h index 713094ebe7..f5dd7fe3d3 100644 --- a/src/calamares/CalamaresWindow.h +++ b/src/calamares/CalamaresWindow.h @@ -11,12 +11,13 @@ #ifndef CALAMARESWINDOW_H #define CALAMARESWINDOW_H -#include #include +#include + namespace Calamares { -class DebugWindow; +class DebugWindowManager; class ViewManager; } // namespace Calamares @@ -38,23 +39,12 @@ public Q_SLOTS: */ void ensureSize( QSize size ); - /** @brief Set visibility of debug window - * - * Shows or hides the debug window, depending on @p show. - * If Calamares is not in debug mode, nothing happens and the debug - * window remains hidden. - */ - void showDebugWindow( bool show ); - -Q_SIGNALS: - void debugWindowShown( bool show ); - protected: virtual void closeEvent( QCloseEvent* e ) override; private: - QPointer< Calamares::DebugWindow > m_debugWindow; // Managed by self - Calamares::ViewManager* m_viewManager; + Calamares::DebugWindowManager* m_debugManager = nullptr; + Calamares::ViewManager* m_viewManager = nullptr; }; #endif // CALAMARESWINDOW_H diff --git a/src/calamares/DebugWindow.cpp b/src/calamares/DebugWindow.cpp index 96f4fb3358..21a044f663 100644 --- a/src/calamares/DebugWindow.cpp +++ b/src/calamares/DebugWindow.cpp @@ -11,15 +11,14 @@ #include "DebugWindow.h" #include "ui_DebugWindow.h" -#include "VariantModel.h" - #include "Branding.h" -#include "modulesystem/Module.h" -#include "modulesystem/ModuleManager.h" - #include "GlobalStorage.h" #include "Job.h" #include "JobQueue.h" +#include "Settings.h" +#include "VariantModel.h" +#include "modulesystem/Module.h" +#include "modulesystem/ModuleManager.h" #include "utils/Logger.h" #include "utils/Retranslator.h" @@ -225,4 +224,55 @@ DebugWindow::closeEvent( QCloseEvent* e ) emit closed(); } + +DebugWindowManager::DebugWindowManager( QObject* parent ) + : QObject( parent ) +{ +} + + +bool +DebugWindowManager::enabled() const +{ + const auto* s = Settings::instance(); + return ( Logger::logLevel() >= Logger::LOGVERBOSE ) || ( s ? s->debugMode() : false ); +} + + +void +DebugWindowManager::show( bool visible ) +{ + if ( !enabled() ) + { + visible = false; + } + if ( m_visible == visible ) + { + return; + } + + if ( visible ) + { + m_debugWindow = new Calamares::DebugWindow(); + m_debugWindow->show(); + connect( m_debugWindow.data(), &Calamares::DebugWindow::closed, this, [=]() { + m_debugWindow->deleteLater(); + m_visible = false; + emit visibleChanged( false ); + } ); + m_visible = true; + emit visibleChanged( true ); + } + else + { + if ( m_debugWindow ) + { + m_debugWindow->deleteLater(); + } + m_visible = false; + emit visibleChanged( false ); + } +} + + } // namespace Calamares diff --git a/src/calamares/DebugWindow.h b/src/calamares/DebugWindow.h index a07487b4ca..7bf18364c3 100644 --- a/src/calamares/DebugWindow.h +++ b/src/calamares/DebugWindow.h @@ -13,6 +13,7 @@ #include "VariantModel.h" +#include #include #include @@ -48,6 +49,43 @@ class DebugWindow : public QWidget std::unique_ptr< VariantModel > m_module_model; }; +/** @brief Manager for the (single) DebugWindow + * + * Only one DebugWindow is expected to be around. This class manages + * (exactly one) DebugWindow and can create and destroy it as needed. + * It is available to the Calamares panels as object `DebugWindow`. + */ +class DebugWindowManager : public QObject +{ + Q_OBJECT + + /// @brief Proxy to Settings::debugMode() default @c false + Q_PROPERTY( bool enabled READ enabled CONSTANT FINAL ) + + /** @brief Is the debug window visible? + * + * Writing @c true to this **may** make the debug window visible to + * the user; only if debugMode() is on. + */ + Q_PROPERTY( bool visible READ visible WRITE show NOTIFY visibleChanged ) + +public: + DebugWindowManager( QObject* parent = nullptr ); + virtual ~DebugWindowManager() override = default; + +public Q_SLOTS: + bool enabled() const; + bool visible() const { return m_visible; } + void show( bool visible ); + +signals: + void visibleChanged( bool visible ); + +private: + QPointer< DebugWindow > m_debugWindow; + bool m_visible = false; +}; + } // namespace Calamares #endif From 0b8ef49e7e05812690e58271505b16dbfc41a622 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 6 Mar 2021 23:11:41 +0100 Subject: [PATCH 197/318] [calamares] Make debug-window available to QML - Add a toggle() to the debug-window manager, for convenience - Make the manager available to QML - Use the debug-window manager (code imported from KaOS) --- src/calamares/CalamaresWindow.cpp | 15 +++++++++++++-- src/calamares/DebugWindow.cpp | 6 ++++++ src/calamares/DebugWindow.h | 1 + src/calamares/calamares-sidebar.qml | 25 +++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 2 deletions(-) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index 0a5014fefb..c37ad97d72 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -32,6 +32,8 @@ #include #include #ifdef WITH_QML +#include +#include #include #include #endif @@ -240,7 +242,7 @@ setDimension( QQuickWidget* w, Qt::Orientation o, int desiredWidth ) static QWidget* -getQmlSidebar( Calamares::DebugWindowManager*, +getQmlSidebar( Calamares::DebugWindowManager* debug, Calamares::ViewManager*, QWidget* parent, Qt::Orientation o, @@ -248,6 +250,11 @@ getQmlSidebar( Calamares::DebugWindowManager*, { CalamaresUtils::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" ) ) ) ); setDimension( w, o, desiredWidth ); @@ -255,7 +262,7 @@ getQmlSidebar( Calamares::DebugWindowManager*, } static QWidget* -getQmlNavigation( Calamares::DebugWindowManager*, +getQmlNavigation( Calamares::DebugWindowManager* debug, Calamares::ViewManager*, QWidget* parent, Qt::Orientation o, @@ -263,6 +270,10 @@ getQmlNavigation( Calamares::DebugWindowManager*, { CalamaresUtils::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" ) ) ) ); setDimension( w, o, desiredWidth ); diff --git a/src/calamares/DebugWindow.cpp b/src/calamares/DebugWindow.cpp index 21a044f663..ba51714372 100644 --- a/src/calamares/DebugWindow.cpp +++ b/src/calamares/DebugWindow.cpp @@ -274,5 +274,11 @@ DebugWindowManager::show( bool visible ) } } +void +DebugWindowManager::toggle() +{ + show( !m_visible ); +} + } // namespace Calamares diff --git a/src/calamares/DebugWindow.h b/src/calamares/DebugWindow.h index 7bf18364c3..41d92588d7 100644 --- a/src/calamares/DebugWindow.h +++ b/src/calamares/DebugWindow.h @@ -77,6 +77,7 @@ public Q_SLOTS: bool enabled() const; bool visible() const { return m_visible; } void show( bool visible ); + void toggle(); signals: void visibleChanged( bool visible ); diff --git a/src/calamares/calamares-sidebar.qml b/src/calamares/calamares-sidebar.qml index c12dd6e34d..5c94fb6b2c 100644 --- a/src/calamares/calamares-sidebar.qml +++ b/src/calamares/calamares-sidebar.qml @@ -1,6 +1,7 @@ /* Sample of QML progress tree. SPDX-FileCopyrightText: 2020 Adriaan de Groot + SPDX-FileCopyrightText: 2021 Anke Boersma SPDX-License-Identifier: GPL-3.0-or-later @@ -59,5 +60,29 @@ Rectangle { Item { Layout.fillHeight: true; } + + Rectangle { + Layout.fillWidth: true; + height: 35 + Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom + color: Branding.styleString( mouseArea.containsMouse ? Branding.SidebarTextHighlight : Branding.SidebarBackground); + visible: debug.enabled + + MouseArea { + id: mouseArea + anchors.fill: parent; + cursorShape: Qt.PointingHandCursor + hoverEnabled: true + Text { + anchors.verticalCenter: parent.verticalCenter; + x: parent.x + 4; + text: qsTr("Show debug information") + color: Branding.styleString( mouseArea.containsMouse ? Branding.SidebarTextSelect : Branding.SidebarBackground ); + font.pointSize : 9 + } + + onClicked: debug.toggle() + } + } } } From 5349e03ea9c23080c02d89045efacb5cf3a34359 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 13:52:13 +0100 Subject: [PATCH 198/318] REUSE: the CI actions are uninteresting --- .reuse/dep5 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.reuse/dep5 b/.reuse/dep5 index a2b9cf8c3b..cfd836c01f 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -29,6 +29,11 @@ Files: .github/ISSUE_TEMPLATE/* License: CC0-1.0 Copyright: no +# GitHub actions are not part of the source +Files: .github/workflows/*.yml +License: CC0-1.0 +Copyright: no + # Packaging information # Files: data/FreeBSD/distinfo data/FreeBSD/pkg-descr data/FreeBSD/pkg-plist From 430b3b072258144cbf5f6d02c40453c7bea2f9bb Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 13:55:20 +0100 Subject: [PATCH 199/318] REUSE: tag the schema file (badly, missing an email address) --- src/modules/shellprocess/shellprocess.schema.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/shellprocess/shellprocess.schema.yaml b/src/modules/shellprocess/shellprocess.schema.yaml index d92ebfc83d..af56707b74 100644 --- a/src/modules/shellprocess/shellprocess.schema.yaml +++ b/src/modules/shellprocess/shellprocess.schema.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: benne-dee +# SPDX-License-Identifier: GPL-3.0-or-later + $schema: http://json-schema.org/draft-07/schema# $id: https://calamares.io/schemas/shellprocess definitions: From 1ebb807624fb1f502cb58b939d29b4284f7a3384 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 13:57:21 +0100 Subject: [PATCH 200/318] [calamares] Drop #warning about KDSAG - it might not be very current, and it's *probably* better to use dbus-activation / kf5dbus, but let's not call it deprecated until very sure that the dbus version does the right thing. --- src/calamares/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp index d601082159..de709156f9 100644 --- a/src/calamares/main.cpp +++ b/src/calamares/main.cpp @@ -17,7 +17,6 @@ #include "utils/Retranslator.h" #ifndef WITH_KF5DBus -#warning "KDSingleApplicationGuard is deprecated" #include "3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h" #endif From 9154228421d1a0409f2c3f09b408fbc996d161c5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 14:22:13 +0100 Subject: [PATCH 201/318] Changes: adjust description of pastebin --- CHANGES | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 07c5c8b9c9..720908ca4c 100644 --- a/CHANGES +++ b/CHANGES @@ -15,10 +15,9 @@ This release contains contributions from (alphabetically by first name): ## Core ## - Uploading your log files (in case of installation failure) has been - expanded and is now more - configurable. Users should still take care when uploading logs, - and distro's should configure a URL with no public viewing - for the uploading of those logs. (Thanks Anubhav) + expanded and is now more configurable. Users should still take care + when uploading logs, and distro's should configure a URL with + no public viewing of those logs. (Thanks Anubhav) ## Modules ## - A new QML-based *finishedq* module has been added. (Thanks Anke) From fc8830ae4a5d9442ecd1ff42aaab9123f86e5e09 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 14:23:27 +0100 Subject: [PATCH 202/318] [libcalamaresui] Tidy logging --- src/libcalamaresui/utils/Paste.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 27ae7f8f7f..2c180bfa85 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -72,7 +72,7 @@ ficheLogUpload( QObject* parent ) return QString(); } - cDebug() << "Paste data written to paste server"; + cDebug() << Logger::SubEntry << "Paste data written to paste server"; if ( !socket->waitForReadyRead() ) { @@ -81,7 +81,7 @@ ficheLogUpload( QObject* parent ) return QString(); } - cDebug() << "Reading response from paste server"; + cDebug() << Logger::SubEntry << "Reading response from paste server"; char resp[ 1024 ]; resp[ 0 ] = '\0'; @@ -109,7 +109,7 @@ ficheLogUpload( QObject* parent ) return QString(); } - cDebug() << "Paste server results:" << pasteUrlMsg; + cDebug() << Logger::SubEntry << "Paste server results:" << pasteUrlMsg; return pasteUrlMsg; } } // namespace CalamaresUtils From bc2435eb7d9cfdc22a2d86c4b9218458b4d18e85 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 14:23:52 +0100 Subject: [PATCH 203/318] [libcalamaresui] Apply coding style --- src/libcalamaresui/utils/Paste.cpp | 12 ++++++------ src/libcalamaresui/utils/Paste.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 2c180bfa85..ce03a77e33 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -12,13 +12,13 @@ #include "Branding.h" #include "utils/Logger.h" +#include +#include #include #include +#include #include #include -#include -#include -#include namespace CalamaresUtils { @@ -96,11 +96,11 @@ ficheLogUpload( QObject* parent ) if ( nBytesRead >= 8 && pasteUrl.isValid() && pasteUrlRegex.match( pasteUrlStr ).hasMatch() ) { QClipboard* clipboard = QApplication::clipboard(); - clipboard->setText(pasteUrlStr, QClipboard::Clipboard); + clipboard->setText( pasteUrlStr, QClipboard::Clipboard ); - if (clipboard->supportsSelection()) + if ( clipboard->supportsSelection() ) { - clipboard->setText(pasteUrlStr, QClipboard::Selection); + clipboard->setText( pasteUrlStr, QClipboard::Selection ); } } else diff --git a/src/libcalamaresui/utils/Paste.h b/src/libcalamaresui/utils/Paste.h index 29e73fc1cc..cde1f18412 100644 --- a/src/libcalamaresui/utils/Paste.h +++ b/src/libcalamaresui/utils/Paste.h @@ -10,7 +10,7 @@ #ifndef UTILS_PASTE_H #define UTILS_PASTE_H -#include +#include class QObject; class QString; From 92e36558fa001137fc3e4591ab11c39075e2cff3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 14:25:40 +0100 Subject: [PATCH 204/318] [libcalamaresui] Remove unnecessary shadowing in lambda --- src/libcalamaresui/ViewManager.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 4e53fb90b8..184dceb328 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -186,11 +186,10 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail msgBox->show(); cDebug() << "Calamares will quit when the dialog closes."; - connect( msgBox, &QMessageBox::buttonClicked, [msgBox]( QAbstractButton* button ) { + connect( msgBox, &QMessageBox::buttonClicked, [msgBox, serverType]( QAbstractButton* button ) { if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole ) { QString pasteUrlMsg; - QString serverType = Calamares::Branding::instance()->uploadServer( Calamares::Branding::Type ); if ( serverType == "fiche" ) { pasteUrlMsg = CalamaresUtils::ficheLogUpload( msgBox ); From 844831751d8b63157425471a90322026ed075cb8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 14:30:20 +0100 Subject: [PATCH 205/318] [libcalamaresui] Factor out the reading of the log file - this will be needed for other pastebins, too --- src/libcalamaresui/utils/Paste.cpp | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index ce03a77e33..d2ef54a929 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -20,6 +20,23 @@ #include #include +/** @brief Reads the logfile, returns its contents. + * + * Returns an empty QByteArray() on any kind of error. + */ +static QByteArray +logFileContents() +{ + QFile pasteSourceFile( Logger::logFile() ); + if ( !pasteSourceFile.open( QIODevice::ReadOnly | QIODevice::Text ) ) + { + cError() << "Could not open log file"; + return QByteArray(); + } + // TODO: read the **last** 16kiB? + return pasteSourceFile.read( 16384 /* bytes */ ); +} + namespace CalamaresUtils { @@ -32,25 +49,18 @@ QStringList UploadServersList = { QString ficheLogUpload( QObject* parent ) { - const QString& ficheHost = Calamares::Branding::instance()->uploadServer( Calamares::Branding::URL ); quint16 fichePort = Calamares::Branding::instance()->uploadServer( Calamares::Branding::Port ).toInt(); QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); - QFile pasteSourceFile( Logger::logFile() ); - if ( !pasteSourceFile.open( QIODevice::ReadOnly | QIODevice::Text ) ) + QByteArray pasteData = logFileContents(); + if ( pasteData.isEmpty() ) { - cError() << "Could not open log file"; + // An error has already been logged return QString(); } - QByteArray pasteData; - while ( !pasteSourceFile.atEnd() ) - { - pasteData += pasteSourceFile.readLine(); - } - QTcpSocket* socket = new QTcpSocket( parent ); socket->connectToHost( ficheHost, fichePort ); From 260862fabc4527ad43db187e291d98c3379ea99f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 14:31:46 +0100 Subject: [PATCH 206/318] [libcalamaresui] Move the format-string closer to where it is used --- src/libcalamaresui/utils/Paste.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index d2ef54a929..e30553272f 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -52,7 +52,6 @@ ficheLogUpload( QObject* parent ) const QString& ficheHost = Calamares::Branding::instance()->uploadServer( Calamares::Branding::URL ); quint16 fichePort = Calamares::Branding::instance()->uploadServer( Calamares::Branding::Port ).toInt(); - QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); QByteArray pasteData = logFileContents(); if ( pasteData.isEmpty() ) @@ -101,7 +100,9 @@ ficheLogUpload( QObject* parent ) QUrl pasteUrl = QUrl( QString( resp ).trimmed(), QUrl::StrictMode ); QString pasteUrlStr = pasteUrl.toString(); QRegularExpression pasteUrlRegex( "^http[s]?://" + ficheHost ); - QString pasteUrlMsg = QString( pasteUrlFmt ).arg( pasteUrlStr ); + + QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); + QString pasteUrlMsg = pasteUrlFmt.arg( pasteUrlStr ); if ( nBytesRead >= 8 && pasteUrl.isValid() && pasteUrlRegex.match( pasteUrlStr ).hasMatch() ) { From 1bf95eacb04082b3d89ecc2a1d8ca58746dba101 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 14:33:14 +0100 Subject: [PATCH 207/318] [libcalamaresui] Tidy the logging some more --- src/libcalamaresui/utils/Paste.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index e30553272f..c84c7bdb44 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -52,7 +52,6 @@ ficheLogUpload( QObject* parent ) const QString& ficheHost = Calamares::Branding::instance()->uploadServer( Calamares::Branding::URL ); quint16 fichePort = Calamares::Branding::instance()->uploadServer( Calamares::Branding::Port ).toInt(); - QByteArray pasteData = logFileContents(); if ( pasteData.isEmpty() ) { @@ -70,7 +69,7 @@ ficheLogUpload( QObject* parent ) return QString(); } - cDebug() << "Connected to paste server"; + cDebug() << "Connected to paste server" << ficheHost; socket->write( pasteData ); From 8af5fb5da530b5553ba4e8bf23ed87bad7f7a4e9 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 14:38:43 +0100 Subject: [PATCH 208/318] [libcalamaresui] Simplify getting URL response - get a QByteArray rather than going through a char[] buffer - bytes-read is not important since the RE can only match if there **are** that many characters. --- src/libcalamaresui/utils/Paste.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index c84c7bdb44..2301993110 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -90,20 +90,17 @@ ficheLogUpload( QObject* parent ) } cDebug() << Logger::SubEntry << "Reading response from paste server"; - - char resp[ 1024 ]; - resp[ 0 ] = '\0'; - qint64 nBytesRead = socket->readLine( resp, 1024 ); + QByteArray responseText = socket->readLine( 1024 ); socket->close(); - QUrl pasteUrl = QUrl( QString( resp ).trimmed(), QUrl::StrictMode ); + QUrl pasteUrl = QUrl( QString( responseText ).trimmed(), QUrl::StrictMode ); QString pasteUrlStr = pasteUrl.toString(); QRegularExpression pasteUrlRegex( "^http[s]?://" + ficheHost ); QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); QString pasteUrlMsg = pasteUrlFmt.arg( pasteUrlStr ); - if ( nBytesRead >= 8 && pasteUrl.isValid() && pasteUrlRegex.match( pasteUrlStr ).hasMatch() ) + if ( pasteUrl.isValid() && pasteUrlRegex.match( pasteUrlStr ).hasMatch() ) { QClipboard* clipboard = QApplication::clipboard(); clipboard->setText( pasteUrlStr, QClipboard::Clipboard ); From f72436aa0a2d3c466e836b5a76e72e48a402540f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 14:41:58 +0100 Subject: [PATCH 209/318] [libcalamaresui] Drop RE-wrangling, compare hosts instead to detect valid paste URL --- src/libcalamaresui/utils/Paste.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 2301993110..cdf8cc17b8 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -95,12 +94,11 @@ ficheLogUpload( QObject* parent ) QUrl pasteUrl = QUrl( QString( responseText ).trimmed(), QUrl::StrictMode ); QString pasteUrlStr = pasteUrl.toString(); - QRegularExpression pasteUrlRegex( "^http[s]?://" + ficheHost ); QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); QString pasteUrlMsg = pasteUrlFmt.arg( pasteUrlStr ); - if ( pasteUrl.isValid() && pasteUrlRegex.match( pasteUrlStr ).hasMatch() ) + if ( pasteUrl.isValid() && pasteUrl.host() == ficheHost ) { QClipboard* clipboard = QApplication::clipboard(); clipboard->setText( pasteUrlStr, QClipboard::Clipboard ); From 3c6683bd982f33bc9795bcb76859812a050d3303 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 14:51:59 +0100 Subject: [PATCH 210/318] [libcalamaresui] Rip out untyped data about upload server This doesn't compile, but indicates the **type** information desired about the (a) upload server. --- src/libcalamaresui/Branding.h | 23 ++++++++++++++++------- src/libcalamaresui/utils/Paste.h | 5 +---- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index 87f71e862c..52c27bfea3 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -83,13 +83,16 @@ class UIDLLEXPORT Branding : public QObject }; Q_ENUM( StyleEntry ) - enum UploadServerEntry : short + /** @brief Supported log-upload servers. + * + * 'None' is here as a fallback. + */ + enum UploadServerType : short { - Type, - URL, - Port + None, + Fiche }; - Q_ENUM( UploadServerEntry ) + Q_ENUM( UploadServerType ) /** @brief Setting for how much the main window may expand. */ enum class WindowExpansion @@ -218,6 +221,13 @@ class UIDLLEXPORT Branding : public QObject ///@brief Which navigation flavor is configured PanelFlavor navigationFlavor() const { return m_navigationFlavor; } + /** @brief Upload server configuration + * + * This is both the type (which may be none, in which case the URL + * is irrelevant and usually empty) and the URL for the upload. + */ + QPair< UploadServerType, QUrl > uploadServer() const { return m_uploadServer; } + /** * Creates a map called "branding" in the global storage, and inserts an * entry for each of the branding strings. This makes the branding @@ -234,7 +244,6 @@ public slots: QString styleString( StyleEntry styleEntry ) const; QString imagePath( ImageEntry imageEntry ) const; - QString uploadServer( UploadServerEntry uploadServerEntry ) const; PanelSide sidebarSide() const { return m_sidebarSide; } PanelSide navigationSide() const { return m_navigationSide; } @@ -252,7 +261,7 @@ public slots: QMap< QString, QString > m_strings; QMap< QString, QString > m_images; QMap< QString, QString > m_style; - QMap< QString, QString > m_uploadServer; + QPair< UploadServerType, QUrl > m_uploadServer; /* The slideshow can be done in one of two ways: * - as a sequence of images diff --git a/src/libcalamaresui/utils/Paste.h b/src/libcalamaresui/utils/Paste.h index cde1f18412..784f2f28a3 100644 --- a/src/libcalamaresui/utils/Paste.h +++ b/src/libcalamaresui/utils/Paste.h @@ -10,10 +10,9 @@ #ifndef UTILS_PASTE_H #define UTILS_PASTE_H -#include +#include class QObject; -class QString; namespace CalamaresUtils { @@ -24,8 +23,6 @@ namespace CalamaresUtils */ QString ficheLogUpload( QObject* parent ); -extern QStringList UploadServersList; - } // namespace CalamaresUtils #endif From bce6f3f1b74a3b0246e13d3ef581db806063791e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 14:56:37 +0100 Subject: [PATCH 211/318] [libcalamaresui] Adjust paste code to desired API Still doesn't compile because consumers are not ready. --- src/libcalamaresui/utils/Paste.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index cdf8cc17b8..b65223a432 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -39,17 +39,10 @@ logFileContents() namespace CalamaresUtils { -QStringList UploadServersList = { - "fiche" - // In future more serverTypes can be added as Calamares support them - // "none" serverType is explicitly not mentioned here -}; - QString ficheLogUpload( QObject* parent ) { - const QString& ficheHost = Calamares::Branding::instance()->uploadServer( Calamares::Branding::URL ); - quint16 fichePort = Calamares::Branding::instance()->uploadServer( Calamares::Branding::Port ).toInt(); + auto [ type, serverUrl ] = Calamares::Branding::instance()->uploadServer(); QByteArray pasteData = logFileContents(); if ( pasteData.isEmpty() ) @@ -59,7 +52,7 @@ ficheLogUpload( QObject* parent ) } QTcpSocket* socket = new QTcpSocket( parent ); - socket->connectToHost( ficheHost, fichePort ); + socket->connectToHost( serverUrl.host(), serverUrl.port() ); if ( !socket->waitForConnected() ) { @@ -68,7 +61,7 @@ ficheLogUpload( QObject* parent ) return QString(); } - cDebug() << "Connected to paste server" << ficheHost; + cDebug() << "Connected to paste server" << serverUrl.host(); socket->write( pasteData ); @@ -98,7 +91,7 @@ ficheLogUpload( QObject* parent ) QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); QString pasteUrlMsg = pasteUrlFmt.arg( pasteUrlStr ); - if ( pasteUrl.isValid() && pasteUrl.host() == ficheHost ) + if ( pasteUrl.isValid() && pasteUrl.host() == serverUrl.host() ) { QClipboard* clipboard = QApplication::clipboard(); clipboard->setText( pasteUrlStr, QClipboard::Clipboard ); From efec12d001417980d0d4fe690a8069adc305a5f4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 15:24:02 +0100 Subject: [PATCH 212/318] [libcalamares] Read structured upload-server info - Use just type and url, since port can be specified in a URL. Note that we only use host and port, not the scheme (or the path, for that matter). - Factor out understanding the *uploadServer* key to a function. --- src/branding/default/branding.desc | 18 +++++++------- src/libcalamaresui/Branding.cpp | 38 +++++++++++++++++++++--------- src/libcalamaresui/Branding.h | 5 ++-- 3 files changed, 38 insertions(+), 23 deletions(-) diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index cd83b02f18..90f92b5f17 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -220,15 +220,13 @@ slideshowAPI: 2 # These options are to customize online uploading of logs to pastebins: -# - type : Defines the kind of pastebin service to be used.Currently -# it accepts two values: -# - none : disables the pastebin functionality -# - fiche : use fiche pastebin server -# - url : Defines the address of pastebin service to be used. -# Takes string as input -# - port : Defines the port number to be used to send logs. Takes -# integer as input +# - type : Defines the kind of pastebin service to be used. Currently +# it accepts two values: +# - none : disables the pastebin functionality +# - fiche : use fiche pastebin server +# - url : Defines the address of pastebin service to be used. +# Takes string as input. Important bits are the host and port, +# the scheme is not used. uploadServer : type : "fiche" - url : "termbin.com" - port : 9999 + url : "http://termbin.com:9999" diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index a71675e386..3668c0b4bc 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -138,6 +138,32 @@ loadStrings( QMap< QString, QString >& map, } } +static Branding::UploadServerInfo +uploadServerFromMap( const QVariantMap& map ) +{ + using Type = Branding::UploadServerType; + // *INDENT-OFF* + // clang-format off + static const NamedEnumTable< Type > names { + { "none", Type::None }, + { "fiche", Type::Fiche } + }; + // clang-format on + // *INDENT-ON* + + QString typestring = map[ "type" ].toString(); + QString urlstring = map[ "url" ].toString(); + + if ( typestring.isEmpty() || urlstring.isEmpty() ) + { + return Branding::UploadServerInfo( Branding::UploadServerType::None, QUrl() ); + } + + 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 ) ); +} + /** @brief Load the @p map with strings from @p config * * If os-release is supported (with KF5 CoreAddons >= 5.58) then @@ -227,11 +253,7 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent ) } ); loadStrings( m_style, doc, "style", []( const QString& s ) -> QString { return s; } ); - const QVariantMap temp = CalamaresUtils::yamlMapToVariant( doc[ "uploadServer" ] ); - for ( auto it = temp.constBegin(); it != temp.constEnd(); ++it ) - { - m_uploadServer.insert( it.key(), it.value().toString() ); - } + m_uploadServer = uploadServerFromMap( CalamaresUtils::yamlMapToVariant( doc[ "uploadServer" ] ) ); } catch ( YAML::Exception& e ) { @@ -292,12 +314,6 @@ Branding::imagePath( Branding::ImageEntry imageEntry ) const return m_images.value( s_imageEntryStrings.value( imageEntry ) ); } -QString -Branding::uploadServer( Branding::UploadServerEntry uploadServerEntry ) const -{ - return m_uploadServer.value( s_uploadServerStrings.value( uploadServerEntry ) ); -} - QPixmap Branding::image( Branding::ImageEntry imageEntry, const QSize& size ) const { diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index 52c27bfea3..831b2adec4 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -226,7 +226,8 @@ class UIDLLEXPORT Branding : public QObject * This is both the type (which may be none, in which case the URL * is irrelevant and usually empty) and the URL for the upload. */ - QPair< UploadServerType, QUrl > uploadServer() const { return m_uploadServer; } + using UploadServerInfo = QPair< UploadServerType, QUrl >; + UploadServerInfo uploadServer() const { return m_uploadServer; } /** * Creates a map called "branding" in the global storage, and inserts an @@ -261,7 +262,7 @@ public slots: QMap< QString, QString > m_strings; QMap< QString, QString > m_images; QMap< QString, QString > m_style; - QPair< UploadServerType, QUrl > m_uploadServer; + UploadServerInfo m_uploadServer; /* The slideshow can be done in one of two ways: * - as a sequence of images From 1ff854f05d66f03955406098be3549e1a6f69961 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 15:32:46 +0100 Subject: [PATCH 213/318] [libcalamaresui] Push upload to a more abstract API - have a namespace Paste with just one entry point, which will handle untangling type &c. This doesn't compile, but indicates the direction to take the API --- src/libcalamaresui/ViewManager.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 184dceb328..30614fdfa9 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -142,8 +142,7 @@ ViewManager::insertViewStep( int before, ViewStep* step ) void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { - QString serverType = Calamares::Branding::instance()->uploadServer( Calamares::Branding::Type ); - bool shouldOfferWebPaste = CalamaresUtils::UploadServersList.contains( serverType ); + bool shouldOfferWebPaste = Calamares::Branding::instance()->uploadServer().first != Calamares::Branding::UploadServerType::None; cError() << "Installation failed:" << message; cDebug() << Logger::SubEntry << "- message:" << message; @@ -186,18 +185,10 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail msgBox->show(); cDebug() << "Calamares will quit when the dialog closes."; - connect( msgBox, &QMessageBox::buttonClicked, [msgBox, serverType]( QAbstractButton* button ) { + connect( msgBox, &QMessageBox::buttonClicked, [msgBox]( QAbstractButton* button ) { if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole ) { - QString pasteUrlMsg; - if ( serverType == "fiche" ) - { - pasteUrlMsg = CalamaresUtils::ficheLogUpload( msgBox ); - } - else - { - pasteUrlMsg = QString(); - } + QString pasteUrlMsg = CalamaresUtils::Paste::doLogUpload(); QString pasteUrlTitle = tr( "Install Log Paste URL" ); if ( pasteUrlMsg.isEmpty() ) From 81badc36f44bd8618ffada5cab481be5bf387999 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 15:42:21 +0100 Subject: [PATCH 214/318] [libcalamaresui] Implement abstract doLogUpload() API This is a "do the right thing" function, which then calls the implementation-specific code for each type. --- src/libcalamaresui/ViewManager.cpp | 5 +++-- src/libcalamaresui/utils/Paste.cpp | 30 +++++++++++++++++++++++------- src/libcalamaresui/utils/Paste.h | 5 ++++- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 30614fdfa9..3d0fccb785 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -142,7 +142,8 @@ ViewManager::insertViewStep( int before, ViewStep* step ) void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { - bool shouldOfferWebPaste = Calamares::Branding::instance()->uploadServer().first != Calamares::Branding::UploadServerType::None; + bool shouldOfferWebPaste + = Calamares::Branding::instance()->uploadServer().first != Calamares::Branding::UploadServerType::None; cError() << "Installation failed:" << message; cDebug() << Logger::SubEntry << "- message:" << message; @@ -188,7 +189,7 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail connect( msgBox, &QMessageBox::buttonClicked, [msgBox]( QAbstractButton* button ) { if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole ) { - QString pasteUrlMsg = CalamaresUtils::Paste::doLogUpload(); + QString pasteUrlMsg = CalamaresUtils::Paste::doLogUpload( msgBox ); QString pasteUrlTitle = tr( "Install Log Paste URL" ); if ( pasteUrlMsg.isEmpty() ) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index b65223a432..e6ac63f885 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -36,14 +36,10 @@ logFileContents() return pasteSourceFile.read( 16384 /* bytes */ ); } -namespace CalamaresUtils -{ -QString -ficheLogUpload( QObject* parent ) +static QString +ficheLogUpload( const QUrl& serverUrl, QObject* parent ) { - auto [ type, serverUrl ] = Calamares::Branding::instance()->uploadServer(); - QByteArray pasteData = logFileContents(); if ( pasteData.isEmpty() ) { @@ -110,4 +106,24 @@ ficheLogUpload( QObject* parent ) cDebug() << Logger::SubEntry << "Paste server results:" << pasteUrlMsg; return pasteUrlMsg; } -} // namespace CalamaresUtils + +QString +CalamaresUtils::Paste::doLogUpload( QObject* parent ) +{ + auto [ type, serverUrl ] = Calamares::Branding::instance()->uploadServer(); + if ( !serverUrl.isValid() ) + { + cWarning() << "Upload configure with invalid URL"; + return QString(); + } + + switch ( type ) + { + case Calamares::Branding::UploadServerType::None: + cWarning() << "No upload configured."; + return QString(); + case Calamares::Branding::UploadServerType::Fiche: + return ficheLogUpload( serverUrl, parent ); + } + return QString(); +} diff --git a/src/libcalamaresui/utils/Paste.h b/src/libcalamaresui/utils/Paste.h index 784f2f28a3..6258e57a09 100644 --- a/src/libcalamaresui/utils/Paste.h +++ b/src/libcalamaresui/utils/Paste.h @@ -16,12 +16,15 @@ class QObject; namespace CalamaresUtils { +namespace Paste +{ /** @brief Send the current log file to a pastebin * * Returns the (string) URL that the pastebin gives us. */ -QString ficheLogUpload( QObject* parent ); +QString doLogUpload( QObject* parent ); +} // namespace Paste } // namespace CalamaresUtils From 846d6abaa83b36223fc43c03c6dd7cc1fbc2fe2a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 15:51:24 +0100 Subject: [PATCH 215/318] [libcalamaresui] Move message- and clipboard handling - The Paste API promises just a (string) URL back, not a whole message, so return just the URL from the abstract API and the concrete (fiche) implementation. - Set clipboard contents from the UI - Build (translated) message in the UI code --- src/libcalamaresui/ViewManager.cpp | 25 ++++++++++++++++++------- src/libcalamaresui/utils/Paste.cpp | 20 ++------------------ 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 3d0fccb785..b22d34c88f 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -189,16 +190,26 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail connect( msgBox, &QMessageBox::buttonClicked, [msgBox]( QAbstractButton* button ) { if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole ) { - QString pasteUrlMsg = CalamaresUtils::Paste::doLogUpload( msgBox ); - - QString pasteUrlTitle = tr( "Install Log Paste URL" ); - if ( pasteUrlMsg.isEmpty() ) + QString pasteUrl = CalamaresUtils::Paste::doLogUpload( msgBox ); + QString pasteUrlMessage; + if ( pasteUrl.isEmpty() ) + { + pasteUrlMessage = tr( "The upload was unsuccessful. No web-paste was done." ); + } + else { - pasteUrlMsg = tr( "The upload was unsuccessful. No web-paste was done." ); + QClipboard* clipboard = QApplication::clipboard(); + clipboard->setText( pasteUrl, QClipboard::Clipboard ); + + if ( clipboard->supportsSelection() ) + { + clipboard->setText( pasteUrl, QClipboard::Selection ); + } + QString pasteUrlFmt = tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); + pasteUrlMessage = pasteUrlFmt.arg( pasteUrl ); } - // TODO: make the URL clickable, or copy it to the clipboard automatically - QMessageBox::critical( nullptr, pasteUrlTitle, pasteUrlMsg ); + QMessageBox::critical( nullptr, tr( "Install Log Paste URL" ), pasteUrlMessage ); } QApplication::quit(); } ); diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index e6ac63f885..d723e182ca 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -12,10 +12,7 @@ #include "Branding.h" #include "utils/Logger.h" -#include -#include #include -#include #include #include @@ -82,29 +79,16 @@ ficheLogUpload( const QUrl& serverUrl, QObject* parent ) socket->close(); QUrl pasteUrl = QUrl( QString( responseText ).trimmed(), QUrl::StrictMode ); - QString pasteUrlStr = pasteUrl.toString(); - - QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); - QString pasteUrlMsg = pasteUrlFmt.arg( pasteUrlStr ); - if ( pasteUrl.isValid() && pasteUrl.host() == serverUrl.host() ) { - QClipboard* clipboard = QApplication::clipboard(); - clipboard->setText( pasteUrlStr, QClipboard::Clipboard ); - - if ( clipboard->supportsSelection() ) - { - clipboard->setText( pasteUrlStr, QClipboard::Selection ); - } + cDebug() << Logger::SubEntry << "Paste server results:" << pasteUrl; + return pasteUrl.toString(); } else { cError() << "No data from paste server"; return QString(); } - - cDebug() << Logger::SubEntry << "Paste server results:" << pasteUrlMsg; - return pasteUrlMsg; } QString From 44ec8a7c0b75f56c89accd1391c8e748f23efb34 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 17:22:48 +0100 Subject: [PATCH 216/318] [libcalamaresui] Improve testability - mark functions with STATICTEST so they can be compiled into a test - move logfile-reading so we can call the pastebin-upload functions with an arbitrary payload. --- src/libcalamaresui/utils/Paste.cpp | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index d723e182ca..ee54d265a2 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -10,6 +10,7 @@ #include "Paste.h" #include "Branding.h" +#include "DllMacro.h" #include "utils/Logger.h" #include @@ -20,7 +21,7 @@ * * Returns an empty QByteArray() on any kind of error. */ -static QByteArray +STATICTEST QByteArray logFileContents() { QFile pasteSourceFile( Logger::logFile() ); @@ -34,16 +35,9 @@ logFileContents() } -static QString -ficheLogUpload( const QUrl& serverUrl, QObject* parent ) +STATICTEST QString +ficheLogUpload( const QByteArray& pasteData, QUrl& serverUrl, QObject* parent ) { - QByteArray pasteData = logFileContents(); - if ( pasteData.isEmpty() ) - { - // An error has already been logged - return QString(); - } - QTcpSocket* socket = new QTcpSocket( parent ); socket->connectToHost( serverUrl.host(), serverUrl.port() ); @@ -100,6 +94,18 @@ CalamaresUtils::Paste::doLogUpload( QObject* parent ) cWarning() << "Upload configure with invalid URL"; return QString(); } + if ( type == Calamares::Branding::UploadServerType::None ) + { + // Early return to avoid reading the log file + return QString(); + } + + QByteArray pasteData = logFileContents(); + if ( pasteData.isEmpty() ) + { + // An error has already been logged + return QString(); + } switch ( type ) { @@ -107,7 +113,7 @@ CalamaresUtils::Paste::doLogUpload( QObject* parent ) cWarning() << "No upload configured."; return QString(); case Calamares::Branding::UploadServerType::Fiche: - return ficheLogUpload( serverUrl, parent ); + return ficheLogUpload( pasteData, serverUrl, parent ); } return QString(); } From a1ed30382028211efa0925cf39e11d16a1d2c267 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 17:55:10 +0100 Subject: [PATCH 217/318] [libcalamaresui] Add test for Paste This tests only the termbin ("fiche") paste by sending it a derpy fixed string. Prints the resulting URL, doesn't verify in particular. It'd be rude to run this test too often. --- src/libcalamaresui/CMakeLists.txt | 9 ++++ src/libcalamaresui/utils/Paste.cpp | 2 +- src/libcalamaresui/utils/TestPaste.cpp | 67 ++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 src/libcalamaresui/utils/TestPaste.cpp diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt index f48008c2d9..4afdc66144 100644 --- a/src/libcalamaresui/CMakeLists.txt +++ b/src/libcalamaresui/CMakeLists.txt @@ -111,3 +111,12 @@ foreach( subdir modulesystem utils viewpages widgets ) file( GLOB subdir_headers "${subdir}/*.h" ) install( FILES ${subdir_headers} DESTINATION include/libcalamares/${subdir} ) endforeach() + +calamares_add_test( + test_libcalamaresuipaste + SOURCES + utils/TestPaste.cpp + utils/Paste.cpp + LIBRARIES + calamaresui +) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index ee54d265a2..2d2f5404ea 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -36,7 +36,7 @@ logFileContents() STATICTEST QString -ficheLogUpload( const QByteArray& pasteData, QUrl& serverUrl, QObject* parent ) +ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* parent ) { QTcpSocket* socket = new QTcpSocket( parent ); socket->connectToHost( serverUrl.host(), serverUrl.port() ); diff --git a/src/libcalamaresui/utils/TestPaste.cpp b/src/libcalamaresui/utils/TestPaste.cpp new file mode 100644 index 0000000000..ff75be02d8 --- /dev/null +++ b/src/libcalamaresui/utils/TestPaste.cpp @@ -0,0 +1,67 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * + * Calamares is Free Software: see the License-Identifier above. + * + * + */ + +#include "Paste.h" + +#include "utils/Logger.h" + +#include +#include + +extern QByteArray logFileContents(); +extern QString ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* parent ); + +class TestPaste : public QObject +{ + Q_OBJECT + +public: + TestPaste() {} + ~TestPaste() override {} + +private Q_SLOTS: + void testGetLogFile(); + void testFichePaste(); +}; + +void +TestPaste::testGetLogFile() +{ + // This test assumes nothing **else** has set up logging yet + QByteArray b = logFileContents(); + QVERIFY( b.isEmpty() ); + + Logger::setupLogLevel( Logger::LOGDEBUG ); + Logger::setupLogfile(); + + b = logFileContents(); + QVERIFY( !b.isEmpty() ); +} + +void +TestPaste::testFichePaste() +{ + QString blabla( "the quick brown fox tested Calamares and found it rubbery" ); + QDateTime now = QDateTime::currentDateTime(); + + QByteArray d = ( blabla + now.toString() ).toUtf8(); + QString s = ficheLogUpload( d, QUrl( "http://termbin.com:9999" ), nullptr ); + + cDebug() << "Paste data to" << s; + QVERIFY( !s.isEmpty() ); +} + + +QTEST_GUILESS_MAIN( TestPaste ) + +#include "utils/moc-warnings.h" + +#include "TestPaste.moc" From ea63f48c315d2f9010272d747b4d028d7c5279a7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 18:21:58 +0100 Subject: [PATCH 218/318] [libcalamares] Put the units in a nested namespace - this makes it much easier to use the literal suffixes by using the namespace rather than individual operators. --- src/libcalamares/GlobalStorage.cpp | 2 +- src/libcalamares/utils/Units.h | 18 ++++++++++++------ src/modules/preservefiles/PreserveFiles.cpp | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/libcalamares/GlobalStorage.cpp b/src/libcalamares/GlobalStorage.cpp index 6cae46eeb2..9f394e2454 100644 --- a/src/libcalamares/GlobalStorage.cpp +++ b/src/libcalamares/GlobalStorage.cpp @@ -19,7 +19,7 @@ #include #include -using CalamaresUtils::operator""_MiB; +using namespace CalamaresUtils::Units; namespace Calamares { diff --git a/src/libcalamares/utils/Units.h b/src/libcalamares/utils/Units.h index abccacb0da..7a13dac102 100644 --- a/src/libcalamares/utils/Units.h +++ b/src/libcalamares/utils/Units.h @@ -18,6 +18,9 @@ namespace CalamaresUtils { +namespace Units +{ + /** User defined literals, 1_KB is 1 KiloByte (= 10^3 bytes) */ constexpr qint64 operator""_KB( unsigned long long m ) { @@ -54,40 +57,42 @@ constexpr qint64 operator""_GiB( unsigned long long m ) return operator""_MiB(m)*1024; } +} + constexpr qint64 KBtoBytes( unsigned long long m ) { - return operator""_KB( m ); + return Units::operator""_KB( m ); } constexpr qint64 KiBtoBytes( unsigned long long m ) { - return operator""_KiB( m ); + return Units::operator""_KiB( m ); } constexpr qint64 MBtoBytes( unsigned long long m ) { - return operator""_MB( m ); + return Units::operator""_MB( m ); } constexpr qint64 MiBtoBytes( unsigned long long m ) { - return operator""_MiB( m ); + return Units::operator""_MiB( m ); } constexpr qint64 GBtoBytes( unsigned long long m ) { - return operator""_GB( m ); + return Units::operator""_GB( m ); } constexpr qint64 GiBtoBytes( unsigned long long m ) { - return operator""_GiB( m ); + return Units::operator""_GiB( m ); } constexpr qint64 @@ -157,4 +162,5 @@ bytesToSectors( qint64 bytes, qint64 blocksize ) } } // namespace CalamaresUtils + #endif diff --git a/src/modules/preservefiles/PreserveFiles.cpp b/src/modules/preservefiles/PreserveFiles.cpp index 64770adce9..b235aac933 100644 --- a/src/modules/preservefiles/PreserveFiles.cpp +++ b/src/modules/preservefiles/PreserveFiles.cpp @@ -18,7 +18,7 @@ #include -using CalamaresUtils::operator""_MiB; +using namespace CalamaresUtils::Units; QString targetPrefix() From 9f17d3fd1206e88485a192635a801d5575c3b26b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 18:25:10 +0100 Subject: [PATCH 219/318] [libcalamaresui] Paste the last 16KiB of the log file - If Calamares is run more than once, reading the log file can get you older / not relevant log messages. Get the tail end instead. --- src/libcalamaresui/utils/Paste.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 2d2f5404ea..ea20dc8b2b 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -12,11 +12,15 @@ #include "Branding.h" #include "DllMacro.h" #include "utils/Logger.h" +#include "utils/Units.h" #include +#include #include #include +using namespace CalamaresUtils::Units; + /** @brief Reads the logfile, returns its contents. * * Returns an empty QByteArray() on any kind of error. @@ -30,8 +34,12 @@ logFileContents() cError() << "Could not open log file"; return QByteArray(); } - // TODO: read the **last** 16kiB? - return pasteSourceFile.read( 16384 /* bytes */ ); + QFileInfo fi( pasteSourceFile ); + if ( fi.size() > 16_KiB ) + { + pasteSourceFile.seek( fi.size() - 16_KiB ); + } + return pasteSourceFile.read( 16_KiB ); } From 98524708cc258e38ef3dbc49621824772e5ab562 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 19:45:12 +0100 Subject: [PATCH 220/318] [partition] Chase namespace change for Units --- src/modules/partition/core/PartitionActions.cpp | 4 ++-- src/modules/partition/gui/PartitionLabelsView.cpp | 2 +- src/modules/partition/tests/CreateLayoutsTests.cpp | 5 ++--- src/modules/partition/tests/PartitionJobTests.cpp | 5 ++--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index dc3b0b572d..d4301578ba 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -29,10 +29,10 @@ #include +using namespace CalamaresUtils::Units; + namespace PartitionActions { -using CalamaresUtils::operator""_GiB; -using CalamaresUtils::operator""_MiB; qint64 swapSuggestion( const qint64 availableSpaceB, Config::SwapChoice swap ) diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp index 7e861d9944..5803d59a28 100644 --- a/src/modules/partition/gui/PartitionLabelsView.cpp +++ b/src/modules/partition/gui/PartitionLabelsView.cpp @@ -27,7 +27,7 @@ #include #include -using CalamaresUtils::operator""_MiB; +using namespace CalamaresUtils::Units; static const int LAYOUT_MARGIN = 4; static const int LABEL_PARTITION_SQUARE_MARGIN = qMax( QFontMetrics( CalamaresUtils::defaultFont() ).ascent() - 2, 18 ); diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp index 216bfc2099..68b839e081 100644 --- a/src/modules/partition/tests/CreateLayoutsTests.cpp +++ b/src/modules/partition/tests/CreateLayoutsTests.cpp @@ -19,6 +19,8 @@ #include +using namespace CalamaresUtils::Units; + class PartitionTable; class SmartStatus; @@ -27,9 +29,6 @@ QTEST_GUILESS_MAIN( CreateLayoutsTests ) static CalamaresUtils::Partition::KPMManager* kpmcore = nullptr; static Calamares::JobQueue* jobqueue = nullptr; -using CalamaresUtils::operator""_MiB; -using CalamaresUtils::operator""_GiB; - #define LOGICAL_SIZE 512 CreateLayoutsTests::CreateLayoutsTests() diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp index 204819fef8..57dc2579c7 100644 --- a/src/modules/partition/tests/PartitionJobTests.cpp +++ b/src/modules/partition/tests/PartitionJobTests.cpp @@ -28,8 +28,7 @@ QTEST_GUILESS_MAIN( PartitionJobTests ) using namespace Calamares; -using CalamaresUtils::operator""_MiB; -using CalamaresUtils::Partition::isPartitionFreeSpace; +using namespace CalamaresUtils::Units; class PartitionMounter { @@ -104,7 +103,7 @@ static Partition* firstFreePartition( PartitionNode* parent ) { for ( auto child : parent->children() ) - if ( isPartitionFreeSpace( child ) ) + if ( CalamaresUtils::Partition::isPartitionFreeSpace( child ) ) { return child; } From a7b46a02eb3a6d8a575008ad203dc814b05a356a Mon Sep 17 00:00:00 2001 From: demmm Date: Tue, 9 Mar 2021 19:45:32 +0100 Subject: [PATCH 221/318] [finishedq] add license for svg file --- src/modules/finishedq/seedling.svg.license | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 src/modules/finishedq/seedling.svg.license diff --git a/src/modules/finishedq/seedling.svg.license b/src/modules/finishedq/seedling.svg.license new file mode 100644 index 0000000000..0604e8da9c --- /dev/null +++ b/src/modules/finishedq/seedling.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2021 FontAwesome +SPDX-License-Identifier: CC-BY-4.0 From d39f2b8c3e41e9a0c705e1038228f91d80dfcdeb Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 11 Mar 2021 06:30:13 -0500 Subject: [PATCH 222/318] [packages] Drop urpmi support This code is essentially untested and unused, as OpenMandriva has been using DNF for three years now. Reference: https://www.openmandriva.org/en/news/article/switching-to-rpmv4 --- src/modules/packages/main.py | 20 -------------------- src/modules/packages/packages.conf | 1 - src/modules/packages/packages.schema.yaml | 1 - 3 files changed, 22 deletions(-) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index 9d912da726..7cd7f3f0b2 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -356,26 +356,6 @@ def update_system(self): pass -class PMUrpmi(PackageManager): - backend = "urpmi" - - def install(self, pkgs, from_local=False): - check_target_env_call(["urpmi", "--download-all", "--no-suggests", - "--no-verify-rpm", "--fastunsafe", - "--ignoresize", "--nolock", - "--auto"] + pkgs) - - def remove(self, pkgs): - check_target_env_call(["urpme", "--auto"] + pkgs) - - def update_db(self): - check_target_env_call(["urpmi.update", "-a"]) - - def update_system(self): - # Doesn't need to update the system explicitly - pass - - class PMXbps(PackageManager): backend = "xbps" diff --git a/src/modules/packages/packages.conf b/src/modules/packages/packages.conf index b1289ad514..3c478fe207 100644 --- a/src/modules/packages/packages.conf +++ b/src/modules/packages/packages.conf @@ -12,7 +12,6 @@ # - pacman - Pacman # - pamac - Manjaro package manager # - portage - Gentoo package manager -# - urpmi - Mandriva package manager # - yum - Yum RPM frontend # - zypp - Zypp RPM frontend # diff --git a/src/modules/packages/packages.schema.yaml b/src/modules/packages/packages.schema.yaml index 79f5f21c82..10eb9808a7 100644 --- a/src/modules/packages/packages.schema.yaml +++ b/src/modules/packages/packages.schema.yaml @@ -17,7 +17,6 @@ properties: - pacman - pamac - portage - - urpmi - yum - zypp - dummy From 63fc1ecca37e26c85e3a41d4e2f68af9bfa02532 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 12 Mar 2021 13:10:48 +0100 Subject: [PATCH 223/318] Changes: document intention of this branch --- CHANGES | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES b/CHANGES index 720908ca4c..2b0c3210a4 100644 --- a/CHANGES +++ b/CHANGES @@ -21,6 +21,7 @@ This release contains contributions from (alphabetically by first name): ## Modules ## - A new QML-based *finishedq* module has been added. (Thanks Anke) + - The *users* module now can set a fixed username and prevent editing. # 3.2.37 (2021-02-23) # From d9f2f5e988ba8f0692106bab7f3e07a641376d38 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 12 Mar 2021 13:16:36 +0100 Subject: [PATCH 224/318] [libcalamares] Start a 'presets' configuration datastructure --- src/libcalamares/CMakeLists.txt | 1 + src/libcalamares/modulesystem/Preset.cpp | 49 ++++++++++++++++++++ src/libcalamares/modulesystem/Preset.h | 57 ++++++++++++++++++++++++ 3 files changed, 107 insertions(+) create mode 100644 src/libcalamares/modulesystem/Preset.cpp create mode 100644 src/libcalamares/modulesystem/Preset.h diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 700eff37b4..bd24726bc5 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -51,6 +51,7 @@ set( libSources modulesystem/Descriptor.cpp modulesystem/InstanceKey.cpp modulesystem/Module.cpp + modulesystem/Preset.cpp modulesystem/RequirementsChecker.cpp modulesystem/RequirementsModel.cpp diff --git a/src/libcalamares/modulesystem/Preset.cpp b/src/libcalamares/modulesystem/Preset.cpp new file mode 100644 index 0000000000..8240e23e77 --- /dev/null +++ b/src/libcalamares/modulesystem/Preset.cpp @@ -0,0 +1,49 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "Preset.h" + +#include "utils/Logger.h" +#include "utils/Variant.h" + +static void +loadPresets( Calamares::ModuleSystem::Presets& preset, + const QVariantMap& configurationMap, + std::function< bool( const QString& ) > pred ) +{ + cDebug() << "Creating presets" << preset.capacity(); + for ( auto it = configurationMap.cbegin(); it != configurationMap.cend(); ++it ) + { + 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 ); + + preset.append( Calamares::ModuleSystem::PresetField { it.key(), value, editable } ); + + cDebug() << Logger::SubEntry << "Preset for" << it.key() << "applied editable?" << editable; + } + } +} + +Calamares::ModuleSystem::Presets::Presets( const QVariantMap& configurationMap ) + + +{ + reserve( configurationMap.count() ); + loadPresets( *this, configurationMap, []( const QString& ) { return true; } ); +} + +Calamares::ModuleSystem::Presets::Presets( const QVariantMap& configurationMap, const QStringList& recognizedKeys ) +{ + reserve( recognizedKeys.size() ); + loadPresets( + *this, configurationMap, [&recognizedKeys]( const QString& s ) { return recognizedKeys.contains( s ); } ); +} diff --git a/src/libcalamares/modulesystem/Preset.h b/src/libcalamares/modulesystem/Preset.h new file mode 100644 index 0000000000..1744313ae8 --- /dev/null +++ b/src/libcalamares/modulesystem/Preset.h @@ -0,0 +1,57 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef CALAMARES_MODULESYSTEM_PRESET_H +#define CALAMARES_MODULESYSTEM_PRESET_H + +#include +#include +#include + +namespace Calamares +{ +namespace ModuleSystem +{ +/** @brief The settings for a single field + * + * The settings apply to a single field; **often** this will + * correspond to a single value or property of a Config + * object, but there is no guarantee of a correspondence + * between names here and names in the code. + * + * The value is stored as a string; consumers (e.g. the UI) + * will need to translate the value to whatever is actually + * used (e.g. in the case of an integer field). + * + * By default, presets are still editable. Set that to @c false + * to make the field unchangeable (again, the UI is responsible + * for setting that up). + */ +struct PresetField +{ + QString fieldName; + QString value; + bool editable = true; +}; + +/** @brief All the presets for one UI entity + * + * This is a collection of presets read from a module + * configuration file, one setting per field. + */ +class Presets : public QVector< PresetField > +{ +public: + explicit Presets( const QVariantMap& configurationMap ); + Presets( const QVariantMap& configurationMap, const QStringList& recognizedKeys ); +}; +} // namespace ModuleSystem +} // namespace Calamares + +#endif From 381a4f9b531de97bdedeb1d8a7b0006006baadc0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 12 Mar 2021 13:25:16 +0100 Subject: [PATCH 225/318] [users] Add preset to users module Config --- src/modules/users/Config.cpp | 7 ++++++- src/modules/users/users.conf | 8 ++++++++ src/modules/users/users.schema.yaml | 12 ++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp index 165e21b9c2..00aa257fae 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp @@ -16,6 +16,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" +#include "modulesystem/Preset.h" #include "utils/Logger.h" #include "utils/String.h" #include "utils/Variant.h" @@ -105,7 +106,7 @@ Config::Config( QObject* parent ) connect( this, &Config::requireStrongPasswordsChanged, this, &Config::checkReady ); } -Config::~Config() { } +Config::~Config() {} void Config::setUserShell( const QString& shell ) @@ -836,6 +837,10 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) updateGSAutoLogin( doAutoLogin(), loginName() ); checkReady(); + + bool bogus = true; + Calamares::ModuleSystem::Presets p( CalamaresUtils::getSubMap( configurationMap, "presets", bogus ), + { "fullname", "loginname", } ); } void diff --git a/src/modules/users/users.conf b/src/modules/users/users.conf index 2e09ae1230..b137a135ad 100644 --- a/src/modules/users/users.conf +++ b/src/modules/users/users.conf @@ -159,3 +159,11 @@ setHostname: EtcFile # (also adds localhost and some ipv6 standard entries). # Defaults to *true*. writeHostsFile: true + +presets: + fullname: + value: "OEM User" + editable: false + loginname: + value: "oem" + editable: false diff --git a/src/modules/users/users.schema.yaml b/src/modules/users/users.schema.yaml index 81088032c8..5870a7e0ab 100644 --- a/src/modules/users/users.schema.yaml +++ b/src/modules/users/users.schema.yaml @@ -43,6 +43,18 @@ properties: setHostname: { type: string, enum: [ None, EtcFile, Hostnamed ] } writeHostsFile: { type: boolean, default: true } + # Presets + # + # TODO: lift up somewhere, since this will return in many modules; + # the type for each field (fullname, loginname) is a + # preset-description (value, editable). + presets: + type: object + additionalProperties: false + properties: + fullname: { type: object } + loginname: { type: object } + required: - defaultGroups - autologinGroup From 0be5e04c2e8655f2965f26f4892fa4f07516e4aa Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 12 Mar 2021 13:49:37 +0100 Subject: [PATCH 226/318] [libcalamares] Add a base class for Config-objects This is an optional (until 3.3) base class, which can handle Presets consistently for configurations. --- src/libcalamares/CMakeLists.txt | 1 + src/libcalamares/modulesystem/Config.cpp | 64 ++++++++++++++++++++++++ src/libcalamares/modulesystem/Config.h | 60 ++++++++++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 src/libcalamares/modulesystem/Config.cpp create mode 100644 src/libcalamares/modulesystem/Config.h diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index bd24726bc5..826f0bc413 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -48,6 +48,7 @@ set( libSources locale/TranslatableString.cpp # Modules + modulesystem/Config.cpp modulesystem/Descriptor.cpp modulesystem/InstanceKey.cpp modulesystem/Module.cpp diff --git a/src/libcalamares/modulesystem/Config.cpp b/src/libcalamares/modulesystem/Config.cpp new file mode 100644 index 0000000000..75c54badf8 --- /dev/null +++ b/src/libcalamares/modulesystem/Config.cpp @@ -0,0 +1,64 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "Config.h" + +#include "Preset.h" +#include "utils/Variant.h" + +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 >() ) +{ +} + +Config::~Config() {} + +void +Config::loadPresets( const QVariantMap& configurationMap ) +{ + const QString key( "presets" ); + if ( !configurationMap.contains( key ) ) + { + d->m_presets.reset(); + return; + } + bool bogus = true; + d->m_presets = std::make_unique< Presets >( CalamaresUtils::getSubMap( configurationMap, key, bogus ) ); +} + +void +Config::loadPresets( const QVariantMap& configurationMap, const QStringList& recognizedKeys ) +{ + const QString key( "presets" ); + if ( !configurationMap.contains( key ) ) + { + d->m_presets.reset(); + return; + } + bool bogus = true; + d->m_presets + = std::make_unique< Presets >( CalamaresUtils::getSubMap( configurationMap, key, bogus ), recognizedKeys ); +} + +} // namespace ModuleSystem +} // namespace Calamares diff --git a/src/libcalamares/modulesystem/Config.h b/src/libcalamares/modulesystem/Config.h new file mode 100644 index 0000000000..9bc0705c6a --- /dev/null +++ b/src/libcalamares/modulesystem/Config.h @@ -0,0 +1,60 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef CALAMARES_MODULESYSTEM_CONFIG_H +#define CALAMARES_MODULESYSTEM_CONFIG_H + +#include "DllMacro.h" + +#include +#include +#include + +#include + +namespace Calamares +{ +namespace ModuleSystem +{ +/** @brief Base class for Config-objects + * + * This centralizes the things every Config-object should + * do and provides one source of preset-data. A Config-object + * for a module can **optionally** inherit from this class + * to get presets-support. + * + * TODO:3.3 This is not optional + * TODO:3.3 Put consistent i18n for Configurations in here too + */ +class DLLEXPORT Config : public QObject +{ +public: + Config( QObject* parent = nullptr ); + ~Config() override; + + /** @brief Set the configuration from the config file + * + * Subclasses must implement this to load configuration data; + * that subclass **should** also call loadPresets() with the + * same map, to pick up the "presets" key consistently. + */ + virtual void setConfigurationMap( const QVariantMap& ) = 0; + +protected: + void loadPresets( const QVariantMap& configurationMap ); + void loadPresets( const QVariantMap& configurationMap, const QStringList& recognizedKeys ); + +private: + class Private; + std::unique_ptr< Private > d; +}; +} // namespace ModuleSystem +} // namespace Calamares + +#endif From 448e478b6d4afc50fbb040196483581a68875bb6 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 12 Mar 2021 13:54:06 +0100 Subject: [PATCH 227/318] [users] Use base Config and its Preset-handling --- src/modules/users/Config.cpp | 11 ++++++----- src/modules/users/Config.h | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp index 00aa257fae..0fcf745faa 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp @@ -16,7 +16,6 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "modulesystem/Preset.h" #include "utils/Logger.h" #include "utils/String.h" #include "utils/Variant.h" @@ -92,7 +91,7 @@ hostNameActionNames() } Config::Config( QObject* parent ) - : QObject( parent ) + : Calamares::ModuleSystem::Config( parent ) { emit readyChanged( m_isReady ); // false @@ -838,9 +837,11 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) updateGSAutoLogin( doAutoLogin(), loginName() ); checkReady(); - bool bogus = true; - Calamares::ModuleSystem::Presets p( CalamaresUtils::getSubMap( configurationMap, "presets", bogus ), - { "fullname", "loginname", } ); + loadPresets( configurationMap, + { + "fullname", + "loginname", + } ); } void diff --git a/src/modules/users/Config.h b/src/modules/users/Config.h index d4bfee4a46..28f0c73d73 100644 --- a/src/modules/users/Config.h +++ b/src/modules/users/Config.h @@ -13,6 +13,7 @@ #include "CheckPWQuality.h" #include "Job.h" +#include "modulesystem/Config.h" #include "utils/NamedEnum.h" #include @@ -85,7 +86,7 @@ class GroupDescription }; -class PLUGINDLLEXPORT Config : public QObject +class PLUGINDLLEXPORT Config : public Calamares::ModuleSystem::Config { Q_OBJECT @@ -161,7 +162,7 @@ class PLUGINDLLEXPORT Config : public QObject Config( QObject* parent = nullptr ); ~Config() override; - void setConfigurationMap( const QVariantMap& ); + void setConfigurationMap( const QVariantMap& ) override; /** @brief Fill Global Storage with some settings * From 8b10a9cfc2ba97cd3ee0ff39426113f030a3da4d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 12 Mar 2021 14:49:46 +0100 Subject: [PATCH 228/318] [libcalamares] Add isEditable() check This adds support for checking whether a field is editable; Config objects should reject changes if the field is not editable. There is an "unlock" setting to override the check, although this is currently always locked. --- src/libcalamares/modulesystem/Config.cpp | 15 ++++++++++++++ src/libcalamares/modulesystem/Config.h | 12 ++++++++++++ src/libcalamares/modulesystem/Preset.cpp | 25 ++++++++++++++++++++++-- src/libcalamares/modulesystem/Preset.h | 18 +++++++++++++++++ 4 files changed, 68 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/modulesystem/Config.cpp b/src/libcalamares/modulesystem/Config.cpp index 75c54badf8..701fbec74d 100644 --- a/src/libcalamares/modulesystem/Config.cpp +++ b/src/libcalamares/modulesystem/Config.cpp @@ -60,5 +60,20 @@ Config::loadPresets( const QVariantMap& configurationMap, const QStringList& rec = std::make_unique< Presets >( CalamaresUtils::getSubMap( configurationMap, key, bogus ), recognizedKeys ); } +bool +Config::isEditable( const QString& fieldName ) const +{ + if ( m_unlocked ) + { + return true; + } + if ( d && d->m_presets ) + { + return d->m_presets->isEditable( fieldName ); + } + return true; +} + + } // namespace ModuleSystem } // namespace Calamares diff --git a/src/libcalamares/modulesystem/Config.h b/src/libcalamares/modulesystem/Config.h index 9bc0705c6a..d0f5fa51f8 100644 --- a/src/libcalamares/modulesystem/Config.h +++ b/src/libcalamares/modulesystem/Config.h @@ -34,6 +34,7 @@ namespace ModuleSystem */ class DLLEXPORT Config : public QObject { + Q_OBJECT public: Config( QObject* parent = nullptr ); ~Config() override; @@ -46,6 +47,16 @@ class DLLEXPORT Config : public QObject */ virtual void setConfigurationMap( const QVariantMap& ) = 0; +public Q_SLOTS: + /** @brief Checks if a @p fieldName is editable according to presets + * + * If the field is named as a preset, **and** the field is set + * to not-editable, returns @c false. Otherwise, return @c true. + * Calling this with an unknown field (one for which no presets + * are accepted) will print a warning and return @c true. + */ + bool isEditable( const QString& fieldName ) const; + protected: void loadPresets( const QVariantMap& configurationMap ); void loadPresets( const QVariantMap& configurationMap, const QStringList& recognizedKeys ); @@ -53,6 +64,7 @@ class DLLEXPORT Config : public QObject private: class Private; std::unique_ptr< Private > d; + bool m_unlocked = false; }; } // namespace ModuleSystem } // namespace Calamares diff --git a/src/libcalamares/modulesystem/Preset.cpp b/src/libcalamares/modulesystem/Preset.cpp index 8240e23e77..9685a6b683 100644 --- a/src/libcalamares/modulesystem/Preset.cpp +++ b/src/libcalamares/modulesystem/Preset.cpp @@ -33,7 +33,11 @@ loadPresets( Calamares::ModuleSystem::Presets& preset, } } -Calamares::ModuleSystem::Presets::Presets( const QVariantMap& configurationMap ) +namespace Calamares +{ +namespace ModuleSystem +{ +Presets::Presets( const QVariantMap& configurationMap ) { @@ -41,9 +45,26 @@ Calamares::ModuleSystem::Presets::Presets( const QVariantMap& configurationMap ) loadPresets( *this, configurationMap, []( const QString& ) { return true; } ); } -Calamares::ModuleSystem::Presets::Presets( const QVariantMap& configurationMap, const QStringList& recognizedKeys ) +Presets::Presets( const QVariantMap& configurationMap, const QStringList& recognizedKeys ) { reserve( recognizedKeys.size() ); loadPresets( *this, configurationMap, [&recognizedKeys]( const QString& s ) { return recognizedKeys.contains( s ); } ); } + +bool +Presets::isEditable( const QString& fieldName ) const +{ + for ( const auto& p : *this ) + { + if ( p.fieldName == fieldName ) + { + return p.editable; + } + } + return true; +} + + +} // namespace ModuleSystem +} // namespace Calamares diff --git a/src/libcalamares/modulesystem/Preset.h b/src/libcalamares/modulesystem/Preset.h index 1744313ae8..59c308b921 100644 --- a/src/libcalamares/modulesystem/Preset.h +++ b/src/libcalamares/modulesystem/Preset.h @@ -48,8 +48,26 @@ struct PresetField class Presets : public QVector< PresetField > { public: + /** @brief Reads preset entries from the map + * + * The map's keys are used as field name, and each value entry + * should specify an initial value and whether the entry is editable. + * Fields are editable by default. + */ explicit Presets( const QVariantMap& configurationMap ); + /** @brief Reads preset entries from the @p configurationMap + * + * As above, but only field names that occur in @p recognizedKeys + * are kept; others are discarded. + */ Presets( const QVariantMap& configurationMap, const QStringList& recognizedKeys ); + + /** @brief Is the given @p fieldName editable? + * + * Fields are editable by default, so if there is no explicit setting, + * returns @c true. + */ + bool isEditable( const QString& fieldName ) const; }; } // namespace ModuleSystem } // namespace Calamares From d8dff3dc6554b1fe00e3f743dc41f4f747a5088b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 12 Mar 2021 17:20:36 +0100 Subject: [PATCH 229/318] [libcalamares] Replace loadPresets() with an applicative style Build up the list of known presets by what the Config-object expects, not by what the Config file provides. This allows early detection of mis-matched configurations. Presets can only apply to Q_PROPERTY properties, and the preset must match the property name. --- src/libcalamares/modulesystem/Config.cpp | 67 +++++++++++++++--------- src/libcalamares/modulesystem/Config.h | 24 ++++++++- src/libcalamares/modulesystem/Preset.cpp | 1 + src/libcalamares/modulesystem/Preset.h | 12 ++++- src/modules/users/Config.cpp | 13 ++--- 5 files changed, 83 insertions(+), 34 deletions(-) diff --git a/src/libcalamares/modulesystem/Config.cpp b/src/libcalamares/modulesystem/Config.cpp index 701fbec74d..af15361298 100644 --- a/src/libcalamares/modulesystem/Config.cpp +++ b/src/libcalamares/modulesystem/Config.cpp @@ -10,6 +10,7 @@ #include "Config.h" #include "Preset.h" +#include "utils/Logger.h" #include "utils/Variant.h" namespace Calamares @@ -33,47 +34,63 @@ Config::Config( QObject* parent ) Config::~Config() {} -void -Config::loadPresets( const QVariantMap& configurationMap ) +bool +Config::isEditable( const QString& fieldName ) const { - const QString key( "presets" ); - if ( !configurationMap.contains( key ) ) + if ( m_unlocked ) { - d->m_presets.reset(); - return; + return true; } - bool bogus = true; - d->m_presets = std::make_unique< Presets >( CalamaresUtils::getSubMap( configurationMap, key, bogus ) ); + if ( d && d->m_presets ) + { + return d->m_presets->isEditable( fieldName ); + } + else + { + cWarning() << "Checking isEditable, but no presets are configured."; + } + return true; } -void -Config::loadPresets( const QVariantMap& configurationMap, const QStringList& recognizedKeys ) +Config::ApplyPresets::ApplyPresets( Calamares::ModuleSystem::Config& c, const QVariantMap& configurationMap ) + : m_c( c ) + , m_bogus( true ) + , m_map( CalamaresUtils::getSubMap( configurationMap, "presets", m_bogus ) ) { - const QString key( "presets" ); - if ( !configurationMap.contains( key ) ) + c.m_unlocked = true; + if ( !c.d->m_presets ) { - d->m_presets.reset(); - return; + c.d->m_presets = std::make_unique< Presets >(); } - bool bogus = true; - d->m_presets - = std::make_unique< Presets >( CalamaresUtils::getSubMap( configurationMap, key, bogus ), recognizedKeys ); } -bool -Config::isEditable( const QString& fieldName ) const + +Config::ApplyPresets& +Config::ApplyPresets::apply( const char* fieldName ) { - if ( m_unlocked ) + const auto prop = m_c.property( fieldName ); + if ( !prop.isValid() ) { - return true; + cWarning() << "Applying invalid property" << fieldName; } - if ( d && d->m_presets ) + else { - return d->m_presets->isEditable( fieldName ); + const QString key( fieldName ); + if ( !key.isEmpty() && m_map.contains( key ) ) + { + QVariantMap m = CalamaresUtils::getSubMap( m_map, key, m_bogus ); + QVariant value = m[ "value" ]; + bool editable = CalamaresUtils::getBool( m, "editable", true ); + + if ( value.isValid() ) + { + m_c.setProperty( fieldName, value ); + } + m_c.d->m_presets->append( PresetField { key, value, editable } ); + } } - return true; + return *this; } - } // namespace ModuleSystem } // namespace Calamares diff --git a/src/libcalamares/modulesystem/Config.h b/src/libcalamares/modulesystem/Config.h index d0f5fa51f8..c38b0c11c8 100644 --- a/src/libcalamares/modulesystem/Config.h +++ b/src/libcalamares/modulesystem/Config.h @@ -58,8 +58,28 @@ public Q_SLOTS: bool isEditable( const QString& fieldName ) const; protected: - void loadPresets( const QVariantMap& configurationMap ); - void loadPresets( const QVariantMap& configurationMap, const QStringList& recognizedKeys ); + friend class ApplyPresets; + /** @brief "Builder" class for presets + * + * Derived classes should instantiate this (with themselves, + * and the whole configuration map that is passed to + * setConfigurationMap()) and then call .apply() to apply + * the presets specified in the configuration to the **named** + * QObject properties. + */ + class ApplyPresets + { + public: + ApplyPresets( Config& c, const QVariantMap& configurationMap ); + ~ApplyPresets() { m_c.m_unlocked = false; } + + ApplyPresets& apply( const char* fieldName ); + + private: + Config& m_c; + bool m_bogus = true; + const QVariantMap m_map; + }; private: class Private; diff --git a/src/libcalamares/modulesystem/Preset.cpp b/src/libcalamares/modulesystem/Preset.cpp index 9685a6b683..3a54c9e68e 100644 --- a/src/libcalamares/modulesystem/Preset.cpp +++ b/src/libcalamares/modulesystem/Preset.cpp @@ -62,6 +62,7 @@ Presets::isEditable( const QString& fieldName ) const return p.editable; } } + cWarning() << "Checking isEditable for unknown field" << fieldName; return true; } diff --git a/src/libcalamares/modulesystem/Preset.h b/src/libcalamares/modulesystem/Preset.h index 59c308b921..f7b5023e5d 100644 --- a/src/libcalamares/modulesystem/Preset.h +++ b/src/libcalamares/modulesystem/Preset.h @@ -36,8 +36,10 @@ namespace ModuleSystem struct PresetField { QString fieldName; - QString value; + QVariant value; bool editable = true; + + bool isValid() const { return !fieldName.isEmpty(); } }; /** @brief All the presets for one UI entity @@ -62,6 +64,14 @@ class Presets : public QVector< PresetField > */ Presets( const QVariantMap& configurationMap, const QStringList& recognizedKeys ); + /** @brief Creates an empty presets map + * + * This constructor is primarily intended for use by the ApplyPresets + * helper class, which will reserve suitable space and load + * presets on-demand. + */ + Presets() = default; + /** @brief Is the given @p fieldName editable? * * Fields are editable by default, so if there is no explicit setting, diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp index 0fcf745faa..047b8d516d 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp @@ -183,7 +183,7 @@ Config::setSudoersGroup( const QString& group ) void Config::setLoginName( const QString& login ) { - if ( login != m_loginName ) + if ( login != m_loginName && isEditable( QStringLiteral( "loginName" ) ) ) { m_customLoginName = !login.isEmpty(); m_loginName = login; @@ -393,6 +393,11 @@ makeHostnameSuggestion( const QStringList& parts ) void Config::setFullName( const QString& name ) { + if ( !isEditable( QStringLiteral( "fullName" ) ) ) + { + return; + } + if ( name.isEmpty() && !m_fullName.isEmpty() ) { if ( !m_customHostName ) @@ -837,11 +842,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) updateGSAutoLogin( doAutoLogin(), loginName() ); checkReady(); - loadPresets( configurationMap, - { - "fullname", - "loginname", - } ); + ApplyPresets( *this, configurationMap ).apply( "fullName" ).apply( "loginName" ); } void From 2e90a8d8298e6c902e10dc930945dbcdb8517c09 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 12 Mar 2021 18:42:37 +0100 Subject: [PATCH 230/318] [libcalamares] Report preset mis-configurations - warn about fields applied twice (program error) - warn about fields not used (configuration error) - add operator<< for "clean" looking preset application --- src/libcalamares/modulesystem/Config.cpp | 28 +++++++++++++++++++++++- src/libcalamares/modulesystem/Config.h | 17 +++++++++++++- src/libcalamares/modulesystem/Preset.cpp | 15 +++++++++++-- src/libcalamares/modulesystem/Preset.h | 6 +++++ src/modules/users/Config.cpp | 3 ++- 5 files changed, 64 insertions(+), 5 deletions(-) diff --git a/src/libcalamares/modulesystem/Config.cpp b/src/libcalamares/modulesystem/Config.cpp index af15361298..71210a9cb0 100644 --- a/src/libcalamares/modulesystem/Config.cpp +++ b/src/libcalamares/modulesystem/Config.cpp @@ -64,6 +64,28 @@ Config::ApplyPresets::ApplyPresets( Calamares::ModuleSystem::Config& c, const QV } } +Config::ApplyPresets::~ApplyPresets() +{ + m_c.m_unlocked = false; + + // Check that there's no **settings** (from the configuration map) + // that have not been consumed by apply() -- if they are there, + // that means the configuration map specifies things that the + // Config object does not expect. + bool haveWarned = false; + for ( const auto& k : m_map.keys() ) + { + if ( !m_c.d->m_presets->find( k ).isValid() ) + { + if ( !haveWarned ) + { + cWarning() << "Preset configuration contains unused keys"; + haveWarned = true; + } + cDebug() << Logger::SubEntry << "Unused key" << k; + } + } +} Config::ApplyPresets& Config::ApplyPresets::apply( const char* fieldName ) @@ -76,7 +98,11 @@ Config::ApplyPresets::apply( const char* fieldName ) else { const QString key( fieldName ); - if ( !key.isEmpty() && m_map.contains( key ) ) + if ( !key.isEmpty() && m_c.d->m_presets->find( key ).isValid() ) + { + cWarning() << "Applying duplicate property" << fieldName; + } + else if ( !key.isEmpty() && m_map.contains( key ) ) { QVariantMap m = CalamaresUtils::getSubMap( m_map, key, m_bogus ); QVariant value = m[ "value" ]; diff --git a/src/libcalamares/modulesystem/Config.h b/src/libcalamares/modulesystem/Config.h index c38b0c11c8..c31433e1ce 100644 --- a/src/libcalamares/modulesystem/Config.h +++ b/src/libcalamares/modulesystem/Config.h @@ -70,10 +70,25 @@ public Q_SLOTS: class ApplyPresets { public: + /** @brief Create a preset-applier for this config + * + * The @p configurationMap should be the one passed in to + * setConfigurationMap() . Presets are extracted from the + * standard key *presets* and can be applied to the configuration + * with apply() or operator<<. + */ ApplyPresets( Config& c, const QVariantMap& configurationMap ); - ~ApplyPresets() { m_c.m_unlocked = false; } + ~ApplyPresets(); + /** @brief Add a preset for the given @p fieldName + * + * This checks for preset-entries in the configuration map that was + * passed in to the constructor. + */ ApplyPresets& apply( const char* fieldName ); + /** @brief Alternate way of writing apply() + */ + ApplyPresets& operator<<( const char* fieldName ) { return apply( fieldName ); } private: Config& m_c; diff --git a/src/libcalamares/modulesystem/Preset.cpp b/src/libcalamares/modulesystem/Preset.cpp index 3a54c9e68e..a2e3f32641 100644 --- a/src/libcalamares/modulesystem/Preset.cpp +++ b/src/libcalamares/modulesystem/Preset.cpp @@ -38,8 +38,6 @@ namespace Calamares namespace ModuleSystem { Presets::Presets( const QVariantMap& configurationMap ) - - { reserve( configurationMap.count() ); loadPresets( *this, configurationMap, []( const QString& ) { return true; } ); @@ -66,6 +64,19 @@ Presets::isEditable( const QString& fieldName ) const return true; } +PresetField +Presets::find( const QString& fieldName ) const +{ + for ( const auto& p : *this ) + { + if ( p.fieldName == fieldName ) + { + return p; + } + } + + return PresetField(); +} } // namespace ModuleSystem } // namespace Calamares diff --git a/src/libcalamares/modulesystem/Preset.h b/src/libcalamares/modulesystem/Preset.h index f7b5023e5d..b768a31c9a 100644 --- a/src/libcalamares/modulesystem/Preset.h +++ b/src/libcalamares/modulesystem/Preset.h @@ -78,6 +78,12 @@ class Presets : public QVector< PresetField > * returns @c true. */ bool isEditable( const QString& fieldName ) const; + + /** @brief Finds the settings for a field @p fieldName + * + * If there is no such field, returns an invalid PresetField. + */ + PresetField find( const QString& fieldName ) const; }; } // namespace ModuleSystem } // namespace Calamares diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp index 047b8d516d..4e02cdcdfd 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp @@ -842,7 +842,8 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) updateGSAutoLogin( doAutoLogin(), loginName() ); checkReady(); - ApplyPresets( *this, configurationMap ).apply( "fullName" ).apply( "loginName" ); + ApplyPresets( *this, configurationMap ) << "fullName" + << "loginName"; } void From 941cc9c48b7d2e4ec4a369a6e8230144c9a21638 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 12 Mar 2021 18:44:14 +0100 Subject: [PATCH 231/318] [users] Match presets to the actual name of fields --- src/modules/users/users.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/users/users.conf b/src/modules/users/users.conf index b137a135ad..87227898f1 100644 --- a/src/modules/users/users.conf +++ b/src/modules/users/users.conf @@ -161,9 +161,9 @@ setHostname: EtcFile writeHostsFile: true presets: - fullname: + fullName: value: "OEM User" editable: false - loginname: + loginName: value: "oem" editable: false From 9fcf9b5fa85822cd2951bb6e46d3a6dadbc5ddad Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 12 Mar 2021 22:27:08 +0100 Subject: [PATCH 232/318] [users] Pick up values from Config object on startup - Previously, we 'knew' that the values in Config were empty, so didn't have to set them from the Config when building the (widget) page --- src/modules/users/UsersPage.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp index 6ea03f8ef1..9aac947796 100644 --- a/src/modules/users/UsersPage.cpp +++ b/src/modules/users/UsersPage.cpp @@ -101,6 +101,7 @@ UsersPage::UsersPage( Config* config, QWidget* parent ) connect( config, &Config::rootPasswordSecondaryChanged, ui->textBoxVerifiedRootPassword, &QLineEdit::setText ); connect( config, &Config::rootPasswordStatusChanged, this, &UsersPage::reportRootPasswordStatus ); + ui->textBoxFullName->setText( config->fullName() ); connect( ui->textBoxFullName, &QLineEdit::textEdited, config, &Config::setFullName ); connect( config, &Config::fullNameChanged, this, &UsersPage::onFullNameTextEdited ); @@ -108,6 +109,7 @@ UsersPage::UsersPage( Config* config, QWidget* parent ) connect( config, &Config::hostNameChanged, ui->textBoxHostName, &QLineEdit::setText ); connect( config, &Config::hostNameStatusChanged, this, &UsersPage::reportHostNameStatus ); + ui->textBoxLoginName->setText( config->loginName() ); connect( ui->textBoxLoginName, &QLineEdit::textEdited, config, &Config::setLoginName ); connect( config, &Config::loginNameChanged, ui->textBoxLoginName, &QLineEdit::setText ); connect( config, &Config::loginNameStatusChanged, this, &UsersPage::reportLoginNameStatus ); From 3ea796d0099e7d8c00ed097816cebf1f439e5648 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 12:27:53 +0100 Subject: [PATCH 233/318] [users] 'undo' changes to values if the UI is wonky - you can still call set*(), eg. from the UI, when the field is not editable. Although the code previously ignored the change, this would lead to a mismatch between what the UI is showing (the changed value) and what the Config has (old value). Emit a changed-signal (notify) with the old value so that the UI is changed *back* as soon as possible. --- src/modules/users/Config.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp index 4e02cdcdfd..71bd487257 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #ifdef HAVE_ICU #include @@ -183,7 +184,13 @@ Config::setSudoersGroup( const QString& group ) void Config::setLoginName( const QString& login ) { - if ( login != m_loginName && isEditable( QStringLiteral( "loginName" ) ) ) + if ( !isEditable( QStringLiteral( "loginName" ) ) ) + { + // Should not have arrived here anyway + QTimer::singleShot( 0, this, [=]() { emit loginNameChanged( m_loginName ); } ); + return; + } + if ( login != m_loginName ) { m_customLoginName = !login.isEmpty(); m_loginName = login; @@ -395,6 +402,8 @@ Config::setFullName( const QString& name ) { if ( !isEditable( QStringLiteral( "fullName" ) ) ) { + // Should not have arrived here anyway + QTimer::singleShot( 0, this, [=]() { emit fullNameChanged( m_fullName ); } ); return; } From b4a21d7acacf1f0be2d42cdb41fb7ef6403579e7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 13:30:26 +0100 Subject: [PATCH 234/318] [libcalamares] Add macro CONFIG_PREVENT_EDITING to handle uneditable fields Boilerplate code for avoiding accidental setting of an internal field when the UI is editable and the underlying data isn't. --- src/libcalamares/modulesystem/Config.h | 40 ++++++++++++++++++++++++++ src/modules/users/Config.cpp | 15 ++-------- 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/src/libcalamares/modulesystem/Config.h b/src/libcalamares/modulesystem/Config.h index c31433e1ce..5facae3cd6 100644 --- a/src/libcalamares/modulesystem/Config.h +++ b/src/libcalamares/modulesystem/Config.h @@ -54,6 +54,25 @@ public Q_SLOTS: * to not-editable, returns @c false. Otherwise, return @c true. * Calling this with an unknown field (one for which no presets * are accepted) will print a warning and return @c true. + * + * @see CONFIG_PREVENT_EDITING + * + * Most setters will call isEditable() to check if the field should + * be editable. Do not count on the setter not being called: the + * UI might not have set the field to fixed / constant / not-editable + * and then you can have the setter called by changes in the UI. + * + * To prevent the UI from changing **and** to make sure that the UI + * reflects the unchanged value (rather than the changed value it + * sent to the Config object), use CONFIG_PREVENT_EDITING, like so: + * + * CONFIG_PREVENT_EDITING( type, "propertyName" ); + * + * The ; is necessary. is the type of the property; for instance + * QString. The name of the property is a (constant) string. The + * macro will return (out of the setter it is used in) if the field + * is not editable, and will send a notification event with the old + * value as soon as the event loop resumes. */ bool isEditable( const QString& fieldName ) const; @@ -104,4 +123,25 @@ public Q_SLOTS: } // namespace ModuleSystem } // namespace Calamares +/// @see Config::isEditable() +// +// This needs to be a macro, because Q_ARG() is a macro that stringifies +// the type name. +#define CONFIG_PREVENT_EDITING( type, fieldName ) \ + do \ + { \ + if ( !isEditable( QStringLiteral( fieldName ) ) ) \ + { \ + auto prop = property( fieldName ); \ + const auto& metaobject = metaObject(); \ + auto metaprop = metaobject->property( metaobject->indexOfProperty( fieldName ) ); \ + if ( metaprop.hasNotifySignal() ) \ + { \ + metaprop.notifySignal().invoke( this, Qt::QueuedConnection, Q_ARG( type, prop.value< type >() ) ); \ + } \ + return; \ + } \ + } while ( 0 ) + + #endif diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp index 71bd487257..7aa1cb65cc 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -184,12 +185,7 @@ Config::setSudoersGroup( const QString& group ) void Config::setLoginName( const QString& login ) { - if ( !isEditable( QStringLiteral( "loginName" ) ) ) - { - // Should not have arrived here anyway - QTimer::singleShot( 0, this, [=]() { emit loginNameChanged( m_loginName ); } ); - return; - } + CONFIG_PREVENT_EDITING( QString, "loginName" ); if ( login != m_loginName ) { m_customLoginName = !login.isEmpty(); @@ -400,12 +396,7 @@ makeHostnameSuggestion( const QStringList& parts ) void Config::setFullName( const QString& name ) { - if ( !isEditable( QStringLiteral( "fullName" ) ) ) - { - // Should not have arrived here anyway - QTimer::singleShot( 0, this, [=]() { emit fullNameChanged( m_fullName ); } ); - return; - } + CONFIG_PREVENT_EDITING( QString, "fullName" ); if ( name.isEmpty() && !m_fullName.isEmpty() ) { From 7bae625f4655721605fa8d16f4f5bf4d4f9975da Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 14:14:29 +0100 Subject: [PATCH 235/318] [users] Pick up UI changes based on the values from Config --- src/modules/users/UsersPage.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp index 9aac947796..1717f3211b 100644 --- a/src/modules/users/UsersPage.cpp +++ b/src/modules/users/UsersPage.cpp @@ -142,6 +142,8 @@ UsersPage::UsersPage( Config* config, QWidget* parent ) CALAMARES_RETRANSLATE_SLOT( &UsersPage::retranslate ) onReuseUserPasswordChanged( m_config->reuseUserPasswordForRoot() ); + onFullNameTextEdited( m_config->fullName() ); + reportLoginNameStatus( m_config->loginNameStatus() ); } UsersPage::~UsersPage() From caf18321df9e9c08abf3f8db12d23bd3871f022a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 14:20:10 +0100 Subject: [PATCH 236/318] [users] Adjust UI to is-field-editable based on presets --- src/modules/users/UsersPage.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp index 1717f3211b..be9e634982 100644 --- a/src/modules/users/UsersPage.cpp +++ b/src/modules/users/UsersPage.cpp @@ -144,6 +144,9 @@ UsersPage::UsersPage( Config* config, QWidget* parent ) onReuseUserPasswordChanged( m_config->reuseUserPasswordForRoot() ); onFullNameTextEdited( m_config->fullName() ); reportLoginNameStatus( m_config->loginNameStatus() ); + + ui->textBoxLoginName->setEnabled( m_config->isEditable( "loginName" ) ); + ui->textBoxFullName->setEnabled( m_config->isEditable( "fullName" ) ); } UsersPage::~UsersPage() From c767311062bf049155c481828c7a9720fd9fd46a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 14:37:52 +0100 Subject: [PATCH 237/318] Changes: pre-release housekeeping --- CHANGES | 7 ++++++- CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 2b0c3210a4..fac42afd4a 100644 --- a/CHANGES +++ b/CHANGES @@ -7,7 +7,7 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. -# 3.2.38 (unreleased) # +# 3.2.38 (2021-03-14) # This release contains contributions from (alphabetically by first name): - Anke Boersma @@ -22,6 +22,11 @@ This release contains contributions from (alphabetically by first name): ## Modules ## - A new QML-based *finishedq* module has been added. (Thanks Anke) - The *users* module now can set a fixed username and prevent editing. + The *presets* configuration entry in `users.conf` can set a *loginName* + and a *fullName* and (independently) enable or disable editing of + that value. You can, for instance, set *loginName* to "manjaro" if + you like; the user can change it afterwards. You could set the + *loginName* to "oem" and prevent editing it as well. #942 # 3.2.37 (2021-02-23) # diff --git a/CMakeLists.txt b/CMakeLists.txt index 758ae3332c..ff65b9f42d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ project( CALAMARES LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development ### OPTIONS # From b30eaaddec5b6a19c75c9572a0c11bdcdf50aaef Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sun, 14 Mar 2021 15:51:01 +0100 Subject: [PATCH 238/318] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_ca@valencia.ts | 1454 +++++++++++++++++---------------- lang/calamares_fi_FI.ts | 28 +- lang/calamares_pt_BR.ts | 8 +- 3 files changed, 768 insertions(+), 722 deletions(-) diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts index 37a0afe18d..589b79e9ce 100644 --- a/lang/calamares_ca@valencia.ts +++ b/lang/calamares_ca@valencia.ts @@ -6,17 +6,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. - + L'<strong>entorn d'arrancada</strong> d'aquest sistema.<br><br>Els sistemes antics x86 només tenen suport per a <strong>BIOS</strong>.<br>Els moderns normalment usen <strong>EFI</strong>, però també poden mostrar-se com a BIOS si l'entorn d'arrancada s'executa en mode de compatibilitat. 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. - + Aquest sistema s'ha iniciat amb un entorn d'arrancada <strong>EFI</strong>. <br><br> Per a configurar una arrancada des d'un entorn EFI, aquest instal·lador ha de desplegar l'aplicació d'un gestor d'arrancada, com ara el <strong>GRUB</strong> o el <strong>systemd-boot</strong> en una <strong>partició EFI del sistema</strong>. Això és automàtic, llevat que trieu fer les particions manualment. En aquest cas, ho haureu de configurar pel vostre compte. 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. - + Aquest sistema s'ha iniciat amb un entorn d'arrancada <strong>BIOS </strong>.<br><br>Per a configurar una arrancada des d'un entorn BIOS, aquest instal·lador ha d'instal·lar un gestor d'arrancada, com ara el <strong>GRUB</strong>, ja siga al començament d'una partició o al <strong>MBR</strong>, a prop del començament de la taula de particions (millor). Això és automàtic, llevat que trieu fer les particions manualment. En aquest cas, ho haureu de configurar pel vostre compte. @@ -24,27 +24,27 @@ Master Boot Record of %1 - + Registre d'arrancada mestre (MBR) de %1 Boot Partition - + Partició d'arrancada System Partition - + Partició del sistema Do not install a boot loader - + No instal·les cap gestor d'arrancada %1 (%2) - + %1 (%2) @@ -52,7 +52,7 @@ Blank Page - + Pàgina en blanc @@ -60,58 +60,58 @@ Form - + Formulari GlobalStorage - + Emmagatzematge global JobQueue - + Cua de tasques Modules - + Mòduls Type: - + Tipus: none - + cap Interface: - + Interfície: Tools - + Eines Reload Stylesheet - + Torna a carregar el full d'estil Widget Tree - + Arbre d'elements Debug information - + Informació de depuració @@ -119,12 +119,12 @@ Set up - + Configuració Install - + Instal·la @@ -132,12 +132,12 @@ Job failed (%1) - + S'ha produït un error en la tasca (%1) Programmed job failure was explicitly requested. - + S'ha sol·licitat explícitament la fallada de la tasca programada. @@ -145,7 +145,7 @@ Done - + Fet @@ -153,7 +153,7 @@ Example job (%1) - + Tasca d'exemple (%1) @@ -161,17 +161,17 @@ Run command '%1' in target system. - + Executa l'ordre "%1" en el sistema de destinació. Run command '%1'. - + Executa l'ordre "%1". Running command %1 %2 - + S'està executant l'ordre %1 %2 @@ -179,32 +179,32 @@ Running %1 operation. - + S'està executant l'operació %1. Bad working directory path - + Hi ha un error en el camí del directori de treball Working directory %1 for python job %2 is not readable. - + El directori de treball %1 per a la tasca python %2 no és llegible. Bad main script file - + El fitxer d'script principal és incorrecte. Main script file %1 for python job %2 is not readable. - + El fitxer d'script principal %1 per a la tasca de python %2 no és llegible. Boost.Python error in job "%1". - + S'ha produït un error de Boost.Python en la tasca "%1". @@ -212,17 +212,17 @@ Loading ... - + S'està carregant... QML Step <i>%1</i>. - + Pas QML <i>%1</i>. Loading failed. - + S'ha produït un error en la càrrega. @@ -230,7 +230,7 @@ Requirements checking for module <i>%1</i> is complete. - + Ha acabat la verificació dels requeriments per al mòdul <i>%1</i>. @@ -251,7 +251,7 @@ System-requirements checking is complete. - + Ha acabat la verificació dels requeriments del sistema. @@ -259,171 +259,173 @@ Setup Failed - + S'ha produït un error en la configuració. Installation Failed - + La instal·lació ha fallat. Would you like to paste the install log to the web? - + Voleu enganxar el registre d'instal·lació a la xarxa? Error - + S'ha produït un error. &Yes - + &Sí &No - + &No &Close - + Tan&ca Install Log Paste URL - + URL de publicació del registre d'instal·lació The upload was unsuccessful. No web-paste was done. - + La càrrega no s'ha fet correctament. No s'ha enganxat res a la xarxa. Calamares Initialization Failed - + La inicialització del Calamares ha fallat. %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. - + No es pot instal·lar %1. El Calamares no ha pogut carregar tots els mòduls configurats. El problema es troba en com utilitza el Calamares la distribució. <br/>The following modules could not be loaded: - + <br/>No s'han pogut carregar els mòduls següents: Continue with setup? - + Voleu continuar la configuració? Continue with installation? - + Voleu continuar la instal·lació? 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> - + El programa de configuració %1 està a punt de fer canvis en el disc per a configurar %2.<br/><strong>No podreu desfer aquests canvis.</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> - + L'instal·lador per a %1 està a punt de fer canvis en el disc per tal d'instal·lar-hi %2.<br/><strong>No podreu desfer aquests canvis.</strong> &Set up now - + Con&figura-ho ara &Install now - + &Instal·la'l ara Go &back - + &Arrere &Set up - + Con&figuració &Install - + &Instal·la Setup is complete. Close the setup program. - + La configuració s'ha completat. Tanqueu el programa de configuració. The installation is complete. Close the installer. - + La instal·lació s'ha completat. Tanqueu l'instal·lador. Cancel setup without changing the system. - + Cancel·la la configuració sense canviar el sistema. Cancel installation without changing the system. - + Cancel·la la instal·lació sense canviar el sistema. &Next - + &Següent &Back - + A&rrere &Done - + &Fet &Cancel - + &Cancel·la Cancel setup? - + Voleu cancel·lar la configuració? Cancel installation? - + Voleu cancel·lar la instal·lació? Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Voleu cancel·lar el procés de configuració actual? +El programa de configuració es tancarà i es perdran tots els canvis. Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + Voleu cancel·lar el procés d'instal·lació actual? +L'instal·lador es tancarà i tots els canvis es perdran. @@ -431,22 +433,22 @@ The installer will quit and all changes will be lost. Unknown exception type - + Tipus d'excepció desconeguda unparseable Python error - + S'ha produït un error de Python no analitzable. unparseable Python traceback - + La traça de Python no es pot analitzar. Unfetchable Python error. - + S'ha produït un error de Python irrecuperable. @@ -455,7 +457,8 @@ The installer will quit and all changes will be lost. Install log posted to: %1 - + Registre d'instal·lació penjat en: +%1 @@ -463,32 +466,32 @@ The installer will quit and all changes will be lost. Show debug information - + Mostra la informació de depuració &Back - + A&rrere &Next - + &Següent &Cancel - + &Cancel·la %1 Setup Program - + Programa de configuració %1 %1 Installer - + Instal·lador de %1 @@ -496,7 +499,7 @@ The installer will quit and all changes will be lost. Gathering system information... - + S'està obtenint la informació del sistema... @@ -504,12 +507,12 @@ The installer will quit and all changes will be lost. Form - + Formulari Select storage de&vice: - + Seleccioneu un dispositiu d'e&mmagatzematge: @@ -517,62 +520,62 @@ The installer will quit and all changes will be lost. Current: - + Actual: After: - + Després: <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + <strong>Particions manuals</strong><br/>Podeu crear particions o canviar-ne la mida pel vostre compte. Reuse %1 as home partition for %2. - + Reutilitza %1 com a partició de l'usuari per a %2. <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + <strong>Seleccioneu una partició per a reduir-la i arrossegueu-la per a redimensionar-la</strong> %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + %1 es reduirà a %2 MiB i es crearà una partició nova de %3 MiB per a %4. Boot loader location: - + Ubicació del gestor d'arrancada: <strong>Select a partition to install on</strong> - + <strong>Seleccioneu una partició per a fer-hi la instal·lació.</strong> An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + No s'ha pogut trobar una partició EFI en cap lloc d'aquest sistema. Torneu arrere i useu les particions manuals per a configurar %1. The EFI system partition at %1 will be used for starting %2. - + La partició EFI de sistema en %1 s'usarà per a iniciar %2. EFI system partition: - + Partició del sistema EFI: 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. - + Pareix que aquest dispositiu d'emmagatzematge no té cap sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu. @@ -580,7 +583,7 @@ The installer will quit and all changes will be lost. <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + <strong>Esborra el disc</strong><br/>Això <font color="red">suprimirà</font> totes les dades del dispositiu seleccionat. @@ -588,7 +591,7 @@ The installer will quit and all changes will be lost. <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - + <strong>Instal·la'l al costat</strong><br/>L'instal·lador reduirà una partició per a fer espai per a %1. @@ -596,62 +599,62 @@ The installer will quit and all changes will be lost. <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + <strong>Reemplaça una partició</strong><br/>Reemplaça una partició per %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. - + Aquest dispositiu d'emmagatzematge té %1. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu. 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. - + Aquest dispositiu d'emmagatzematge ja té un sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu. 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. - + Aquest dispositiu d'emmagatzematge ja té múltiples sistemes operatius. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu. 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/> - + Aquest dispositiu d'emmagatzematge ja té un sistema operatiu, però la taula de particions <strong>%1</strong> és diferent de la necessària: <strong>%2</strong>.<br/> This storage device has one of its partitions <strong>mounted</strong>. - + Aquest dispositiu d'emmagatzematge té una de les particions <strong>muntada</strong>. This storage device is a part of an <strong>inactive RAID</strong> device. - + Aquest dispositiu d'emmagatzematge forma part d'un dispositiu de <strong>RAID inactiu</strong>. No Swap - + Sense intercanvi Reuse Swap - + Reutilitza l'intercanvi Swap (no Hibernate) - + Intercanvi (sense hibernació) Swap (with Hibernate) - + Intercanvi (amb hibernació) Swap to file - + Intercanvi en fitxer @@ -659,17 +662,17 @@ The installer will quit and all changes will be lost. Clear mounts for partitioning operations on %1 - + Neteja els muntatges per a les operacions de partició en %1 Clearing mounts for partitioning operations on %1. - + S'estan netejant els muntatges per a les operacions de les particions en %1. Cleared all mounts for %1 - + S'han netejat tots els muntatges de %1. @@ -677,22 +680,22 @@ The installer will quit and all changes will be lost. Clear all temporary mounts. - + Neteja tots els muntatges temporals. Clearing all temporary mounts. - + S'estan netejant tots els muntatges temporals. Cannot get list of temporary mounts. - + No es pot obtindre la llista dels muntatges temporals. Cleared all temporary mounts. - + S'han netejat tots els muntatges temporals. @@ -701,17 +704,17 @@ The installer will quit and all changes will be lost. Could not run command. - + No s'ha pogut executar l'ordre. The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. - + L'odre s'executa en l'entorn de l'amfitrió i necessita saber el camí de l'arrel, però el punt de muntatge de l'arrel no està definit. The command needs to know the user's name, but no username is defined. - + L'ordre necessita saber el nom de l'usuari, però no hi ha cap nom d'usuari definit. @@ -719,137 +722,137 @@ The installer will quit and all changes will be lost. Set keyboard model to %1.<br/> - + Estableix el model de teclat en %1.<br/> Set keyboard layout to %1/%2. - + Estableix la distribució del teclat a %1/%2. Set timezone to %1/%2. - + Estableix el fus horari a %1/%2. The system language will be set to %1. - + La llengua del sistema s'establirà en %1. The numbers and dates locale will be set to %1. - + Els números i les dates de la configuració local s'establiran en %1. Network Installation. (Disabled: Incorrect configuration) - + Instal·lació per xarxa. (Inhabilitada: configuració incorrecta) Network Installation. (Disabled: Received invalid groups data) - + Instal·lació per xarxa. (Inhabilitada: dades de grups rebudes no vàlides) Network Installation. (Disabled: internal error) - + Instal·lació per xarxa. (Inhabilitada: error intern) Network Installation. (Disabled: Unable to fetch package lists, check your network connection) - + Instal·lació per xarxa. (Inhabilitada: no es poden obtindre les llistes de paquets, comproveu la connexió.) This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + Aquest ordinador no satisfà els requisits mínims per a configurar-hi %1.<br/> La configuració no pot continuar. <a href="#details">Detalls...</a> This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + Aquest ordinador no satisfà els requisits mínims per a instal·lar-hi %1.<br/> La instal·lació no pot continuar. <a href="#details">Detalls...</a> This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + Aquest ordinador no satisfà alguns dels requisits recomanats per a configurar-hi %1.<br/>La configuració pot continuar, però és possible que algunes característiques no estiguen habilitades. This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + Aquest ordinador no satisfà alguns dels requisits recomanats per a instal·lar-hi %1.<br/>La instal·lació pot continuar, però és possible que algunes característiques no estiguen habilitades. This program will ask you some questions and set up %2 on your computer. - + Aquest programa us farà unes preguntes i instal·larà %2 en l'ordinador. <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Us donen la benvinguda al programa de configuració del Calamares per a %1</h1> <h1>Welcome to %1 setup</h1> - + <h1>Us donen la benvinguda a la configuració per a %1</h1> <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Us donen la benvinguda a l'instal·lador del Calamares per a %1</h1> <h1>Welcome to the %1 installer</h1> - + <h1>Us donen la benvinguda a l'instal·lador per a %1</h1> Your username is too long. - + El nom d'usuari és massa llarg. '%1' is not allowed as username. - + No es permet %1 com a nom d'usuari. Your username must start with a lowercase letter or underscore. - + El nom d'usuari ha de començar amb una lletra en minúscula o una ratlla baixa. Only lowercase letters, numbers, underscore and hyphen are allowed. - + Només es permeten lletres en minúscula, números, ratlles baixes i guions. Your hostname is too short. - + El nom d'amfitrió és massa curt. Your hostname is too long. - + El nom d'amfitrió és massa llarg. '%1' is not allowed as hostname. - + No es permet %1 com a nom d'amfitrió. Only letters, numbers, underscore and hyphen are allowed. - + Només es permeten lletres, números, ratlles baixes i guions. Your passwords do not match! - + Les contrasenyes no coincideixen. @@ -857,7 +860,7 @@ The installer will quit and all changes will be lost. Contextual Processes Job - + Tasca de procés contextual @@ -865,77 +868,77 @@ The installer will quit and all changes will be lost. Create a Partition - + Creació d'una partició Si&ze: - + Mi&da: MiB - + MiB Partition &Type: - + &Tipus de partició: &Primary - + &Primària E&xtended - + &Ampliada Fi&le System: - + S&istema de fitxers: LVM LV name - + Nom del volum lògic LVM &Mount Point: - + Punt de &muntatge: Flags: - + Marcadors: En&crypt - + En&cripta Logical - + Lògica Primary - + Primària GPT - + GPT Mountpoint already in use. Please select another one. - + El punt de muntatge ja està en ús. Seleccioneu-ne un altre. @@ -943,22 +946,22 @@ The installer will quit and all changes will be lost. Create new %2MiB partition on %4 (%3) with file system %1. - + Crea una partició nova de %2 MiB a %4 (%3) amb el sistema de fitxers %1. Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Crea una partició nova de <strong>%2 MiB</strong> a <strong>%4</strong> (%3) amb el sistema de fitxers <strong>%1</strong>. Creating new %1 partition on %2. - + S'està creant la partició nova %1 en %2. The installer failed to create partition on disk '%1'. - + L'instal·lador no ha pogut crear la partició en el disc '%1'. @@ -966,27 +969,27 @@ The installer will quit and all changes will be lost. Create Partition Table - + Creació de la taula de particions Creating a new partition table will delete all existing data on the disk. - + La creació d'una nova taula de particions suprimirà totes les dades existents en el disc. What kind of partition table do you want to create? - + Quin tipus de taula de particions voleu crear? Master Boot Record (MBR) - + Registre d'arrancada mestre (MBR) GUID Partition Table (GPT) - + Taula de particions GUID (GPT) @@ -994,22 +997,22 @@ The installer will quit and all changes will be lost. Create new %1 partition table on %2. - + Creació d'una taula de particions nova %1 en %2. Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). - + Creació d'una taula de particions nova <strong>%1</strong> en <strong>%2</strong> (%3). Creating new %1 partition table on %2. - + S'està creant la taula de particions nova %1 en %2. The installer failed to create a partition table on %1. - + L'instal·lador no ha pogut crear la taula de particions en %1. @@ -1017,33 +1020,33 @@ The installer will quit and all changes will be lost. Create user %1 - + Crea l'usuari %1 Create user <strong>%1</strong>. - + Crea l'usuari <strong>%1</strong>. Preserving home directory - + S'està preservant el directori personal Creating user %1 - + S'està creant l'usuari %1. Configuring user %1 - + S'està configurant l'usuari %1 Setting file permissions - + S'estan establint els permisos del fitxer @@ -1051,7 +1054,7 @@ The installer will quit and all changes will be lost. Create Volume Group - + Crea un grup de volums @@ -1059,22 +1062,22 @@ The installer will quit and all changes will be lost. Create new volume group named %1. - + Crea un grup de volums nou anomenat %1. Create new volume group named <strong>%1</strong>. - + Crea un grup de volums nou anomenat <strong>%1</strong>. Creating new volume group named %1. - + S'està creant el grup de volums nou anomenat %1. The installer failed to create a volume group named '%1'. - + L'instal·lador no ha pogut crear un grup de volums anomenat "%1". @@ -1083,17 +1086,17 @@ The installer will quit and all changes will be lost. Deactivate volume group named %1. - + Desactiva el grup de volums anomenat %1. Deactivate volume group named <strong>%1</strong>. - + Desactiva el grup de volums anomenat <strong>%1</strong>. The installer failed to deactivate a volume group named %1. - + L'instal·lador no ha pogut desactivar un grup de volums anomenat %1. @@ -1101,22 +1104,22 @@ The installer will quit and all changes will be lost. Delete partition %1. - + Suprimeix la partició %1. Delete partition <strong>%1</strong>. - + Suprimeix la partició <strong>%1</strong>. Deleting partition %1. - + S'està suprimint la partició %1. The installer failed to delete partition %1. - + L'instal·lador no ha pogut suprimir la partició %1. @@ -1124,32 +1127,32 @@ The installer will quit and all changes will be lost. This device has a <strong>%1</strong> partition table. - + Aquest dispositiu té una taula de particions <strong>%1</strong>. 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. - + Aquest dispositiu és un dispositiu <strong>de bucle</strong>.<br><br>Això és un pseudodispositiu sense taula de particions que fa que un fitxer siga accessible com un dispositiu de bloc. Aquest tipus de configuració normalment només conté un sol sistema de fitxers. 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. - + Aquest instal·lador <strong>no pot detectar una taula de particions</strong> en el dispositiu d'emmagatzematge seleccionat.<br><br>O bé el dispositiu no té taula de particions o la taula de particions és corrupta o d'un tipus desconegut.<br>Aquest instal·lador pot crear una nova taula de particions, o bé automàticament o a través de la pàgina del partidor manual. <br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment. - + <br><br>Aquest és el tipus de taula de particions recomanat per als sistemes moderns que s'inicien des d'un entorn d'arrancada <strong>EFI</strong>. <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>Aquest tipus de taula de particions és només recomanable en sistemes més antics que s'inicien des d'un entorn d'arrancada <strong>BIOS</strong>. Per a la majoria de la resta d'usos, es recomana fer servir GPT.<br><br><strong>Avís:</strong> la taula de particions MBR és un estàndard obsolet de l'era MSDOS. Es poden crear <br>només 4 <em>particions primàries</em> i d'aquestes 4, una pot ser una partició <em>ampliada</em> que pot contindre algunes particions <em>lògiques</em>. 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. - + El tipus de <strong>taula de particions</strong> actualment present en el dispositiu d'emmagatzematge seleccionat.<br><br> L'única manera de canviar el tipus de taula de particions és esborrar i tornar a crear la taula de particions des de zero, fet que destrueix totes les dades del dispositiu d'emmagatzematge. <br>Aquest instal·lador mantindrà la taula de particions actual llevat que decidiu expressament el contrari. <br>Si no n'esteu segur, en els sistemes moderns es prefereix GPT. @@ -1158,13 +1161,13 @@ The installer will quit and all changes will be lost. %1 - %2 (%3) device[name] - size[number] (device-node[name]) - + %1 - %2 (%3) %1 - (%2) device[name] - (device-node[name]) - + %1 - (%2) @@ -1172,17 +1175,17 @@ The installer will quit and all changes will be lost. Write LUKS configuration for Dracut to %1 - + Escriu la configuració de LUKS per a Dracut en %1 Skip writing LUKS configuration for Dracut: "/" partition is not encrypted - + Omet l'escriptura de la configuració de LUKS per a Dracut: la partició "/" no està encriptada Failed to open %1 - + No s'ha pogut obrir %1 @@ -1190,7 +1193,7 @@ The installer will quit and all changes will be lost. Dummy C++ Job - + Tasca C++ de proves @@ -1198,57 +1201,57 @@ The installer will quit and all changes will be lost. Edit Existing Partition - + Edita la partició existent Content: - + Contingut: &Keep - + &Conserva Format - + Formata Warning: Formatting the partition will erase all existing data. - + Advertència: formatar la partició esborrarà totes les dades existents. &Mount Point: - + Punt de &muntatge: Si&ze: - + Mi&da: MiB - + MiB Fi&le System: - + S&istema de fitxers: Flags: - + Marcadors: Mountpoint already in use. Please select another one. - + El punt de muntatge ja està en ús. Seleccioneu-ne un altre. @@ -1256,28 +1259,28 @@ The installer will quit and all changes will be lost. Form - + Formulari En&crypt system - + En&cripta el sistema Passphrase - + Contrasenya Confirm passphrase - + Confirmeu la contrasenya Please enter the same passphrase in both boxes. - + Escriviu la mateixa contrasenya en les dues caselles. @@ -1285,37 +1288,37 @@ The installer will quit and all changes will be lost. Set partition information - + Estableix la informació de la partició Install %1 on <strong>new</strong> %2 system partition. - + Instal·la %1 en la partició de sistema <strong>nova</strong> %2. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Estableix la partició <strong>nova</strong> %2 amb el punt de muntatge <strong>%1</strong>. Install %2 on %3 system partition <strong>%1</strong>. - + Instal·la %2 en la partició de sistema %3 <strong>%1</strong>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Estableix la partició %3 <strong>%1</strong> amb el punt de muntatge <strong>%2</strong>. Install boot loader on <strong>%1</strong>. - + Instal·la el gestor d'arrancada en <strong>%1</strong>. Setting up mount points. - + S'estableixen els punts de muntatge. @@ -1323,42 +1326,42 @@ The installer will quit and all changes will be lost. Form - + Formulari &Restart now - + &Reinicia ara <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <h1>Tot fet.</h1><br/>%1 s'ha configurat a l'ordinador.<br/>Ara podeu començar a usar el nou 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>Quan aquesta casella està marcada, el sistema es reinicia immediatament en clicar en <span style="font-style:italic;">Fet</span> o tancar el programa de configuració.</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>Tot fet.</h1><br/>%1 s'ha instal·lat a l'ordinador.<br/>Ara podeu reiniciar-lo per tal d'accedir al sistema operatiu nou o bé continuar usant l'entorn autònom de %2. <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>Quan aquesta casella està marcada, el sistema es reiniciarà immediatament quan cliqueu en <span style="font-style:italic;">Fet</span> o tanqueu l'instal·lador.</p></body></html> <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>La configuració ha fallat.</h1><br/>No s'ha configurat %1 en l'ordinador.<br/>El missatge d'error ha estat el següent: %2. <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - + <h1>La instal·lació ha fallat</h1><br/>No s'ha instal·lat %1 en l'ordinador.<br/>El missatge d'error ha estat el següent: %2. @@ -1366,27 +1369,27 @@ The installer will quit and all changes will be lost. Finish - + Acaba Setup Complete - + S'ha completat la configuració. Installation Complete - + Ha acabat la instal·lació. The setup of %1 is complete. - + La configuració de %1 ha acabat. The installation of %1 is complete. - + La instal·lació de %1 ha acabat. @@ -1394,22 +1397,22 @@ The installer will quit and all changes will be lost. Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Formata la partició %1 (sistema de fitxers: %2, mida: %3 MiB) de %4. Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formata la partició de <strong>%3 MiB</strong> <strong>%1</strong> amb el sistema de fitxers <strong>%2</strong>. Formatting partition %1 with file system %2. - + S'està formatant la partició %1 amb el sistema de fitxers %2. The installer failed to format partition %1 on disk '%2'. - + L'instal·lador no ha pogut formatar la partició %1 del disc '%2'. @@ -1417,72 +1420,72 @@ The installer will quit and all changes will be lost. has at least %1 GiB available drive space - + té com a mínim %1 GiB d'espai de disc disponible. There is not enough drive space. At least %1 GiB is required. - + No hi ha prou espai de disc disponible. Com a mínim hi ha d'haver %1 GiB. has at least %1 GiB working memory - + té com a mínim %1 GiB de memòria de treball. The system does not have enough working memory. At least %1 GiB is required. - + El sistema no té prou memòria de treball. Com a mínim cal que hi haja %1 GiB. is plugged in to a power source - + està connectat a la xarxa elèctrica The system is not plugged in to a power source. - + El sistema no està connectat a una xarxa elèctrica. is connected to the Internet - + està connectat a Internet The system is not connected to the Internet. - + El sistema no està connectat a Internet. is running the installer as an administrator (root) - + està executant l'instal·lador com a administrador (arrel). The setup program is not running with administrator rights. - + El programa de configuració no s'està executant amb privilegis d'administració. The installer is not running with administrator rights. - + L'instal·lador no s'està executant amb privilegis d'administració. has a screen large enough to show the whole installer - + té una pantalla suficientment gran per a mostrar completament l'instal·lador. The screen is too small to display the setup program. - + La pantalla és massa menuda per a mostrar el programa de configuració. The screen is too small to display the installer. - + La pantalla és massa menuda per a mostrar l'instal·lador. @@ -1490,7 +1493,7 @@ The installer will quit and all changes will be lost. Collecting information about your machine. - + S'està recopilant informació sobre la màquina. @@ -1501,22 +1504,22 @@ The installer will quit and all changes will be lost. OEM Batch Identifier - + Identificador de lots d'OEM Could not create directories <code>%1</code>. - + No s'han pogut crear els directoris <code>%1</code>. Could not open file <code>%1</code>. - + No s'ha pogut obrir el fitxer <code>%1</code>. Could not write to file <code>%1</code>. - + No s'ha pogut escriure en el fitxer <code>%1</code>. @@ -1524,7 +1527,7 @@ The installer will quit and all changes will be lost. Creating initramfs with mkinitcpio. - + Creació d'initramfs amb mkinitcpio. @@ -1532,7 +1535,7 @@ The installer will quit and all changes will be lost. Creating initramfs. - + Creació d'initramfs. @@ -1540,17 +1543,17 @@ The installer will quit and all changes will be lost. Konsole not installed - + El Konsole no està instal·lat. Please install KDE Konsole and try again! - + Instal·leu el Konsole de KDE i torneu a intentar-ho. Executing script: &nbsp;<code>%1</code> - + S'està executant l'script &nbsp;<code>%1</code> @@ -1558,7 +1561,7 @@ The installer will quit and all changes will be lost. Script - + Script @@ -1566,7 +1569,7 @@ The installer will quit and all changes will be lost. Keyboard - + Teclat @@ -1574,7 +1577,7 @@ The installer will quit and all changes will be lost. Keyboard - + Teclat @@ -1582,22 +1585,22 @@ The installer will quit and all changes will be lost. System locale setting - + Configuració local del sistema 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>. - + La configuració local del sistema afecta la llengua i el joc de caràcters d'alguns elements de la interfície de línia d'ordres. <br/>La configuració actual és <strong>%1</strong>. &Cancel - + &Cancel·la &OK - + D'ac&ord @@ -1605,42 +1608,42 @@ The installer will quit and all changes will be lost. Form - + Formulari <h1>License Agreement</h1> - + <h1>Acord de llicència</h1> I accept the terms and conditions above. - + Accepte els termes i les condicions anteriors. Please review the End User License Agreements (EULAs). - + Consulteu els acords de llicència d'usuari final (EULA). This setup procedure will install proprietary software that is subject to licensing terms. - + Aquest procediment de configuració instal·larà programari propietari subjecte a termes de llicència. If you do not agree with the terms, the setup procedure cannot continue. - + Si no esteu d'acord amb els termes, el procediment de configuració no pot continuar. This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience. - + Aquest procediment de configuració instal·larà propietari subjecte a termes de llicència per tal de proporcionar característiques addicionals i millorar l'experiència de l'usuari. If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead. - + Si no esteu d'acord en els termes, no s'instal·larà el programari propietari i es faran servir les alternatives de codi lliure. @@ -1648,7 +1651,7 @@ The installer will quit and all changes will be lost. License - + Llicència @@ -1656,59 +1659,59 @@ The installer will quit and all changes will be lost. URL: %1 - + URL: %1 <strong>%1 driver</strong><br/>by %2 %1 is an untranslatable product name, example: Creative Audigy driver - + <strong> controlador %1</strong><br/>de %2 <strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font> %1 is usually a vendor name, example: Nvidia graphics driver - + <strong> controlador gràfic %1</strong><br/><font color="Grey">de %2</font> <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font> - + <strong> connector del navegador %1</strong><br/><font color="Grey">de %2</font> <strong>%1 codec</strong><br/><font color="Grey">by %2</font> - + <strong> còdec %1</strong><br/><font color="Grey">de %2</font> <strong>%1 package</strong><br/><font color="Grey">by %2</font> - + <strong> paquet %1</strong><br/><font color="Grey">de %2</font> <strong>%1</strong><br/><font color="Grey">by %2</font> - + <strong>%1</strong><br/><font color="Grey">de %2</font> File: %1 - + Fitxer: %1 Hide license text - + Amaga el text de la llicència Show the license text - + Mostra el text de la llicència Open license agreement in browser. - + Obri l'acord de llicència en el navegador. @@ -1716,18 +1719,18 @@ The installer will quit and all changes will be lost. Region: - + Regió: Zone: - + Zona: &Change... - + &Canvia... @@ -1735,7 +1738,7 @@ The installer will quit and all changes will be lost. Location - + Ubicació @@ -1743,7 +1746,7 @@ The installer will quit and all changes will be lost. Location - + Ubicació @@ -1751,35 +1754,35 @@ The installer will quit and all changes will be lost. Configuring LUKS key file. - + 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. @@ -1787,17 +1790,17 @@ The installer will quit and all changes will be lost. Generate machine-id. - + Generació de l'id. de la màquina Configuration Error - + S'ha produït un error en la configuració. No root mount point is set for MachineId. - + No s'ha proporcionat el punt de muntatge d'arrel establit per a MachineId. @@ -1805,14 +1808,16 @@ The installer will quit and all changes will be lost. Timezone: %1 - + Fus horari: %1 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. - + Seleccioneu la ubicació preferida en el mapa perquè l'instal·lador puga suggerir-vos la configuració +de la llengua i la zona horària. Podeu afinar la configuració suggerida a continuació. Busqueu en el mapa arrossegant-lo +per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé useu la rodeta del ratolí. @@ -1821,97 +1826,97 @@ The installer will quit and all changes will be lost. Package selection - + Selecció de paquets Office software - + Programari d'oficina Office package - + Paquet d'oficina Browser software - + Programari de navegador Browser package - + Paquet de navegador Web browser - + Navegador web Kernel - + Nucli Services - + Serveis Login - + Entrada Desktop - + Escriptori Applications - + Aplicacions Communication - + Comunicació Development - + Desenvolupament Office - + Oficina Multimedia - + Multimèdia Internet - + Internet Theming - + Tema Gaming - + Jugant Utilities - + Utilitats @@ -1919,7 +1924,7 @@ The installer will quit and all changes will be lost. Notes - + Notes @@ -1927,17 +1932,17 @@ The installer will quit and all changes will be lost. Ba&tch: - + &Lot: <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> - + <html><head/><body><p>Introduïu ací l'identificador de lots. Això es guardarà en el sistema de destinació.</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>Configuració d'OEM</h1><p>El Calamares usarà els paràmetres d'OEM durant la configuració del sistema de destinació.</p></body></html> @@ -1945,12 +1950,12 @@ The installer will quit and all changes will be lost. OEM Configuration - + Configuració d'OEM Set the OEM Batch Identifier to <code>%1</code>. - + Estableix l'identificador de lots d'OEM en <code>%1</code>. @@ -1958,29 +1963,29 @@ The installer will quit and all changes will be lost. Select your preferred Region, or use the default one based on your current location. - + Trieu la regió preferida o useu la predeterminada basada en la ubicació actual. Timezone: %1 - + Fus horari: %1 Select your preferred Zone within your Region. - + Trieu la zona preferida dins de la regió. Zones - + Zones You can fine-tune Language and Locale settings below. - + Podeu acabar d'ajustar els paràmetres locals i de llengua a continuació. @@ -1988,72 +1993,72 @@ The installer will quit and all changes will be lost. Password is too short - + La contrasenya és massa curta. Password is too long - + La contrasenya és massa llarga. Password is too weak - + La contrasenya és massa feble. Memory allocation error when setting '%1' - + S'ha produït un error d'assignació de memòria en establir "%1" Memory allocation error - + S'ha produït un error en reservar memòria. The password is the same as the old one - + La contrasenya és la mateixa que l'anterior. The password is a palindrome - + La contrasenya és un palíndrom. The password differs with case changes only - + La contrasenya es diferencia tan sols amb canvis de majúscules a minúscules. The password is too similar to the old one - + La contrasenya és massa semblant a l'anterior. The password contains the user name in some form - + La contrasenya conté el nom d'usuari d'alguna manera. The password contains words from the real name of the user in some form - + La contrasenya d'alguna manera conté paraules del nom real de l'usuari. The password contains forbidden words in some form - + La contrasenya d'alguna manera conté paraules prohibides. The password contains too few digits - + La contrasenya no conté prou dígits. The password contains too few uppercase letters - + La contrasenya no conté prou lletres en majúscula. @@ -2066,32 +2071,32 @@ The installer will quit and all changes will be lost. The password contains too few lowercase letters - + La contrasenya no conté prou lletres en minúscula. The password contains too few non-alphanumeric characters - + La contrasenya no conté prou caràcters no alfanumèrics. The password is too short - + La contrasenya és massa curta. The password does not contain enough character classes - + La contrasenya no conté prou tipus de caràcters. The password contains too many same characters consecutively - + La contrasenya conté consecutivament massa caràcters idèntics. The password contains too many characters of the same class consecutively - + La contrasenya conté consecutivament massa caràcters de la mateixa classe. @@ -2128,7 +2133,7 @@ The installer will quit and all changes will be lost. The password is a rotated version of the previous one - + La contrasenya és només l'anterior capgirada. @@ -2165,97 +2170,97 @@ The installer will quit and all changes will be lost. The password contains too long of a monotonic character sequence - + La contrasenya conté una seqüència monòtona de caràcters massa gran. No password supplied - + No s'ha proporcionat cap contrasenya. Cannot obtain random numbers from the RNG device - + No es poden obtindre nombres aleatoris del dispositiu RNG. Password generation failed - required entropy too low for settings - + Ha fallat la generació de la contrasenya. L'entropia necessària és massa baixa per als paràmetres. The password fails the dictionary check - %1 - + La contrasenya no aprova la comprovació del diccionari: %1 The password fails the dictionary check - + La contrasenya no supera la comprovació del diccionari. Unknown setting - %1 - + Paràmetre desconegut: %1 Unknown setting - + Ajust desconegut Bad integer value of setting - %1 - + El valor de l'ajust de l'enter no és correcte %1 Bad integer value - + El valor de l'enter no és correcte. Setting %1 is not of integer type - + El paràmetre %1 no és del tipus enter. Setting is not of integer type - + El paràmetre no és del tipus enter. Setting %1 is not of string type - + El paràmetre %1 no és del tipus cadena. Setting is not of string type - + El paràmetre no és del tipus cadena. Opening the configuration file failed - + L'obertura del fitxer de configuració ha fallat. The configuration file is malformed - + El fitxer de configuració té un format incorrecte. Fatal failure - + S'ha produït un error fatal. Unknown error - + S'ha produït un error desconegut Password is empty - + La contrasenya està buida. @@ -2263,32 +2268,32 @@ The installer will quit and all changes will be lost. Form - + Formulari Product Name - + Nom del producte TextLabel - + Etiqueta de text Long Product Description - + Descripció llarga del producte Package Selection - + Selecció de paquets Please pick a product from the list. The selected product will be installed. - + Trieu un producte de la llista. S'instal·larà el producte seleccionat. @@ -2296,7 +2301,7 @@ The installer will quit and all changes will be lost. Packages - + Paquets @@ -2304,12 +2309,12 @@ The installer will quit and all changes will be lost. Name - + Nom Description - + Descripció @@ -2317,17 +2322,17 @@ The installer will quit and all changes will be lost. Form - + Formulari Keyboard Model: - + Model de teclat: Type here to test your keyboard - + Escriviu ací per a provar el teclat @@ -2335,96 +2340,96 @@ The installer will quit and all changes will be lost. Form - + Formulari What is your name? - + Quin és el vostre nom? Your Full Name - + Nom complet What name do you want to use to log in? - + Quin nom voleu utilitzar per a entrar al sistema? login - + Entrada What is the name of this computer? - + Quin és el nom d'aquest ordinador? <small>This name will be used if you make the computer visible to others on a network.</small> - + <small>Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa.</small> Computer Name - + Nom de l'ordinador Choose a password to keep your account safe. - + Seleccioneu una contrasenya per a mantindre el vostre compte segur. <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>Escriviu la mateixa contrasenya dues vegades per a poder comprovar-ne els errors de mecanografia. Una bona contrasenya contindrà una barreja de lletres, números i signes de puntuació. Hauria de tindre un mínim de huit caràcters i s'hauria de canviar sovint.</small> Password - + Contrasenya Repeat Password - + Repetiu la contrasenya When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no podreu indicar-ne una de dèbil. Require strong passwords. - + Requereix contrasenyes fortes. Log in automatically without asking for the password. - + Entra automàticament sense demanar la contrasenya. Use the same password for the administrator account. - + Usa la mateixa contrasenya per al compte d'administració. Choose a password for the administrator account. - + Trieu una contrasenya per al compte d'administració. <small>Enter the same password twice, so that it can be checked for typing errors.</small> - + <small>Escriviu la mateixa contrasenya dues vegades per a poder comprovar-ne els errors de mecanografia.</small> @@ -2432,43 +2437,43 @@ The installer will quit and all changes will be lost. Root - + Arrel Home - + Inici Boot - + Arrancada EFI system - + Sistema EFI Swap - + Intercanvi New partition for %1 - + Partició nova per a %1 New partition - + Partició nova %1 %2 size[number] filesystem[name] - + %1 %2 @@ -2477,33 +2482,33 @@ The installer will quit and all changes will be lost. Free Space - + Espai lliure New partition - + Partició nova Name - + Nom File System - + Sistema de fitxers Mount Point - + Punt de muntatge Size - + Mida @@ -2511,77 +2516,77 @@ The installer will quit and all changes will be lost. Form - + Formulari Storage de&vice: - + Dispositiu d'e&mmagatzematge: &Revert All Changes - + &Desfés tots els canvis New Partition &Table - + Nova &taula de particions Cre&ate - + Cre&a &Edit - + &Edita &Delete - + Su&primeix New Volume Group - + Grup de volums nou Resize Volume Group - + Canvia la mida del grup de volums Deactivate Volume Group - + Desactiva el grup de volums Remove Volume Group - + Suprimeix el grup de volums I&nstall boot loader on: - + I&nstal·la el gestor d'arrancada en: Are you sure you want to create a new partition table on %1? - + Segur que voleu crear una nova taula de particions en %1? Can not create new partition - + No es pot crear la partició nova 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. - + La taula de particions de %1 ja té %2 particions primàries i no se n'hi poden afegir més. Suprimiu una partició primària i afegiu-hi una partició ampliada. @@ -2589,117 +2594,117 @@ The installer will quit and all changes will be lost. Gathering system information... - + S'està obtenint la informació del sistema... Partitions - + Particions Install %1 <strong>alongside</strong> another operating system. - + Instal·la %1 <strong>al costat</strong> d'un altre sistema operatiu. <strong>Erase</strong> disk and install %1. - + <strong>Esborra</strong> el disc i instal·la-hi %1. <strong>Replace</strong> a partition with %1. - + <strong>Reemplaça</strong> una partició amb %1. <strong>Manual</strong> partitioning. - + Particions <strong>manuals</strong>. Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + Instal·la %1 <strong>al costat</strong> d'un altre sistema operatiu en el disc <strong>%2</strong> (%3). <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Esborra</strong> el disc <strong>%2</strong> (%3) i instal·la-hi %1. <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Reemplaça</strong> una partició del disc <strong>%2</strong> (%3) amb %1. <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Particions <strong>manuals</strong> del disc <strong>%1</strong> (%2). Disk <strong>%1</strong> (%2) - + Disc <strong>%1</strong> (%2) Current: - + Actual: After: - + Després: No EFI system partition configured - + No hi ha cap partició EFI de sistema configurada An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + Cal una partició EFI de sistema per a iniciar %1. <br/><br/>Per a configurar una partició EFI de sistema, torneu arrere i seleccioneu o creeu un sistema de fitxers FAT32 amb el marcador <strong>%3</strong> habilitada i el punt de muntatge <strong>%2</strong>. <br/><br/>Podeu continuar sense la creació d'una partició EFI de sistema, però el sistema podria no iniciar-se. An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Cal una partició EFI de sistema per a iniciar %1. <br/><br/> Ja s'ha configurat una partició amb el punt de muntatge <strong>%2</strong> però no se n'ha establit el marcador <strong>%3</strong>. <br/>Per a establir-la-hi, torneu arrere i editeu la partició. <br/><br/>Podeu continuar sense establir la bandera, però el sistema podria no iniciar-se. EFI system partition flag not set - + No s'ha establit el marcador de la partició EFI del sistema 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>bios_grub</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 a configurar una taula de particions GPT en un sistema BIOS, (si no s'ha fet ja) torneu arrere i establiu la taula de particions a GPT, després creeu una partició sense formatar de 8 MB amb el marcador <strong>bios_grub</strong> habilitada.<br/><br/>Cal una partició sense format de 8 MB per a iniciar %1 en un sistema BIOS amb 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ó. @@ -2707,13 +2712,13 @@ The installer will quit and all changes will be lost. Plasma Look-and-Feel Job - + Tasca d'aspecte i comportament del Plasma Could not select KDE Plasma Look-and-Feel package - + No s'ha pogut seleccionar el paquet de l'aspecte i comportament del Plasma de KDE. @@ -2721,17 +2726,17 @@ The installer will quit and all changes will be lost. 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. - + Trieu un aspecte i comportament per a l'escriptori Plasma de KDE. També podeu ometre aquest pas i establir-ho una vegada configurat el sistema. Quan cliqueu en una selecció d'aspecte i comportament, podreu veure'n una previsualització. 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 installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. - + Trieu un aspecte i comportament per a l'escriptori Plasma de KDE. També podeu ometre aquest pas i configurar-ho una vegada instal·lat el sistema. Quan cliqueu en una selecció d'aspecte i comportament, podreu veure'n una previsualització. @@ -2739,7 +2744,7 @@ The installer will quit and all changes will be lost. Look-and-Feel - + Aspecte i comportament @@ -2747,17 +2752,17 @@ The installer will quit and all changes will be lost. Saving files for later ... - + S'estan guardant fitxers per a més tard... No files configured to save for later. - + No s'ha configurat cap fitxer per a guardar per a més tard. Not all of the configured files could be preserved. - + No s'han pogut conservar tots els fitxers configurats. @@ -2766,64 +2771,67 @@ The installer will quit and all changes will be lost. There was no output from the command. - + +No hi ha hagut eixida de l'ordre. Output: - + +Eixida: + External command crashed. - + L'ordre externa ha fallat. Command <i>%1</i> crashed. - + L'ordre <i>%1</i> ha fallat. External command failed to start. - + L'ordre externa no s'ha pogut iniciar. Command <i>%1</i> failed to start. - + L'ordre <i>%1</i> no s'ha pogut iniciar. Internal error when starting command. - + S'ha produït un error intern en iniciar l'ordre. Bad parameters for process job call. - + Hi ha paràmetres incorrectes per a la crida de la tasca del procés. External command failed to finish. - + L'ordre externa no ha acabat correctament. Command <i>%1</i> failed to finish in %2 seconds. - + L'ordre <i>%1</i> no ha pogut acabar en %2 segons. External command finished with errors. - + L'ordre externa ha acabat amb errors. Command <i>%1</i> finished with exit code %2. - + L'ordre <i>%1</i> ha acabat amb el codi d'eixida %2. @@ -2831,33 +2839,33 @@ Output: %1 (%2) - + %1 (%2) unknown - + desconegut extended - + ampliada unformatted - + sense format swap - + intercanvi Default - + Per defecte @@ -2865,43 +2873,43 @@ Output: File not found - + No s'ha pogut trobar el fitxer. Path <pre>%1</pre> must be an absolute path. - + El camí <pre>%1</pre> ha de ser un camí absolut. Directory not found - + No s'ha trobat el directori Could not create new random file <pre>%1</pre>. - + No s'ha pogut crear el fitxer aleatori nou <pre>%1</pre>. No product - + Cap producte No description provided. - + No s'ha proporcionat cap descripció. (no mount point) - + (sense punt de muntatge) Unpartitioned space or unknown partition table - + L'espai està sense partir o es desconeix la taula de particions @@ -2910,7 +2918,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>Aquest ordinador no compleix alguns dels requisits recomanats per a configurar-hi %1.<br/> +La configuració pot continuar, però és possible que algunes característiques no estiguen habilitades.</p> @@ -2918,7 +2927,7 @@ Output: Remove live user from target system - + Suprimeix l'usuari de la sessió autònoma del sistema de destinació @@ -2927,17 +2936,17 @@ Output: Remove Volume Group named %1. - + Suprimeix el grup de volums anomenat %1. Remove Volume Group named <strong>%1</strong>. - + Suprimeix el grup de volums anomenat <strong>%1</strong>. The installer failed to remove a volume group named '%1'. - + L'instal·lador no ha pogut eliminar un grup de volums anomenat "%1". @@ -2945,74 +2954,74 @@ Output: Form - + Formulari Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. - + Seleccioneu on instal·lar %1.<br/><font color="red">Atenció: </font>això suprimirà tots els fitxers de la partició seleccionada. The selected item does not appear to be a valid partition. - + L'element seleccionat no sembla que siga una partició vàlida. %1 cannot be installed on empty space. Please select an existing partition. - + %1 no es pot instal·lar en un espai buit. Seleccioneu una partició existent. %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 no es pot instal·lar en una partició ampliada. Seleccioneu una partició existent primària o lògica. %1 cannot be installed on this partition. - + %1 no es pot instal·lar en aquesta partició. Data partition (%1) - + Partició de dades (%1) Unknown system partition (%1) - + Partició de sistema desconeguda (%1) %1 system partition (%2) - + %1 partició de sistema (%2) <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <strong>%4</strong><br/><br/>La partició %1 és massa menuda per a %2. Seleccioneu una partició amb capacitat d'almenys %3 GB. <strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + <strong>%2</strong><br/><br/>No es pot trobar cap partició EFI en cap lloc del sistema. Torneu arrere i useu les particions manuals per a establir %1. <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + <strong>%3</strong><br/><br/>%1 s'instal·larà en %2.<br/><font color="red">Atenció: </font>totes les dades de la partició %2 es perdran. The EFI system partition at %1 will be used for starting %2. - + La partició EFI de sistema en %1 s'usarà per a iniciar %2. EFI system partition: - + Partició del sistema EFI: @@ -3021,13 +3030,15 @@ Output: <p>This computer does not satisfy the minimum requirements for installing %1.<br/> Installation cannot continue.</p> - + <p>Aquest ordinador no satisfà els requisits mínims per a instal·lar-hi %1.<br/> +La instal·lació no pot continuar.</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>Aquest ordinador no compleix alguns dels requisits recomanats per a configurar-hi %1.<br/> +La configuració pot continuar, però és possible que algunes característiques no estiguen habilitades.</p> @@ -3035,27 +3046,27 @@ Output: Resize Filesystem Job - + Tasca de canviar de mida un sistema de fitxers Invalid configuration - + La configuració no és vàlida The file-system resize job has an invalid configuration and will not run. - + La tasca de canviar de mida un sistema de fitxers té una configuració no vàlida i no s'executarà. KPMCore not Available - + KPMCore no disponible Calamares cannot start KPMCore for the file-system resize job. - + El Calamares no pot iniciar KPMCore per a la tasca de canviar de mida un sistema de fitxers. @@ -3064,39 +3075,39 @@ Output: Resize Failed - + Ha fallat el canvi de mida. The filesystem %1 could not be found in this system, and cannot be resized. - + El sistema de fitxers %1 no s'ha pogut trobar en aquest sistema i, per tant, no se'n pot canviar la mida. The device %1 could not be found in this system, and cannot be resized. - + El dispositiu%1 no s'ha pogut trobar en aquest sistema i, per tant, no se'n pot canviar la mida. The filesystem %1 cannot be resized. - + No es pot canviar la mida del sistema de fitxers %1. The device %1 cannot be resized. - + No es pot canviar la mida del dispositiu %1. The filesystem %1 must be resized, but cannot. - + Cal canviar la mida del sistema de fitxers %1, però no es pot. The device %1 must be resized, but cannot - + Cal canviar la mida del dispositiu %1, però no es pot. @@ -3104,22 +3115,22 @@ Output: Resize partition %1. - + Canvia la mida de la partició %1. Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. - + Canvia la mida de la partició de <strong>%2 MiB</strong>, <strong>%1</strong>, a <strong>%3 MiB</strong>. Resizing %2MiB partition %1 to %3MiB. - + Es canvia la mida de la partició %1 de %2 MiB a %3 MiB. The installer failed to resize partition %1 on disk '%2'. - + L'instal·lador no ha pogut canviar la mida de la partició %1 del disc %2. @@ -3127,7 +3138,7 @@ Output: Resize Volume Group - + Canvia la mida del grup de volums @@ -3136,17 +3147,17 @@ Output: Resize volume group named %1 from %2 to %3. - + Canvia la mida del grup de volums anomenat %1 de %2 a %3. Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>. - + Canvia la mida del grup de volums anomenat <strong>%1</strong> de <strong>%2</strong> a <strong>%3</strong>. The installer failed to resize a volume group named '%1'. - + L'instal·lador no ha pogut canviar la mida del grup de volums anomenat "%1". @@ -3154,12 +3165,12 @@ Output: For best results, please ensure that this computer: - + Per a obtindre els millors resultats, assegureu-vos que aquest ordinador... System requirements - + Requisits de sistema @@ -3167,27 +3178,27 @@ Output: This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + Aquest ordinador no satisfà els requisits mínims per a configurar-hi %1.<br/> La configuració no pot continuar. <a href="#details">Detalls...</a> This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + Aquest ordinador no satisfà els requisits mínims per a instal·lar-hi %1.<br/> La instal·lació no pot continuar. <a href="#details">Detalls...</a> This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + Aquest ordinador no satisfà alguns dels requisits recomanats per a configurar-hi %1.<br/>La configuració pot continuar, però és possible que algunes característiques no estiguen habilitades. This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + Aquest ordinador no satisfà alguns dels requisits recomanats per a instal·lar-hi %1.<br/>La instal·lació pot continuar, però és possible que algunes característiques no estiguen habilitades. This program will ask you some questions and set up %2 on your computer. - + Aquest programa us farà unes preguntes i instal·larà %2 en l'ordinador. @@ -3195,12 +3206,12 @@ Output: Scanning storage devices... - + S'estan escanejant els dispositius d'emmagatzematge... Partitioning - + S'estan fent les particions @@ -3208,29 +3219,29 @@ Output: Set hostname %1 - + Estableix el nom d'amfitrió %1 Set hostname <strong>%1</strong>. - + Estableix el nom d'amfitrió <strong>%1</strong>. Setting hostname %1. - + S'estableix el nom d'amfitrió %1. Internal Error - + S'ha produït un error intern. Cannot write hostname to target system - + No es pot escriure el nom d'amfitrió en el sistema de destinació @@ -3238,29 +3249,29 @@ Output: Set keyboard model to %1, layout to %2-%3 - + Canvia el model de teclat en %1, la disposició de teclat en %2-%3 Failed to write keyboard configuration for the virtual console. - + No s'ha pogut escriure la configuració del teclat per a la consola virtual. Failed to write to %1 - + No s'ha pogut escriure en %1 Failed to write keyboard configuration for X11. - + No s'ha pogut escriure la configuració del teclat per a X11. Failed to write keyboard configuration to existing /etc/default directory. - + No s'ha pogut escriure la configuració del teclat en el directori existent /etc/default. @@ -3268,82 +3279,82 @@ Output: Set flags on partition %1. - + Estableix els marcadors en la partició %1. Set flags on %1MiB %2 partition. - + Estableix els marcadors en la partició %2 de %1 MiB. Set flags on new partition. - + Estableix els marcadors en la partició nova. Clear flags on partition <strong>%1</strong>. - + Neteja els marcadors de la partició <strong>%1</strong>. Clear flags on %1MiB <strong>%2</strong> partition. - + Neteja els marcadors de la partició <strong>%2</strong> de %1 MiB. Clear flags on new partition. - + Neteja els marcadors de la partició nova. Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Estableix el marcador <strong>%2</strong> en la partició <strong>%1</strong>. Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Estableix el marcador de la partició <strong>%2</strong> de %1 MiB com a <strong>%3</strong>. Flag new partition as <strong>%1</strong>. - + Estableix el marcador de la partició nova com a <strong>%1</strong>. Clearing flags on partition <strong>%1</strong>. - + S'estan netejant els marcadors de la partició <strong>%1</strong>. Clearing flags on %1MiB <strong>%2</strong> partition. - + S'estan netejant els marcadors de la partició <strong>%2</strong>de %1 MiB. Clearing flags on new partition. - + S'estan netejant els marcadors de la partició nova. Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + S'estan establint els marcadors <strong>%2</strong> en la partició <strong>%1</strong>. Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + S'estan establint els marcadors <strong>%3</strong> en la partició <strong>%2</strong> de %1 MiB. Setting flags <strong>%1</strong> on new partition. - + S'estan establint els marcadors <strong>%1</strong> en la partició nova. The installer failed to set flags on partition %1. - + L'instal·lador no ha pogut establir els marcadors en la partició %1. @@ -3351,42 +3362,42 @@ Output: Set password for user %1 - + Establiu una contrasenya per a l'usuari %1 Setting password for user %1. - + S'està establint la contrasenya per a l'usuari %1. Bad destination system path. - + La destinació de la ruta del sistema és errònia. rootMountPoint is %1 - + El punt de muntatge de l'arrel és %1 Cannot disable root account. - + No es pot desactivar el compte d'arrel. passwd terminated with error code %1. - + El procés passwd ha acabat amb el codi d'error %1. Cannot set password for user %1. - + No es pot establir la contrasenya per a l'usuari %1. usermod terminated with error code %1. - + usermod ha terminat amb el codi d'error %1. @@ -3394,37 +3405,37 @@ Output: Set timezone to %1/%2 - + Estableix el fus horari en %1/%2 Cannot access selected timezone path. - + No es pot accedir al camí del fus horari seleccionat. Bad path: %1 - + Camí incorrecte: %1 Cannot set timezone. - + No es pot establir el fus horari. Link creation failed, target: %1; link name: %2 - + No s'ha pogut crear el vincle; destinació: %1, nom del vincle: %2 Cannot set timezone, - + No es pot establir el fus horari, Cannot open /etc/timezone for writing - + No es pot obrir /etc/timezone per a escriure-hi @@ -3432,18 +3443,18 @@ Output: Preparing groups. - + S'estan preparant els grups. Could not create groups in target system - + No s'han pogut crear grups en el sistema de destinació. These groups are missing in the target system: %1 - + Aquests grups falten en el sistema de destinació: %1 @@ -3451,17 +3462,17 @@ Output: Configure <pre>sudo</pre> users. - + Configuració d'usuaris de <pre>sudo</pre>. Cannot chmod sudoers file. - + No es pot fer chmod al fitxer sudoers. Cannot create sudoers file for writing. - + No es pot crear el fitxer sudoers per a escriure-hi. @@ -3469,7 +3480,7 @@ Output: Shell Processes Job - + Tasca de processos de l'intèrpret d'ordres @@ -3478,7 +3489,7 @@ Output: %L1 / %L2 slide counter, %1 of %2 (numeric) - + %L1 / %L2 @@ -3486,12 +3497,12 @@ Output: This is an overview of what will happen once you start the setup procedure. - + Això és un resum de què passarà quan s'inicie el procés de configuració. This is an overview of what will happen once you start the install procedure. - + Això és un resum de què passarà quan s'inicie el procés d'instal·lació. @@ -3499,7 +3510,7 @@ Output: Summary - + Resum @@ -3507,22 +3518,22 @@ Output: Installation feedback - + Informació de retorn de la instal·lació Sending installation feedback. - + S'envia la informació de retorn de la instal·lació. Internal error in install-tracking. - + S'ha produït un error intern en install-tracking. HTTP request timed out. - + La petició HTTP ha esgotat el temps d'espera. @@ -3530,28 +3541,28 @@ Output: KDE user feedback - + Informació de retorn d'usuaris de KDE. Configuring KDE user feedback. - + S'està configurant la informació de retorn dels usuaris de KDE. Error in KDE user feedback configuration. - + S'ha produït un error en la configuració de la informació de retorn dels usuaris KDE. Could not configure KDE user feedback correctly, script error %1. - + No s'ha pogut configurar la informació de retorn dels usuaris de KDE correctament. S'ha produït un error en l'script %1. Could not configure KDE user feedback correctly, Calamares error %1. - + No s'ha pogut configurar la informació de retorn dels usuaris de KDE correctament. S'ha produït un error del Calamares %1. @@ -3559,28 +3570,28 @@ Output: Machine feedback - + Informació de retorn de la màquina Configuring machine feedback. - + Es configura la informació de retorn de la màquina. Error in machine feedback configuration. - + S'ha produït un error en la configuració de la informació de retorn de la màquina. Could not configure machine feedback correctly, script error %1. - + No s'ha pogut configurar la informació de retorn de la màquina correctament. S'ha produït un error d'script %1. Could not configure machine feedback correctly, Calamares error %1. - + No s'ha pogut configurar la informació de retorn de la màquina correctament. S'ha produït un error del Calamares %1. @@ -3588,42 +3599,42 @@ Output: Form - + Formulari Placeholder - + Marcador de posició <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>Cliqueu ací per a no enviar <span style=" font-weight:600;">cap mena d'informació</span> de la vostra instal·lació.</p></body></html> <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> - + <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Cliqueu ací per a obtindre més informació sobre la informació de retorn dels usuaris.</span></a></p></body></html> 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. - + El seguiment ajuda l'equip de desenvolupament de %1 a veure amb quina freqüència, en quin maquinari s'instal·la i quines aplicacions s'usen. Per a veure què s'enviarà, cliqueu en la icona d'ajuda que hi ha al costat de cada àrea. 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. - + Si seleccioneu això, enviareu informació de la vostra instal·lació i el vostre maquinari. Aquesta informació només s'enviarà <b>una vegada</b> després d'acabar la instal·lació. By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + Si seleccioneu això, enviareu informació periòdicament de la instal·lació a la vostra <b>màquina</b>, el maquinari i les aplicacions en %1. By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. - + Si seleccioneu això, enviareu informació regularment de la vostra instal·lació d'<b>usuari</b>, del maquinari i de les aplicacions i dels patrons d'ús d'aplicacions en %1. @@ -3631,7 +3642,7 @@ Output: Feedback - + Realimentació @@ -3639,12 +3650,12 @@ Output: <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>Si hi ha més d'una persona que ha d'usar aquest ordinador, podeu crear diversos comptes després de la configuració.</small> <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> - + <small>Si hi ha més d'una persona que ha d'usar aquest ordinador, podeu crear diversos comptes després de la instal·lació.</small> @@ -3652,7 +3663,7 @@ Output: Users - + Usuaris @@ -3660,7 +3671,7 @@ Output: Users - + Usuaris @@ -3683,52 +3694,52 @@ Output: Create Volume Group - + Crea un grup de volums List of Physical Volumes - + Llista de volums físics Volume Group Name: - + Nom del grup de volums: Volume Group Type: - + Tipus del grup de volums: Physical Extent Size: - + Mida de l'extensió física: MiB - + MiB Total Size: - + Mida total: Used Size: - + Mida usada: Total Sectors: - + Sectors totals: Quantity of LVs: - + Quantitat de volums lògics: @@ -3736,78 +3747,78 @@ Output: Form - + Formulari Select application and system language - + Seleccioneu una aplicació i la llengua del sistema &About - + &Quant a Open donations website - + Obri el lloc web per als donatius &Donate - + Feu un &donatiu Open help and support website - + Obri el lloc web per a l'ajuda i el suport &Support - + &Suport Open issues and bug-tracking website - + Obri el lloc web de problemes i de seguiment d'errors &Known issues - + &Incidències conegudes Open release notes website - + Obri el lloc web de les notes de la versió &Release notes - + &Notes de la versió <h1>Welcome to the Calamares setup program for %1.</h1> - + <h1>Us donen la benvinguda al programa de configuració del Calamares per a %1.</h1> <h1>Welcome to %1 setup.</h1> - + <h1>Us donem la benvinguda a la configuració per a %1.</h1> <h1>Welcome to the Calamares installer for %1.</h1> - + <h1>Us donem la benvinguda a l'instal·lador Calamares per a %1.</h1> <h1>Welcome to the %1 installer.</h1> - + <h1>Us donem la benvinguda a l'instal·lador per a %1.</h1> @@ -3817,7 +3828,7 @@ Output: About %1 setup - + Quant a la configuració de %1 @@ -3827,7 +3838,7 @@ Output: <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.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. - + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Agraïments per a <a href="https://calamares.io/team/">l'equip del Calamares</a> i per a <a href="https://www.transifex.com/calamares/calamares/">l'equip de traducció del Calamares</a>.<br/><br/>El desenvolupament del<a href="https://calamares.io/">Calamares</a> està patrocinat per <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. @@ -3862,12 +3873,23 @@ Output: development is sponsored by <br/> <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/> + <strong>%2<br/> + per a %3</strong><br/><br/> + Copyright 2014-2017, Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Copyright 2017-2020, Adriaan de Groot &lt;groot@kde.org&gt;<br/> + Moltes gràcies a <a href='https://calamares.io/team/'>l'equip del Calamares</a> + i a <a href='https://www.transifex.com/calamares/calamares/'>l'equip de traducció + del Calamares</a>.<br/><br/> + El desenvolupament del<a href='https://calamares.io/'>Calamares</a> + està patrocinat per <br/> + <a href='http://www.blue-systems.com/'>Blue Systems</a> - + Liberating Software. Back - + Arrere @@ -3876,18 +3898,20 @@ Output: <h1>Languages</h1> </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>. - + <h1>Llengües</h1> </br> + La configuració local del sistema afecta la llengua i el joc de caràcters d'alguns elements de la interfície de línia d'ordres. La configuració actual és <strong>%1</strong>. <h1>Locales</h1> </br> The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>. - + <h1>Configuració local</h1> </br> + La configuració local del sistema afecta el format de números i dates. La configuració actual és <strong>%1</strong>. Back - + Arrere @@ -3895,42 +3919,42 @@ Output: Keyboard Model - + Model de teclat Layouts - + Disposicions Keyboard Layout - + Disposició del teclat Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. - + Cliqueu en el model de teclat preferit per a seleccionar-ne la disposició i la variant, o useu el predeterminat basat en el maquinari detectat. Models - + Models Variants - + Variants Keyboard Variant - + Variant del teclat Test your keyboard - + Comproveu el teclat. @@ -3938,7 +3962,7 @@ Output: Change - + Canvia @@ -3947,7 +3971,8 @@ Output: <h3>%1</h3> <p>These are example release notes.</p> - + <h3>%1</h3> + <p>Aquestes són exemples de notes de la versió.</p> @@ -3975,12 +4000,32 @@ Output: </ul> <p>The vertical scrollbar is adjustable, current width set to 10.</p> - + <h3>%1</h3> + <p>Aquest és un fitxer QML d'exemple. Es mostren les opcions en text enriquit amb contingut parpellejant.</p> + + <p>El QML amb text enriquit pot crear etiquetes d'HTML, el contingut parpellejant és útil per a pantalles tàctils.</p> + + <p><b>Això és text en negreta.</b></p> + <p><i>Això és text en cursiva.</i></p> + <p><u>Això és text subratllat.</u></p> + <p><center>Aquest text estarà alineat al centre.</center></p> + <p><s>Aquest text és ratllat.</s></p> + + <p>Codi d'exemple: + <code>ls -l /home</code></p> + + <p><b>Llistes:</b></p> + <ul> + <li>Sistemes amb CPU d'Intel</li> + <li>Sistemes amb CPU AMD</li> + </ul> + + <p>La barra de desplaçament vertical és ajustable, amplària actual a 10.</p> Back - + Arrere @@ -3988,112 +4033,112 @@ Output: Pick your user name and credentials to login and perform admin tasks - + Trieu el nom d'usuari i les credencials per a iniciar la sessió i fer tasques d'administració. What is your name? - + Quin és el vostre nom? Your Full Name - + Nom complet What name do you want to use to log in? - + Quin nom voleu utilitzar per a entrar al sistema? Login Name - + Nom d'entrada If more than one person will use this computer, you can create multiple accounts after installation. - + Si hi ha més d'una persona que ha d'usar aquest ordinador, podeu crear diversos comptes després de la instal·lació. What is the name of this computer? - + Quin és el nom d'aquest ordinador? Computer Name - + Nom de l'ordinador This name will be used if you make the computer visible to others on a network. - + Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa. Choose a password to keep your account safe. - + Seleccioneu una contrasenya per a mantindre el vostre compte segur. Password - + Contrasenya Repeat Password - + Repetiu la contrasenya 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. - + Escriviu la mateixa contrasenya dues vegades per a poder comprovar-ne els errors de mecanografia. Una bona contrasenya contindrà una barreja de lletres, números i signes de puntuació. Hauria de tindre un mínim de huit caràcters i s'hauria de canviar sovint. Validate passwords quality - + Valida la qualitat de les contrasenyes. When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no podreu indicar-ne una de dèbil. Log in automatically without asking for the password - + Entra automàticament sense demanar la contrasenya. Reuse user password as root password - + Reutilitza la contrasenya d'usuari com a contrasenya d'arrel. Use the same password for the administrator account. - + Usa la mateixa contrasenya per al compte d'administració. Choose a root password to keep your account safe. - + Trieu una contrasenya d'arrel per mantindre el compte segur. Root Password - + Contrasenya d'arrel Repeat Root Password - + Repetiu la contrasenya d'arrel. Enter the same password twice, so that it can be checked for typing errors. - + Escriviu la mateixa contrasenya dues vegades per a poder comprovar-ne els errors de mecanografia. @@ -4102,32 +4147,33 @@ 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>Us donem la benvinguda a l'instal·lador <quote>%2</quote>per a %1</h3> + <p>Aquest programa us farà algunes preguntes i instal·larà el %1 a l'ordinador. </p> About - + Quant a Support - + Suport Known issues - + Incidències conegudes Release notes - + Notes de la versió Donate - + Feu un donatiu diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index fed6cf513c..8625d81315 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -65,7 +65,7 @@ GlobalStorage - Globaali-tallennus + Tallennustila @@ -106,12 +106,12 @@ Widget Tree - Widget puu + Widget puurakenne Debug information - Virheenkorjaustiedot + Vianetsinnän tiedot @@ -137,7 +137,7 @@ Programmed job failure was explicitly requested. - Ohjelmoitua työn epäonnistumista pyydettiin erikseen. + Ohjelmoitu työn epäonnistuminen pyydettiin erikseen. @@ -184,7 +184,7 @@ Bad working directory path - Epäkelpo työskentelyhakemiston polku + Virheellinen työkansion polku @@ -194,12 +194,12 @@ Bad main script file - Huono pää-skripti tiedosto + Virheellinen komentosarjan tiedosto Main script file %1 for python job %2 is not readable. - Pääskriptitiedosto %1 pythonin työlle %2 ei ole luettavissa. + Komentosarjan tiedosto %1 python työlle %2 ei ole luettavissa. @@ -237,7 +237,7 @@ Waiting for %n module(s). Odotetaan %n moduuli(t). - Odotetaan %n moduuli(t). + Odotetaan %n moduulia. @@ -245,13 +245,13 @@ (%n second(s)) (%n sekunti(a)) - (%n sekunti(a)) + (%n sekuntia) System-requirements checking is complete. - Järjestelmävaatimusten tarkistus on valmis. + Järjestelmän vaatimusten tarkistus on valmis. @@ -264,7 +264,7 @@ Installation Failed - Asennus Epäonnistui + Asentaminen epäonnistui @@ -306,12 +306,12 @@ Calamares Initialization Failed - Calamares-alustustaminen epäonnistui + Calamaresin alustaminen epäonnistui %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 ei voida asentaa. Calamares ei voinut ladata kaikkia määritettyjä moduuleja. Ongelma on siinä, miten jakelu käyttää Calamaresia. + %1 ei voi asentaa. Calamares ei voinut ladata kaikkia määritettyjä moduuleja. Ongelma on siinä, miten jakelu käyttää Calamaresia. @@ -321,7 +321,7 @@ Continue with setup? - Jatka asennusta? + Jatketaanko asennusta? diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index 9ce469a7dd..a2253b970c 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -11,7 +11,7 @@ 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. - Este sistema foi iniciado com um ambiente de inicialização <strong>EFI</strong>.<br><br>Para configurar o início a partir de um ambiente EFI, este instalador deverá instalar um gerenciador de inicialização, como o <strong>GRUB</strong> ou <strong>systemd-boot</strong> em uma <strong>Partição de Sistema EFI</strong>. Esse processo é automático, a não ser que escolha o particionamento manual, que no caso fará você escolher ou criar o gerenciador de inicialização por conta própria. + Este sistema foi iniciado com um ambiente de inicialização <strong>EFI</strong>.<br><br>Para configurar o início a partir de um ambiente EFI, este instalador deverá instalar um gerenciador de inicialização, como o <strong>GRUB</strong> ou <strong>systemd-boot</strong> em uma <strong>Partição de Sistema EFI</strong>. Esse processo é automático, a não ser que você escolha o particionamento manual, que no caso fará você escolher ou criar o gerenciador de inicialização por conta própria. @@ -2664,17 +2664,17 @@ O instalador será fechado e todas as alterações serão perdidas. An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - É necessário uma partição de sistema EFI para iniciar %1.<br/><br/>Para configurar uma partição de sistema EFI, volte e faça a seleção ou crie um sistema de arquivos FAT32 com a flag <strong>%3</strong> ativada e o ponto de montagem <strong>%2</strong>.<br/><br/>Você pode continuar sem definir uma partição de sistema EFI, mas seu sistema poderá falhar ao iniciar. + Uma partição de sistema EFI é necessária para iniciar %1.<br/><br/>Para configurar uma partição de sistema EFI, volte e selecione ou crie um sistema de arquivos FAT32 com o marcador <strong>%3</strong> ativado e o ponto de montagem <strong>%2</strong>.<br/><br/>Você pode continuar sem definir uma partição de sistema EFI, mas seu sistema poderá falhar ao iniciar. An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - É necessário uma partição de sistema EFI para iniciar %1.<br/><br/>Uma partição foi configurada com o ponto de montagem <strong>%2</strong>, mas não foi definida a flag <strong>%3</strong>.<br/>Para definir a flag, volte e edite a partição.<br/><br/>Você pode continuar sem definir a flag, mas seu sistema poderá falhar ao iniciar. + Uma partição de sistema EFI é necessária para iniciar %1.<br/><br/>Uma partição foi configurada com o ponto de montagem <strong>%2</strong>, mas o marcador <strong>%3</strong> não foi definido.<br/>Para definir o marcador, volte e edite a partição.<br/><br/>Você pode continuar sem definir o marcador, mas seu sistema poderá falhar ao iniciar. EFI system partition flag not set - Marcador da partição do sistema EFI não definida + Marcador da partição de sistema EFI não definido From d3a27f3c3c97d2149a41c72ee3a7a27a6be64e31 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sun, 14 Mar 2021 15:51:01 +0100 Subject: [PATCH 239/318] i18n: [python] Automatic merge of Transifex translations --- lang/python/az/LC_MESSAGES/python.po | 4 +- lang/python/az_AZ/LC_MESSAGES/python.po | 4 +- lang/python/ca@valencia/LC_MESSAGES/python.po | 146 ++++++++++-------- lang/python/he/LC_MESSAGES/python.po | 2 +- lang/python/ko/LC_MESSAGES/python.po | 4 +- 5 files changed, 92 insertions(+), 68 deletions(-) diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po index 1b6dc24444..5a03b748d6 100644 --- a/lang/python/az/LC_MESSAGES/python.po +++ b/lang/python/az/LC_MESSAGES/python.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Xəyyam Qocayev , 2020 +# xxmn77 , 2020 # #, fuzzy msgid "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Xəyyam Qocayev , 2020\n" +"Last-Translator: xxmn77 , 2020\n" "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po index 546cd56c1f..027e819d5f 100644 --- a/lang/python/az_AZ/LC_MESSAGES/python.po +++ b/lang/python/az_AZ/LC_MESSAGES/python.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Xəyyam Qocayev , 2020 +# xxmn77 , 2020 # #, fuzzy msgid "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Xəyyam Qocayev , 2020\n" +"Last-Translator: xxmn77 , 2020\n" "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/ca@valencia/LC_MESSAGES/python.po b/lang/python/ca@valencia/LC_MESSAGES/python.po index f4d8c444ff..6767bc2ec6 100644 --- a/lang/python/ca@valencia/LC_MESSAGES/python.po +++ b/lang/python/ca@valencia/LC_MESSAGES/python.po @@ -3,6 +3,9 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +# Translators: +# Raul , 2021 +# #, fuzzy msgid "" msgstr "" @@ -10,6 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" +"Last-Translator: Raul , 2021\n" "Language-Team: Catalan (Valencian) (https://www.transifex.com/calamares/teams/20061/ca@valencia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,11 +23,11 @@ msgstr "" #: src/modules/grubcfg/main.py:28 msgid "Configure GRUB." -msgstr "" +msgstr "Configura el GRUB" #: src/modules/mount/main.py:30 msgid "Mounting partitions." -msgstr "" +msgstr "S'estan muntant les particions." #: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 @@ -35,172 +39,183 @@ msgstr "" #: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" -msgstr "" +msgstr "S'ha produït un error en la configuració." #: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 #: src/modules/fstab/main.py:362 msgid "No partitions are defined for 
{!s}
to use." -msgstr "" +msgstr "No s'han definit particions perquè les use 
{!s}
." #: src/modules/services-systemd/main.py:26 msgid "Configure systemd services" -msgstr "" +msgstr "Configura els serveis de systemd" #: src/modules/services-systemd/main.py:59 #: src/modules/services-openrc/main.py:93 msgid "Cannot modify service" -msgstr "" +msgstr "No es pot modificar el servei." #: src/modules/services-systemd/main.py:60 msgid "" "systemctl {arg!s} call in chroot returned error code {num!s}." msgstr "" +"La crida de systemctl {arg!s} a chroot ha retornat el codi " +"d'error {num!s}." #: src/modules/services-systemd/main.py:63 #: src/modules/services-systemd/main.py:67 msgid "Cannot enable systemd service {name!s}." -msgstr "" +msgstr "No es pot habilitar el servei de systemd {name!s}." #: src/modules/services-systemd/main.py:65 msgid "Cannot enable systemd target {name!s}." -msgstr "" +msgstr "No es pot habilitar la destinació de systemd {name!s}." #: src/modules/services-systemd/main.py:69 msgid "Cannot disable systemd target {name!s}." -msgstr "" +msgstr "No es pot inhabilitar la destinació de systemd {name!s}." #: src/modules/services-systemd/main.py:71 msgid "Cannot mask systemd unit {name!s}." -msgstr "" +msgstr "No es pot emmascarar la unitat de systemd {name!s}." #: src/modules/services-systemd/main.py:73 msgid "" "Unknown systemd commands {command!s} and " "{suffix!s} for unit {name!s}." msgstr "" +"Es desconeixen les ordres de systemd: {command!s} i " +"{suffix!s}, per a la unitat {name!s}." #: src/modules/umount/main.py:31 msgid "Unmount file systems." -msgstr "" +msgstr "Desmunta els sistemes de fitxers." #: src/modules/unpackfs/main.py:35 msgid "Filling up filesystems." -msgstr "" +msgstr "S'estan emplenant els sistemes de fitxers." #: src/modules/unpackfs/main.py:255 msgid "rsync failed with error code {}." -msgstr "" +msgstr "Ha fallat rsync amb el codi d'error {}." #: src/modules/unpackfs/main.py:300 msgid "Unpacking image {}/{}, file {}/{}" -msgstr "" +msgstr "S’està desempaquetant la imatge {}/{}, fitxer {}/{}" #: src/modules/unpackfs/main.py:315 msgid "Starting to unpack {}" -msgstr "" +msgstr "S’està començant a desempaquetar {}" #: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464 msgid "Failed to unpack image \"{}\"" -msgstr "" +msgstr "No s’ha pogut desempaquetar la imatge \"{}\"." #: src/modules/unpackfs/main.py:431 msgid "No mount point for root partition" -msgstr "" +msgstr "No hi ha cap punt de muntatge per a la partició d'arrel." #: src/modules/unpackfs/main.py:432 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" +"globalstorage no conté cap clau de \"rootMountPoint\". No s'està fent res." #: src/modules/unpackfs/main.py:437 msgid "Bad mount point for root partition" -msgstr "" +msgstr "El punt de muntatge per a la partició d'arrel és incorrecte." #: src/modules/unpackfs/main.py:438 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" +"El punt de muntatge d'arrel és \"{}\", que no existeix. No s’està fent res." #: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458 #: src/modules/unpackfs/main.py:478 msgid "Bad unsquash configuration" -msgstr "" +msgstr "La configuració d'unsquash és incorrecta." #: src/modules/unpackfs/main.py:455 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" -msgstr "" +msgstr "El nucli actual no admet el sistema de fitxers per a \"{}\" ({})." #: src/modules/unpackfs/main.py:459 msgid "The source filesystem \"{}\" does not exist" -msgstr "" +msgstr "El sistema de fitxers font \"{}\" no existeix." #: src/modules/unpackfs/main.py:465 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" +"No s’ha pogut trobar unsquashfs. Assegureu-vos que teniu el paquet squashfs-" +"tools instal·lat." #: src/modules/unpackfs/main.py:479 msgid "The destination \"{}\" in the target system is not a directory" -msgstr "" +msgstr "La destinació \"{}\" en el sistema de destinació no és un directori." #: src/modules/displaymanager/main.py:514 msgid "Cannot write KDM configuration file" -msgstr "" +msgstr "No es pot escriure el fitxer de configuració del KDM." #: src/modules/displaymanager/main.py:515 msgid "KDM config file {!s} does not exist" -msgstr "" +msgstr "El fitxer de configuració del KDM {!s} no existeix." #: src/modules/displaymanager/main.py:576 msgid "Cannot write LXDM configuration file" -msgstr "" +msgstr "No es pot escriure el fitxer de configuració de l'LXDM." #: src/modules/displaymanager/main.py:577 msgid "LXDM config file {!s} does not exist" -msgstr "" +msgstr "El fitxer de configuració de l'LXDM {!s} no existeix." #: src/modules/displaymanager/main.py:660 msgid "Cannot write LightDM configuration file" -msgstr "" +msgstr "No es pot escriure el fitxer de configuració del LightDM." #: src/modules/displaymanager/main.py:661 msgid "LightDM config file {!s} does not exist" -msgstr "" +msgstr "El fitxer de configuració del LightDM {!s} no existeix." #: src/modules/displaymanager/main.py:735 msgid "Cannot configure LightDM" -msgstr "" +msgstr "No es pot configurar el LightDM." #: src/modules/displaymanager/main.py:736 msgid "No LightDM greeter installed." -msgstr "" +msgstr "No hi ha benvinguda instal·lada per al LightDM." #: src/modules/displaymanager/main.py:767 msgid "Cannot write SLIM configuration file" -msgstr "" +msgstr "No es pot escriure el fitxer de configuració de l'SLIM." #: src/modules/displaymanager/main.py:768 msgid "SLIM config file {!s} does not exist" -msgstr "" +msgstr "El fitxer de configuració de l'SLIM {!s} no existeix." #: src/modules/displaymanager/main.py:894 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:895 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." 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:977 msgid "Display manager configuration was incomplete" -msgstr "" +msgstr "La configuració del gestor de pantalla no era completa." #: src/modules/initcpiocfg/main.py:28 msgid "Configuring mkinitcpio." -msgstr "" +msgstr "S'està configurant mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 @@ -209,139 +224,148 @@ msgstr "" #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" +"No s'ha proporcionat el punt de muntatge perquè l'use 
{!s}
." #: src/modules/luksopenswaphookcfg/main.py:26 msgid "Configuring encrypted swap." -msgstr "" +msgstr "S’està configurant l'intercanvi encriptat." #: src/modules/rawfs/main.py:26 msgid "Installing data." -msgstr "" +msgstr "S'estan instal·lant les dades." #: src/modules/services-openrc/main.py:29 msgid "Configure OpenRC services" -msgstr "" +msgstr "Configura els serveis d'OpenRC" #: src/modules/services-openrc/main.py:57 msgid "Cannot add service {name!s} to run-level {level!s}." -msgstr "" +msgstr "No es pot afegir el servei {name!s} al nivell d'execució {level!s}." #: src/modules/services-openrc/main.py:59 msgid "Cannot remove service {name!s} from run-level {level!s}." msgstr "" +"No es pot suprimir el servei {name!s} del nivell d'execució {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 "" +"Servei - acció desconeguda {arg!s} per al servei {name!s} al " +"nivell d'execució {level!s}." #: src/modules/services-openrc/main.py:94 msgid "" "rc-update {arg!s} call in chroot returned error code {num!s}." msgstr "" +"La crida de rc-update {arg!s} a chroot ha retornat el codi " +"d'error {num!s}." #: src/modules/services-openrc/main.py:101 msgid "Target runlevel does not exist" -msgstr "" +msgstr "El nivell d'execució de destinació no existeix." #: src/modules/services-openrc/main.py:102 msgid "" "The path for runlevel {level!s} is {path!s}, which does not " "exist." msgstr "" +"El camí per al nivell d'execució {level!s} és {path!s}, però no" +" existeix." #: src/modules/services-openrc/main.py:110 msgid "Target service does not exist" -msgstr "" +msgstr "El servei de destinació no existeix." #: src/modules/services-openrc/main.py:111 msgid "" "The path for service {name!s} is {path!s}, which does not " "exist." msgstr "" +"El camí per al servei {name!s} és {path!s}, però no existeix." #: src/modules/plymouthcfg/main.py:27 msgid "Configure Plymouth theme" -msgstr "" +msgstr "Configura el tema del Plymouth" #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 #: src/modules/packages/main.py:69 msgid "Install packages." -msgstr "" +msgstr "Instal·la els paquets." #: src/modules/packages/main.py:57 #, python-format msgid "Processing packages (%(count)d / %(total)d)" -msgstr "" +msgstr "S'estan processant els paquets (%(count)d / %(total)d)" #: src/modules/packages/main.py:62 #, python-format msgid "Installing one package." msgid_plural "Installing %(num)d packages." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "S'està instal·lant un paquet." +msgstr[1] "S'està instal·lant %(num)d paquets." #: src/modules/packages/main.py:65 #, python-format msgid "Removing one package." msgid_plural "Removing %(num)d packages." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "S’està eliminant un paquet." +msgstr[1] "S’està eliminant %(num)d paquets." #: src/modules/bootloader/main.py:42 msgid "Install bootloader." -msgstr "" +msgstr "Instal·la el carregador d'arrancada." #: src/modules/hwclock/main.py:26 msgid "Setting hardware clock." -msgstr "" +msgstr "Configuració del rellotge del maquinari." #: src/modules/mkinitfs/main.py:27 msgid "Creating initramfs with mkinitfs." -msgstr "" +msgstr "Creació d’initramfs amb mkinitfs." #: src/modules/mkinitfs/main.py:49 msgid "Failed to run mkinitfs on the target" -msgstr "" +msgstr "No s’ha pogut executar mkinitfs en la destinació." #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 msgid "The exit code was {}" -msgstr "" +msgstr "El codi d'eixida ha estat {}" #: src/modules/dracut/main.py:27 msgid "Creating initramfs with dracut." -msgstr "" +msgstr "Creació d’initramfs amb dracut." #: src/modules/dracut/main.py:49 msgid "Failed to run dracut on the target" -msgstr "" +msgstr "No s’ha pogut executar dracut en la destinació." #: src/modules/initramfscfg/main.py:32 msgid "Configuring initramfs." -msgstr "" +msgstr "Es configuren initramfs." #: src/modules/openrcdmcryptcfg/main.py:26 msgid "Configuring OpenRC dmcrypt service." -msgstr "" +msgstr "Configuració del servei OpenRC dmcrypt." #: src/modules/fstab/main.py:29 msgid "Writing fstab." -msgstr "" +msgstr "Escriptura d’fstab." #: src/modules/dummypython/main.py:35 msgid "Dummy python job." -msgstr "" +msgstr "Tasca de python de proves." #: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93 #: src/modules/dummypython/main.py:94 msgid "Dummy python step {}" -msgstr "" +msgstr "Pas de python de proves {}" #: src/modules/localecfg/main.py:30 msgid "Configuring locales." -msgstr "" +msgstr "Configuració d’idioma." #: src/modules/networkcfg/main.py:28 msgid "Saving network configuration." -msgstr "" +msgstr "S'està guardant la configuració de la xarxa." diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po index 6f6200ac76..459e858b32 100644 --- a/lang/python/he/LC_MESSAGES/python.po +++ b/lang/python/he/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # Eli Shleifer , 2017 -# Omer I.S. , 2020 +# Omeritzics Games , 2020 # Yaron Shahrabani , 2020 # #, fuzzy diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po index 0e54afa7d8..0adc5b53a2 100644 --- a/lang/python/ko/LC_MESSAGES/python.po +++ b/lang/python/ko/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # Ji-Hyeon Gim , 2018 -# Bruce Lee , 2020 +# JungHee Lee , 2020 # #, fuzzy msgid "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-12-07 17:09+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Bruce Lee , 2020\n" +"Last-Translator: JungHee Lee , 2020\n" "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From 9ae87b7fb7be0de86c7f28e9ed37b3b188101d1b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 15:56:22 +0100 Subject: [PATCH 240/318] [calamares] Change .desktop invocation FIXES #1653 --- calamares.desktop | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 calamares.desktop diff --git a/calamares.desktop b/calamares.desktop old mode 100644 new mode 100755 index 834c4a5182..cd8a353c9c --- a/calamares.desktop +++ b/calamares.desktop @@ -1,3 +1,4 @@ +#!/usr/bin/env xdg-open [Desktop Entry] Type=Application Version=1.0 @@ -5,7 +6,7 @@ Name=Install System GenericName=System Installer Keywords=calamares;system;installer; TryExec=calamares -Exec=pkexec /usr/bin/calamares +Exec=sh -c "pkexec calamares" Comment=Calamares — System Installer Icon=calamares Terminal=false From b4485f4dc90fecb0d12db70cb0c57df3b918cc48 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 16:05:04 +0100 Subject: [PATCH 241/318] Changes: mention the .desktop file --- CHANGES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index fac42afd4a..32f248d918 100644 --- a/CHANGES +++ b/CHANGES @@ -18,6 +18,8 @@ This release contains contributions from (alphabetically by first name): expanded and is now more configurable. Users should still take care when uploading logs, and distro's should configure a URL with no public viewing of those logs. (Thanks Anubhav) + - The .desktop file for Calamares now makes a longer trip, calling + `sh -c "pkexec calamares"`; distributions may still need to adjust. ## Modules ## - A new QML-based *finishedq* module has been added. (Thanks Anke) From 8c7e214376b5b05491d175e6b72915a48dab04ab Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 16:07:02 +0100 Subject: [PATCH 242/318] [users] Make the example config usable Although the example configurations shouldn't really be used as a sample of how to configure **your** Calamares for your distro, many distro's do just copy the examples. So leave traces of the OEM-configuration settings in the example, and give the standard configuration a 'nothing changed' set of presets. --- src/modules/users/users.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/users/users.conf b/src/modules/users/users.conf index 87227898f1..a196e57d38 100644 --- a/src/modules/users/users.conf +++ b/src/modules/users/users.conf @@ -162,8 +162,8 @@ writeHostsFile: true presets: fullName: - value: "OEM User" - editable: false + # value: "OEM User" + editable: true loginName: - value: "oem" - editable: false + # value: "oem" + editable: true From 0716f92f62a06f42195c07fb66cda447bc0a9940 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 16:12:55 +0100 Subject: [PATCH 243/318] CMake: update translations lists - ne_NP, id_ID and zh seem to duplicate existing languages, and I'm not sure why they were requested in the first place. --- CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff65b9f42d..c46be69c86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,14 +141,15 @@ set( CALAMARES_DESCRIPTION_SUMMARY # NOTE: update these lines by running `txstats.py`, or for full automation # `txstats.py -e`. See also # -# Total 71 languages -set( _tx_complete az ca fi_FI fur he hr ja lt sq uk zh_CN zh_TW ) -set( _tx_good as ast az_AZ be cs_CZ da de es fa fr hi hu it_IT ko - ml nl pt_BR pt_PT ru sk sv tg tr_TR vi ) +# Total 75 languages +set( _tx_complete az az_AZ be ca de fi_FI he hi hr ja ko lt pt_BR + pt_PT sq sv tr_TR uk vi zh_CN zh_TW ) +set( _tx_good as ast ca@valencia cs_CZ da es fa fr fur hu it_IT ml + nl ru sk tg ) set( _tx_ok ar bg bn el en_GB es_MX es_PR et eu gl id is mr nb pl ro sl sr sr@latin th ) -set( _tx_incomplete ca@valencia eo fr_CH gu ie kk kn lo lv mk ne_NP - te ur uz ) +set( _tx_incomplete eo fr_CH gu id_ID ie kk kn lo lv mk ne ne_NP si + te ur uz zh ) ### Required versions # From d3f84980b32c3d879d3ddb11a4dc9750ac5d244b Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sun, 14 Mar 2021 16:17:09 +0100 Subject: [PATCH 244/318] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_ar.ts | 367 +-- lang/calamares_as.ts | 368 +-- lang/calamares_ast.ts | 367 +-- lang/calamares_az.ts | 368 +-- lang/calamares_az_AZ.ts | 368 +-- lang/calamares_be.ts | 368 +-- lang/calamares_bg.ts | 367 +-- lang/calamares_bn.ts | 367 +-- lang/calamares_ca.ts | 368 +-- lang/calamares_ca@valencia.ts | 368 +-- lang/calamares_cs_CZ.ts | 368 +-- lang/calamares_da.ts | 368 +-- lang/calamares_de.ts | 368 +-- lang/calamares_el.ts | 361 +-- lang/calamares_en.ts | 374 +-- lang/calamares_en_GB.ts | 367 +-- lang/calamares_eo.ts | 361 +-- lang/calamares_es.ts | 367 +-- lang/calamares_es_MX.ts | 367 +-- lang/calamares_es_PR.ts | 359 ++- lang/calamares_et.ts | 367 +-- lang/calamares_eu.ts | 365 +-- lang/calamares_fa.ts | 362 +-- lang/calamares_fi_FI.ts | 368 +-- lang/calamares_fr.ts | 368 +-- lang/calamares_fr_CH.ts | 359 ++- lang/calamares_fur.ts | 368 +-- lang/calamares_gl.ts | 367 +-- lang/calamares_gu.ts | 359 ++- lang/calamares_he.ts | 368 +-- lang/calamares_hi.ts | 368 +-- lang/calamares_hr.ts | 368 +-- lang/calamares_hu.ts | 367 +-- lang/calamares_id.ts | 368 +-- lang/calamares_id_ID.ts | 4217 ++++++++++++++++++++++++++++++++ lang/calamares_ie.ts | 361 +-- lang/calamares_is.ts | 367 +-- lang/calamares_it_IT.ts | 368 +-- lang/calamares_ja.ts | 370 +-- lang/calamares_kk.ts | 359 ++- lang/calamares_kn.ts | 359 ++- lang/calamares_ko.ts | 368 +-- lang/calamares_lo.ts | 359 ++- lang/calamares_lt.ts | 368 +-- lang/calamares_lv.ts | 359 ++- lang/calamares_mk.ts | 359 ++- lang/calamares_ml.ts | 368 +-- lang/calamares_mr.ts | 359 ++- lang/calamares_nb.ts | 359 ++- lang/calamares_ne.ts | 4228 +++++++++++++++++++++++++++++++++ lang/calamares_ne_NP.ts | 359 ++- lang/calamares_nl.ts | 368 +-- lang/calamares_pl.ts | 367 +-- lang/calamares_pt_BR.ts | 368 +-- lang/calamares_pt_PT.ts | 368 +-- lang/calamares_ro.ts | 367 +-- lang/calamares_ru.ts | 368 +-- lang/calamares_si.ts | 4228 +++++++++++++++++++++++++++++++++ lang/calamares_sk.ts | 368 +-- lang/calamares_sl.ts | 361 +-- lang/calamares_sq.ts | 368 +-- lang/calamares_sr.ts | 361 +-- lang/calamares_sr@latin.ts | 361 +-- lang/calamares_sv.ts | 368 +-- lang/calamares_te.ts | 359 ++- lang/calamares_tg.ts | 370 +-- lang/calamares_th.ts | 361 +-- lang/calamares_tr_TR.ts | 368 +-- lang/calamares_uk.ts | 368 +-- lang/calamares_ur.ts | 359 ++- lang/calamares_uz.ts | 359 ++- lang/calamares_vi.ts | 368 +-- lang/calamares_zh.ts | 4217 ++++++++++++++++++++++++++++++++ lang/calamares_zh_CN.ts | 368 +-- lang/calamares_zh_TW.ts | 368 +-- 75 files changed, 33218 insertions(+), 9613 deletions(-) create mode 100644 lang/calamares_id_ID.ts create mode 100644 lang/calamares_ne.ts create mode 100644 lang/calamares_si.ts create mode 100644 lang/calamares_zh.ts diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts index eef4dfbb2a..e9946899d7 100644 --- a/lang/calamares_ar.ts +++ b/lang/calamares_ar.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information معلومات التّنقيح @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install ثبت @@ -143,7 +151,7 @@ Calamares::JobThread - + Done انتهى @@ -265,171 +273,180 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed فشل التثبيت - + Would you like to paste the install log to the web? - + Error خطأ - - + + &Yes &نعم - - + + &No &لا - + &Close &اغلاق - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? الإستمرار في التثبيت؟ - + 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 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 على وشك بإجراء تعديلات على قرصك لتثبيت %2.<br/><strong>لن تستطيع التّراجع عن هذا.</strong> - + &Set up now - + &Install now &ثبت الأن - + Go &back &إرجع - + &Set up - + &Install &ثبت - + Setup is complete. Close the setup program. اكتمل الإعداد. أغلق برنامج الإعداد. - + The installation is complete. Close the installer. اكتمل التثبيت , اغلق المثبِت - + Cancel setup without changing the system. - + Cancel installation without changing the system. الغاء الـ تثبيت من دون احداث تغيير في النظام - + &Next &التالي - + &Back &رجوع - + &Done - + &Cancel &إلغاء - + Cancel setup? إلغاء الإعداد؟ - + 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 install process? The installer will quit and all changes will be lost. أتريد إلغاء عمليّة التّثبيت الحاليّة؟ @@ -459,44 +476,15 @@ The installer will quit and all changes will be lost. خطأ لا يمكن الحصول علية في بايثون. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - أظهر معلومات التّنقيح - - - - &Back - &رجوع - - - - &Next - &التالي - - - - &Cancel - &إلغاء - - - + %1 Setup Program - + %1 Installer %1 المثبت @@ -817,50 +805,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. اسم المستخدم طويل جدًّا. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. اسم المضيف قصير جدًّا. - + Your hostname is too long. اسم المضيف طويل جدًّا. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! لا يوجد تطابق في كلمات السر! + + + Setup Failed + + + + + Installation Failed + فشل التثبيت + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -951,22 +979,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. ينشئ قسم %1 جديد على %2. - + The installer failed to create partition on disk '%1'. فشل المثبّت في إنشاء قسم على القرص '%1'. @@ -1293,37 +1342,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. ثبّت %1 على قسم نظام %2 <strong>جديد</strong>. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - اضطب قسم %2 <strong>جديد</strong> بنقطة الضّمّ <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - ثبّت %2 على قسم النّظام %3 ‏<strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - اضبط القسم %3 <strong>%1</strong> بنقطة الضّمّ <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + ثبّت %2 على قسم النّظام %3 ‏<strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. ثبّت محمّل الإقلاع على <strong>%1</strong>. - + Setting up mount points. يضبط نقاط الضّمّ. @@ -1341,62 +1410,50 @@ The installer will quit and all changes will be lost. أ&عد التّشغيل الآن - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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>انتهينا.</h1><br/>لقد ثُبّت %1 على حاسوبك.<br/>يمكنك إعادة التّشغيل وفتح النّظام الجديد، أو متابعة استخدام بيئة %2 الحيّة. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish أنهِ + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - + + Finish + أنهِ @@ -2299,7 +2356,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2809,65 +2866,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. معاملات نداء المهمة سيّئة. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3683,12 +3740,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 installation.</small> @@ -3916,6 +3973,44 @@ Output: + + calamares-sidebar + + + Show debug information + أظهر معلومات التّنقيح + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_as.ts b/lang/calamares_as.ts index c5c0cb7693..af7ee1a037 100644 --- a/lang/calamares_as.ts +++ b/lang/calamares_as.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ ৱিজেত্ ত্ৰি - + Debug information ডিবাগ তথ্য @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up চেত্ আপ - + Install ইনস্তল @@ -143,7 +151,7 @@ Calamares::JobThread - + Done হৈ গ'ল @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed চেত্ আপ বিফল হ'ল - + Installation Failed ইনস্তলেচন বিফল হ'ল - + Would you like to paste the install log to the web? আপুনি ৱেবত ইণ্স্টল ল'গ পেস্ট কৰিব বিচাৰে নেকি? - + Error ত্ৰুটি - - + + &Yes হয় (&Y) - - + + &No নহয় (&N) - + &Close বন্ধ (&C) - + Install Log Paste URL ইনস্তল​ ল'গ পেস্ট URL - + The upload was unsuccessful. No web-paste was done. আপলোড বিফল হৈছিল। কোনো ৱেব-পেস্ট কৰা হোৱা নাছিল। + Install log posted to + +%1 + +Link copied to clipboard + + + + 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 ইনস্তল কৰিব পৰা নগ'ল। কেলামাৰেচে সকলোবোৰ সংৰূপ দিয়া মডিউল লোড্ কৰাত সফল নহ'ল। এইটো এটা আপোনাৰ ডিষ্ট্ৰিবিউচনে কি ধৰণে কেলামাৰেচ ব্যৱহাৰ কৰিছে, সেই সম্বন্ধীয় সমস্যা। - + <br/>The following modules could not be loaded: <br/>নিম্নোক্ত মডিউলবোৰ লোড্ কৰিৱ পৰা নগ'ল: - + Continue with setup? চেত্ আপ অব্যাহত ৰাখিব? - + 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> %1 চেত্ আপ প্ৰগ্ৰেমটোৱে %2 চেত্ আপ কৰিবলৈ আপোনাৰ ডিস্কত সালসলনি কৰিব।<br/><strong>আপুনি এইবোৰ পিছত পূৰ্বলৈ সলনি কৰিব নোৱাৰিব।</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 ইনস্তলাৰটোৱে %2 ইনস্তল কৰিবলৈ আপোনাৰ ডিস্কত সালসলনি কৰিব।<br/><strong>আপুনি এইবোৰ পিছত পূৰ্বলৈ সলনি কৰিব নোৱাৰিব।</strong> - + &Set up now এতিয়া চেত্ আপ কৰক (&S) - + &Install now এতিয়া ইনস্তল কৰক (&I) - + Go &back উভতি যাওক (&b) - + &Set up চেত্ আপ কৰক (&S) - + &Install ইনস্তল (&I) - + Setup is complete. Close the setup program. চেত্ আপ সম্পূৰ্ণ হ'ল। প্ৰোগ্ৰেম বন্ধ কৰক। - + The installation is complete. Close the installer. ইনস্তলেচন সম্পূৰ্ণ হ'ল। ইন্স্তলাৰ বন্ধ কৰক। - + Cancel setup without changing the system. চিছ্তেম সলনি নকৰাকৈ চেত্ আপ বাতিল কৰক। - + Cancel installation without changing the system. চিছ্তেম সলনি নকৰাকৈ ইনস্তলেচন বাতিল কৰক। - + &Next পৰবর্তী (&N) - + &Back পাছলৈ (&B) - + &Done হৈ গ'ল (&D) - + &Cancel বাতিল কৰক (&C) - + Cancel setup? চেত্ আপ বাতিল কৰিব? - + 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 install process? The installer will quit and all changes will be lost. সচাকৈয়ে চলিত ইনস্তল প্ৰক্ৰিয়া বাতিল কৰিব বিচাৰে নেকি? @@ -451,45 +468,15 @@ The installer will quit and all changes will be lost. ঢুকি নোপোৱা পাইথন ক্ৰুটি। - - CalamaresUtils - - - Install log posted to: -%1 - ইনস্তল​​ ল'গ পোস্ট কৰা হৈছে: -%1 - - CalamaresWindow - - Show debug information - দিবাগ তথ্য দেখাওক - - - - &Back - পাছলৈ (&B) - - - - &Next - পৰবর্তী (&N) - - - - &Cancel - বাতিল কৰক (&C) - - - + %1 Setup Program %1 চেত্ আপ প্ৰোগ্ৰেম - + %1 Installer %1 ইনস্তলাৰ @@ -810,50 +797,90 @@ The installer will quit and all changes will be lost. <h1>%1 ইনস্তলাৰলৈ আদৰণি জনাইছো।</h1> - + Your username is too long. আপোনাৰ ইউজাৰ নাম বহুত দীঘল। - + '%1' is not allowed as username. '%1'ক ব্যৱহাৰকাৰীৰ নাম হিচাপে ব্যৱহাৰ কৰা অবধ্য | - + Your username must start with a lowercase letter or underscore. আপোনাৰ ব্যৱহাৰকাৰী নাম lowercase বৰ্ণ বা underscoreৰে আৰম্ভ হ'ব লাগিব। - + Only lowercase letters, numbers, underscore and hyphen are allowed. কেৱল lowercase বৰ্ণ, সংখ্যা, underscore আৰু hyphenৰ হে মাত্ৰ অনুমতি আছে। - + Your hostname is too short. আপোনাৰ হ'স্ট্ নাম বহুত ছুটি। - + Your hostname is too long. আপোনাৰ হ'স্ট্ নাম বহুত দীঘল। - + '%1' is not allowed as hostname. '%1'ক আয়োজকৰ নাম হিচাপে ব্যৱহাৰ কৰা অবধ্য | - + Only letters, numbers, underscore and hyphen are allowed. কেৱল বৰ্ণ, সংখ্যা, underscore আৰু hyphenৰ হে মাত্ৰ অনুমতি আছে। - + Your passwords do not match! আপোনাৰ পাছৱৰ্ডকেইটাৰ মিল নাই! + + + Setup Failed + চেত্ আপ বিফল হ'ল + + + + Installation Failed + ইনস্তলেচন বিফল হ'ল + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + চেত্ আপ সম্পুৰ্ণ হৈছে + + + + Installation Complete + ইনস্তলচেন সম্পুৰ্ণ হ'ল + + + + The setup of %1 is complete. + %1ৰ চেত্ আপ সম্পুৰ্ণ হৈছে। + + + + The installation of %1 is complete. + %1ৰ ইনস্তলচেন সম্পুৰ্ণ হ'ল। + ContextualProcessJob @@ -944,22 +971,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). + + + + Create new %2MiB partition on %4 (%3) with file system %1. %1 ফাইল চিছটেমৰ সৈতে %4 (%3) ত %2MiBৰ নতুন বিভাজন বনাওক। - + + 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>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. <strong>%4</strong>ত নতুন (%3) <strong>%1</strong> ফাইল চিছটেমৰ <strong>%2MiB</strong> বিভাজন কৰক। - + + Creating new %1 partition on %2. %2ত নতুন %1 বিভজন বনাই আছে। - + The installer failed to create partition on disk '%1'. '%1' ডিস্কত নতুন বিভাজন বনোৱাত ইনস্তলাৰটো বিফল হ'ল। @@ -1286,37 +1334,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. <strong>নতুন</strong> %2 চিছটেম বিভাজনত %1 ইনস্তল কৰক। - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - <strong>%1</strong> মাউন্ট পইন্টৰ সৈতে <strong>নতুন</strong> %2 বিভজন স্থাপন কৰক। + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - %3 চিছটেম বিভাজনত <strong>%1</strong>ত %2 ইনস্তল কৰক। + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - %3 বিভাজন <strong>%1</strong> <strong>%2</strong>ৰ সৈতে স্থাপন কৰক। + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + %3 চিছটেম বিভাজনত <strong>%1</strong>ত %2 ইনস্তল কৰক। + + + Install boot loader on <strong>%1</strong>. <strong>1%ত</strong> বুত্ লোডাৰ ইনস্তল কৰক। - + Setting up mount points. মাউন্ট পইন্ট চেত্ আপ হৈ আছে। @@ -1334,62 +1402,50 @@ The installer will quit and all changes will be lost. পুনৰাৰম্ভ কৰক (&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>সকলো কৰা হ'ল।</h1> <br/>আপোনাৰ কম্পিউটাৰত %1 স্থাপন কৰা হ'ল। <br/>আপুনি এতিয়া নতুন চিছটেম ব্যৱহাৰ কৰা আৰম্ভ কৰিব পাৰিব। - + <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>এইটো বিকল্পত ক্লিক কৰাৰ লগে লগে আপোনাৰ চিছটেম পুনৰাৰম্ভ হ'ব যেতিয়া আপুনি <span style="font-style:italic;">হৈ গ'ল</span>ত ক্লিক কৰে বা চেত্ আপ প্ৰগ্ৰেম বন্ধ কৰে।</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>সকলো কৰা হ'ল।</h1> আপোনাৰ কম্পিউটাৰত %1 ইনস্তল কৰা হ'ল। <br/>আপুনি এতিয়া নতুন চিছটেম পুনৰাৰম্ভ কৰিব পাৰিব অথবা %2 লাইভ বাতাৱৰণ ব্যৱহাৰ কৰা অবিৰত ৰাখিব পাৰে। - + <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>এইটো বিকল্পত ক্লিক কৰাৰ লগে লগে আপোনাৰ চিছটেম পুনৰাৰম্ভ হ'ব যেতিয়া আপুনি <span style="font-style:italic;">হৈ গ'ল</span>ত ক্লিক কৰে বা ইনস্তলাৰ বন্ধ কৰে।</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>স্থাপন প্ৰক্ৰিয়া বিফল হ'ল।</h1> <br/>আপোনাৰ কম্পিউটাৰত %1 স্থাপন নহ'ল্। <br/>ক্ৰুটি বাৰ্তা আছিল: %2। - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>ইনস্তলচেন প্ৰক্ৰিয়া বিফল হ'ল।</h1> <br/>আপোনাৰ কম্পিউটাৰত %1 ইনস্তল নহ'ল্। <br/>ক্ৰুটি বাৰ্তা আছিল: %2। - FinishedViewStep + FinishedQmlViewStep - + Finish সমাপ্ত + + + FinishedViewStep - - Setup Complete - চেত্ আপ সম্পুৰ্ণ হৈছে - - - - Installation Complete - ইনস্তলচেন সম্পুৰ্ণ হ'ল - - - - The setup of %1 is complete. - %1ৰ চেত্ আপ সম্পুৰ্ণ হৈছে। - - - - The installation of %1 is complete. - %1ৰ ইনস্তলচেন সম্পুৰ্ণ হ'ল। + + Finish + সমাপ্ত @@ -2258,7 +2314,7 @@ The installer will quit and all changes will be lost. অজ্ঞাত ক্ৰুটি - + Password is empty খালী পাছৱৰ্ড @@ -2768,14 +2824,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. কমাণ্ডৰ পৰা কোনো আউটপুট পোৱা নগ'ল। - + Output: @@ -2784,52 +2840,52 @@ Output: - + External command crashed. বাহ্যিক কমাণ্ড ক্ৰেছ্ কৰিলে। - + Command <i>%1</i> crashed. <i>%1</i> কমাণ্ড ক্ৰেছ্ কৰিলে। - + External command failed to start. বাহ্যিক কমাণ্ড আৰম্ভ হোৱাত বিফল হ'ল। - + Command <i>%1</i> failed to start. <i>%1</i> কমাণ্ড আৰম্ভ হোৱাত বিফল হ'ল। - + Internal error when starting command. কমাণ্ড আৰম্ভ কৰাৰ সময়ত আভ্যন্তৰীণ ক্ৰুটি। - + Bad parameters for process job call. প্ৰক্ৰিয়া কাৰ্য্যৰ বাবে বেয়া মান। - + External command failed to finish. বাহ্যিক কমাণ্ড সমাপ্ত কৰাত বিফল হ'ল। - + Command <i>%1</i> failed to finish in %2 seconds. <i>%1</i> কমাণ্ড সমাপ্ত কৰাত %2 ছেকেণ্ডত বিফল হ'ল। - + External command finished with errors. বাহ্যিক কমাণ্ড ক্ৰটিৰ সৈতে সমাপ্ত হ'ল। - + Command <i>%1</i> finished with exit code %2. <i>%1</i> কমাণ্ড %2 এক্সিড্ কোডৰ সৈতে সমাপ্ত হ'ল। @@ -3646,12 +3702,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>যদি এটাতকৈ বেছি ব্যক্তিয়ে এইটো কম্পিউটাৰ ব্যৱহাৰ কৰে, আপুনি চেত্ আপৰ পিছত বহুতো একাউন্ট বনাব পাৰে।</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>যদি এটাতকৈ বেছি ব্যক্তিয়ে এইটো কম্পিউটাৰ ব্যৱহাৰ কৰে, আপুনি ইনস্তলচেন​ৰ পিছত বহুতো একাউন্ট বনাব পাৰে।</small> @@ -3879,6 +3935,44 @@ Output: পাছলৈ + + calamares-sidebar + + + Show debug information + দিবাগ তথ্য দেখাওক + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts index b2798512f0..7f593e9f51 100644 --- a/lang/calamares_ast.ts +++ b/lang/calamares_ast.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information Información de la depuración @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Configuración - + Install Instalación @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Fecho @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Falló la configuración - + Installation Failed Falló la instalación - + Would you like to paste the install log to the web? - + Error Fallu - - + + &Yes &Sí - - + + &No &Non - + &Close &Zarrar - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Falló l'aniciu de Calamares - + %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 nun pue instalase. Calamares nun foi a cargar tolos módulos configuraos. Esto ye un problema col mou nel que la distribución usa Calamares. - + <br/>The following modules could not be loaded: <br/>Nun pudieron cargase los módulos de darréu: - + Continue with setup? ¿Siguir cola instalación? - + Continue with installation? ¿Siguir cola instalación? - + 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> El programa d'instalación de %1 ta a piques de facer cambeos nel discu pa configurar %2.<br/><strong>Nun vas ser a desfacer estos cambeos.<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> L'instalador de %1 ta a piques de facer cambeos nel discu pa instalar %2.<br/><strong>Nun vas ser a desfacer esos cambeos.</strong> - + &Set up now &Configurar agora - + &Install now &Instalar agora - + Go &back Dir p'&atrás - + &Set up &Configurar - + &Install &Instalar - + Setup is complete. Close the setup program. Completóse la configuración. Zarra'l programa de configuración. - + The installation is complete. Close the installer. Completóse la instalación. Zarra l'instalador. - + Cancel setup without changing the system. Encaboxa la configuración ensin camudar el sistema. - + Cancel installation without changing the system. Encaboxa la instalación ensin camudar el sistema. - + &Next &Siguiente - + &Back &Atrás - + &Done &Fecho - + &Cancel &Encaboxar - + Cancel setup? ¿Encaboxar la configuración? - + Cancel installation? ¿Encaboxar la instalación? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. ¿De xuru que quies encaboxar el procesu actual de configuración? El programa de configuración va colar y van perdese tolos cambeos. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. ¿De xuru que quies encaboxar el procesu actual d'instalación? @@ -451,44 +468,15 @@ L'instalador va colar y van perdese tolos cambeos. Fallu de Python al que nun pue dise en cata. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - Amosar la depuración - - - - &Back - &Atrás - - - - &Next - &Siguiente - - - - &Cancel - &Encaboxar - - - + %1 Setup Program Programa de configuración de %1 - + %1 Installer Instalador de %1 @@ -809,50 +797,90 @@ L'instalador va colar y van perdese tolos cambeos. <h1>Afáyate nel instalador de %1</h1> - + Your username is too long. El nome d'usuariu ye perllargu. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. El nome d'agospiu ye percurtiu. - + Your hostname is too long. El nome d'agospiu ye perllargu. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! ¡Les contraseñes nun concasen! + + + Setup Failed + Falló la configuración + + + + Installation Failed + Falló la instalación + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Configuración completada + + + + Installation Complete + Instalación completada + + + + The setup of %1 is complete. + La configuración de %1 ta completada. + + + + The installation of %1 is complete. + Completóse la instalación de %1. + ContextualProcessJob @@ -943,22 +971,43 @@ L'instalador va colar y van perdese tolos cambeos. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. Creando una partición %1 en %2. - + The installer failed to create partition on disk '%1'. L'instalador falló al crear la partición nel discu «%1». @@ -1285,37 +1334,57 @@ L'instalador va colar y van perdese tolos cambeos. FillGlobalStorageJob - + Set partition information Afitamientu de la información de les particiones - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Va instalase %1 na partición %2 <strong>nueva</strong> del sistema. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Va configurase una partición %2 <strong>nueva</strong> col puntu de montaxe <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Va instalase %2 na partición %3 del sistema de <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Va configurase la partición %3 de <strong>%1</strong> col puntu de montaxe <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Va instalase %2 na partición %3 del sistema de <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Va instalase'l xestor d'arrinque en <strong>%1</strong>. - + Setting up mount points. Configurando los puntos de montaxe. @@ -1333,62 +1402,50 @@ L'instalador va colar y van perdese tolos cambeos. &Reaniciar agora - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Too fecho.</h1><br/>%1 configuróse nel ordenador.<br/>Agora pues usar el sistema nuevu. - + <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>Cuando se conseña esti caxellu, el sistema va reaniciase nel intre cuando calques en <span style="font-style:italic;">Fecho</span> o zarres el programa de configuración.</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>Too fecho.</h1><br/>%1 instalóse nel ordenador.<br/>Agora pues renaiciar nel sistema nuevu o siguir usando l'entornu live de %2. - + <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>Cuando se conseña esti caxellu, el sistema va reaniciase nel intre cuando calques en <span style="font-style:italic;">Fecho</span> o zarres l'instalador.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Falló la configuración</h1><br/>%1 nun se configuró nel ordenador.<br/>El mensaxe de fallu foi: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Falló la instalación</h1><br/>%1 nun s'instaló nel ordenador.<br/>El mensaxe de fallu foi: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Fin + + + FinishedViewStep - - Setup Complete - Configuración completada - - - - Installation Complete - Instalación completada - - - - The setup of %1 is complete. - La configuración de %1 ta completada. - - - - The installation of %1 is complete. - Completóse la instalación de %1. + + Finish + Fin @@ -2255,7 +2312,7 @@ L'instalador va colar y van perdese tolos cambeos. Desconozse'l fallu - + Password is empty La contraseña ta balera @@ -2765,14 +2822,14 @@ L'instalador va colar y van perdese tolos cambeos. ProcessResult - + There was no output from the command. El comandu nun produxo nenguna salida. - + Output: @@ -2781,52 +2838,52 @@ Salida: - + External command crashed. El comandu esternu cascó. - + Command <i>%1</i> crashed. El comandu <i>%1</i> cascó. - + External command failed to start. El comandu esternu falló al aniciar. - + Command <i>%1</i> failed to start. El comandu <i>%1</i> falló al aniciar. - + Internal error when starting command. Fallu internu al aniciar el comandu. - + Bad parameters for process job call. Los parámetros son incorreutos pa la llamada del trabayu de procesos. - + External command failed to finish. El comandu esternu finó al finar. - + Command <i>%1</i> failed to finish in %2 seconds. El comandu <i>%1</i> falló al finar en %2 segundos. - + External command finished with errors. El comandu esternu finó con fallos. - + Command <i>%1</i> finished with exit code %2. El comandu <i>%1</i> finó col códigu de salida %2. @@ -3645,12 +3702,12 @@ Salida: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Si va usar l'ordenador más d'una persona, pues crear más cuentes tres la configuración.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Si va usar l'ordenador más d'una persona, pues crear más cuentes tres la instalación.</small> @@ -3878,6 +3935,44 @@ Salida: + + calamares-sidebar + + + Show debug information + Amosar la depuración + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts index 52ca0f6677..1262f0b3fc 100644 --- a/lang/calamares_az.ts +++ b/lang/calamares_az.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Vidjetlər ağacı - + Debug information Sazlama məlumatları @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Ayarlamaq - + Install Quraşdırmaq @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Quraşdırılma başa çatdı @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Quraşdırılma xətası - + Installation Failed Quraşdırılma alınmadı - + Would you like to paste the install log to the web? Quraşdırma jurnalını vebdə yerləşdirmək istəyirsinizmi? - + Error Xəta - - + + &Yes &Bəli - - + + &No &Xeyr - + &Close &Bağlamaq - + Install Log Paste URL Jurnal yerləşdirmə URL-nu daxil etmək - + The upload was unsuccessful. No web-paste was done. Yükləmə uğursuz oldu. Heç nə vebdə daxil edilmədi. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Calamares işə salına bilmədi - + %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 quraşdırılmadı. Calamares konfiqurasiya edilmiş modulların hamısını yükləyə bilmədi. Bu Calamares'i, sizin distribütör tərəfindən necə istifadə edilməsindən asılı olan bir problemdir. - + <br/>The following modules could not be loaded: <br/>Yüklənə bilməyən modullar aşağıdakılardır: - + Continue with setup? Quraşdırılma davam etdirilsin? - + Continue with installation? Quraşdırılma davam etdirilsin? - + 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 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</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 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong> - + &Set up now &İndi ayarlamaq - + &Install now Q&uraşdırmağa başlamaq - + Go &back &Geriyə - + &Set up A&yarlamaq - + &Install Qu&raşdırmaq - + Setup is complete. Close the setup program. Quraşdırma başa çatdı. Quraşdırma proqramını bağlayın. - + The installation is complete. Close the installer. Quraşdırma başa çatdı. Quraşdırıcını bağlayın. - + Cancel setup without changing the system. Sistemi dəyişdirmədən quraşdırmanı ləğv etmək. - + Cancel installation without changing the system. Sistemə dəyişiklik etmədən quraşdırmadan imtina etmək. - + &Next İ&rəli - + &Back &Geriyə - + &Done &Hazır - + &Cancel İm&tina etmək - + Cancel setup? Quraşdırılmadan imtina edilsin? - + Cancel installation? Yüklənmədən imtina edilsin? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Siz doğrudanmı hazırkı quraşdırmadan imtina etmək istəyirsiniz? Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Siz doğrudanmı hazırkı yüklənmədən imtina etmək istəyirsiniz? @@ -451,45 +468,15 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Oxunmayan Python xətası. - - CalamaresUtils - - - Install log posted to: -%1 - Quraşdırma jurnalı göndərmə ünvanı: -%1 - - CalamaresWindow - - Show debug information - Sazlama məlumatlarını göstərmək - - - - &Back - &Geriyə - - - - &Next - İ&rəli - - - - &Cancel - &İmtina etmək - - - + %1 Setup Program %1 Quraşdırıcı proqram - + %1 Installer %1 Quraşdırıcı @@ -810,50 +797,90 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.<h1>%1 quraşdırıcısına xoş gəldiniz</h1> - + Your username is too long. İstifadəçi adınız çox uzundur. - + '%1' is not allowed as username. İstifadəçi adı '%1' ola bilməz - + Your username must start with a lowercase letter or underscore. İstifadəçi adınız yalnız kiçik və ya alt cizgili hərflərdən ibarət olmalıdır. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Yalnız kiçik hərflərdən, simvollardan, alt cizgidən və defisdən istifadə oluna bilər. - + Your hostname is too short. Host adınız çox qısadır. - + Your hostname is too long. Host adınız çox uzundur. - + '%1' is not allowed as hostname. Host_adı '%1' ola bilməz - + Only letters, numbers, underscore and hyphen are allowed. 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! + + + Setup Failed + Quraşdırılma xətası + + + + Installation Failed + Quraşdırılma alınmadı + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Quraşdırma tamamlandı + + + + Installation Complete + Quraşdırma tamamlandı + + + + The setup of %1 is complete. + %1 quraşdırmaq başa çatdı. + + + + The installation of %1 is complete. + %1-n quraşdırılması başa çatdı. + ContextualProcessJob @@ -944,22 +971,43 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. %1 fayl sistemi ilə %4 (%3)-də yeni %2MB bölmə yaratmaq. - + + 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>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. <strong>%1</strong> fayl sistemi ilə <strong>%4</strong> (%3)-də yeni <strong>%2MB</strong> bölmə yaratmaq. - + + Creating new %1 partition on %2. %2-də yeni %1 bölmə yaratmaq. - + The installer failed to create partition on disk '%1'. Quraşdırıcı '%1' diskində bölmə yarada bilmədi. @@ -1286,37 +1334,57 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. FillGlobalStorageJob - + Set partition information Bölmə məlumatlarını ayarlamaq - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. %2 <strong>yeni</strong> sistem diskinə %1 quraşdırmaq. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - %2 <strong>yeni</strong> bölməsini <strong>%1</strong> qoşulma nöqtəsi ilə ayarlamaq. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - %3dəki <strong>%1</strong> sistem bölməsinə %2 quraşdırmaq. + + 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>. + + + + + 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>. - %3 bölməsinə <strong>%1</strong> ilə <strong>%2</strong> qoşulma nöqtəsi ayarlamaq. + + Install %2 on %3 system partition <strong>%1</strong>. + %3dəki <strong>%1</strong> sistem bölməsinə %2 quraşdırmaq. - + Install boot loader on <strong>%1</strong>. Ön yükləyicini <strong>%1</strong>də quraşdırmaq. - + Setting up mount points. Qoşulma nöqtəsini ayarlamaq. @@ -1334,62 +1402,50 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.&Yenidən başlatmaq - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Hər şey hazırdır.</h1><br/>%1 kompyuterinizə qurulub.<br/>Siz indi yeni sisteminizi başlada bilərsiniz. - + <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 çərçivə işarələnərsə siz <span style="font-style:italic;">Hazır</span> düyməsinə vurduğunuz və ya quraşdırıcı proqramı bağlatdığınız zaman sisteminiz dərhal yenidən başladılacaqdı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>Hər şey hazırdır.</h1><br/>%1 kompyuterinizə quraşdırıldı.<br/>Siz yenidən başladaraq yeni sisteminizə daxil ola və ya %2 Canlı mühitini istifadə etməyə davam edə bilərsiniz. - + <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 çərçivə işarələnərsə siz <span style="font-style:italic;">Hazır</span> düyməsinə vurduğunuz və ya quraşdırıcınıı bağladığınız zaman sisteminiz dərhal yenidən başladılacaqdı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>Quraşdırılma alınmadı</h1><br/>%1 kompyuterinizə quraşdırıla bilmədi.<br/>Baş vermiş xəta: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Quraşdırılma alınmadı</h1><br/>%1 kompyuterinizə quraşdırıla bilmədi.<br/>Baş vermiş xəta: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Son + + + FinishedViewStep - - Setup Complete - Quraşdırma tamamlandı - - - - Installation Complete - Quraşdırma tamamlandı - - - - The setup of %1 is complete. - %1 quraşdırmaq başa çatdı. - - - - The installation of %1 is complete. - %1-n quraşdırılması başa çatdı. + + Finish + Son @@ -2258,7 +2314,7 @@ 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 @@ -2769,14 +2825,14 @@ Lütfən bir birinci disk bölümünü çıxarın və əvəzinə genişləndiril ProcessResult - + There was no output from the command. Əmrlərdən çıxarış alınmadı. - + Output: @@ -2785,52 +2841,52 @@ Output: - + External command crashed. Xarici əmr qəzası baş verdi. - + Command <i>%1</i> crashed. <i>%1</i> əmrində qəza baş verdi. - + External command failed to start. Xarici əmr başladıla bilmədi. - + Command <i>%1</i> failed to start. <i>%1</i> əmri əmri başladıla bilmədi. - + Internal error when starting command. Əmr başlayarkən daxili xəta. - + Bad parameters for process job call. İş prosesini çağırmaq üçün xətalı parametr. - + External command failed to finish. Xarici əmr başa çatdırıla bilmədi. - + Command <i>%1</i> failed to finish in %2 seconds. <i>%1</i> əmrini %2 saniyədə başa çatdırmaq mümkün olmadı. - + External command finished with errors. Xarici əmr xəta ilə başa çatdı. - + Command <i>%1</i> finished with exit code %2. <i>%1</i> əmri %2 xəta kodu ilə başa çatdı. @@ -3649,12 +3705,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Əgər bu kompyuteri sizdən başqa şəxs istifadə edəcəkdirsə o zaman ayarlandıqdan sonra bir neçə istifadəçi hesabı yarada bilərsiniz.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Əgər bu kompyuteri sizdən başqa şəxs istifadə edəcəkdirsə o zaman quraşdırıldıqdan sonra bir neçə istifadəçi hesabı yarada bilərsiniz.</small> @@ -3891,6 +3947,44 @@ Output: Geriyə + + calamares-sidebar + + + Show debug information + Sazlama məlumatlarını göstərmək + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts index 37d3dc28b5..d432fb1bd5 100644 --- a/lang/calamares_az_AZ.ts +++ b/lang/calamares_az_AZ.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Vidjetlər ağacı - + Debug information Sazlama məlumatları @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Ayarlamaq - + Install Quraşdırmaq @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Quraşdırılma başa çatdı @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Quraşdırılma xətası - + Installation Failed Quraşdırılma alınmadı - + Would you like to paste the install log to the web? Quraşdırma jurnalını vebdə yerləşdirmək istəyirsinizmi? - + Error Xəta - - + + &Yes &Bəli - - + + &No &Xeyr - + &Close &Bağlamaq - + Install Log Paste URL Jurnal yerləşdirmə URL-nu daxil etmək - + The upload was unsuccessful. No web-paste was done. Yükləmə uğursuz oldu. Heç nə vebdə daxil edilmədi. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Calamares işə salına bilmədi - + %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 quraşdırılmadı. Calamares konfiqurasiya edilmiş modulların hamısını yükləyə bilmədi. Bu Calamares'i, sizin distribütör tərəfindən necə istifadə edilməsindən asılı olan bir problemdir. - + <br/>The following modules could not be loaded: <br/>Yüklənə bilməyən modullar aşağıdakılardır: - + Continue with setup? Quraşdırılma davam etdirilsin? - + Continue with installation? Quraşdırılma davam etdirilsin? - + 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 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</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 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong> - + &Set up now &İndi ayarlamaq - + &Install now Q&uraşdırmağa başlamaq - + Go &back &Geriyə - + &Set up A&yarlamaq - + &Install Qu&raşdırmaq - + Setup is complete. Close the setup program. Quraşdırma başa çatdı. Quraşdırma proqramını bağlayın. - + The installation is complete. Close the installer. Quraşdırma başa çatdı. Quraşdırıcını bağlayın. - + Cancel setup without changing the system. Sistemi dəyişdirmədən quraşdırmanı ləğv etmək. - + Cancel installation without changing the system. Sistemə dəyişiklik etmədən quraşdırmadan imtina etmək. - + &Next İ&rəli - + &Back &Geriyə - + &Done &Hazır - + &Cancel İm&tina etmək - + Cancel setup? Quraşdırılmadan imtina edilsin? - + Cancel installation? Yüklənmədən imtina edilsin? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Siz doğrudanmı hazırkı quraşdırmadan imtina etmək istəyirsiniz? Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Siz doğrudanmı hazırkı yüklənmədən imtina etmək istəyirsiniz? @@ -451,45 +468,15 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Oxunmayan Python xətası. - - CalamaresUtils - - - Install log posted to: -%1 - Quraşdırma jurnalı göndərmə ünvanı: -%1 - - CalamaresWindow - - Show debug information - Sazlama məlumatlarını göstərmək - - - - &Back - &Geriyə - - - - &Next - İ&rəli - - - - &Cancel - &İmtina etmək - - - + %1 Setup Program %1 Quraşdırıcı proqram - + %1 Installer %1 Quraşdırıcı @@ -810,50 +797,90 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.<h1>%1 quraşdırıcısına xoş gəldiniz</h1> - + Your username is too long. İstifadəçi adınız çox uzundur. - + '%1' is not allowed as username. İstifadəçi adı '%1' ola bilməz - + Your username must start with a lowercase letter or underscore. İstifadəçi adınız yalnız kiçik və ya alt cizgili hərflərdən ibarət olmalıdır. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Yalnız kiçik hərflərdən, simvollardan, alt cizgidən və defisdən istifadə oluna bilər. - + Your hostname is too short. Host adınız çox qısadır. - + Your hostname is too long. Host adınız çox uzundur. - + '%1' is not allowed as hostname. Host_adı '%1' ola bilməz - + Only letters, numbers, underscore and hyphen are allowed. 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! + + + Setup Failed + Quraşdırılma xətası + + + + Installation Failed + Quraşdırılma alınmadı + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Quraşdırma tamamlandı + + + + Installation Complete + Quraşdırma tamamlandı + + + + The setup of %1 is complete. + %1 quraşdırmaq başa çatdı. + + + + The installation of %1 is complete. + %1-n quraşdırılması başa çatdı. + ContextualProcessJob @@ -944,22 +971,43 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. %1 fayl sistemi ilə %4 (%3)-də yeni %2MB bölmə yaratmaq. - + + 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>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. <strong>%1</strong> fayl sistemi ilə <strong>%4</strong> (%3)-də yeni <strong>%2MB</strong> bölmə yaratmaq. - + + Creating new %1 partition on %2. %2-də yeni %1 bölmə yaratmaq. - + The installer failed to create partition on disk '%1'. Quraşdırıcı '%1' diskində bölmə yarada bilmədi. @@ -1286,37 +1334,57 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. FillGlobalStorageJob - + Set partition information Bölmə məlumatlarını ayarlamaq - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. %2 <strong>yeni</strong> sistem diskinə %1 quraşdırmaq. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - %2 <strong>yeni</strong> bölməsini <strong>%1</strong> qoşulma nöqtəsi ilə ayarlamaq. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - %3dəki <strong>%1</strong> sistem bölməsinə %2 quraşdırmaq. + + 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>. + + + + + 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>. - %3 bölməsinə <strong>%1</strong> ilə <strong>%2</strong> qoşulma nöqtəsi ayarlamaq. + + Install %2 on %3 system partition <strong>%1</strong>. + %3dəki <strong>%1</strong> sistem bölməsinə %2 quraşdırmaq. - + Install boot loader on <strong>%1</strong>. Ön yükləyicini <strong>%1</strong>də quraşdırmaq. - + Setting up mount points. Qoşulma nöqtəsini ayarlamaq. @@ -1334,62 +1402,50 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.&Yenidən başlatmaq - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Hər şey hazırdır.</h1><br/>%1 kompyuterinizə qurulub.<br/>Siz indi yeni sisteminizi başlada bilərsiniz. - + <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 çərçivə işarələnərsə siz <span style="font-style:italic;">Hazır</span> düyməsinə vurduğunuz və ya quraşdırıcı proqramı bağlatdığınız zaman sisteminiz dərhal yenidən başladılacaqdı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>Hər şey hazırdır.</h1><br/>%1 kompyuterinizə quraşdırıldı.<br/>Siz yenidən başladaraq yeni sisteminizə daxil ola və ya %2 Canlı mühitini istifadə etməyə davam edə bilərsiniz. - + <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 çərçivə işarələnərsə siz <span style="font-style:italic;">Hazır</span> düyməsinə vurduğunuz və ya quraşdırıcınıı bağladığınız zaman sisteminiz dərhal yenidən başladılacaqdı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>Quraşdırılma alınmadı</h1><br/>%1 kompyuterinizə quraşdırıla bilmədi.<br/>Baş vermiş xəta: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Quraşdırılma alınmadı</h1><br/>%1 kompyuterinizə quraşdırıla bilmədi.<br/>Baş vermiş xəta: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Son + + + FinishedViewStep - - Setup Complete - Quraşdırma tamamlandı - - - - Installation Complete - Quraşdırma tamamlandı - - - - The setup of %1 is complete. - %1 quraşdırmaq başa çatdı. - - - - The installation of %1 is complete. - %1-n quraşdırılması başa çatdı. + + Finish + Son @@ -2258,7 +2314,7 @@ 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 @@ -2769,14 +2825,14 @@ Lütfən bir birinci disk bölümünü çıxarın və əvəzinə genişləndiril ProcessResult - + There was no output from the command. Əmrlərdən çıxarış alınmadı. - + Output: @@ -2785,52 +2841,52 @@ Output: - + External command crashed. Xarici əmr qəzası baş verdi. - + Command <i>%1</i> crashed. <i>%1</i> əmrində qəza baş verdi. - + External command failed to start. Xarici əmr başladıla bilmədi. - + Command <i>%1</i> failed to start. <i>%1</i> əmri əmri başladıla bilmədi. - + Internal error when starting command. Əmr başlayarkən daxili xəta. - + Bad parameters for process job call. İş prosesini çağırmaq üçün xətalı parametr. - + External command failed to finish. Xarici əmr başa çatdırıla bilmədi. - + Command <i>%1</i> failed to finish in %2 seconds. <i>%1</i> əmrini %2 saniyədə başa çatdırmaq mümkün olmadı. - + External command finished with errors. Xarici əmr xəta ilə başa çatdı. - + Command <i>%1</i> finished with exit code %2. <i>%1</i> əmri %2 xəta kodu ilə başa çatdı. @@ -3649,12 +3705,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Əgər bu kompyuteri sizdən başqa şəxs istifadə edəcəkdirsə o zaman ayarlandıqdan sonra bir neçə istifadəçi hesabı yarada bilərsiniz.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Əgər bu kompyuteri sizdən başqa şəxs istifadə edəcəkdirsə o zaman quraşdırıldıqdan sonra bir neçə istifadəçi hesabı yarada bilərsiniz.</small> @@ -3891,6 +3947,44 @@ Output: Geriyə + + calamares-sidebar + + + Show debug information + Sazlama məlumatlarını göstərmək + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts index 0f94413d38..b0acdec042 100644 --- a/lang/calamares_be.ts +++ b/lang/calamares_be.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Дрэва віджэтаў - + Debug information Адладачная інфармацыя @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Наладзіць - + Install Усталяваць @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Завершана @@ -261,170 +269,179 @@ Calamares::ViewManager - + Setup Failed Усталёўка схібіла - + Installation Failed Не атрымалася ўсталяваць - + Would you like to paste the install log to the web? Сапраўды хочаце ўставіць журнал усталёўкі па сеціўным адрасе? - + Error Памылка - - + + &Yes &Так - - + + &No &Не - + &Close &Закрыць - + Install Log Paste URL Уставіць журнал усталёўкі па URL - + The upload was unsuccessful. No web-paste was done. Запампаваць не атрымалася. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Не атрымалася ініцыялізаваць Calamares - + %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. У Calamares не атрымалася загрузіць усе падрыхтаваныя модулі. Гэтая праблема ўзнікла праз асаблівасці выкарыстання Calamares вашым дыстрыбутывам. - + <br/>The following modules could not be loaded: <br/>Не атрымалася загрузіць наступныя модулі: - + Continue with setup? Працягнуць усталёўку? - + 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> Праграма ўсталёўкі %1 гатовая ўнесці змены на ваш дыск, каб усталяваць %2.<br/><strong>Скасаваць змены будзе немагчыма.</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 гатовая ўнесці змены на ваш дыск, каб усталяваць %2.<br/><strong>Адрабіць змены будзе немагчыма.</strong> - + &Set up now &Усталяваць - + &Install now &Усталяваць - + Go &back &Назад - + &Set up &Усталяваць - + &Install &Усталяваць - + Setup is complete. Close the setup program. Усталёўка завершаная. Закрыйце праграму ўсталёўкі. - + The installation is complete. Close the installer. Усталёўка завершаная. Закрыйце праграму. - + Cancel setup without changing the system. Скасаваць усталёўку без змены сістэмы. - + Cancel installation without changing the system. Скасаваць усталёўку без змены сістэмы. - + &Next &Далей - + &Back &Назад - + &Done &Завершана - + &Cancel &Скасаваць - + Cancel setup? Скасаваць усталёўку? - + 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 install process? The installer will quit and all changes will be lost. Сапраўды хочаце скасаваць працэс усталёўкі? Праграма спыніць працу, а ўсе змены страцяцца. @@ -453,45 +470,15 @@ The installer will quit and all changes will be lost. Невядомая памылка Python. - - CalamaresUtils - - - Install log posted to: -%1 - Журнал усталёўкі апублікаваны ў: -%1 - - CalamaresWindow - - Show debug information - Паказаць адладачную інфармацыю - - - - &Back - &Назад - - - - &Next - &Далей - - - - &Cancel - &Скасаваць - - - + %1 Setup Program Праграма ўсталёўкі %1 - + %1 Installer Праграма ўсталёўкі %1 @@ -812,50 +799,90 @@ The installer will quit and all changes will be lost. <h1>Вітаем у праграме ўсталёўкі %1</h1> - + Your username is too long. Імя карыстальніка занадта доўгае. - + '%1' is not allowed as username. '%1' немагчыма выкарыстаць як імя карыстальніка. - + Your username must start with a lowercase letter or underscore. Імя карыстальніка павінна пачынацца з малой літары альбо сімвала падкрэслівання. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Дазваляюцца толькі літары, лічбы, знакі падкрэслівання, працяжнікі. - + Your hostname is too short. Назва вашага камп’ютара занадта кароткая. - + Your hostname is too long. Назва вашага камп’ютара занадта доўгая. - + '%1' is not allowed as hostname. '%1' немагчыма выкарыстаць як назву хоста. - + Only letters, numbers, underscore and hyphen are allowed. Толькі літары, лічбы, знакі падкрэслівання, працяжнікі. - + Your passwords do not match! Вашыя паролі не супадаюць! + + + Setup Failed + Усталёўка схібіла + + + + Installation Failed + Не атрымалася ўсталяваць + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Усталёўка завершаная + + + + Installation Complete + Усталёўка завершаная + + + + The setup of %1 is complete. + Усталёўка %1 завершаная. + + + + The installation of %1 is complete. + Усталёўка %1 завершаная. + ContextualProcessJob @@ -946,22 +973,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). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Стварыць новы раздзел %2MБ на %4 (%3) з файлавай сістэмай %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Стварыць новы раздзел <strong>%2MiB</strong> на <strong>%4</strong> (%3) з файлавай сістэмай <strong>%1</strong>. - + + Creating new %1 partition on %2. Стварэнне новага раздзела %1 на %2. - + The installer failed to create partition on disk '%1'. У праграмы ўсталёўкі не атрымалася стварыць новы раздзел на дыску '%1'. @@ -1288,37 +1336,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. Усталяваць %1 на <strong>новы</strong> %2 сістэмны раздзел. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Наладзіць <strong>новы</strong> %2 раздзел з пунктам мантавання <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Усталяваць %2 на %3 сістэмны раздзел <strong>%1</strong>. + + 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>. + + + + + 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>. - Наладзіць %3 раздзел <strong>%1</strong> з пунктам мантавання <strong>%2</strong>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + Усталяваць %2 на %3 сістэмны раздзел <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Усталяваць загрузчык на <strong>%1</strong>. - + Setting up mount points. Наладка пунктаў мантавання. @@ -1336,62 +1404,50 @@ The installer will quit and all changes will be lost. &Перазапусціць - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Гатова.</h1><br/>Сістэма %1 усталяваная на ваш камп’ютар.<br/> Вы ўжо можаце пачаць выкарыстоўваць вашу новую сістэму. - + <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>Калі адзначана, то сістэма перазапусціцца адразу пасля націскання кнопкі <span style="font-style:italic;">Завершана</span> альбо закрыцця праграмы ўсталёўкі.</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>Завершана.</h1><br/>Сістэма %1 усталяваная на ваш камп’ютар.<br/>Вы можаце перазапусціць камп’ютар і ўвайсці ў яе, альбо працягнуць працу ў Live-асяроддзі %2. - + <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>Калі адзначана, то сістэма перазапусціцца адразу пасля націскання кнопкі <span style="font-style:italic;">Завершана</span> альбо закрыцця праграмы ўсталёўкі.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Адбыўся збой</h1><br/>Сістэму %1 не атрымалася ўсталяваць на ваш камп’ютар.<br/>Паведамленне памылкі: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Адбыўся збой</h1><br/>Сістэму %1 не атрымалася ўсталяваць на ваш камп’ютар.<br/>Паведамленне памылкі: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Завяршыць + + + FinishedViewStep - - Setup Complete - Усталёўка завершаная - - - - Installation Complete - Усталёўка завершаная - - - - The setup of %1 is complete. - Усталёўка %1 завершаная. - - - - The installation of %1 is complete. - Усталёўка %1 завершаная. + + Finish + Завяршыць @@ -2278,7 +2334,7 @@ The installer will quit and all changes will be lost. Невядомая памылка - + Password is empty Пароль пусты @@ -2788,14 +2844,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. Вываду ад загада няма. - + Output: @@ -2804,52 +2860,52 @@ Output: - + External command crashed. Вонкавы загад схібіў. - + Command <i>%1</i> crashed. Загад <i>%1</i> схібіў. - + External command failed to start. Не атрымалася запусціць вонкавы загад. - + Command <i>%1</i> failed to start. Не атрымалася запусціць загад <i>%1</i>. - + Internal error when starting command. Падчас запуску загада адбылася ўнутраная памылка. - + Bad parameters for process job call. Хібныя параметры выкліку працэсу. - + External command failed to finish. Не атрымалася завяршыць вонкавы загад. - + Command <i>%1</i> failed to finish in %2 seconds. Загад <i>%1</i> не атрымалася завяршыць за %2 секунд. - + External command finished with errors. Вонкавы загад завяршыўся з памылкамі. - + Command <i>%1</i> finished with exit code %2. Загад <i>%1</i> завяршыўся з кодам %2. @@ -3668,12 +3724,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Калі камп’ютарам карыстаецца некалькі чалавек, то вы можаце стварыць для іх акаўнты пасля завяршэння ўсталёўкі.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Калі камп’ютарам карыстаецца некалькі чалавек, то вы можаце стварыць для іх акаўнты пасля завяршэння ўсталёўкі.</small> @@ -3911,6 +3967,44 @@ Output: Назад + + calamares-sidebar + + + Show debug information + Паказаць адладачную інфармацыю + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts index 7b94947dfa..dace8bafa1 100644 --- a/lang/calamares_bg.ts +++ b/lang/calamares_bg.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information Информация за отстраняване на грешки @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Инсталирай @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Готово @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed Неуспешна инсталация - + Would you like to paste the install log to the web? - + Error Грешка - - + + &Yes &Да - - + + &No &Не - + &Close &Затвори - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Инициализацията на Calamares се провали - + %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 не може да се инсталира. Calamares не можа да зареди всичките конфигурирани модули. Това е проблем с начина, по който Calamares е използван от дистрибуцията. - + <br/>The following modules could not be loaded: <br/>Следните модули не могат да се заредят: - + Continue with setup? Продължаване? - + 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 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 ще направи промени по вашия диск за да инсталира %2. <br><strong>Промените ще бъдат окончателни.</strong> - + &Set up now - + &Install now &Инсталирай сега - + Go &back В&ръщане - + &Set up - + &Install &Инсталирай - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Инсталацията е завършена. Затворете инсталаторa. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Отказ от инсталацията без промяна на системата. - + &Next &Напред - + &Back &Назад - + &Done &Готово - + &Cancel &Отказ - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. Наистина ли искате да отмените текущият процес на инсталиране? @@ -450,44 +467,15 @@ The installer will quit and all changes will be lost. Недостъпна грешка на Python. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - Покажи информация за отстраняване на грешки - - - - &Back - &Назад - - - - &Next - &Напред - - - - &Cancel - &Отказ - - - + %1 Setup Program - + %1 Installer %1 Инсталатор @@ -809,50 +797,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. Вашето потребителско име е твърде дълго. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Вашето име на хоста е твърде кратко. - + Your hostname is too long. Вашето име на хоста е твърде дълго. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Паролите Ви не съвпадат! + + + Setup Failed + + + + + Installation Failed + Неуспешна инсталация + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + Инсталацията е завършена + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + Инсталацията на %1 е завършена. + ContextualProcessJob @@ -943,22 +971,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. Създаване на нов %1 дял върху %2. - + The installer failed to create partition on disk '%1'. Инсталатора не успя да създаде дял върху диск '%1'. @@ -1285,37 +1334,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. Инсталирай %1 на <strong>нов</strong> %2 системен дял. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Създай <strong>нов</strong> %2 дял със точка на монтиране <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Инсталирай %2 на %3 системен дял <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Създай %3 дял <strong>%1</strong> с точка на монтиране <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Инсталирай %2 на %3 системен дял <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Инсталиране на зареждач върху <strong>%1</strong>. - + Setting up mount points. Настройка на точките за монтиране. @@ -1333,62 +1402,50 @@ The installer will quit and all changes will be lost. &Рестартирай сега - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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>Завършено.</h1><br/>%1 беше инсталирана на вашият компютър.<br/>Вече можете да рестартирате в новата си система или да продължите да използвате %2 Живата среда. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Инсталацията е неуспешна</h1><br/>%1 не е инсталиран на Вашия компютър.<br/>Съобщението с грешката е: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Завърши + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - Инсталацията е завършена - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - Инсталацията на %1 е завършена. + + Finish + Завърши @@ -2255,7 +2312,7 @@ The installer will quit and all changes will be lost. Неизвестна грешка - + Password is empty @@ -2765,13 +2822,13 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: @@ -2780,52 +2837,52 @@ Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Невалидни параметри за извикване на задача за процес. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3642,12 +3699,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 installation.</small> @@ -3875,6 +3932,44 @@ Output: + + calamares-sidebar + + + Show debug information + Покажи информация за отстраняване на грешки + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts index 68200c5843..670a6c2ef9 100644 --- a/lang/calamares_bn.ts +++ b/lang/calamares_bn.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information তথ্য ডিবাগ করুন @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install ইনস্টল করুন @@ -143,7 +151,7 @@ Calamares::JobThread - + Done সম্পন্ন @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed ইনস্টলেশন ব্যর্থ হলো - + Would you like to paste the install log to the web? - + Error ত্রুটি - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? সেটআপ চালিয়ে যেতে চান? - + 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 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 ইনস্টলার %2 সংস্থাপন করতে আপনার ডিস্কে পরিবর্তন করতে যাচ্ছে। - + &Set up now - + &Install now এবংএখনই ইনস্টল করুন - + Go &back এবংফিরে যান - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next এবং পরবর্তী - + &Back এবং পেছনে - + &Done - + &Cancel এবংবাতিল করুন - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. আপনি কি সত্যিই বর্তমান সংস্থাপন প্রক্রিয়া বাতিল করতে চান? @@ -450,44 +467,15 @@ The installer will quit and all changes will be lost. অতুলনীয় পাইথন ত্রুটি। - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - ডিবাগ তথ্য দেখান - - - - &Back - এবং পেছনে - - - - &Next - এবং পরবর্তী - - - - &Cancel - এবংবাতিল করুন - - - + %1 Setup Program - + %1 Installer 1% ইনস্টল @@ -808,50 +796,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! আপনার পাসওয়ার্ড মেলে না! + + + Setup Failed + + + + + Installation Failed + ইনস্টলেশন ব্যর্থ হলো + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -942,22 +970,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. %2-এ নতুন %1 পার্টিশন তৈরি করা হচ্ছে। - + The installer failed to create partition on disk '%1'. ইনস্টলার '%1' ডিস্কে পার্টিশন তৈরি করতে ব্যর্থ হয়েছে। @@ -1284,37 +1333,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. <strong>নতুন</strong> %2 সিস্টেম পার্টিশনে %1 সংস্থাপন করুন। - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - মাউন্ট বিন্দু <strong>%1</strong> দিয়ে <strong>নতুন</strong> %2 পার্টিশন বিন্যাস করুন। + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - %3 সিস্টেম পার্টিশন <strong>%1</strong> এ %2 ইনস্টল করুন। + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - %3 পার্টিশন <strong>%1</strong> মাউন্ট বিন্দু <strong>%2</strong> দিয়ে বিন্যাস করুন। + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + %3 সিস্টেম পার্টিশন <strong>%1</strong> এ %2 ইনস্টল করুন। + + + Install boot loader on <strong>%1</strong>. <strong>%1</strong> এ বুট লোডার ইনস্টল করুন। - + Setting up mount points. মাউন্ট পয়েন্ট সেট আপ করা হচ্ছে। @@ -1332,62 +1401,50 @@ The installer will quit and all changes will be lost. এবংএখন আবার চালু করুন - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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>সব শেষ।</h1><br/>%1 আপনার কম্পিউটারে সংস্থাপন করা হয়েছে।<br/>আপনি এখন আপনার নতুন সিস্টেমে পুনর্সূচনা করতে পারেন, অথবা %2 লাইভ পরিবেশ ব্যবহার চালিয়ে যেতে পারেন। - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish শেষ করুন + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - + + Finish + শেষ করুন @@ -2254,7 +2311,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2764,65 +2821,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3638,12 +3695,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 installation.</small> @@ -3871,6 +3928,44 @@ Output: + + calamares-sidebar + + + Show debug information + ডিবাগ তথ্য দেখান + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index 118f454463..b1375ea2f3 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Arbre de ginys - + Debug information Informació de depuració @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Configuració - + Install Instal·la @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Fet @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Ha fallat la configuració. - + Installation Failed La instal·lació ha fallat. - + Would you like to paste the install log to the web? Voleu enganxar el registre d'instal·lació a la xarxa? - + Error Error - - + + &Yes &Sí - - + + &No &No - + &Close Tan&ca - + Install Log Paste URL URL de publicació del registre d'instal·lació - + The upload was unsuccessful. No web-paste was done. La càrrega no s'ha fet correctament. No s'ha enganxat res a la xarxa. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Ha fallat la inicialització de Calamares - + %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. No es pot instal·lar %1. El Calamares no ha pogut carregar tots els mòduls configurats. Aquest és un problema amb la manera com el Calamares és utilitzat per la distribució. - + <br/>The following modules could not be loaded: <br/>No s'han pogut carregar els mòduls següents: - + Continue with setup? Voleu continuar la configuració? - + Continue with installation? Voleu continuar la instal·lació? - + 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> El programa de configuració %1 està a punt de fer canvis al disc per tal de configurar %2.<br/><strong>No podreu desfer aquests canvis.</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> L'instal·lador per a %1 està a punt de fer canvis al disc per tal d'instal·lar-hi %2.<br/><strong>No podreu desfer aquests canvis.</strong> - + &Set up now Con&figura-ho ara - + &Install now &Instal·la'l ara - + Go &back Ves &enrere - + &Set up Con&figura-ho - + &Install &Instal·la - + Setup is complete. Close the setup program. La configuració s'ha acabat. Tanqueu el programa de configuració. - + The installation is complete. Close the installer. La instal·lació s'ha acabat. Tanqueu l'instal·lador. - + Cancel setup without changing the system. Cancel·la la configuració sense canviar el sistema. - + Cancel installation without changing the system. Cancel·leu la instal·lació sense canviar el sistema. - + &Next &Següent - + &Back &Enrere - + &Done &Fet - + &Cancel &Cancel·la - + Cancel setup? Voleu cancel·lar la configuració? - + Cancel installation? Voleu cancel·lar la instal·lació? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Realment voleu cancel·lar el procés de configuració actual? El programa de configuració es tancarà i es perdran tots els canvis. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Voleu cancel·lar el procés d'instal·lació actual? @@ -451,45 +468,15 @@ L'instal·lador es tancarà i tots els canvis es perdran. Error de Python irrecuperable. - - CalamaresUtils - - - Install log posted to: -%1 - Registre d'instal·lació penjat a -%1 - - CalamaresWindow - - Show debug information - Informació de depuració - - - - &Back - &Enrere - - - - &Next - &Següent - - - - &Cancel - &Cancel·la - - - + %1 Setup Program Programa de configuració %1 - + %1 Installer Instal·lador de %1 @@ -810,50 +797,90 @@ L'instal·lador es tancarà i tots els canvis es perdran. <h1>Benvingut/da a l'instal·lador per a %1</h1> - + Your username is too long. El nom d'usuari és massa llarg. - + '%1' is not allowed as username. No es permet %1 com a nom d'usuari. - + Your username must start with a lowercase letter or underscore. El nom d'usuari ha de començar amb una lletra en minúscula o una ratlla baixa. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Només es permeten lletres en minúscula, números, ratlles baixes i guions. - + Your hostname is too short. El nom d'amfitrió és massa curt. - + Your hostname is too long. El nom d'amfitrió és massa llarg. - + '%1' is not allowed as hostname. No es permet %1 com a nom d'amfitrió. - + Only letters, numbers, underscore and hyphen are allowed. Només es permeten lletres, números, ratlles baixes i guions. - + Your passwords do not match! Les contrasenyes no coincideixen! + + + Setup Failed + Ha fallat la configuració. + + + + Installation Failed + La instal·lació ha fallat. + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Configuració completa + + + + Installation Complete + Instal·lació acabada + + + + The setup of %1 is complete. + La configuració de %1 ha acabat. + + + + The installation of %1 is complete. + La instal·lació de %1 ha acabat. + ContextualProcessJob @@ -944,22 +971,43 @@ L'instal·lador es tancarà i tots els canvis es perdran. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Crea una partició nova de %2 MiB a %4 (%3) amb el sistema de fitxers %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Crea una partició nova de <strong>%2 MiB</strong> a <strong>%4</strong> (%3) amb el sistema de fitxers <strong>%1</strong>. - + + Creating new %1 partition on %2. Es crea la partició nova %1 a %2. - + The installer failed to create partition on disk '%1'. L'instal·lador no ha pogut crear la partició al disc '%1'. @@ -1286,37 +1334,57 @@ L'instal·lador es tancarà i tots els canvis es perdran. FillGlobalStorageJob - + Set partition information Estableix la informació de la partició - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Instal·la %1 a la partició de sistema <strong>nova</strong> %2. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Estableix la partició <strong>nova</strong> %2 amb el punt de muntatge <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Instal·la %2 a la partició de sistema %3 <strong>%1</strong>. + + 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>. + + + + + 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>. - Estableix la partició %3 <strong>%1</strong> amb el punt de muntatge <strong>%2</strong>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + Instal·la %2 a la partició de sistema %3 <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Instal·la el gestor d'arrencada a <strong>%1</strong>. - + Setting up mount points. S'estableixen els punts de muntatge. @@ -1334,62 +1402,50 @@ L'instal·lador es tancarà i tots els canvis es perdran. &Reinicia ara - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Tot fet.</h1><br/>%1 s'ha configurat a l'ordinador.<br/>Ara podeu començar a usar el nou 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>Quan aquesta casella està marcada, el sistema es reiniciarà immediatament quan cliqueu a <span style="font-style:italic;">Fet</span> o tanqueu el programa de configuració.</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>Tot fet.</h1><br/>%1 s'ha instal·lat a l'ordinador.<br/>Ara podeu reiniciar-lo per tal d'accedir al sistema operatiu nou o bé continuar usant l'entorn autònom de %2. - + <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>Quan aquesta casella està marcada, el sistema es reiniciarà immediatament quan cliqueu a <span style=" font-style:italic;">Fet</span> o tanqueu l'instal·lador.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>La configuració ha fallat.</h1><br/>No s'ha configurat %1 a l'ordinador.<br/>El missatge d'error ha estat el següent: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>La instal·lació ha fallat</h1><br/>No s'ha instal·lat %1 a l'ordinador.<br/>El missatge d'error ha estat el següent: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Acaba + + + FinishedViewStep - - Setup Complete - Configuració completa - - - - Installation Complete - Instal·lació acabada - - - - The setup of %1 is complete. - La configuració de %1 ha acabat. - - - - The installation of %1 is complete. - La instal·lació de %1 ha acabat. + + Finish + Acaba @@ -2258,7 +2314,7 @@ 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. @@ -2768,14 +2824,14 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé ProcessResult - + There was no output from the command. No hi ha hagut sortida de l'ordre. - + Output: @@ -2784,52 +2840,52 @@ Sortida: - + External command crashed. L'ordre externa ha fallat. - + Command <i>%1</i> crashed. L'ordre <i>%1</i> ha fallat. - + External command failed to start. L'ordre externa no s'ha pogut iniciar. - + Command <i>%1</i> failed to start. L'ordre <i>%1</i> no s'ha pogut iniciar. - + Internal error when starting command. Error intern en iniciar l'ordre. - + Bad parameters for process job call. Paràmetres incorrectes per a la crida de la tasca del procés. - + External command failed to finish. L'ordre externa no ha acabat correctament. - + Command <i>%1</i> failed to finish in %2 seconds. L'ordre <i>%1</i> no ha pogut acabar en %2 segons. - + External command finished with errors. L'ordre externa ha acabat amb errors. - + Command <i>%1</i> finished with exit code %2. L'ordre <i>%1</i> ha acabat amb el codi de sortida %2. @@ -3648,12 +3704,12 @@ La configuració pot continuar, però algunes característiques podrien estar in UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Si més d'una persona usarà aquest ordinador, podeu crear diversos comptes després de la configuració.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Si més d'una persona usarà aquest ordinador, podeu crear diversos comptes després de la instal·lació.</small> @@ -3892,6 +3948,44 @@ La configuració pot continuar, però algunes característiques podrien estar in Enrere + + calamares-sidebar + + + Show debug information + Informació de depuració + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts index 589b79e9ce..9b910f2361 100644 --- a/lang/calamares_ca@valencia.ts +++ b/lang/calamares_ca@valencia.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Arbre d'elements - + Debug information Informació de depuració @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Configuració - + Install Instal·la @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Fet @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed S'ha produït un error en la configuració. - + Installation Failed La instal·lació ha fallat. - + Would you like to paste the install log to the web? Voleu enganxar el registre d'instal·lació a la xarxa? - + Error S'ha produït un error. - - + + &Yes &Sí - - + + &No &No - + &Close Tan&ca - + Install Log Paste URL URL de publicació del registre d'instal·lació - + The upload was unsuccessful. No web-paste was done. La càrrega no s'ha fet correctament. No s'ha enganxat res a la xarxa. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed La inicialització del Calamares ha fallat. - + %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. No es pot instal·lar %1. El Calamares no ha pogut carregar tots els mòduls configurats. El problema es troba en com utilitza el Calamares la distribució. - + <br/>The following modules could not be loaded: <br/>No s'han pogut carregar els mòduls següents: - + Continue with setup? Voleu continuar la configuració? - + Continue with installation? Voleu continuar la instal·lació? - + 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> El programa de configuració %1 està a punt de fer canvis en el disc per a configurar %2.<br/><strong>No podreu desfer aquests canvis.</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> L'instal·lador per a %1 està a punt de fer canvis en el disc per tal d'instal·lar-hi %2.<br/><strong>No podreu desfer aquests canvis.</strong> - + &Set up now Con&figura-ho ara - + &Install now &Instal·la'l ara - + Go &back &Arrere - + &Set up Con&figuració - + &Install &Instal·la - + Setup is complete. Close the setup program. La configuració s'ha completat. Tanqueu el programa de configuració. - + The installation is complete. Close the installer. La instal·lació s'ha completat. Tanqueu l'instal·lador. - + Cancel setup without changing the system. Cancel·la la configuració sense canviar el sistema. - + Cancel installation without changing the system. Cancel·la la instal·lació sense canviar el sistema. - + &Next &Següent - + &Back A&rrere - + &Done &Fet - + &Cancel &Cancel·la - + Cancel setup? Voleu cancel·lar la configuració? - + Cancel installation? Voleu cancel·lar la instal·lació? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Voleu cancel·lar el procés de configuració actual? El programa de configuració es tancarà i es perdran tots els canvis. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Voleu cancel·lar el procés d'instal·lació actual? @@ -451,45 +468,15 @@ L'instal·lador es tancarà i tots els canvis es perdran. S'ha produït un error de Python irrecuperable. - - CalamaresUtils - - - Install log posted to: -%1 - Registre d'instal·lació penjat en: -%1 - - CalamaresWindow - - Show debug information - Mostra la informació de depuració - - - - &Back - A&rrere - - - - &Next - &Següent - - - - &Cancel - &Cancel·la - - - + %1 Setup Program Programa de configuració %1 - + %1 Installer Instal·lador de %1 @@ -810,50 +797,90 @@ L'instal·lador es tancarà i tots els canvis es perdran. <h1>Us donen la benvinguda a l'instal·lador per a %1</h1> - + Your username is too long. El nom d'usuari és massa llarg. - + '%1' is not allowed as username. No es permet %1 com a nom d'usuari. - + Your username must start with a lowercase letter or underscore. El nom d'usuari ha de començar amb una lletra en minúscula o una ratlla baixa. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Només es permeten lletres en minúscula, números, ratlles baixes i guions. - + Your hostname is too short. El nom d'amfitrió és massa curt. - + Your hostname is too long. El nom d'amfitrió és massa llarg. - + '%1' is not allowed as hostname. No es permet %1 com a nom d'amfitrió. - + Only letters, numbers, underscore and hyphen are allowed. Només es permeten lletres, números, ratlles baixes i guions. - + Your passwords do not match! Les contrasenyes no coincideixen. + + + Setup Failed + S'ha produït un error en la configuració. + + + + Installation Failed + La instal·lació ha fallat. + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + S'ha completat la configuració. + + + + Installation Complete + Ha acabat la instal·lació. + + + + The setup of %1 is complete. + La configuració de %1 ha acabat. + + + + The installation of %1 is complete. + La instal·lació de %1 ha acabat. + ContextualProcessJob @@ -944,22 +971,43 @@ L'instal·lador es tancarà i tots els canvis es perdran. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Crea una partició nova de %2 MiB a %4 (%3) amb el sistema de fitxers %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Crea una partició nova de <strong>%2 MiB</strong> a <strong>%4</strong> (%3) amb el sistema de fitxers <strong>%1</strong>. - + + Creating new %1 partition on %2. S'està creant la partició nova %1 en %2. - + The installer failed to create partition on disk '%1'. L'instal·lador no ha pogut crear la partició en el disc '%1'. @@ -1286,37 +1334,57 @@ L'instal·lador es tancarà i tots els canvis es perdran. FillGlobalStorageJob - + Set partition information Estableix la informació de la partició - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Instal·la %1 en la partició de sistema <strong>nova</strong> %2. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Estableix la partició <strong>nova</strong> %2 amb el punt de muntatge <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Instal·la %2 en la partició de sistema %3 <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Estableix la partició %3 <strong>%1</strong> amb el punt de muntatge <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Instal·la %2 en la partició de sistema %3 <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Instal·la el gestor d'arrancada en <strong>%1</strong>. - + Setting up mount points. S'estableixen els punts de muntatge. @@ -1334,62 +1402,50 @@ L'instal·lador es tancarà i tots els canvis es perdran. &Reinicia ara - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Tot fet.</h1><br/>%1 s'ha configurat a l'ordinador.<br/>Ara podeu començar a usar el nou 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>Quan aquesta casella està marcada, el sistema es reinicia immediatament en clicar en <span style="font-style:italic;">Fet</span> o tancar el programa de configuració.</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>Tot fet.</h1><br/>%1 s'ha instal·lat a l'ordinador.<br/>Ara podeu reiniciar-lo per tal d'accedir al sistema operatiu nou o bé continuar usant l'entorn autònom de %2. - + <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>Quan aquesta casella està marcada, el sistema es reiniciarà immediatament quan cliqueu en <span style="font-style:italic;">Fet</span> o tanqueu l'instal·lador.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>La configuració ha fallat.</h1><br/>No s'ha configurat %1 en l'ordinador.<br/>El missatge d'error ha estat el següent: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>La instal·lació ha fallat</h1><br/>No s'ha instal·lat %1 en l'ordinador.<br/>El missatge d'error ha estat el següent: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Acaba + + + FinishedViewStep - - Setup Complete - S'ha completat la configuració. - - - - Installation Complete - Ha acabat la instal·lació. - - - - The setup of %1 is complete. - La configuració de %1 ha acabat. - - - - The installation of %1 is complete. - La instal·lació de %1 ha acabat. + + Finish + Acaba @@ -2258,7 +2314,7 @@ 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. @@ -2768,14 +2824,14 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé ProcessResult - + There was no output from the command. No hi ha hagut eixida de l'ordre. - + Output: @@ -2784,52 +2840,52 @@ Eixida: - + External command crashed. L'ordre externa ha fallat. - + Command <i>%1</i> crashed. L'ordre <i>%1</i> ha fallat. - + External command failed to start. L'ordre externa no s'ha pogut iniciar. - + Command <i>%1</i> failed to start. L'ordre <i>%1</i> no s'ha pogut iniciar. - + Internal error when starting command. S'ha produït un error intern en iniciar l'ordre. - + Bad parameters for process job call. Hi ha paràmetres incorrectes per a la crida de la tasca del procés. - + External command failed to finish. L'ordre externa no ha acabat correctament. - + Command <i>%1</i> failed to finish in %2 seconds. L'ordre <i>%1</i> no ha pogut acabar en %2 segons. - + External command finished with errors. L'ordre externa ha acabat amb errors. - + Command <i>%1</i> finished with exit code %2. L'ordre <i>%1</i> ha acabat amb el codi d'eixida %2. @@ -3648,12 +3704,12 @@ La configuració pot continuar, però és possible que algunes característiques UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Si hi ha més d'una persona que ha d'usar aquest ordinador, podeu crear diversos comptes després de la configuració.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Si hi ha més d'una persona que ha d'usar aquest ordinador, podeu crear diversos comptes després de la instal·lació.</small> @@ -3892,6 +3948,44 @@ La configuració pot continuar, però és possible que algunes característiques Arrere + + calamares-sidebar + + + Show debug information + Mostra la informació de depuració + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts index 789fea0dbe..d108a7b7ac 100644 --- a/lang/calamares_cs_CZ.ts +++ b/lang/calamares_cs_CZ.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Strom widgetu - + Debug information Ladící informace @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Nastavit - + Install Instalovat @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Hotovo @@ -261,171 +269,180 @@ Calamares::ViewManager - + Setup Failed Nastavení se nezdařilo - + Installation Failed Instalace se nezdařila - + Would you like to paste the install log to the web? Chcete vyvěsit záznam událostí při instalaci na web? - + Error Chyba - - + + &Yes &Ano - - + + &No &Ne - + &Close &Zavřít - + Install Log Paste URL URL pro vložení záznamu událostí při instalaci - + The upload was unsuccessful. No web-paste was done. Nahrání se nezdařilo. Na web nebylo nic vloženo. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Inicializace Calamares se nezdařila - + %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 nemůže být nainstalováno. Calamares se nepodařilo načíst všechny nastavené moduly. Toto je problém způsobu použití Calamares ve vámi používané distribuci. - + <br/>The following modules could not be loaded: <br/> Následující moduly se nepodařilo načíst: - + Continue with setup? Pokračovat s instalací? - + Continue with installation? Pokračovat v instalaci? - + 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> Instalátor %1 provede změny na datovém úložišti, aby bylo nainstalováno %2.<br/><strong>Změny nebude možné vrátit zpět.</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> Instalátor %1 provede změny na datovém úložišti, aby bylo nainstalováno %2.<br/><strong>Změny nebude možné vrátit zpět.</strong> - + &Set up now Na&stavit nyní - + &Install now &Spustit instalaci - + Go &back Jít &zpět - + &Set up Na&stavit - + &Install Na&instalovat - + Setup is complete. Close the setup program. Nastavení je dokončeno. Ukončete nastavovací program. - + The installation is complete. Close the installer. Instalace je dokončena. Ukončete instalátor. - + Cancel setup without changing the system. Zrušit nastavení bez změny v systému. - + Cancel installation without changing the system. Zrušení instalace bez provedení změn systému. - + &Next &Další - + &Back &Zpět - + &Done &Hotovo - + &Cancel &Storno - + Cancel setup? Zrušit nastavování? - + Cancel installation? Přerušit instalaci? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Opravdu chcete přerušit instalaci? Instalační program bude ukončen a všechny změny ztraceny. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Opravdu chcete instalaci přerušit? @@ -455,45 +472,15 @@ Instalační program bude ukončen a všechny změny ztraceny. Chyba při načítání Python skriptu. - - CalamaresUtils - - - Install log posted to: -%1 - Záznam událostí instalace vyvěšen na: -%1 - - CalamaresWindow - - Show debug information - Zobrazit ladící informace - - - - &Back - &Zpět - - - - &Next - &Další - - - - &Cancel - &Storno - - - + %1 Setup Program Instalátor %1 - + %1 Installer %1 instalátor @@ -814,50 +801,90 @@ Instalační program bude ukončen a všechny změny ztraceny. <h1>Vítejte v instalátoru %1.</h1> - + Your username is too long. Vaše uživatelské jméno je příliš dlouhé. - + '%1' is not allowed as username. „%1“ není možné použít jako uživatelské jméno. - + Your username must start with a lowercase letter or underscore. Je třeba, aby uživatelské jméno začínalo na malé písmeno nebo podtržítko. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Je možné použít pouze malá písmena, číslice, podtržítko a spojovník. - + Your hostname is too short. Název stroje je příliš krátký. - + Your hostname is too long. Název stroje je příliš dlouhý. - + '%1' is not allowed as hostname. „%1“ není možné použít jako název počítače. - + Only letters, numbers, underscore and hyphen are allowed. Je možné použít pouze písmena, číslice, podtržítko a spojovník. - + Your passwords do not match! Zadání hesla se neshodují! + + + Setup Failed + Nastavení se nezdařilo + + + + Installation Failed + Instalace se nezdařila + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Nastavení dokončeno + + + + Installation Complete + Instalace dokončena + + + + The setup of %1 is complete. + Nastavení %1 je dokončeno. + + + + The installation of %1 is complete. + Instalace %1 je dokončena. + ContextualProcessJob @@ -948,22 +975,43 @@ Instalační program bude ukončen a všechny změny ztraceny. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Vytvořit nový %2MiB oddíl na %4 (%3) se souborovým systémem %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Vytvořit nový <strong>%2MiB</strong> oddíl na <strong>%4</strong> (%3) se souborovým systémem <strong>%1</strong>. - + + Creating new %1 partition on %2. Vytváří se nový %1 oddíl na %2. - + The installer failed to create partition on disk '%1'. Instalátoru se nepodařilo vytvořit oddíl na datovém úložišti „%1“. @@ -1290,37 +1338,57 @@ Instalační program bude ukončen a všechny změny ztraceny. FillGlobalStorageJob - + Set partition information Nastavit informace o oddílu - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Nainstalovat %1 na <strong>nový</strong> %2 systémový oddíl. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Nastavit <strong>nový</strong> %2 oddíl s přípojným bodem <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Nainstalovat %2 na %3 systémový oddíl <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Nastavit %3 oddíl <strong>%1</strong> s přípojným bodem <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Nainstalovat %2 na %3 systémový oddíl <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Nainstalovat zavaděč do <strong>%1</strong>. - + Setting up mount points. Nastavují se přípojné body. @@ -1338,62 +1406,50 @@ Instalační program bude ukončen a všechny změny ztraceny. &Restartovat nyní - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Instalace je u konce.</h1><br/>%1 byl nainstalován na váš počítač.<br/>Nyní ho můžete restartovat a přejít do čerstvě nainstalovaného systému, nebo můžete pokračovat v práci ve stávajícím prostředím %2, spuštěným z instalačního média. - + <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>Když je tato kolonka zaškrtnutá, systém se restartuje jakmile kliknete na <span style="font-style:italic;">Hotovo</span> nebo zavřete instalátor.</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>Instalace je u konce.</h1><br/>%1 bylo nainstalováno na váš počítač.<br/>Nyní ho můžete restartovat a přejít do čerstvě nainstalovaného systému, nebo můžete pokračovat v práci ve stávajícím prostředím %2, spuštěným z instalačního média. - + <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>Když je tato kolonka zaškrtnutá, systém se restartuje jakmile kliknete na <span style="font-style:italic;">Hotovo</span> nebo zavřete instalátor.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Instalace se nezdařila</h1><br/>%1 nebyl instalován na váš počítač.<br/>Hlášení o chybě: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalace se nezdařila</h1><br/>%1 nebylo nainstalováno na váš počítač.<br/>Hlášení o chybě: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Dokončit + + + FinishedViewStep - - Setup Complete - Nastavení dokončeno - - - - Installation Complete - Instalace dokončena - - - - The setup of %1 is complete. - Nastavení %1 je dokončeno. - - - - The installation of %1 is complete. - Instalace %1 je dokončena. + + Finish + Dokončit @@ -2280,7 +2336,7 @@ Instalační program bude ukončen a všechny změny ztraceny. Neznámá chyba - + Password is empty Heslo není vyplněné @@ -2790,14 +2846,14 @@ Instalační program bude ukončen a všechny změny ztraceny. ProcessResult - + There was no output from the command. Příkaz neposkytl žádný výstup. - + Output: @@ -2806,52 +2862,52 @@ Výstup: - + External command crashed. Vnější příkaz byl neočekávaně ukončen. - + Command <i>%1</i> crashed. Příkaz <i>%1</i> byl neočekávaně ukončen. - + External command failed to start. Vnější příkaz se nepodařilo spustit. - + Command <i>%1</i> failed to start. Příkaz <i>%1</i> se nepodařilo spustit. - + Internal error when starting command. Vnitřní chyba při spouštění příkazu. - + Bad parameters for process job call. Chybné parametry volání úlohy procesu. - + External command failed to finish. Vnější příkaz se nepodařilo dokončit. - + Command <i>%1</i> failed to finish in %2 seconds. Příkaz <i>%1</i> se nepodařilo dokončit do %2 sekund. - + External command finished with errors. Vnější příkaz skončil s chybami. - + Command <i>%1</i> finished with exit code %2. Příkaz <i>%1</i> skončil s návratovým kódem %2. @@ -3670,12 +3726,12 @@ Výstup: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Pokud bude tento počítač používat více lidí, můžete přidat uživatelské účty po dokončení instalace.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Pokud bude tento počítač používat více lidí, můžete přidat uživatelské účty po dokončení instalace.</small> @@ -3914,6 +3970,44 @@ Výstup: Zpět + + calamares-sidebar + + + Show debug information + Zobrazit ladící informace + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index d97d97efd7..ebd5a655d9 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Widgettræ - + Debug information Fejlretningsinformation @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Opsæt - + Install Installation @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Færdig @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Opsætningen mislykkedes - + Installation Failed Installation mislykkedes - + Would you like to paste the install log to the web? Vil du indsætte installationsloggen på webbet? - + Error Fejl - - + + &Yes &Ja - - + + &No &Nej - + &Close &Luk - + Install Log Paste URL Indsættelses-URL for installationslog - + The upload was unsuccessful. No web-paste was done. Uploaden lykkedes ikke. Der blev ikke foretaget nogen webindsættelse. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Initiering af Calamares mislykkedes - + %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 kan ikke installeres. Calamares kunne ikke indlæse alle de konfigurerede moduler. Det er et problem med den måde Calamares bruges på af distributionen. - + <br/>The following modules could not be loaded: <br/>Følgende moduler kunne ikke indlæses: - + Continue with setup? Fortsæt med opsætningen? - + Continue with installation? Fortsæt installationen? - + 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-opsætningsprogrammet er ved at foretage ændringer til din disk for at opsætte %2.<br/><strong>Det vil ikke være muligt at fortryde ændringerne.</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-installationsprogrammet er ved at foretage ændringer til din disk for at installere %2.<br/><strong>Det vil ikke være muligt at fortryde ændringerne.</strong> - + &Set up now &Opsæt nu - + &Install now &Installér nu - + Go &back Gå &tilbage - + &Set up &Opsæt - + &Install &Installér - + Setup is complete. Close the setup program. Opsætningen er fuldført. Luk opsætningsprogrammet. - + The installation is complete. Close the installer. Installationen er fuldført. Luk installationsprogrammet. - + Cancel setup without changing the system. Annullér opsætningen uden at ændre systemet. - + Cancel installation without changing the system. Annullér installation uden at ændre systemet. - + &Next &Næste - + &Back &Tilbage - + &Done &Færdig - + &Cancel &Annullér - + Cancel setup? Annullér opsætningen? - + Cancel installation? Annullér installationen? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Vil du virkelig annullere den igangværende opsætningsproces? Opsætningsprogrammet vil stoppe og alle ændringer vil gå tabt. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Vil du virkelig annullere den igangværende installationsproces? @@ -451,45 +468,15 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Python-fejl som ikke kan hentes. - - CalamaresUtils - - - Install log posted to: -%1 - Installationslog indsendt til: -%1 - - CalamaresWindow - - Show debug information - Vis fejlretningsinformation - - - - &Back - &Tilbage - - - - &Next - &Næste - - - - &Cancel - &Annullér - - - + %1 Setup Program %1-opsætningsprogram - + %1 Installer %1-installationsprogram @@ -810,50 +797,90 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.<h1>Velkommen til %1-installationsprogrammet</h1> - + Your username is too long. Dit brugernavn er for langt. - + '%1' is not allowed as username. '%1' er ikke tilladt som brugernavn. - + Your username must start with a lowercase letter or underscore. Dit brugernavn skal begynde med et bogstav med småt eller understregning. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Det er kun tilladt at bruge bogstaver med småt, tal, understregning og bindestreg. - + Your hostname is too short. Dit værtsnavn er for kort. - + Your hostname is too long. Dit værtsnavn er for langt. - + '%1' is not allowed as hostname. '%1' er ikke tilladt som værtsnavn. - + Only letters, numbers, underscore and hyphen are allowed. Det er kun tilladt at bruge bogstaver, tal, understregning og bindestreg. - + Your passwords do not match! Dine adgangskoder er ikke ens! + + + Setup Failed + Opsætningen mislykkedes + + + + Installation Failed + Installation mislykkedes + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Opsætningen er fuldført + + + + Installation Complete + Installation fuldført + + + + The setup of %1 is complete. + Opsætningen af %1 er fuldført. + + + + The installation of %1 is complete. + Installationen af %1 er fuldført. + ContextualProcessJob @@ -944,22 +971,43 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Opret en ny %2 MiB partition på %4 (%3) med %1-filsystem. - + + 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>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Opret en ny <strong>%2 MiB</strong> partition på <strong>%4</strong> (%3) med <strong>%1</strong>-filsystem. - + + Creating new %1 partition on %2. Opretter ny %1-partition på %2. - + The installer failed to create partition on disk '%1'. Installationsprogrammet kunne ikke oprette partition på disk '%1'. @@ -1286,37 +1334,57 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. FillGlobalStorageJob - + Set partition information Indstil partitionsinformation - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Installér %1 på <strong>ny</strong> %2-systempartition. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Opsæt den <strong>nye</strong> %2 partition med monteringspunkt <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Installér %2 på %3-systempartition <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Opsæt %3 partition <strong>%1</strong> med monteringspunkt <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Installér %2 på %3-systempartition <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Installér bootloader på <strong>%1</strong>. - + Setting up mount points. Opsætter monteringspunkter. @@ -1334,62 +1402,50 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.&Genstart nu - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Færdig.</h1><br/>%1 er blevet opsat på din computer.<br/>Du kan nu begynde at bruge dit nye system. - + <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>Når boksen er tilvalgt, vil dit system genstarte med det samme når du klikker på <span style="font-style:italic;">Færdig</span> eller lukker opsætningsprogrammet.</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>Færdig.</h1><br/>%1 er blevet installeret på din computer.<br/>Du kan nu genstarte for at komme ind i dit nye system eller fortsætte med at bruge %2 livemiljøet. - + <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>Når boksen er tilvalgt, vil dit system genstarte med det samme når du klikker på <span style="font-style:italic;">Færdig</span> eller lukker installationsprogrammet.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Opsætningen mislykkede</h1><br/>%1 er ikke blevet opsat på din computer.<br/>Fejlmeddelelsen var: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installation mislykkede</h1><br/>%1 er ikke blevet installeret på din computer.<br/>Fejlmeddelelsen var: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Færdig + + + FinishedViewStep - - Setup Complete - Opsætningen er fuldført - - - - Installation Complete - Installation fuldført - - - - The setup of %1 is complete. - Opsætningen af %1 er fuldført. - - - - The installation of %1 is complete. - Installationen af %1 er fuldført. + + Finish + Færdig @@ -2258,7 +2314,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Ukendt fejl - + Password is empty Adgangskoden er tom @@ -2768,14 +2824,14 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. ProcessResult - + There was no output from the command. Der var ikke nogen output fra kommandoen. - + Output: @@ -2784,52 +2840,52 @@ Output: - + External command crashed. Ekstern kommando holdt op med at virke. - + Command <i>%1</i> crashed. Kommandoen <i>%1</i> holdte op med at virke. - + External command failed to start. Ekstern kommando kunne ikke starte. - + Command <i>%1</i> failed to start. Kommandoen <i>%1</i> kunne ikke starte. - + Internal error when starting command. Intern fejl ved start af kommando. - + Bad parameters for process job call. Ugyldige parametre til kald af procesjob. - + External command failed to finish. Ekstern kommando blev ikke færdig. - + Command <i>%1</i> failed to finish in %2 seconds. Kommandoen <i>%1</i> blev ikke færdig på %2 sekunder. - + External command finished with errors. Ekstern kommando blev færdig med fejl. - + Command <i>%1</i> finished with exit code %2. Kommandoen <i>%1</i> blev færdig med afslutningskoden %2. @@ -3649,12 +3705,12 @@ setting UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Hvis mere end én person bruger computeren, kan du oprette flere konti efter opsætningen.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Hvis mere end én person bruger computeren, kan du oprette flere konti efter installationen.</small> @@ -3892,6 +3948,44 @@ setting Tilbage + + calamares-sidebar + + + Show debug information + Vis fejlretningsinformation + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index a1147010bc..cbc9fa0d99 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Widget-Baum - + Debug information Debug-Information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Einrichtung - + Install Installieren @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Fertig @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Setup fehlgeschlagen - + Installation Failed Installation gescheitert - + Would you like to paste the install log to the web? Möchten Sie das Installationsprotokoll an eine Internetadresse senden? - + Error Fehler - - + + &Yes &Ja - - + + &No &Nein - + &Close &Schließen - + Install Log Paste URL Internetadresse für das Senden des Installationsprotokolls - + The upload was unsuccessful. No web-paste was done. Das Hochladen ist fehlgeschlagen. Es wurde nichts an eine Internetadresse gesendet. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Initialisierung von Calamares fehlgeschlagen - + %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 kann nicht installiert werden. Calamares war nicht in der Lage, alle konfigurierten Module zu laden. Dieses Problem hängt mit der Art und Weise zusammen, wie Calamares von der jeweiligen Distribution eingesetzt wird. - + <br/>The following modules could not be loaded: <br/>Die folgenden Module konnten nicht geladen werden: - + Continue with setup? Setup fortsetzen? - + Continue with installation? Installation fortsetzen? - + 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> Das %1 Installationsprogramm ist dabei, Änderungen an Ihrer Festplatte vorzunehmen, um %2 einzurichten.<br/><strong> Sie werden diese Änderungen nicht rückgängig machen können.</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> Das %1 Installationsprogramm wird Änderungen an Ihrer Festplatte vornehmen, um %2 zu installieren.<br/><strong>Diese Änderungen können nicht rückgängig gemacht werden.</strong> - + &Set up now &Jetzt einrichten - + &Install now Jetzt &installieren - + Go &back Gehe &zurück - + &Set up &Einrichten - + &Install &Installieren - + Setup is complete. Close the setup program. Setup ist abgeschlossen. Schließe das Installationsprogramm. - + The installation is complete. Close the installer. Die Installation ist abgeschlossen. Schließe das Installationsprogramm. - + Cancel setup without changing the system. Installation abbrechen ohne das System zu verändern. - + Cancel installation without changing the system. Installation abbrechen, ohne das System zu verändern. - + &Next &Weiter - + &Back &Zurück - + &Done &Erledigt - + &Cancel &Abbrechen - + Cancel setup? Installation abbrechen? - + Cancel installation? Installation abbrechen? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Wollen Sie die Installation wirklich abbrechen? Dadurch wird das Installationsprogramm beendet und alle Änderungen gehen verloren. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Wollen Sie wirklich die aktuelle Installation abbrechen? @@ -451,45 +468,15 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Nicht zuzuordnender Python-Fehler - - CalamaresUtils - - - Install log posted to: -%1 - Installationsprotokoll gesendet an: -%1 - - CalamaresWindow - - Show debug information - Debug-Information anzeigen - - - - &Back - &Zurück - - - - &Next - &Weiter - - - - &Cancel - &Abbrechen - - - + %1 Setup Program %1 Installationsprogramm - + %1 Installer %1 Installationsprogramm @@ -810,50 +797,90 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. <h1>Willkommen zum Installationsprogramm für %1</h1> - + Your username is too long. Ihr Benutzername ist zu lang. - + '%1' is not allowed as username. '%1' ist als Benutzername nicht erlaubt. - + Your username must start with a lowercase letter or underscore. Ihr Benutzername muss mit einem Kleinbuchstaben oder Unterstrich beginnen. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Es sind nur Kleinbuchstaben, Zahlen, Unterstrich und Bindestrich erlaubt. - + Your hostname is too short. Ihr Computername ist zu kurz. - + Your hostname is too long. Ihr Computername ist zu lang. - + '%1' is not allowed as hostname. '%1' ist als Computername nicht erlaubt. - + Only letters, numbers, underscore and hyphen are allowed. Es sind nur Buchstaben, Zahlen, Unter- und Bindestriche erlaubt. - + Your passwords do not match! Ihre Passwörter stimmen nicht überein! + + + Setup Failed + Setup fehlgeschlagen + + + + Installation Failed + Installation gescheitert + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Installation abgeschlossen + + + + Installation Complete + Installation abgeschlossen + + + + The setup of %1 is complete. + Die Installation von %1 ist abgeschlossen. + + + + The installation of %1 is complete. + Die Installation von %1 ist abgeschlossen. + ContextualProcessJob @@ -944,22 +971,43 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Erstelle eine neue Partition mit einer Größe von %2MiB auf %4 (%3) mit dem Dateisystem %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Erstelle eine neue Partition mit einer Größe von <strong>%2MiB</strong> auf <strong>%4</strong> (%3) mit dem Dateisystem <strong>%1</strong>. - + + Creating new %1 partition on %2. Erstelle eine neue %1 Partition auf %2. - + The installer failed to create partition on disk '%1'. Das Installationsprogramm scheiterte beim Erstellen der Partition auf Datenträger '%1'. @@ -1286,37 +1334,57 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. FillGlobalStorageJob - + Set partition information Setze Partitionsinformationen - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Installiere %1 auf <strong>neuer</strong> %2 Systempartition. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Erstelle <strong>neue</strong> %2 Partition mit Einhängepunkt <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Installiere %2 auf %3 Systempartition <strong>%1</strong>. + + 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>. + + + + + 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>. - Erstelle %3 Partition <strong>%1</strong> mit Einhängepunkt <strong>%2</strong>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + Installiere %2 auf %3 Systempartition <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Installiere Bootloader auf <strong>%1</strong>. - + Setting up mount points. Richte Einhängepunkte ein. @@ -1334,62 +1402,50 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Jetzt &Neustarten - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Alles erledigt.</h1><br/>%1 wurde auf Ihrem Computer eingerichtet.<br/>Sie können nun mit Ihrem neuen System arbeiten. - + <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>Wenn diese Option aktiviert ist, genügt zum Neustart des Systems ein Klick auf <span style="font-style:italic;">Fertig</span> oder das Schließen des Installationsprogramms.</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>Alles erledigt.</h1><br/>%1 wurde auf Ihrem Computer installiert.<br/>Sie können nun in Ihr neues System neustarten oder mit der %2 Live-Umgebung fortfahren. - + <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>Wenn diese Option aktiviert ist, genügt zum Neustart des Systems ein Klick auf <span style="font-style:italic;">Fertig</span> oder das Schließen des Installationsprogramms.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Installation fehlgeschlagen</h1><br/>%1 wurde nicht auf Ihrem Computer eingerichtet.<br/>Die Fehlermeldung war: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installation fehlgeschlagen</h1><br/>%1 wurde nicht auf deinem Computer installiert.<br/>Die Fehlermeldung lautet: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Beenden + + + FinishedViewStep - - Setup Complete - Installation abgeschlossen - - - - Installation Complete - Installation abgeschlossen - - - - The setup of %1 is complete. - Die Installation von %1 ist abgeschlossen. - - - - The installation of %1 is complete. - Die Installation von %1 ist abgeschlossen. + + Finish + Beenden @@ -2258,7 +2314,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Unbekannter Fehler - + Password is empty Passwort nicht vergeben @@ -2768,14 +2824,14 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. ProcessResult - + There was no output from the command. Dieser Befehl hat keine Ausgabe erzeugt. - + Output: @@ -2784,52 +2840,52 @@ Ausgabe: - + External command crashed. Externes Programm abgestürzt. - + Command <i>%1</i> crashed. Programm <i>%1</i> abgestürzt. - + External command failed to start. Externes Programm konnte nicht gestartet werden. - + Command <i>%1</i> failed to start. Das Programm <i>%1</i> konnte nicht gestartet werden. - + Internal error when starting command. Interner Fehler beim Starten des Programms. - + Bad parameters for process job call. Ungültige Parameter für Prozessaufruf. - + External command failed to finish. Externes Programm konnte nicht abgeschlossen werden. - + Command <i>%1</i> failed to finish in %2 seconds. Programm <i>%1</i> konnte nicht innerhalb von %2 Sekunden abgeschlossen werden. - + External command finished with errors. Externes Programm mit Fehlern beendet. - + Command <i>%1</i> finished with exit code %2. Befehl <i>%1</i> beendet mit Exit-Code %2. @@ -3648,12 +3704,12 @@ Ausgabe: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Falls dieser Computer von mehr als einer Person benutzt werden soll, können weitere Benutzerkonten nach der Installation eingerichtet werden.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Falls dieser Computer von mehr als einer Person benutzt werden soll, können weitere Benutzerkonten nach der Installation eingerichtet werden.</small> @@ -3892,6 +3948,44 @@ Ausgabe: Zurück + + calamares-sidebar + + + Show debug information + Debug-Information anzeigen + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts index 7d87b64d3f..16333af389 100644 --- a/lang/calamares_el.ts +++ b/lang/calamares_el.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information Πληροφορίες αποσφαλμάτωσης @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Εγκατάσταση @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Ολοκληρώθηκε @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed Η εγκατάσταση απέτυχε - + Would you like to paste the install log to the web? - + Error Σφάλμα - - + + &Yes &Ναι - - + + &No &Όχι - + &Close &Κλείσιμο - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Η αρχικοποίηση του Calamares απέτυχε - + %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: - + Continue with setup? Συνέχεια με την εγκατάσταση; - + 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 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 θα κάνει αλλαγές στον δίσκο για να εγκαταστήσετε το %2.<br/><strong>Δεν θα είστε σε θέση να αναιρέσετε τις αλλαγές.</strong> - + &Set up now - + &Install now &Εγκατάσταση τώρα - + Go &back Μετάβαση &πίσω - + &Set up - + &Install &Εγκατάσταση - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Η εγκτάσταση ολοκληρώθηκε. Κλείστε το πρόγραμμα εγκατάστασης. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Ακύρωση της εγκατάστασης χωρίς αλλαγές στο σύστημα. - + &Next &Επόμενο - + &Back &Προηγούμενο - + &Done &Ολοκληρώθηκε - + &Cancel &Ακύρωση - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. Θέλετε πραγματικά να ακυρώσετε τη διαδικασία εγκατάστασης; @@ -450,44 +467,15 @@ The installer will quit and all changes will be lost. Μη ανακτήσιµο σφάλμα Python. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - Εμφάνιση πληροφοριών απασφαλμάτωσης - - - - &Back - &Προηγούμενο - - - - &Next - &Επόμενο - - - - &Cancel - &Ακύρωση - - - + %1 Setup Program - + %1 Installer Εφαρμογή εγκατάστασης του %1 @@ -808,50 +796,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. Το όνομα χρήστη είναι πολύ μακρύ. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Το όνομα υπολογιστή είναι πολύ σύντομο. - + Your hostname is too long. Το όνομα υπολογιστή είναι πολύ μακρύ. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Οι κωδικοί πρόσβασης δεν ταιριάζουν! + + + Setup Failed + + + + + Installation Failed + Η εγκατάσταση απέτυχε + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -942,22 +970,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. Δημιουργείται νέα %1 κατάτμηση στο %2. - + The installer failed to create partition on disk '%1'. Η εγκατάσταση απέτυχε να δημιουργήσει μία κατάτμηση στον δίσκο '%1'. @@ -1284,37 +1333,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. Εγκατάσταση %1 στο <strong>νέο</strong> %2 διαμέρισμα συστήματος. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. - + Install boot loader on <strong>%1</strong>. Εγκατάσταση φορτωτή εκκίνησης στο <strong>%1</strong>. - + Setting up mount points. @@ -1332,62 +1401,50 @@ The installer will quit and all changes will be lost. Ε&πανεκκίνηση τώρα - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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>Η εγκατάσταση ολοκληρώθηκε.</h1><br/>Το %1 εγκαταστήθηκε στον υπολογιστή.<br/>Τώρα, μπορείτε να επανεκκινήσετε τον υπολογιστή σας ή να συνεχίσετε να δοκιμάζετε το %2. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Τέλος + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - + + Finish + Τέλος @@ -2254,7 +2311,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2764,65 +2821,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Λανθασμένοι παράμετροι για την κλήση διεργασίας. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3638,12 +3695,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 installation.</small> @@ -3871,6 +3928,44 @@ Output: + + calamares-sidebar + + + Show debug information + Εμφάνιση πληροφοριών απασφαλμάτωσης + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts index fc66795b32..eb20be4c27 100644 --- a/lang/calamares_en.ts +++ b/lang/calamares_en.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + Manage auto-mount settings + + BootInfoWidget @@ -109,7 +117,7 @@ Widget Tree - + Debug information Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Set up - + Install Install @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Done @@ -257,171 +265,184 @@ Calamares::ViewManager - + Setup Failed Setup Failed - + Installation Failed Installation Failed - + Would you like to paste the install log to the web? Would you like to paste the install log to the web? - + Error Error - - + + &Yes &Yes - - + + &No &No - + &Close &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 + +Link copied to clipboard + Install log posted to + +%1 + +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? @@ -451,45 +472,15 @@ The installer will quit and all changes will be lost. Unfetchable Python error. - - CalamaresUtils - - - Install log posted to: -%1 - Install log posted to: -%1 - - CalamaresWindow - - Show debug information - Show debug information - - - - &Back - &Back - - - - &Next - &Next - - - - &Cancel - &Cancel - - - + %1 Setup Program %1 Setup Program - + %1 Installer %1 Installer @@ -810,50 +801,90 @@ The installer will quit and all changes will be lost. <h1>Welcome to the %1 installer</h1> - + Your username is too long. Your username is too long. - + '%1' is not allowed as username. '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Your hostname is too short. - + Your hostname is too long. Your hostname is too long. - + '%1' is not allowed as hostname. '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Your passwords do not match! + + + 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. + ContextualProcessJob @@ -944,22 +975,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'. @@ -1286,37 +1338,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>. - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + 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>. - - Install %2 on %3 system partition <strong>%1</strong>. - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. + + 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. @@ -1334,62 +1406,50 @@ The installer will quit and all changes will be lost. &Restart now - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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>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> - + <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>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. - + <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>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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Finish + + + FinishedViewStep - - 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. + + Finish + Finish @@ -2258,7 +2318,7 @@ The installer will quit and all changes will be lost. Unknown error - + Password is empty Password is empty @@ -2768,14 +2828,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: @@ -2784,52 +2844,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. @@ -3648,12 +3708,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> @@ -3892,6 +3952,46 @@ Output: Back + + calamares-sidebar + + + Show debug information + Show debug information + + + + finishedq + + + Installation Completed + Installation Completed + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + Close Installer + Close Installer + + + + Restart System + Restart System + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + i18n diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts index 8c427b7308..194caa7592 100644 --- a/lang/calamares_en_GB.ts +++ b/lang/calamares_en_GB.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Install @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Done @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed Installation Failed - + Would you like to paste the install log to the web? - + Error Error - - + + &Yes &Yes - - + + &No &No - + &Close &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Calamares Initialisation 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? - + 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 - + &Install now &Install now - + Go &back Go &back - + &Set up - + &Install &Install - + 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 installation without changing the system. Cancel installation without changing the system. - + &Next &Next - + &Back &Back - + &Done &Done - + &Cancel &Cancel - + 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 install process? The installer will quit and all changes will be lost. Do you really want to cancel the current install process? @@ -450,44 +467,15 @@ The installer will quit and all changes will be lost. Unfetchable Python error. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - Show debug information - - - - &Back - &Back - - - - &Next - &Next - - - - &Cancel - &Cancel - - - + %1 Setup Program - + %1 Installer %1 Installer @@ -808,50 +796,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Your hostname is too short. - + Your hostname is too long. Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + Installation Failed + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + Installation Complete + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + The installation of %1 is complete. + ContextualProcessJob @@ -942,22 +970,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). + + + + 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). + + + + 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'. @@ -1284,37 +1333,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. Install %1 on <strong>new</strong> %2 system partition. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Install %2 on %3 system partition <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. + + 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>%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. @@ -1332,62 +1401,50 @@ The installer will quit and all changes will be lost. &Restart now - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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>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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - Installation Complete - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - The installation of %1 is complete. + + Finish + Finish @@ -2254,7 +2311,7 @@ The installer will quit and all changes will be lost. Unknown error - + Password is empty @@ -2764,14 +2821,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: @@ -2780,52 +2837,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. @@ -3641,12 +3698,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 installation.</small> @@ -3874,6 +3931,44 @@ Output: + + calamares-sidebar + + + Show debug information + Show debug information + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts index 15fea5a6e2..a4483e7fba 100644 --- a/lang/calamares_eo.ts +++ b/lang/calamares_eo.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ KromprogrametArbo - + Debug information Sencimiga Informaĵo @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Aranĝu - + Install Instalu @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Finita @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed - + Would you like to paste the install log to the web? - + Error Eraro - - + + &Yes &Jes - - + + &No &Ne - + &Close &Fermi - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 &Aranĝu nun - + &Install now &Instali nun - + Go &back Iru &Reen - + &Set up &Aranĝu - + &Install &Instali - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Nuligi instalado sen ŝanĝante la sistemo. - + &Next &Sekva - + &Back &Reen - + &Done &Finita - + &Cancel &Nuligi - + Cancel setup? - + Cancel installation? Nuligi instalado? - + 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. Ĉu vi vere volas nuligi la instalan procedon? @@ -450,44 +467,15 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - &Reen - - - - &Next - &Sekva - - - - &Cancel - &Nuligi - - - + %1 Setup Program - + %1 Installer %1 Instalilo @@ -808,50 +796,90 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Agordaĵo Plenumita + + + + Installation Complete + Instalaĵo Plenumita + + + + The setup of %1 is complete. + La agordaĵo de %1 estas plenumita. + + + + The installation of %1 is complete. + La instalaĵo de %1 estas plenumita. + ContextualProcessJob @@ -942,22 +970,43 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1284,37 +1333,57 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1332,62 +1401,50 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. &Restartigu nun - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Plenumita!</h1><br/>%1 estis agordita sur vian komputilon.<br/>Vi povas nun ekuzi vian novan sistemon. - + <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>Se ĉi tio elektobutono estas elektita, via sistemo restartos senprokraste, kiam vi klikas <span style="font-style:italic;">Finita</span> aŭ vi malfermas la agordilon.</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>Plenumita!</h1><br/>%1 estis instalita sur vian komputilon.<br/>Vi povas nun restartigas en vian novan sistemon, aŭ vi povas pluiri uzi la %2 aŭtonoman sistemon. - + <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>Se ĉi tio elektobutono estas elektita, via sistemo restartos senprokraste, kiam vi klikas <span style="font-style:italic;">Finita</span> aŭ vi malfermas la instalilon.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Agorado Malsukcesis</h1><br/>%1 ne estis agordita sur vian komputilon.<br/>La erara mesaĝo estis: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalaĵo Malsukcesis</h1><br/>%1 ne estis instalita sur vian komputilon.<br/>La erara mesaĝo estis: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Pretigu + + + FinishedViewStep - - Setup Complete - Agordaĵo Plenumita - - - - Installation Complete - Instalaĵo Plenumita - - - - The setup of %1 is complete. - La agordaĵo de %1 estas plenumita. - - - - The installation of %1 is complete. - La instalaĵo de %1 estas plenumita. + + Finish + Pretigu @@ -2254,7 +2311,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - + Password is empty @@ -2764,65 +2821,65 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3638,12 +3695,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 installation.</small> @@ -3871,6 +3928,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts index 932bb827aa..79da48d525 100644 --- a/lang/calamares_es.ts +++ b/lang/calamares_es.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -110,7 +118,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar - + Debug information Información de depuración. @@ -118,12 +126,12 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar Calamares::ExecutionViewStep - + Set up Instalar - + Install Instalar @@ -144,7 +152,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar Calamares::JobThread - + Done Hecho @@ -258,170 +266,179 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar Calamares::ViewManager - + Setup Failed Configuración Fallida - + Installation Failed Error en la Instalación - + Would you like to paste the install log to the web? ¿Desea pegar el registro de instalación en la web? - + Error Error - - + + &Yes &Sí - - + + &No &No - + &Close &Cerrar - + Install Log Paste URL Pegar URL Registro de Instalación - + The upload was unsuccessful. No web-paste was done. La carga no tuvo éxito. No se realizó pegado web. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed La inicialización de Calamares falló - + %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 no se pudo instalar. Calamares no fue capaz de cargar todos los módulos configurados. Esto es un problema con la forma en que Calamares es usado por la distribución - + <br/>The following modules could not be loaded: Los siguientes módulos no se pudieron cargar: - + Continue with setup? ¿Continuar con la configuración? - + Continue with installation? Continuar con la instalación? - + 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> El programa de instalación %1 está a punto de hacer cambios en el disco con el fin de configurar %2.<br/><strong>No podrá deshacer estos cambios.</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> El instalador %1 va a realizar cambios en su disco para instalar %2.<br/><strong>No podrá deshacer estos cambios.</strong> - + &Set up now &Configurar ahora - + &Install now &Instalar ahora - + Go &back Regresar - + &Set up &Instalar - + &Install &Instalar - + Setup is complete. Close the setup program. La instalación se ha completado. Cierre el instalador. - + The installation is complete. Close the installer. La instalación se ha completado. Cierre el instalador. - + Cancel setup without changing the system. Cancelar instalación sin cambiar el sistema. - + Cancel installation without changing the system. Cancelar instalación sin cambiar el sistema. - + &Next &Siguiente - + &Back &Atrás - + &Done &Hecho - + &Cancel &Cancelar - + Cancel setup? ¿Cancelar la instalación? - + Cancel installation? ¿Cancelar la instalación? - + 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. ¿Realmente quiere cancelar el proceso de instalación? @@ -451,44 +468,15 @@ Saldrá del instalador y se perderán todos los cambios. Error de Python Unfetchable. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - Mostrar información de depuración. - - - - &Back - &Atrás - - - - &Next - &Siguiente - - - - &Cancel - &Cancelar - - - + %1 Setup Program - + %1 Installer %1 Instalador @@ -809,50 +797,90 @@ Saldrá del instalador y se perderán todos los cambios. - + Your username is too long. Su nombre de usuario es demasiado largo. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. El nombre del Host es demasiado corto. - + Your hostname is too long. El nombre del Host es demasiado largo. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! ¡Sus contraseñas no coinciden! + + + Setup Failed + Configuración Fallida + + + + Installation Failed + Error en la Instalación + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + Instalación completada + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + Se ha completado la instalación de %1. + ContextualProcessJob @@ -943,22 +971,43 @@ Saldrá del instalador y se perderán todos los cambios. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. Creando nueva %1 partición en %2 - + The installer failed to create partition on disk '%1'. El instalador fallo al crear la partición en el disco '%1'. @@ -1285,37 +1334,57 @@ Saldrá del instalador y se perderán todos los cambios. FillGlobalStorageJob - + Set partition information Establecer la información de la partición - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Instalar %1 en <strong>nuevo</strong> %2 partición del sistema. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Configurar <strong>nueva</strong> %2 partición con punto de montaje <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Instalar %2 en %3 partición del sistema <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Configurar %3 partición <strong>%1</strong> con punto de montaje <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Instalar %2 en %3 partición del sistema <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Instalar gestor de arranque en <strong>%1</strong>. - + Setting up mount points. Configurando puntos de montaje. @@ -1333,62 +1402,50 @@ Saldrá del instalador y se perderán todos los cambios. &Reiniciar ahora - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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>Listo.</h1><br/>%1 ha sido instalado en su equipo.<br/>Ahora puede reiniciar hacia su nuevo sistema, o continuar utilizando %2 Live. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>La instalación falló</h1><br/>%1 no se ha instalado en su equipo.<br/>El mensaje de error fue: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Finalizar + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - Instalación completada - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - Se ha completado la instalación de %1. + + Finish + Finalizar @@ -2255,7 +2312,7 @@ Saldrá del instalador y se perderán todos los cambios. Error desconocido - + Password is empty La contraseña vacia @@ -2765,14 +2822,14 @@ Saldrá del instalador y se perderán todos los cambios. ProcessResult - + There was no output from the command. No hubo salida del comando. - + Output: @@ -2781,52 +2838,52 @@ Salida: - + External command crashed. El comando externo falló. - + Command <i>%1</i> crashed. El comando <i>%1</i> falló. - + External command failed to start. El comando externo no se pudo iniciar. - + Command <i>%1</i> failed to start. El comando <i>%1</i> no se pudo iniciar. - + Internal error when starting command. Error interno al iniciar el comando. - + Bad parameters for process job call. Parámetros erróneos para la llamada de la tarea del procreso. - + External command failed to finish. El comando externo no se pudo finalizar. - + Command <i>%1</i> failed to finish in %2 seconds. El comando <i>%1</i> no se pudo finalizar en %2 segundos. - + External command finished with errors. El comando externo finalizó con errores. - + Command <i>%1</i> finished with exit code %2. El comando <i>%1</i> finalizó con un código de salida %2. @@ -3642,12 +3699,12 @@ Salida: 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 installation.</small> @@ -3875,6 +3932,44 @@ Salida: + + calamares-sidebar + + + Show debug information + Mostrar información de depuración. + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts index 9f2793cae1..c5f6adfc4a 100644 --- a/lang/calamares_es_MX.ts +++ b/lang/calamares_es_MX.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information Información de depuración @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Preparar - + Install Instalar @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Hecho @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Fallo en la configuración. - + Installation Failed Instalación Fallida - + Would you like to paste the install log to the web? - + Error Error - - + + &Yes &Si - - + + &No &No - + &Close &Cerrar - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed La inicialización de Calamares ha fallado - + %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 no pudo ser instalado. Calamares no pudo cargar todos los módulos configurados. Este es un problema con la forma en que Calamares esta siendo usada por la distribución. - + <br/>The following modules could not be loaded: <br/>Los siguientes módulos no pudieron ser cargados: - + Continue with setup? ¿Continuar con la instalación? - + Continue with installation? ¿Continuar con la instalación? - + 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> El %1 programa de instalación esta a punto de realizar cambios a su disco con el fin de establecer %2.<br/><strong>Usted no podrá deshacer estos cambios.</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> El instalador %1 va a realizar cambios en su disco para instalar %2.<br/><strong>No podrá deshacer estos cambios.</strong> - + &Set up now &Configurar ahora - + &Install now &Instalar ahora - + Go &back &Regresar - + &Set up &Configurar - + &Install &Instalar - + Setup is complete. Close the setup program. Configuración completa. Cierre el programa de instalación. - + The installation is complete. Close the installer. Instalación completa. Cierre el instalador. - + Cancel setup without changing the system. Cancelar la configuración sin cambiar el sistema. - + Cancel installation without changing the system. Cancelar instalación sin cambiar el sistema. - + &Next &Siguiente - + &Back &Atrás - + &Done &Hecho - + &Cancel &Cancelar - + Cancel setup? ¿Cancelar la configuración? - + Cancel installation? ¿Cancelar la instalación? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. ¿Realmente desea cancelar el actual proceso de configuración? El programa de instalación se cerrará y todos los cambios se perderán. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. ¿Realmente desea cancelar el proceso de instalación actual? @@ -451,44 +468,15 @@ El instalador terminará y se perderán todos los cambios. Error de Python inalcanzable. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - Mostrar información de depuración - - - - &Back - &Atrás - - - - &Next - &Siguiente - - - - &Cancel - &Cancelar - - - + %1 Setup Program %1 Programa de instalación - + %1 Installer %1 Instalador @@ -810,50 +798,90 @@ El instalador terminará y se perderán todos los cambios. - + Your username is too long. Tu nombre de usuario es demasiado largo. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. El nombre de tu equipo es demasiado corto. - + Your hostname is too long. El nombre de tu equipo es demasiado largo. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Las contraseñas no coinciden! + + + Setup Failed + Fallo en la configuración. + + + + Installation Failed + Instalación Fallida + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + Instalación Completa + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + La instalación de %1 está completa. + ContextualProcessJob @@ -944,22 +972,43 @@ El instalador terminará y se perderán todos los cambios. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Crear nueva %2MiB partición en %4 (%3) con el sistema de archivos %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Crear nueva<strong>%2MiB</strong> partición en<strong>%2MiB</strong> (%3) con el sistema de archivos <strong>%1</strong>. - + + Creating new %1 partition on %2. Creando nueva partición %1 en %2 - + The installer failed to create partition on disk '%1'. El instalador falló en crear la partición en el disco '%1'. @@ -1286,37 +1335,57 @@ El instalador terminará y se perderán todos los cambios. FillGlobalStorageJob - + Set partition information Fijar información de la partición. - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Instalar %1 en <strong>nueva</strong> %2 partición de sistema. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Configurar <strong>nueva</strong> %2 partición con punto de montaje <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Instalar %2 en %3 partición del sistema <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Configurar %3 partición <strong>%1</strong> con punto de montaje <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Instalar %2 en %3 partición del sistema <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Instalar el cargador de arranque en <strong>%1</strong>. - + Setting up mount points. Configurando puntos de montaje. @@ -1334,62 +1403,50 @@ El instalador terminará y se perderán todos los cambios. &Reiniciar ahora - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Todo listo.</h1><br/>%1 se ha configurado en su computadora. <br/>Ahora puede comenzar a usar su nuevo 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>Cuando esta casilla está marcada, su sistema se reiniciará inmediatamente cuando haga clic en <span style="font-style:italic;">Listo</span> o cierre el programa de instalación.</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>Listo.</h1><br/>%1 ha sido instalado en su computadora.<br/>Ahora puede reiniciar su nuevo sistema, o continuar usando el entorno Live %2. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalación fallida</h1> <br/>%1 no ha sido instalado en su computador. <br/>El mensaje de error es: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Terminado + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - Instalación Completa - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - La instalación de %1 está completa. + + Finish + Terminado @@ -2256,7 +2313,7 @@ El instalador terminará y se perderán todos los cambios. Error desconocido - + Password is empty @@ -2766,14 +2823,14 @@ El instalador terminará y se perderán todos los cambios. ProcessResult - + There was no output from the command. No hubo salida desde el comando. - + Output: @@ -2782,52 +2839,52 @@ Salida - + External command crashed. El comando externo ha fallado. - + Command <i>%1</i> crashed. El comando <i>%1</i> ha fallado. - + External command failed to start. El comando externo falló al iniciar. - + Command <i>%1</i> failed to start. El comando <i>%1</i> Falló al iniciar. - + Internal error when starting command. Error interno al iniciar el comando. - + Bad parameters for process job call. Parámetros erróneos en la llamada al proceso. - + External command failed to finish. Comando externo falla al finalizar - + Command <i>%1</i> failed to finish in %2 seconds. Comando <i>%1</i> falló al finalizar en %2 segundos. - + External command finished with errors. Comando externo finalizado con errores - + Command <i>%1</i> finished with exit code %2. Comando <i>%1</i> finalizó con código de salida %2. @@ -3644,12 +3701,12 @@ Salida UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Si más de una persona usará esta computadora, puede crear múltiples cuentas después de la configuración</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Si más de una persona usará esta computadora, puede crear varias cuentas después de la instalación.</small> @@ -3877,6 +3934,44 @@ Salida + + calamares-sidebar + + + Show debug information + Mostrar información de depuración + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts index a2c2902d08..3dd9caed8e 100644 --- a/lang/calamares_es_PR.ts +++ b/lang/calamares_es_PR.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information Información de depuración @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Instalar @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Hecho @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed Falló la instalación - + Would you like to paste the install log to the web? - + Error Error - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Próximo - + &Back &Atrás - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -449,44 +466,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - &Atrás - - - - &Next - &Próximo - - - - &Cancel - - - - + %1 Setup Program - + %1 Installer @@ -807,50 +795,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + Falló la instalación + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -941,22 +969,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1283,37 +1332,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1331,61 +1400,49 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. + + Finish @@ -2253,7 +2310,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2763,65 +2820,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Parámetros erróneos para el trabajo en proceso. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3637,12 +3694,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 installation.</small> @@ -3870,6 +3927,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts index 6ae0d5f894..bad69099dc 100644 --- a/lang/calamares_et.ts +++ b/lang/calamares_et.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information Silumisteave @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Paigalda @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Valmis @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed Paigaldamine ebaõnnestus - + Would you like to paste the install log to the web? - + Error Viga - - + + &Yes &Jah - - + + &No &Ei - + &Close &Sulge - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Calamarese alglaadimine ebaõnnestus - + %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 ei saa paigaldada. Calamares ei saanud laadida kõiki konfigureeritud mooduleid. See on distributsiooni põhjustatud Calamarese kasutamise viga. - + <br/>The following modules could not be loaded: <br/>Järgnevaid mooduleid ei saanud laadida: - + Continue with setup? Jätka seadistusega? - + 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 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 paigaldaja on tegemas muudatusi sinu kettale, et paigaldada %2.<br/><strong>Sa ei saa neid muudatusi tagasi võtta.</strong> - + &Set up now &Seadista kohe - + &Install now &Paigalda kohe - + Go &back Mine &tagasi - + &Set up &Seadista - + &Install &Paigalda - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Paigaldamine on lõpetatud. Sulge paigaldaja. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Tühista paigaldamine ilma süsteemi muutmata. - + &Next &Edasi - + &Back &Tagasi - + &Done &Valmis - + &Cancel &Tühista - + Cancel setup? - + Cancel installation? Tühista paigaldamine? - + 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. Kas sa tõesti soovid tühistada praeguse paigaldusprotsessi? @@ -450,44 +467,15 @@ Paigaldaja sulgub ning kõik muutused kaovad. Kättesaamatu Python'i viga. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - Kuva silumisteavet - - - - &Back - &Tagasi - - - - &Next - &Edasi - - - - &Cancel - &Tühista - - - + %1 Setup Program - + %1 Installer %1 paigaldaja @@ -808,50 +796,90 @@ Paigaldaja sulgub ning kõik muutused kaovad. - + Your username is too long. Sinu kasutajanimi on liiga pikk. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Sinu hostinimi on liiga lühike. - + Your hostname is too long. Sinu hostinimi on liiga pikk. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Sinu paroolid ei ühti! + + + Setup Failed + + + + + Installation Failed + Paigaldamine ebaõnnestus + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Seadistus valmis + + + + Installation Complete + Paigaldus valmis + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + %1 paigaldus on valmis. + ContextualProcessJob @@ -942,22 +970,43 @@ Paigaldaja sulgub ning kõik muutused kaovad. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. Loon uut %1 partitsiooni kettal %2. - + The installer failed to create partition on disk '%1'. Paigaldaja ei suutnud luua partitsiooni kettale "%1". @@ -1284,37 +1333,57 @@ Paigaldaja sulgub ning kõik muutused kaovad. FillGlobalStorageJob - + Set partition information Sea partitsiooni teave - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Paigalda %1 <strong>uude</strong> %2 süsteemipartitsiooni. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Seadista <strong>uus</strong> %2 partitsioon monteerimiskohaga <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Paigalda %2 %3 süsteemipartitsioonile <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Seadista %3 partitsioon <strong>%1</strong> monteerimiskohaga <strong>%2</strong> + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Paigalda %2 %3 süsteemipartitsioonile <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Paigalda käivituslaadur kohta <strong>%1</strong>. - + Setting up mount points. Seadistan monteerimispunkte. @@ -1332,62 +1401,50 @@ Paigaldaja sulgub ning kõik muutused kaovad. &Taaskäivita nüüd - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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>Kõik on valmis.</h1><br/>%1 on paigaldatud sinu arvutisse.<br/>Sa võid nüüd taaskäivitada oma uude süsteemi või jätkata %2 live-keskkonna kasutamist. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Paigaldamine ebaõnnestus</h1><br/>%1 ei paigaldatud sinu arvutisse.<br/>Veateade oli: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Valmis + + + FinishedViewStep - - Setup Complete - Seadistus valmis - - - - Installation Complete - Paigaldus valmis - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - %1 paigaldus on valmis. + + Finish + Valmis @@ -2254,7 +2311,7 @@ Paigaldaja sulgub ning kõik muutused kaovad. Tundmatu viga - + Password is empty @@ -2764,14 +2821,14 @@ Paigaldaja sulgub ning kõik muutused kaovad. ProcessResult - + There was no output from the command. Käsul polnud väljundit. - + Output: @@ -2780,52 +2837,52 @@ Väljund: - + External command crashed. Väline käsk jooksis kokku. - + Command <i>%1</i> crashed. Käsk <i>%1</i> jooksis kokku. - + External command failed to start. Välise käsu käivitamine ebaõnnestus. - + Command <i>%1</i> failed to start. Käsu <i>%1</i> käivitamine ebaõnnestus. - + Internal error when starting command. Käsu käivitamisel esines sisemine viga. - + Bad parameters for process job call. Protsessi töö kutsel olid halvad parameetrid. - + External command failed to finish. Väline käsk ei suutnud lõpetada. - + Command <i>%1</i> failed to finish in %2 seconds. Käsk <i>%1</i> ei suutnud lõpetada %2 sekundi jooksul. - + External command finished with errors. Väline käsk lõpetas vigadega. - + Command <i>%1</i> finished with exit code %2. Käsk <i>%1</i> lõpetas sulgemiskoodiga %2. @@ -3641,12 +3698,12 @@ Väljund: 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 installation.</small> @@ -3874,6 +3931,44 @@ Väljund: + + calamares-sidebar + + + Show debug information + Kuva silumisteavet + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts index 64bad9cc22..275dff6b06 100644 --- a/lang/calamares_eu.ts +++ b/lang/calamares_eu.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information Arazte informazioa @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Instalatu @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Egina @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed Instalazioak huts egin du - + Would you like to paste the install log to the web? - + Error Akatsa - - + + &Yes &Bai - - + + &No &Ez - + &Close &Itxi - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Calamares instalazioak huts egin du - + %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 ezin da instalatu. Calamares ez da gai konfiguratutako modulu guztiak kargatzeko. Arazao hau banaketak Calamares erabiltzen duen eragatik da. - + <br/>The following modules could not be loaded: <br/> Ondorengo moduluak ezin izan dira kargatu: - + Continue with setup? Ezarpenarekin jarraitu? - + Continue with installation? Instalazioarekin jarraitu? - + 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> %1 instalatzailea zure diskoan aldaketak egitera doa %2 instalatzeko.<br/><strong>Ezingo dituzu desegin aldaketa hauek.</strong> - + &Set up now - + &Install now &Instalatu orain - + Go &back &Atzera - + &Set up - + &Install &Instalatu - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Instalazioa burutu da. Itxi instalatzailea. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Instalazioa bertan behera utsi da sisteman aldaketarik gabe. - + &Next &Hurrengoa - + &Back &Atzera - + &Done E&ginda - + &Cancel &Utzi - + Cancel setup? - + Cancel installation? Bertan behera utzi instalazioa? - + 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. Ziur uneko instalazio prozesua bertan behera utzi nahi duzula? @@ -450,44 +467,15 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - Erakutsi arazte informazioa - - - - &Back - &Atzera - - - - &Next - &Hurrengoa - - - - &Cancel - &Utzi - - - + %1 Setup Program - + %1 Installer %1 Instalatzailea @@ -808,50 +796,90 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. - + Your username is too long. Zure erabiltzaile-izena luzeegia da. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Zure ostalari-izena laburregia da. - + Your hostname is too long. Zure ostalari-izena luzeegia da. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Pasahitzak ez datoz bat! + + + Setup Failed + + + + + Installation Failed + Instalazioak huts egin du + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + Instalazioa amaitua + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + %1 instalazioa amaitu da. + ContextualProcessJob @@ -942,22 +970,43 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. %1 partizioa berria sortzen %2n. - + The installer failed to create partition on disk '%1'. Huts egin du instalatzaileak '%1' diskoan partizioa sortzen. @@ -1284,37 +1333,57 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. FillGlobalStorageJob - + Set partition information Ezarri partizioaren informazioa - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Instalatu %1 sistemako %2 partizio <strong>berrian</strong>. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Ezarri %2 partizio <strong>berria</strong> <strong>%1</strong> muntatze puntuarekin. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Ezarri %3 partizioa <strong>%1</strong> <strong>%2</strong> muntatze puntuarekin. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. Instalatu abio kargatzailea <strong>%1</strong>-(e)n. - + Setting up mount points. Muntatze puntuak ezartzen. @@ -1332,62 +1401,50 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. &Berrabiarazi orain - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Bukatu + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - Instalazioa amaitua - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - %1 instalazioa amaitu da. + + Finish + Bukatu @@ -2254,7 +2311,7 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Hutsegite ezezaguna - + Password is empty @@ -2764,13 +2821,13 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. ProcessResult - + There was no output from the command. - + Output: @@ -2779,52 +2836,52 @@ Irteera: - + External command crashed. Kanpo-komandoak huts egin du. - + Command <i>%1</i> crashed. <i>%1</i> komandoak huts egin du. - + External command failed to start. Ezin izan da %1 kanpo-komandoa abiarazi. - + Command <i>%1</i> failed to start. Ezin izan da <i>%1</i> komandoa abiarazi. - + Internal error when starting command. Barne-akatsa komandoa abiarazterakoan. - + Bad parameters for process job call. - + External command failed to finish. Kanpo-komandoa ez da bukatu. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. Kanpo-komandoak akatsekin bukatu da. - + Command <i>%1</i> finished with exit code %2. @@ -3640,12 +3697,12 @@ Irteera: 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 installation.</small> @@ -3873,6 +3930,44 @@ Irteera: Atzera + + calamares-sidebar + + + Show debug information + Erakutsi arazte informazioa + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts index 9044df5494..d7a27ef6ac 100644 --- a/lang/calamares_fa.ts +++ b/lang/calamares_fa.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ درخت ابزارک‌ها - + Debug information اطّلاعات اشکال‌زدایی @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up راه‌اندازی - + Install نصب @@ -143,7 +151,7 @@ Calamares::JobThread - + Done انجام شد. @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed راه‌اندازی شکست خورد. - + Installation Failed نصب شکست خورد - + Would you like to paste the install log to the web? آیا مایلید که گزارش‌ها در وب الصاق شوند؟ - + Error خطا - - + + &Yes &بله - - + + &No &خیر - + &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 + +Link copied to clipboard + + + + 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 نمی‌تواند نصب شود. کالاماریس نمی‌تواند همه ماژول‌های پیکربندی را بالا بیاورد. این یک مشکل در نحوه استفاده کالاماریس توسط توزیع است. - + <br/>The following modules could not be loaded: <br/>این ماژول نمی‌تواند بالا بیاید: - + Continue with setup? ادامهٔ برپایی؟ - + 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> برنامه نصب %1 در شرف ایجاد تغییرات در دیسک شما به منظور راه‌اندازی %2 است. <br/><strong>شما قادر نخواهید بود تا این تغییرات را برگردانید.</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 می‌خواهد برای نصب %2 تغییراتی در دیسکتان بدهد. <br/><strong>نخواهید توانست این تغییرات را برگردانید.</strong> - + &Set up now &همین حالا راه‌انداری کنید - + &Install now &اکنون نصب شود - + Go &back &بازگشت - + &Set up &راه‌اندازی - + &Install &نصب - + Setup is complete. Close the setup program. نصب انجام شد. برنامه نصب را ببندید. - + The installation is complete. Close the installer. نصب انجام شد. نصاب را ببندید. - + Cancel setup without changing the system. لغو راه‌اندازی بدون تغییر سیستم. - + Cancel installation without changing the system. لغو نصب بدون تغییر کردن سیستم. - + &Next &بعدی - + &Back &پیشین - + &Done &انجام شد - + &Cancel &لغو - + Cancel setup? لغو راه‌اندازی؟ - + 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 install process? The installer will quit and all changes will be lost. واقعاً می خواهید فرایند نصب فعلی را لغو کنید؟ @@ -451,45 +468,15 @@ The installer will quit and all changes will be lost. خطای پایتونی غیرقابل دریافت. - - CalamaresUtils - - - Install log posted to: -%1 - نصب رخدادهای ارسال شده به: -%1 - - CalamaresWindow - - Show debug information - نمایش اطّلاعات اشکال‌زدایی - - - - &Back - &قبلی - - - - &Next - &بعدی - - - - &Cancel - &لغو - - - + %1 Setup Program %1 برنامه راه‌اندازی - + %1 Installer نصب‌کنندهٔ %1 @@ -810,50 +797,90 @@ The installer will quit and all changes will be lost. <h1>به نصب‌کنندهٔ %1 خوش آمدید.</h1> - + Your username is too long. نام کاربریتان بیش از حد بلند است. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. نام کاربری شما باید با یک حرف کوچک یا خط زیر شروع شود. - + Only lowercase letters, numbers, underscore and hyphen are allowed. فقط حروف کوچک ، اعداد ، زیر خط و خط خط مجاز است. - + Your hostname is too short. نام میزبانتان بیش از حد کوتاه است. - + Your hostname is too long. نام میزبانتان بیش از حد بلند است. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. فقط حروف ، اعداد ، زیر خط و خط خط مجاز است. - + Your passwords do not match! گذرواژه‌هایتان مطابق نیستند! + + + Setup Failed + راه‌اندازی شکست خورد. + + + + Installation Failed + نصب شکست خورد + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + برپایی کامل شد + + + + Installation Complete + نصب کامل شد + + + + The setup of %1 is complete. + برپایی %1 کامل شد. + + + + The installation of %1 is complete. + نصب %1 کامل شد. + ContextualProcessJob @@ -944,22 +971,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). + + + + Create new %2MiB partition on %4 (%3) with file system %1. ایچاد افراز %2می‌ب جدید روی %4 (%3) با سامانهٔ پروندهٔ %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. ایچاد افراز <strong>%2می‌ب</strong> جدید روی <strong>%</strong>4 (%3) با سامانهٔ پروندهٔ <strong>%</strong>1. - + + Creating new %1 partition on %2. در حال ایجاد افراز %1 جدید روی %2. - + The installer failed to create partition on disk '%1'. @@ -1286,37 +1334,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. برپایی نقطه‌های اتّصال @@ -1334,62 +1402,50 @@ The installer will quit and all changes will be lost. &راه‌اندازی دوباره - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. تمام شد.٪ 1 در رایانه شما تنظیم شده است. اکنون می توانید از سیستم جدید خود استفاده کنید. - + <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> هنگامی که این کادر علامت گذاری شد ، هنگامی که بر روی انجام شده کلیک کنید یا برنامه نصب را ببندید ، سیستم شما بلافاصله راه اندازی می شود. - + <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>همه‌چیز انجام شد.</h1><br/>%1 روی رایانه‌تان نصب شد.<br/>ممکن است بخواهید به سامانهٔ جدیدتان وارد شده تا به استفاده از محیط زندهٔ %2 ادامه دهید. - + <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> هنگامی که این کادر علامت گذاری شد ، هنگامی که بر روی انجام شده کلیک کنید یا نصب را ببندید ، سیستم شما بلافاصله راه اندازی می شود. - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish پایان + + + FinishedViewStep - - Setup Complete - برپایی کامل شد - - - - Installation Complete - نصب کامل شد - - - - The setup of %1 is complete. - برپایی %1 کامل شد. - - - - The installation of %1 is complete. - نصب %1 کامل شد. + + Finish + پایان @@ -2256,7 +2312,7 @@ The installer will quit and all changes will be lost. خطای ناشناخته - + Password is empty گذرواژه خالی است @@ -2766,65 +2822,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. output هیچ خروجی از دستور نبود. - + Output: خروجی - + External command crashed. فرمان خارجی خراب شد. - + Command <i>%1</i> crashed. - + External command failed to start. دستور خارجی شروع نشد. - + Command <i>%1</i> failed to start. - + Internal error when starting command. خطای داخلی هنگام شروع دستور. - + Bad parameters for process job call. پارامترهای نامناسب برای صدا زدن کار پردازش شده است - + External command failed to finish. فرمان خارجی به پایان نرسید. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. دستور خارجی با خطا به پایان رسید. - + Command <i>%1</i> finished with exit code %2. @@ -3640,12 +3696,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 installation.</small> @@ -3873,6 +3929,44 @@ Output: بازگشت + + calamares-sidebar + + + Show debug information + نمایش اطّلاعات اشکال‌زدایی + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index 8625d81315..5b0eb435b9 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Widget puurakenne - + Debug information Vianetsinnän tiedot @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Määritä - + Install Asenna @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Valmis @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Asennus epäonnistui - + Installation Failed Asentaminen epäonnistui - + Would you like to paste the install log to the web? Haluatko liittää asennuslokin verkkoon? - + Error Virhe - - + + &Yes &Kyllä - - + + &No &Ei - + &Close &Sulje - + Install Log Paste URL Asenna lokitiedon URL-osoite - + The upload was unsuccessful. No web-paste was done. Lähettäminen epäonnistui. Web-liittämistä ei tehty. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Calamaresin alustaminen epäonnistui - + %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 ei voi asentaa. Calamares ei voinut ladata kaikkia määritettyjä moduuleja. Ongelma on siinä, miten jakelu käyttää Calamaresia. - + <br/>The following modules could not be loaded: <br/>Seuraavia moduuleja ei voitu ladata: - + Continue with setup? Jatketaanko asennusta? - + Continue with installation? Jatka asennusta? - + 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 asennusohjelma on aikeissa tehdä muutoksia levylle, jotta voit määrittää kohteen %2.<br/><strong>Et voi kumota näitä muutoksia.</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> Asennus ohjelman %1 on tehtävä muutoksia levylle, jotta %2 voidaan asentaa.<br/><strong>Et voi kumota näitä muutoksia.</strong> - + &Set up now &Määritä nyt - + &Install now &Asenna nyt - + Go &back Mene &takaisin - + &Set up &Määritä - + &Install &Asenna - + Setup is complete. Close the setup program. Asennus on valmis. Sulje asennusohjelma. - + The installation is complete. Close the installer. Asennus on valmis. Sulje asennusohjelma. - + Cancel setup without changing the system. Peruuta asennus muuttamatta järjestelmää. - + Cancel installation without changing the system. Peruuta asennus tekemättä muutoksia järjestelmään. - + &Next &Seuraava - + &Back &Takaisin - + &Done &Valmis - + &Cancel &Peruuta - + Cancel setup? Peruuta asennus? - + Cancel installation? Peruuta asennus? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Haluatko todella peruuttaa nykyisen asennuksen? Asennusohjelma lopetetaan ja kaikki muutokset menetetään. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Oletko varma että haluat peruuttaa käynnissä olevan asennusprosessin? @@ -451,45 +468,15 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Python virhettä ei voitu hakea. - - CalamaresUtils - - - Install log posted to: -%1 - Asennuksen loki lähetetty: -%1 - - CalamaresWindow - - Show debug information - Näytä virheenkorjaustiedot - - - - &Back - &Takaisin - - - - &Next - &Seuraava - - - - &Cancel - &Peruuta - - - + %1 Setup Program %1 Asennusohjelma - + %1 Installer %1 Asennusohjelma @@ -811,50 +798,90 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.<h1>Tervetuloa %1 -asennusohjelmaan</h1> - + Your username is too long. Käyttäjänimesi on liian pitkä. - + '%1' is not allowed as username. '%1' ei ole sallittu käyttäjänimenä. - + Your username must start with a lowercase letter or underscore. Käyttäjätunnuksesi täytyy alkaa pienillä kirjaimilla tai alaviivoilla. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Vain pienet kirjaimet, numerot, alaviivat ja tavuviivat ovat sallittuja. - + Your hostname is too short. Isäntänimesi on liian lyhyt. - + Your hostname is too long. Isäntänimesi on liian pitkä. - + '%1' is not allowed as hostname. '%1' ei ole sallittu koneen nimenä. - + Only letters, numbers, underscore and hyphen are allowed. Vain kirjaimet, numerot, alaviivat ja tavuviivat ovat sallittuja. - + Your passwords do not match! Salasanasi eivät täsmää! + + + Setup Failed + Asennus epäonnistui + + + + Installation Failed + Asentaminen epäonnistui + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Asennus valmis + + + + Installation Complete + Asennus valmis + + + + The setup of %1 is complete. + Asennus %1 on valmis. + + + + The installation of %1 is complete. + Asennus %1 on valmis. + ContextualProcessJob @@ -945,22 +972,43 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Luo uusi %2Mib-osio %4 (%3) tiedostojärjestelmällä %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Luo uusi <strong>%2Mib</strong> osio <strong>%4</strong> (%3) tiedostojärjestelmällä <strong>%1</strong>. - + + Creating new %1 partition on %2. Luodaan uutta %1-osiota kohteessa %2. - + The installer failed to create partition on disk '%1'. Asennusohjelma epäonnistui osion luonnissa levylle '%1'. @@ -1287,37 +1335,57 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. FillGlobalStorageJob - + Set partition information Aseta osion tiedot - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Asenna %1 <strong>uusi</strong> %2 järjestelmä osio. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Määritä <strong>uusi</strong> %2 -osio liitepisteellä<strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Asenna %2 - %3 -järjestelmän osioon <strong>%1</strong>. + + 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>. + + + + + 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>. - Määritä %3 osio <strong>%1</strong> jossa on liitäntäpiste <strong>%2</strong>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + Asenna %2 - %3 -järjestelmän osioon <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Asenna käynnistyslatain <strong>%1</strong>. - + Setting up mount points. Liitosten määrittäminen. @@ -1335,62 +1403,50 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.&Käynnistä uudelleen - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Valmista.</h1><br/>%1 on määritetty tietokoneellesi.<br/>Voit nyt alkaa käyttää uutta järjestelmääsi. - + <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>Kun tämä valintaruutu on valittu, järjestelmä käynnistyy heti, kun napsautat <span style="font-style:italic;">Valmis</span> -painiketta tai suljet asennusohjelman.</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>Kaikki tehty.</h1><br/>%1 on asennettu tietokoneellesi.<br/>Voit joko uudelleenkäynnistää uuteen kokoonpanoosi, tai voit jatkaa %2 live-ympäristön käyttöä. - + <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>Kun tämä valintaruutu on valittuna, järjestelmä käynnistyy heti, kun napsautat <span style="font-style:italic;">Valmis</span> tai suljet asentimen.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Asennus epäonnistui</h1><br/>%1 ei ole määritetty tietokoneellesi.<br/> Virhesanoma oli: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Asennus epäonnistui </h1><br/>%1 ei ole asennettu tietokoneeseesi.<br/>Virhesanoma oli: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Valmis + + + FinishedViewStep - - Setup Complete - Asennus valmis - - - - Installation Complete - Asennus valmis - - - - The setup of %1 is complete. - Asennus %1 on valmis. - - - - The installation of %1 is complete. - Asennus %1 on valmis. + + Finish + Valmis @@ -2259,7 +2315,7 @@ hiiren vieritystä skaalaamiseen. Tuntematon virhe - + Password is empty Salasana on tyhjä @@ -2769,14 +2825,14 @@ hiiren vieritystä skaalaamiseen. ProcessResult - + There was no output from the command. Komentoa ei voitu ajaa. - + Output: @@ -2785,52 +2841,52 @@ Ulostulo: - + External command crashed. Ulkoinen komento kaatui. - + Command <i>%1</i> crashed. Komento <i>%1</i> kaatui. - + External command failed to start. Ulkoisen komennon käynnistäminen epäonnistui. - + Command <i>%1</i> failed to start. Komennon <i>%1</i> käynnistäminen epäonnistui. - + Internal error when starting command. Sisäinen virhe käynnistettäessä komentoa. - + Bad parameters for process job call. Huonot parametrit prosessin kutsuun. - + External command failed to finish. Ulkoinen komento ei onnistunut. - + Command <i>%1</i> failed to finish in %2 seconds. Komento <i>%1</i> epäonnistui %2 sekunnissa. - + External command finished with errors. Ulkoinen komento päättyi virheisiin. - + Command <i>%1</i> finished with exit code %2. Komento <i>%1</i> päättyi koodiin %2. @@ -3650,12 +3706,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Jos useampi kuin yksi henkilö käyttää tätä tietokonetta, voit luoda useita tilejä asennuksen jälkeen.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Jos useampi kuin yksi henkilö käyttää tätä tietokonetta, voit luoda useita tilejä asennuksen jälkeen.</small> @@ -3894,6 +3950,44 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Takaisin + + calamares-sidebar + + + Show debug information + Näytä virheenkorjaustiedot + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index 64304cce8a..c65d36f7bd 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Arbre de Widget - + Debug information Informations de dépannage @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Configurer - + Install Installer @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Fait @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Échec de la configuration - + Installation Failed L'installation a échoué - + Would you like to paste the install log to the web? Voulez-vous copier le journal d'installation sur le Web ? - + Error Erreur - - + + &Yes &Oui - - + + &No &Non - + &Close &Fermer - + Install Log Paste URL URL de copie du journal d'installation - + The upload was unsuccessful. No web-paste was done. L'envoi a échoué. La copie sur le web n'a pas été effectuée. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed L'initialisation de Calamares a échoué - + %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 n'a pas pu être installé. Calamares n'a pas pu charger tous les modules configurés. C'est un problème avec la façon dont Calamares est utilisé par la distribution. - + <br/>The following modules could not be loaded: Les modules suivants n'ont pas pu être chargés : - + Continue with setup? Poursuivre la configuration ? - + Continue with installation? Continuer avec l'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> Le programme de configuration de %1 est sur le point de procéder aux changements sur le disque afin de configurer %2.<br/> <strong>Vous ne pourrez pas annulez ces changements.</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> L'installateur %1 est sur le point de procéder aux changements sur le disque afin d'installer %2.<br/> <strong>Vous ne pourrez pas annulez ces changements.<strong> - + &Set up now &Configurer maintenant - + &Install now &Installer maintenant - + Go &back &Retour - + &Set up &Configurer - + &Install &Installer - + Setup is complete. Close the setup program. La configuration est terminée. Fermer le programme de configuration. - + The installation is complete. Close the installer. L'installation est terminée. Fermer l'installateur. - + Cancel setup without changing the system. Annuler la configuration sans toucher au système. - + Cancel installation without changing the system. Annuler l'installation sans modifier votre système. - + &Next &Suivant - + &Back &Précédent - + &Done &Terminé - + &Cancel &Annuler - + Cancel setup? Annuler la configuration ? - + Cancel installation? Abandonner l'installation ? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Voulez-vous vraiment abandonner le processus de configuration ? Le programme de configuration se fermera et les changements seront perdus. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Voulez-vous vraiment abandonner le processus d'installation ? @@ -451,45 +468,15 @@ L'installateur se fermera et les changements seront perdus. Erreur Python non rapportable. - - CalamaresUtils - - - Install log posted to: -%1 - Le journal d'installation a été posté sur : -%1 - - CalamaresWindow - - Show debug information - Afficher les informations de dépannage - - - - &Back - &Précédent - - - - &Next - &Suivant - - - - &Cancel - &Annuler - - - + %1 Setup Program Programme de configuration de %1 - + %1 Installer Installateur %1 @@ -810,50 +797,90 @@ L'installateur se fermera et les changements seront perdus. <h1>Bienvenue dans l'installateur de %1</h1> - + Your username is too long. Votre nom d'utilisateur est trop long. - + '%1' is not allowed as username. '%1' n'est pas autorisé comme nom d'utilisateur. - + Your username must start with a lowercase letter or underscore. Votre nom d'utilisateur doit commencer avec une lettre minuscule ou un underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Seuls les minuscules, nombres, underscores et tirets sont autorisés. - + Your hostname is too short. Le nom d'hôte est trop petit. - + Your hostname is too long. Le nom d'hôte est trop long. - + '%1' is not allowed as hostname. '%1' n'est pas autorisé comme nom d'hôte. - + Only letters, numbers, underscore and hyphen are allowed. Seuls les lettres, nombres, underscores et tirets sont autorisés. - + Your passwords do not match! Vos mots de passe ne correspondent pas ! + + + Setup Failed + Échec de la configuration + + + + Installation Failed + L'installation a échoué + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Configuration terminée + + + + Installation Complete + Installation terminée + + + + The setup of %1 is complete. + La configuration de %1 est terminée. + + + + The installation of %1 is complete. + L'installation de %1 est terminée. + ContextualProcessJob @@ -944,22 +971,43 @@ L'installateur se fermera et les changements seront perdus. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Créer une nouvelle partition de %2Mio sur %4 (%3) avec le système de fichier %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Créer une nouvelle partition de <strong>%2Mio</strong> sur <strong>%4</strong> (%3) avec le système de fichiers <strong>%1</strong>. - + + Creating new %1 partition on %2. Création d'une nouvelle partition %1 sur %2. - + The installer failed to create partition on disk '%1'. Le programme d'installation n'a pas pu créer la partition sur le disque '%1'. @@ -1286,37 +1334,57 @@ L'installateur se fermera et les changements seront perdus. FillGlobalStorageJob - + Set partition information Configurer les informations de la partition - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Installer %1 sur le <strong>nouveau</strong> système de partition %2. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Configurer la <strong>nouvelle</strong> partition %2 avec le point de montage <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Installer %2 sur la partition système %3 <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Configurer la partition %3 <strong>%1</strong> avec le point de montage <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Installer %2 sur la partition système %3 <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Installer le chargeur de démarrage sur <strong>%1</strong>. - + Setting up mount points. Configuration des points de montage. @@ -1334,62 +1402,50 @@ L'installateur se fermera et les changements seront perdus. &Redémarrer maintenant - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Configuration terminée.</h1><br/>%1 a été configuré sur votre ordinateur.<br/>Vous pouvez maintenant utiliser votre nouveau système. - + <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>En sélectionnant cette option, votre système redémarrera immédiatement quand vous cliquerez sur <span style=" font-style:italic;">Terminé</span> ou fermerez le programme de configuration.</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>Installation terminée.</h1><br/>%1 a été installé sur votre ordinateur.<br/>Vous pouvez redémarrer sur le nouveau système, ou continuer d'utiliser l'environnement actuel %2 . - + <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>En sélectionnant cette option, votre système redémarrera immédiatement quand vous cliquerez sur <span style=" font-style:italic;">Terminé</span> ou fermerez l'installateur.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Échec de la configuration</h1><br/>%1 n'a pas été configuré sur cet ordinateur.<br/>Le message d'erreur était : %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installation échouée</h1><br/>%1 n'a pas été installée sur cet ordinateur.<br/>Le message d'erreur était : %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Terminer + + + FinishedViewStep - - Setup Complete - Configuration terminée - - - - Installation Complete - Installation terminée - - - - The setup of %1 is complete. - La configuration de %1 est terminée. - - - - The installation of %1 is complete. - L'installation de %1 est terminée. + + Finish + Terminer @@ -2257,7 +2313,7 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de Erreur inconnue - + Password is empty Le mot de passe est vide @@ -2768,14 +2824,14 @@ Vous pouvez obtenir un aperçu des différentes apparences en cliquant sur celle ProcessResult - + There was no output from the command. Il y a eu aucune sortie de la commande - + Output: @@ -2784,52 +2840,52 @@ Sortie - + External command crashed. La commande externe s'est mal terminée. - + Command <i>%1</i> crashed. La commande <i>%1</i> s'est arrêtée inopinément. - + External command failed to start. La commande externe n'a pas pu être lancée. - + Command <i>%1</i> failed to start. La commande <i>%1</i> n'a pas pu être lancée. - + Internal error when starting command. Erreur interne au lancement de la commande - + Bad parameters for process job call. Mauvais paramètres pour l'appel au processus de job. - + External command failed to finish. La commande externe ne s'est pas terminée. - + Command <i>%1</i> failed to finish in %2 seconds. La commande <i>%1</i> ne s'est pas terminée en %2 secondes. - + External command finished with errors. La commande externe s'est terminée avec des erreurs. - + Command <i>%1</i> finished with exit code %2. La commande <i>%1</i> s'est terminée avec le code de sortie %2. @@ -3645,12 +3701,12 @@ Sortie UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>si plusieurs personnes utilisent cet ordinateur, vous pourrez créer plusieurs comptes après la configuration.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>si plusieurs personnes utilisent cet ordinateur, vous pourrez créer plusieurs comptes après l'installation.</small> @@ -3878,6 +3934,44 @@ Sortie + + calamares-sidebar + + + Show debug information + Afficher les informations de dépannage + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_fr_CH.ts b/lang/calamares_fr_CH.ts index 7085c9796b..a42fd77131 100644 --- a/lang/calamares_fr_CH.ts +++ b/lang/calamares_fr_CH.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +151,7 @@ Calamares::JobThread - + Done @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed - + Would you like to paste the install log to the web? - + Error - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -449,44 +466,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - - - - - &Next - - - - - &Cancel - - - - + %1 Setup Program - + %1 Installer @@ -807,50 +795,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -941,22 +969,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1283,37 +1332,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1331,61 +1400,49 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. + + Finish @@ -2253,7 +2310,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2763,65 +2820,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3637,12 +3694,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 installation.</small> @@ -3870,6 +3927,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts index 2d2c8eb3fb..7f333adfce 100644 --- a/lang/calamares_fur.ts +++ b/lang/calamares_fur.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Arbul dai widget - + Debug information Informazions di debug @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Impostazion - + Install Instale @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Fat @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Configurazion falide - + Installation Failed Instalazion falide - + Would you like to paste the install log to the web? Meti sul web il regjistri di instalazion? - + Error Erôr - - + + &Yes &Sì - - + + &No &No - + &Close S&iere - + Install Log Paste URL URL de copie dal regjistri di instalazion - + The upload was unsuccessful. No web-paste was done. Il cjariament sù pe rêt al è lât strucj. No je stade fate nissune copie sul web. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Inizializazion di Calamares falide - + %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. No si pues instalâ %1. Calamares nol è rivât a cjariâ ducj i modui configurâts. Chest probleme achì al è causât de distribuzion e di cemût che al ven doprât Calamares. - + <br/>The following modules could not be loaded: <br/>I modui chi sot no puedin jessi cjariâts: - + Continue with setup? Continuâ cu la configurazion? - + Continue with installation? Continuâ cu la instalazion? - + 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> Il program di configurazion %1 al sta par aplicâ modifichis al disc, di mût di podê instalâ %2.<br/><strong>No si podarà tornâ indaûr e anulâ chestis modifichis.</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> Il program di instalazion %1 al sta par aplicâ modifichis al disc, di mût di podê instalâ %2.<br/><strong>No tu podarâs tornâ indaûr e anulâ chestis modifichis.</strong> - + &Set up now &Configure cumò - + &Install now &Instale cumò - + Go &back &Torne indaûr - + &Set up &Configure - + &Install &Instale - + Setup is complete. Close the setup program. Configurazion completade. Siere il program di configurazion. - + The installation is complete. Close the installer. La instalazion e je stade completade. Siere il program di instalazion. - + Cancel setup without changing the system. Anule la configurazion cence modificâ il sisteme. - + Cancel installation without changing the system. Anulâ la instalazion cence modificâ il sisteme. - + &Next &Sucessîf - + &Back &Indaûr - + &Done &Fat - + &Cancel &Anule - + Cancel setup? Anulâ la configurazion? - + Cancel installation? Anulâ la instalazion? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Anulâ pardabon il procès di configurazion? Il program di configurazion al jessarà e dutis lis modifichis a laran pierdudis. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Anulâ pardabon il procès di instalazion? @@ -451,45 +468,15 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< erôr di Python che no si pues recuperâ. - - CalamaresUtils - - - Install log posted to: -%1 - Regjistri di instalazion publicât su: -%1 - - CalamaresWindow - - Show debug information - Mostre informazions di debug - - - - &Back - &Indaûr - - - - &Next - &Sucessîf - - - - &Cancel - &Anule - - - + %1 Setup Program Program di configurazion di %1 - + %1 Installer Program di instalazion di %1 @@ -810,50 +797,90 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< <h1>Benvignûts tal program di instalazion di %1</h1> - + Your username is too long. Il to non utent al è masse lunc. - + '%1' is not allowed as username. '%1' nol è ametût come non utent. - + Your username must start with a lowercase letter or underscore. Il to non utent al scugne scomençâ cuntune letare minuscule o une liniute basse. - + Only lowercase letters, numbers, underscore and hyphen are allowed. A son ametûts dome i numars, lis letaris minusculis, lis liniutis bassis e i tratuts. - + Your hostname is too short. Il to non host al è masse curt. - + Your hostname is too long. Il to non host al è masse lunc. - + '%1' is not allowed as hostname. '%1' nol è ametût come non host. - + Only letters, numbers, underscore and hyphen are allowed. A son ametûts dome i numars, lis letaris, lis liniutis bassis e i tratuts. - + Your passwords do not match! Lis passwords no corispuindin! + + + Setup Failed + Configurazion falide + + + + Installation Failed + Instalazion falide + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Configurazion completade + + + + Installation Complete + Instalazion completade + + + + The setup of %1 is complete. + La configurazion di %1 e je completade. + + + + The installation of %1 is complete. + La instalazion di %1 e je completade. + ContextualProcessJob @@ -944,22 +971,43 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Creâ une gnove partizion di %2MiB su %4 (%3) cul filesystem %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Creâ une gnove partizion di <strong>%2MiB</strong> su <strong>%4</strong> (%3) cul filesystem <strong>%1</strong>. - + + Creating new %1 partition on %2. Daûr a creâ une gnove partizion %1 su %2. - + The installer failed to create partition on disk '%1'. Il program di instalazion nol è rivât a creâ la partizion sul disc '%1'. @@ -1286,37 +1334,57 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< FillGlobalStorageJob - + Set partition information Stabilî informazions di partizion - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Instalâ %1 te <strong>gnove</strong> partizion di sisteme %2. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Configurâ la <strong>gnove</strong> partizion %2 cul pont di montaç <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Instalâ %2 te partizion di sisteme %3 <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Configurâ la partizion %3 <strong>%1</strong> cul pont di montaç <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Instalâ %2 te partizion di sisteme %3 <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Instalâ il gjestôr di inviament su <strong>%1</strong>. - + Setting up mount points. Daûr a configurâ i ponts di montaç. @@ -1334,62 +1402,50 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< &Torne invie cumò - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Fat dut.</h1><br/>%1 al è stât configurât sul computer.<br/>Tu puedis cumò scomençâ a doprâ il gnûf sisteme. - + <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>Cuant che cheste casele e ven selezionade, il sisteme al tornarà a inviâsi a colp apene che si fasarà clic su <span style="font-style:italic;">Fat</span> o si sierarà il program di configurazion.</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>Fat dut.</h1><br/>%1 al è stât instalât sul computer.<br/>Tu puedis tornâ a inviâ la machine tal gnûf sisteme o continuâ a doprâ l'ambient Live di %2. - + <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>Cuant che cheste casele e ven selezionade, il sisteme al tornarà a inviâsi a colp apene che si fasarà clic su <span style="font-style:italic;">Fat</span> o si sierarà il program di instalazion.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Configurazion falide</h1><br/>%1 nol è stât configurât sul to computer.<br/>Il messaç di erôr al jere: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalazion falide</h1><br/>%1 nol è stât instalât sul to computer.<br/>Il messaç di erôr al jere: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Finìs + + + FinishedViewStep - - Setup Complete - Configurazion completade - - - - Installation Complete - Instalazion completade - - - - The setup of %1 is complete. - La configurazion di %1 e je completade. - - - - The installation of %1 is complete. - La instalazion di %1 e je completade. + + Finish + Finìs @@ -2258,7 +2314,7 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Erôr no cognossût - + Password is empty Password vueide @@ -2768,14 +2824,14 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< ProcessResult - + There was no output from the command. No si à vût un output dal comant. - + Output: @@ -2784,52 +2840,52 @@ Output: - + External command crashed. Comant esterni colassât. - + Command <i>%1</i> crashed. Comant <i>%1</i> colassât. - + External command failed to start. Il comant esterni nol è rivât a inviâsi. - + Command <i>%1</i> failed to start. Il comant <i>%1</i> nol è rivât a inviâsi. - + Internal error when starting command. Erôr interni tal inviâ il comant. - + Bad parameters for process job call. Parametris sbaliâts par processâ la clamade de operazion. - + External command failed to finish. Il comant esterni nol è stât finît. - + Command <i>%1</i> failed to finish in %2 seconds. Il comant <i>%1</i> nol è stât finît in %2 seconts. - + External command finished with errors. Il comant esterni al è terminât cun erôrs. - + Command <i>%1</i> finished with exit code %2. Il comant <i>%1</i> al è terminât cul codiç di jessude %2. @@ -3648,12 +3704,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Se chest computer al vignarà doprât di plui di une persone, si pues creâ plui accounts dopo vê completade la configurazion.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Se chest computer al vignarà doprât di plui di une persone, si pues creâ plui accounts dopo vê completade la instalazion.</small> @@ -3892,6 +3948,44 @@ Output: Indaûr + + calamares-sidebar + + + Show debug information + Mostre informazions di debug + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts index 5b510c46ce..3235f7d083 100644 --- a/lang/calamares_gl.ts +++ b/lang/calamares_gl.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -110,7 +118,7 @@ - + Debug information Informe de depuración de erros. @@ -118,12 +126,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Instalar @@ -144,7 +152,7 @@ Calamares::JobThread - + Done Feito @@ -258,170 +266,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed Erro na instalación - + Would you like to paste the install log to the web? - + Error Erro - - + + &Yes &Si - - + + &No &Non - + &Close &Pechar - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Fallou a inicialización do Calamares - + %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. Non é posíbel instalar %1. O calamares non foi quen de cargar todos os módulos configurados. Este é un problema relacionado con como esta distribución utiliza o Calamares. - + <br/>The following modules could not be loaded: <br/> Non foi posíbel cargar os módulos seguintes: - + Continue with setup? Continuar coa posta en marcha? - + 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 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> O %1 instalador está a piques de realizar cambios no seu disco para instalar %2.<br/><strong>Estes cambios non poderán desfacerse.</strong> - + &Set up now - + &Install now &Instalar agora - + Go &back Ir &atrás - + &Set up - + &Install &Instalar - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Completouse a instalacion. Peche o instalador - + Cancel setup without changing the system. - + Cancel installation without changing the system. Cancelar a instalación sen cambiar o sistema - + &Next &Seguinte - + &Back &Atrás - + &Done &Feito - + &Cancel &Cancelar - + Cancel setup? - + Cancel installation? Cancelar a instalación? - + 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. Desexa realmente cancelar o proceso actual de instalación? @@ -451,44 +468,15 @@ O instalador pecharase e perderanse todos os cambios. Erro de Python non recuperable - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - Mostrar informes de depuración - - - - &Back - &Atrás - - - - &Next - &Seguinte - - - - &Cancel - &Cancelar - - - + %1 Setup Program - + %1 Installer Instalador de %1 @@ -809,50 +797,90 @@ O instalador pecharase e perderanse todos os cambios. - + Your username is too long. O nome de usuario é demasiado longo. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. O nome do computador é demasiado curto. - + Your hostname is too long. O nome do computador é demasiado longo. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Os contrasinais non coinciden! + + + Setup Failed + + + + + Installation Failed + Erro na instalación + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + Instalacion completa + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + Completouse a instalación de %1 + ContextualProcessJob @@ -943,22 +971,43 @@ O instalador pecharase e perderanse todos os cambios. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. Creando unha nova partición %1 en %2. - + The installer failed to create partition on disk '%1'. O instalador fallou ó crear a partición no disco '%1'. @@ -1285,37 +1334,57 @@ O instalador pecharase e perderanse todos os cambios. FillGlobalStorageJob - + Set partition information Poñela información da partición - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Instalar %1 nunha <strong>nova</strong> partición do sistema %2 - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Configure unha <strong>nova</strong> partición %2 con punto de montaxe <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Instalar %2 na partición do sistema %3 <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Configurala partición %3 <strong>%1</strong> con punto de montaxe <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Instalar %2 na partición do sistema %3 <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Instalar o cargador de arranque en <strong>%1</strong>. - + Setting up mount points. Configuralos puntos de montaxe. @@ -1333,62 +1402,50 @@ O instalador pecharase e perderanse todos os cambios. &Reiniciar agora. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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>Todo feito.</h1><br/>%1 foi instalado na súa computadora.<br/>Agora pode reiniciar no seu novo sistema ou continuar a usalo entorno Live %2. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Fallou a instalación</h1><br/>%1 non se pudo instalar na sua computadora. <br/>A mensaxe de erro foi: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Fin + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - Instalacion completa - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - Completouse a instalación de %1 + + Finish + Fin @@ -2255,7 +2312,7 @@ O instalador pecharase e perderanse todos os cambios. Erro descoñecido - + Password is empty @@ -2765,14 +2822,14 @@ O instalador pecharase e perderanse todos os cambios. ProcessResult - + There was no output from the command. A saída non produciu ningunha saída. - + Output: @@ -2781,52 +2838,52 @@ Saída: - + External command crashed. A orde externa fallou - + Command <i>%1</i> crashed. A orde <i>%1</i> fallou. - + External command failed to start. Non foi posíbel iniciar a orde externa. - + Command <i>%1</i> failed to start. Non foi posíbel iniciar a orde <i>%1</i>. - + Internal error when starting command. Produciuse un erro interno ao iniciar a orde. - + Bad parameters for process job call. Erro nos parámetros ao chamar o traballo - + External command failed to finish. A orde externa non se puido rematar. - + Command <i>%1</i> failed to finish in %2 seconds. A orde <i>%1</i> non se puido rematar en %2s segundos. - + External command finished with errors. A orde externa rematou con erros. - + Command <i>%1</i> finished with exit code %2. A orde <i>%1</i> rematou co código de erro %2. @@ -3642,12 +3699,12 @@ Saída: 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 installation.</small> @@ -3875,6 +3932,44 @@ Saída: + + calamares-sidebar + + + Show debug information + Mostrar informes de depuración + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts index 0ae3da8aa5..20b7b62fb2 100644 --- a/lang/calamares_gu.ts +++ b/lang/calamares_gu.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +151,7 @@ Calamares::JobThread - + Done @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed - + Would you like to paste the install log to the web? - + Error - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -449,44 +466,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - - - - - &Next - - - - - &Cancel - - - - + %1 Setup Program - + %1 Installer @@ -807,50 +795,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -941,22 +969,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1283,37 +1332,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1331,61 +1400,49 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. + + Finish @@ -2253,7 +2310,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2763,65 +2820,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3637,12 +3694,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 installation.</small> @@ -3870,6 +3927,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index 57d654e05d..7171eb1d8e 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ עץ וידג׳טים - + Debug information מידע על ניפוי שגיאות @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up הקמה - + Install התקנה @@ -143,7 +151,7 @@ Calamares::JobThread - + Done סיום @@ -261,171 +269,180 @@ Calamares::ViewManager - + Setup Failed ההתקנה נכשלה - + Installation Failed ההתקנה נכשלה - + Would you like to paste the install log to the web? להדביק את יומן ההתקנה לאינטרנט? - + Error שגיאה - - + + &Yes &כן - - + + &No &לא - + &Close &סגירה - + Install Log Paste URL כתובת הדבקת יומן התקנה - + The upload was unsuccessful. No web-paste was done. ההעלאה לא הצליחה. לא בוצעה הדבקה לאינטרנט. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed הפעלת Calamares נכשלה - + %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. ל־Calamares אין אפשרות לטעון את המודולים המוגדרים. מדובר בתקלה באופן בו ההפצה משתמשת ב־Calamares. - + <br/>The following modules could not be loaded: <br/>לא ניתן לטעון את המודולים הבאים: - + Continue with setup? להמשיך בהתקנה? - + 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> תכנית ההתקנה של %1 עומדת לבצע שינויים בכונן הקשיח שלך לטובת התקנת %2.<br/><strong>לא תהיה לך אפשרות לבטל את השינויים האלה.</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 עומדת לבצע שינויים בכונן שלך לטובת התקנת %2.<br/><strong>לא תהיה אפשרות לבטל את השינויים הללו.</strong> - + &Set up now להת&קין כעת - + &Install now להת&קין כעת - + Go &back ח&זרה - + &Set up להת&קין - + &Install הת&קנה - + Setup is complete. Close the setup program. ההתקנה הושלמה. נא לסגור את תכנית ההתקנה. - + The installation is complete. Close the installer. תהליך ההתקנה הושלם. נא לסגור את תכנית ההתקנה. - + Cancel setup without changing the system. ביטול ההתקנה ללא שינוי המערכת. - + Cancel installation without changing the system. ביטול התקנה ללא ביצוע שינוי במערכת. - + &Next &קדימה - + &Back &אחורה - + &Done &סיום - + &Cancel &ביטול - + Cancel setup? לבטל את ההתקנה? - + 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 install process? The installer will quit and all changes will be lost. האם אכן ברצונך לבטל את תהליך ההתקנה? @@ -455,45 +472,15 @@ The installer will quit and all changes will be lost. שגיאת Python לא ניתנת לאחזור. - - CalamaresUtils - - - Install log posted to: -%1 - יומן ההתקנה פורסם בכתובת: -%1 - - CalamaresWindow - - Show debug information - הצגת מידע ניפוי שגיאות - - - - &Back - ה&קודם - - - - &Next - הב&א - - - - &Cancel - &ביטול - - - + %1 Setup Program תכנית התקנת %1 - + %1 Installer אשף התקנת %1 @@ -814,50 +801,90 @@ The installer will quit and all changes will be lost. <h1>ברוך בואך לתכנית התקנת %1</h1> - + Your username is too long. שם המשתמש ארוך מדי. - + '%1' is not allowed as username. אסור להשתמש ב־‚%1’ כשם משתמש. - + Your username must start with a lowercase letter or underscore. שם המשתמש שלך חייב להתחיל באות קטנה או בקו תחתי. - + Only lowercase letters, numbers, underscore and hyphen are allowed. מותר להשתמש רק באותיות קטנות, ספרות, קווים תחתיים ומינוסים. - + Your hostname is too short. שם המחשב קצר מדי. - + Your hostname is too long. שם המחשב ארוך מדי. - + '%1' is not allowed as hostname. אסור להשתמש ב־‚%1’ כשם מארח. - + Only letters, numbers, underscore and hyphen are allowed. מותר להשתמש רק באותיות, ספרות, קווים תחתיים ומינוסים. - + Your passwords do not match! הסיסמאות לא תואמות! + + + Setup Failed + ההתקנה נכשלה + + + + Installation Failed + ההתקנה נכשלה + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + ההתקנה הושלמה + + + + Installation Complete + ההתקנה הושלמה + + + + The setup of %1 is complete. + ההתקנה של %1 הושלמה. + + + + The installation of %1 is complete. + ההתקנה של %1 הושלמה. + ContextualProcessJob @@ -948,22 +975,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). + + + + Create new %2MiB partition on %4 (%3) with file system %1. יצירת מחיצה חדשה בגודל %2MiB על גבי %4 (%3) עם מערכת הקבצים %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. יצירת מחיצה חדשה בגודל <strong>%2MiB</strong> על גבי <strong>%4</strong> (%3) עם מערכת הקבצים <strong>%1</strong>. - + + Creating new %1 partition on %2. מוגדרת מחיצת %1 חדשה על %2. - + The installer failed to create partition on disk '%1'. אשף ההתקנה נכשל ביצירת מחיצה על הכונן ‚%1’. @@ -1290,37 +1338,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. התקנת %1 על מחיצת מערכת <strong>חדשה</strong> מסוג %2. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - הגדרת מחיצת מערכת <strong>חדשה</strong> מסוג %2 עם נקודת העיגון <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - התקנת %2 על מחיצת מערכת <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>. + + + + + 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>. - התקן מחיצה מסוג %3 <strong>%1</strong> עם נקודת העיגון <strong>%2</strong>. + + Install %2 on %3 system partition <strong>%1</strong>. + התקנת %2 על מחיצת מערכת <strong>%1</strong> מסוג %3. - + Install boot loader on <strong>%1</strong>. התקנת מנהל אתחול מערכת על <strong>%1</strong>. - + Setting up mount points. כעת בהגדרת נקודות העיגון. @@ -1338,62 +1406,50 @@ The installer will quit and all changes will be lost. ה&פעלה מחדש כעת - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>הכול הושלם.</h1><br/>ההתקנה של %1 למחשב שלך הושלמה.<br/>מעתה יתאפשר לך להשתמש במערכת החדשה שלך. - + <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>אם תיבה זו מסומנת, המערכת שלך תופעל מחדש מיידית עם הלחיצה על <span style="font-style:italic;">סיום</span> או עם סגירת תכנית ההתקנה.</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>תהליך ההתקנה הסתיים.</h1><br/>%1 הותקן על המחשב שלך.<br/> כעת ניתן לאתחל את המחשב אל תוך המערכת החדשה שהותקנה, או להמשיך להשתמש בסביבה הנוכחית של %2. - + <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>אם תיבה זו מסומנת, המערכת שלך תופעל מחדש מיידית עם הלחיצה על <span style="font-style:italic;">סיום</span> או עם סגירת תכנית ההתקנה.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>ההתקנה נכשלה</h1><br/>ההתקנה של %1 במחשבך לא הושלמה.<br/>הודעת השגיאה הייתה: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>ההתקנה נכשלה</h1><br/>%1 לא הותקן על מחשבך.<br/> הודעת השגיאה: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish סיום + + + FinishedViewStep - - Setup Complete - ההתקנה הושלמה - - - - Installation Complete - ההתקנה הושלמה - - - - The setup of %1 is complete. - ההתקנה של %1 הושלמה. - - - - The installation of %1 is complete. - ההתקנה של %1 הושלמה. + + Finish + סיום @@ -2280,7 +2336,7 @@ The installer will quit and all changes will be lost. שגיאה לא ידועה - + Password is empty שדה הסיסמה ריק @@ -2790,14 +2846,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. לא היה פלט מהפקודה. - + Output: @@ -2806,52 +2862,52 @@ Output: - + External command crashed. הפקודה החיצונית נכשלה. - + Command <i>%1</i> crashed. הפקודה <i>%1</i> קרסה. - + External command failed to start. הפעלת הפעולה החיצונית נכשלה. - + Command <i>%1</i> failed to start. הפעלת הפקודה <i>%1</i> נכשלה. - + Internal error when starting command. שגיאה פנימית בעת הפעלת פקודה. - + Bad parameters for process job call. פרמטרים לא תקינים עבור קריאת עיבוד פעולה. - + External command failed to finish. סיום הפקודה החיצונית נכשל. - + Command <i>%1</i> failed to finish in %2 seconds. הפקודה <i>%1</i> לא הסתיימה תוך %2 שניות. - + External command finished with errors. הפקודה החיצונית הסתיימה עם שגיאות. - + Command <i>%1</i> finished with exit code %2. הפקודה <i>%1</i> הסתיימה עם קוד היציאה %2. @@ -3670,12 +3726,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>אם מחשב זה מיועד לשימוש לטובת למעלה ממשתמש אחד, ניתן ליצור מגוון חשבונות לאחר ההתקנה.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>אם מחשב זה מיועד לשימוש לטובת למעלה ממשתמש אחד, ניתן ליצור מגוון חשבונות לאחר ההתקנה.</small> @@ -3914,6 +3970,44 @@ Output: חזרה + + calamares-sidebar + + + Show debug information + הצגת מידע ניפוי שגיאות + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts index d37b295211..a91072f871 100644 --- a/lang/calamares_hi.ts +++ b/lang/calamares_hi.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ विजेट ट्री - + Debug information डीबग संबंधी जानकारी @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up सेटअप - + Install इंस्टॉल करें @@ -143,7 +151,7 @@ Calamares::JobThread - + Done पूर्ण @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed सेटअप विफल रहा - + Installation Failed इंस्टॉल विफल रहा। - + Would you like to paste the install log to the web? क्या आप इंस्टॉल प्रक्रिया की लॉग फ़ाइल इंटरनेट पर पेस्ट करना चाहेंगे ? - + Error त्रुटि - - + + &Yes हाँ (&Y) - - + + &No नहीं (&N) - + &Close बंद करें (&C) - + Install Log Paste URL इंस्टॉल प्रक्रिया की लॉग फ़ाइल पेस्ट करें - + The upload was unsuccessful. No web-paste was done. अपलोड विफल रहा। इंटरनेट पर पेस्ट नहीं हो सका। + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Calamares का आरंभीकरण विफल रहा - + %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 इंस्टॉल नहीं किया जा सका। Calamares सभी विन्यस्त मॉड्यूल लोड करने में विफल रहा। यह आपके लिनक्स वितरण द्वारा Calamares के उपयोग से संबंधित एक समस्या है। - + <br/>The following modules could not be loaded: <br/>निम्नलिखित मॉड्यूल लोड नहीं हो सकें : - + Continue with setup? सेटअप करना जारी रखें? - + 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> %2 सेटअप करने हेतु %1 सेटअप प्रोग्राम आपकी डिस्क में बदलाव करने वाला है।<br/><strong>आप इन बदलावों को पूर्ववत नहीं कर पाएंगे।</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> %2 इंस्टॉल करने के लिए %1 इंस्टॉलर आपकी डिस्क में बदलाव करने वाला है।<br/><strong>आप इन बदलावों को पूर्ववत नहीं कर पाएंगे।</strong> - + &Set up now अभी सेटअप करें (&S) - + &Install now अभी इंस्टॉल करें (&I) - + Go &back वापस जाएँ (&b) - + &Set up सेटअप करें (&S) - + &Install इंस्टॉल करें (&I) - + Setup is complete. Close the setup program. सेटअप पूर्ण हुआ। सेटअप प्रोग्राम बंद कर दें। - + The installation is complete. Close the installer. इंस्टॉल पूर्ण हुआ।अब इंस्टॉलर को बंद करें। - + Cancel setup without changing the system. सिस्टम में बदलाव किये बिना सेटअप रद्द करें। - + Cancel installation without changing the system. सिस्टम में बदलाव किये बिना इंस्टॉल रद्द करें। - + &Next आगे (&N) - + &Back वापस (&B) - + &Done हो गया (&D) - + &Cancel रद्द करें (&C) - + Cancel setup? सेटअप रद्द करें? - + 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 install process? The installer will quit and all changes will be lost. क्या आप वाकई वर्तमान इंस्टॉल प्रक्रिया रद्द करना चाहते हैं? @@ -451,45 +468,15 @@ The installer will quit and all changes will be lost. अप्राप्य पाइथन त्रुटि। - - CalamaresUtils - - - Install log posted to: -%1 - इंस्टॉल प्रक्रिया की लॉग फ़ाइल, यहाँ पेस्ट की गई : -%1 - - CalamaresWindow - - Show debug information - डीबग संबंधी जानकारी दिखाएँ - - - - &Back - वापस (&B) - - - - &Next - आगे (&N) - - - - &Cancel - रद्द करें (&C) - - - + %1 Setup Program %1 सेटअप प्रोग्राम - + %1 Installer %1 इंस्टॉलर @@ -810,50 +797,90 @@ The installer will quit and all changes will be lost. <h1>%1 इंस्टॉलर में आपका स्वागत है</h1> - + Your username is too long. उपयोक्ता नाम बहुत लंबा है। - + '%1' is not allowed as username. उपयोक्ता नाम के रूप में '%1' का उपयोग अस्वीकार्य है। - + Your username must start with a lowercase letter or underscore. उपयोक्ता नाम का आरंभ केवल लोअरकेस अक्षर या अंडरस्कोर(-) से ही करें। - + Only lowercase letters, numbers, underscore and hyphen are allowed. केवल लोअरकेस अक्षर, अंक, अंडरस्कोर(_) व हाइफ़न(-) ही स्वीकार्य हैं। - + Your hostname is too short. होस्ट नाम बहुत छोटा है। - + Your hostname is too long. होस्ट नाम बहुत लंबा है। - + '%1' is not allowed as hostname. होस्ट नाम के रूप में '%1' का उपयोग अस्वीकार्य है। - + Only letters, numbers, underscore and hyphen are allowed. केवल अक्षर, अंक, अंडरस्कोर(_) व हाइफ़न(-) ही स्वीकार्य हैं। - + Your passwords do not match! आपके कूटशब्द मेल नहीं खाते! + + + Setup Failed + सेटअप विफल रहा + + + + Installation Failed + इंस्टॉल विफल रहा। + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + सेटअप पूर्ण हुआ + + + + Installation Complete + इंस्टॉल पूर्ण हुआ + + + + The setup of %1 is complete. + %1 का सेटअप पूर्ण हुआ। + + + + The installation of %1 is complete. + %1 का इंस्टॉल पूर्ण हुआ। + ContextualProcessJob @@ -944,22 +971,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). + + + + Create new %2MiB partition on %4 (%3) with file system %1. फ़ाइल सिस्टम %1 के साथ %4 (%3) पर नया %2MiB का विभाजन बनाएँ। - + + 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>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. फ़ाइल सिस्टम <strong>%1</strong> के साथ <strong>%4</strong> (%3) पर नया <strong>%2MiB</strong> का विभाजन बनाएँ। - + + Creating new %1 partition on %2. %2 पर नया %1 विभाजन बनाया जा रहा है। - + The installer failed to create partition on disk '%1'. इंस्टॉलर डिस्क '%1' पर विभाजन बनाने में विफल रहा। @@ -1286,37 +1334,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. <strong>नए</strong> %2 सिस्टम विभाजन पर %1 इंस्टॉल करें। - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - <strong>नया</strong> %2 विभाजन माउंट पॉइंट <strong>%1</strong> के साथ सेट करें। + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - %3 सिस्टम विभाजन <strong>%1</strong> पर %2 इंस्टॉल करें। + + 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>. + + + + + 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>. - %3 विभाजन <strong>%1</strong> माउंट पॉइंट <strong>%2</strong> के साथ सेट करें। + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + %3 सिस्टम विभाजन <strong>%1</strong> पर %2 इंस्टॉल करें। + + + Install boot loader on <strong>%1</strong>. बूट लोडर <strong>%1</strong> पर इंस्टॉल करें। - + Setting up mount points. माउंट पॉइंट सेट किए जा रहे हैं। @@ -1334,62 +1402,50 @@ The installer will quit and all changes will be lost. अभी पुनः आरंभ करें (&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>सब हो गया।</h1><br/>आपके कंप्यूटर पर %1 को सेटअप कर दिया गया है।<br/>अब आप अपने नए सिस्टम का उपयोग कर सकते है। - + <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>यह विकल्प चयनित होने पर आपका सिस्टम तुरंत पुनः आरंभ हो जाएगा जब आप <span style="font-style:italic;">हो गया</span>पर क्लिक करेंगे या सेटअप प्रोग्राम को बंद करेंगे।</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>सब हो गया।</h1><br/>आपके कंप्यूटर पर %1 इंस्टॉल हो चुका है।<br/>अब आप आपने नए सिस्टम को पुनः आरंभ कर सकते है, या फिर %2 लाइव वातावरण उपयोग करना जारी रखें। - + <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>यह विकल्प चयनित होने पर आपका सिस्टम तुरंत पुनः आरंभ हो जाएगा जब आप <span style="font-style:italic;">हो गया</span>पर क्लिक करेंगे या इंस्टॉलर बंद करेंगे।</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>सेटअप विफल रहा</h1><br/>%1 आपके कंप्यूटर पर सेटअप नहीं हुआ।<br/>त्रुटि संदेश : %2। - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>इंस्टॉल विफल रहा</h1><br/>%1 आपके कंप्यूटर पर इंस्टॉल नहीं हुआ।<br/>त्रुटि संदेश : %2। - FinishedViewStep + FinishedQmlViewStep - + Finish समाप्त करें + + + FinishedViewStep - - Setup Complete - सेटअप पूर्ण हुआ - - - - Installation Complete - इंस्टॉल पूर्ण हुआ - - - - The setup of %1 is complete. - %1 का सेटअप पूर्ण हुआ। - - - - The installation of %1 is complete. - %1 का इंस्टॉल पूर्ण हुआ। + + Finish + समाप्त करें @@ -2258,7 +2314,7 @@ The installer will quit and all changes will be lost. अज्ञात त्रुटि - + Password is empty कूटशब्द रिक्त है @@ -2768,14 +2824,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. कमांड से कोई आउटपुट नहीं मिला। - + Output: @@ -2784,52 +2840,52 @@ Output: - + External command crashed. बाह्य कमांड क्रैश हो गई। - + Command <i>%1</i> crashed. कमांड <i>%1</i> क्रैश हो गई। - + External command failed to start. बाह्य​ कमांड शुरू होने में विफल। - + Command <i>%1</i> failed to start. कमांड <i>%1</i> शुरू होने में विफल। - + Internal error when starting command. कमांड शुरू करते समय आंतरिक त्रुटि। - + Bad parameters for process job call. प्रक्रिया कार्य कॉल के लिए गलत मापदंड। - + External command failed to finish. बाहरी कमांड समाप्त करने में विफल। - + Command <i>%1</i> failed to finish in %2 seconds. कमांड <i>%1</i> %2 सेकंड में समाप्त होने में विफल। - + External command finished with errors. बाहरी कमांड त्रुटि के साथ समाप्त। - + Command <i>%1</i> finished with exit code %2. कमांड <i>%1</i> exit कोड %2 के साथ समाप्त। @@ -3648,12 +3704,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>यदि एक से अधिक व्यक्ति इस कंप्यूटर का उपयोग करेंगे, तो आप सेटअप के उपरांत एकाधिक अकाउंट बना सकते हैं।</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>यदि एक से अधिक व्यक्ति इस कंप्यूटर का उपयोग करेंगे, तो आप इंस्टॉल के उपरांत एकाधिक अकाउंट बना सकते हैं।</small> @@ -3892,6 +3948,44 @@ Output: वापस + + calamares-sidebar + + + Show debug information + डीबग संबंधी जानकारी दिखाएँ + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts index 24d19128db..845d382ed8 100644 --- a/lang/calamares_hr.ts +++ b/lang/calamares_hr.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Stablo widgeta - + Debug information Debug informacija @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Postaviti - + Install Instaliraj @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Gotovo @@ -259,171 +267,180 @@ Calamares::ViewManager - + Setup Failed Instalacija nije uspjela - + Installation Failed Instalacija nije uspjela - + Would you like to paste the install log to the web? Želite li objaviti dnevnik instaliranja na web? - + Error Greška - - + + &Yes &Da - - + + &No &Ne - + &Close &Zatvori - + Install Log Paste URL URL za objavu dnevnika instaliranja - + The upload was unsuccessful. No web-paste was done. Objava dnevnika instaliranja na web nije uspjela. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Inicijalizacija Calamares-a nije uspjela - + %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 se ne može se instalirati. Calamares nije mogao učitati sve konfigurirane module. Ovo je problem s načinom na koji se Calamares koristi u distribuciji. - + <br/>The following modules could not be loaded: <br/>Sljedeći moduli se nisu mogli učitati: - + Continue with setup? Nastaviti s postavljanjem? - + Continue with installation? Nastaviti sa instalacijom? - + 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> Instalacijski program %1 će izvršiti promjene na vašem disku kako bi postavio %2. <br/><strong>Ne možete poništiti te promjene.</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 instalacijski program će napraviti promjene na disku kako bi instalirao %2.<br/><strong>Nećete moći vratiti te promjene.</strong> - + &Set up now &Postaviti odmah - + &Install now &Instaliraj sada - + Go &back Idi &natrag - + &Set up &Postaviti - + &Install &Instaliraj - + Setup is complete. Close the setup program. Instalacija je završena. Zatvorite instalacijski program. - + The installation is complete. Close the installer. Instalacija je završena. Zatvorite instalacijski program. - + Cancel setup without changing the system. Odustanite od instalacije bez promjena na sustavu. - + Cancel installation without changing the system. Odustanite od instalacije bez promjena na sustavu. - + &Next &Sljedeće - + &Back &Natrag - + &Done &Gotovo - + &Cancel &Odustani - + Cancel setup? Prekinuti instalaciju? - + Cancel installation? Prekinuti instalaciju? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Stvarno želite prekinuti instalacijski proces? Instalacijski program će izaći i sve promjene će biti izgubljene. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Stvarno želite prekinuti instalacijski proces? @@ -453,45 +470,15 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Nedohvatljiva Python greška. - - CalamaresUtils - - - Install log posted to: -%1 - Dnevnik instaliranja je objavljen na: -%1 - - CalamaresWindow - - Show debug information - Prikaži debug informaciju - - - - &Back - &Natrag - - - - &Next - &Sljedeće - - - - &Cancel - &Odustani - - - + %1 Setup Program %1 instalacijski program - + %1 Installer %1 Instalacijski program @@ -812,50 +799,90 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.<h1>Dobrodošli u %1 instalacijski program</h1> - + Your username is too long. Vaše korisničko ime je predugačko. - + '%1' is not allowed as username. '%1' nije dopušteno kao korisničko ime. - + Your username must start with a lowercase letter or underscore. Vaše korisničko ime mora započeti malim slovom ili podvlakom. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Dopuštena su samo mala slova, brojevi, podvlake i crtice. - + Your hostname is too short. Ime računala je kratko. - + Your hostname is too long. Ime računala je predugačko. - + '%1' is not allowed as hostname. '%1' nije dopušteno kao ime računala. - + Only letters, numbers, underscore and hyphen are allowed. Dopuštena su samo slova, brojevi, podvlake i crtice. - + Your passwords do not match! Lozinke se ne podudaraju! + + + Setup Failed + Instalacija nije uspjela + + + + Installation Failed + Instalacija nije uspjela + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Instalacija je završena + + + + Installation Complete + Instalacija je završena + + + + The setup of %1 is complete. + Instalacija %1 je završena. + + + + The installation of %1 is complete. + Instalacija %1 je završena. + ContextualProcessJob @@ -946,22 +973,43 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Stvori novu %2MB particiju na %4 (%3) s datotečnim sustavom %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Stvori novu <strong>%2MB</strong> particiju na <strong>%4</strong> (%3) s datotečnim sustavom <strong>%1</strong>. - + + Creating new %1 partition on %2. Stvaram novu %1 particiju na %2. - + The installer failed to create partition on disk '%1'. Instalacijski program nije uspio stvoriti particiju na disku '%1'. @@ -1288,37 +1336,57 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. FillGlobalStorageJob - + Set partition information Postavi informacije o particiji - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Instaliraj %1 na <strong>novu</strong> %2 sistemsku particiju. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Postavi <strong>novu</strong> %2 particiju s točkom montiranja <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Instaliraj %2 na %3 sistemsku particiju <strong>%1</strong>. + + 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>. + + + + + 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>. - Postavi %3 particiju <strong>%1</strong> s točkom montiranja <strong>%2</strong>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + Instaliraj %2 na %3 sistemsku particiju <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Instaliraj boot učitavač na <strong>%1</strong>. - + Setting up mount points. Postavljam točke montiranja. @@ -1336,62 +1404,50 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.&Ponovno pokreni sada - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Gotovo.</h1><br/>%1 je instaliran na vaše računalo.<br/>Sada možete koristiti vaš novi sustav. - + <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>Kada je odabrana ova opcija, vaš sustav će se ponovno pokrenuti kada kliknete na <span style="font-style:italic;">Gotovo</span> ili zatvorite instalacijski program.</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>Gotovo.</h1><br/>%1 je instaliran na vaše računalo.<br/>Sada možete ponovno pokrenuti računalo ili nastaviti sa korištenjem %2 live okruženja. - + <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>Kada je odabrana ova opcija, vaš sustav će se ponovno pokrenuti kada kliknete na <span style="font-style:italic;">Gotovo</span> ili zatvorite instalacijski program.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Instalacija nije uspijela</h1><br/>%1 nije instaliran na vaše računalo.<br/>Greška: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalacija nije uspijela</h1><br/>%1 nije instaliran na vaše računalo.<br/>Greška: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Završi + + + FinishedViewStep - - Setup Complete - Instalacija je završena - - - - Installation Complete - Instalacija je završena - - - - The setup of %1 is complete. - Instalacija %1 je završena. - - - - The installation of %1 is complete. - Instalacija %1 je završena. + + Finish + Završi @@ -2269,7 +2325,7 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje. Nepoznata greška - + Password is empty Lozinka je prazna @@ -2779,14 +2835,14 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje. ProcessResult - + There was no output from the command. Nema izlazne informacije od naredbe. - + Output: @@ -2795,52 +2851,52 @@ Izlaz: - + External command crashed. Vanjska naredba je prekinula s radom. - + Command <i>%1</i> crashed. Naredba <i>%1</i> je prekinula s radom. - + External command failed to start. Vanjska naredba nije uspješno pokrenuta. - + Command <i>%1</i> failed to start. Naredba <i>%1</i> nije uspješno pokrenuta. - + Internal error when starting command. Unutrašnja greška pri pokretanju naredbe. - + Bad parameters for process job call. Krivi parametri za proces poziva posla. - + External command failed to finish. Vanjska naredba se nije uspjela izvršiti. - + Command <i>%1</i> failed to finish in %2 seconds. Naredba <i>%1</i> nije uspjela završiti za %2 sekundi. - + External command finished with errors. Vanjska naredba je završila sa pogreškama. - + Command <i>%1</i> finished with exit code %2. Naredba <i>%1</i> je završila sa izlaznim kodom %2. @@ -3659,12 +3715,12 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Ako će više osoba koristiti ovo računalo, možete postaviti više korisničkih računa poslije instalacije.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Ako će više osoba koristiti ovo računalo, možete postaviti više korisničkih računa poslije instalacije.</small> @@ -3903,6 +3959,44 @@ Liberating Software. Natrag + + calamares-sidebar + + + Show debug information + Prikaži debug informaciju + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts index 0ec4648e1c..0b2e9dab22 100644 --- a/lang/calamares_hu.ts +++ b/lang/calamares_hu.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Modul- fa - + Debug information Hibakeresési információk @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Összeállítás - + Install Telepít @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Kész @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Telepítési hiba - + Installation Failed Telepítés nem sikerült - + Would you like to paste the install log to the web? - + Error Hiba - - + + &Yes &Igen - - + + &No &Nem - + &Close &Bezár - + Install Log Paste URL Telepítési napló beillesztési URL-je. - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed A Calamares előkészítése meghiúsult - + %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. A(z) %1 nem telepíthető. A Calamares nem tudta betölteni a konfigurált modulokat. Ez a probléma abból fakad, ahogy a disztribúció a Calamarest használja. - + <br/>The following modules could not be loaded: <br/>A következő modulok nem tölthetőek be: - + Continue with setup? Folytatod a telepítéssel? - + Continue with installation? Folytatja a telepítést? - + 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> A %1 telepítő változtatásokat fog végrehajtani a lemezen a %2 telepítéséhez. <br/><strong>Ezután már nem tudja visszavonni a változtatásokat.</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> A %1 telepítő változtatásokat fog elvégezni, hogy telepítse a következőt: %2.<br/><strong>A változtatások visszavonhatatlanok lesznek.</strong> - + &Set up now &Telepítés most - + &Install now &Telepítés most - + Go &back Menj &vissza - + &Set up &Telepítés - + &Install &Telepítés - + Setup is complete. Close the setup program. Telepítés sikerült. Zárja be a telepítőt. - + The installation is complete. Close the installer. A telepítés befejeződött, Bezárhatod a telepítőt. - + Cancel setup without changing the system. Telepítés megszakítása a rendszer módosítása nélkül. - + Cancel installation without changing the system. Kilépés a telepítőből a rendszer megváltoztatása nélkül. - + &Next &Következő - + &Back &Vissza - + &Done &Befejez - + &Cancel &Mégse - + Cancel setup? Megszakítja a telepítést? - + Cancel installation? Abbahagyod a telepítést? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Valóban megszakítod a telepítési eljárást? A telepítő ki fog lépni és minden változtatás elveszik. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Biztos abba szeretnéd hagyni a telepítést? @@ -451,44 +468,15 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. Összehasonlíthatatlan Python hiba. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - Hibakeresési információk mutatása - - - - &Back - &Vissza - - - - &Next - &Következő - - - - &Cancel - &Mégse - - - + %1 Setup Program %1 Program telepítése - + %1 Installer %1 Telepítő @@ -810,50 +798,90 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> - + Your username is too long. A felhasználónév túl hosszú. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. A hálózati név túl rövid. - + Your hostname is too long. A hálózati név túl hosszú. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! A két jelszó nem egyezik! + + + Setup Failed + Telepítési hiba + + + + Installation Failed + Telepítés nem sikerült + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Telepítés Sikerült + + + + Installation Complete + A telepítés befejeződött. + + + + The setup of %1 is complete. + A telepítésből %1 van kész. + + + + The installation of %1 is complete. + A %1 telepítése elkészült. + ContextualProcessJob @@ -944,22 +972,43 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Új partíció létrehozása %2MiB partíción a %4 (%3) %1 fájlrendszerrel - + + 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>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Új <strong>%2MiB </strong>partíció létrehozása itt <strong>%4</strong> (%3) fájlrendszer típusa <strong>%1</strong>. - + + Creating new %1 partition on %2. Új %1 partíció létrehozása a következőn: %2. - + The installer failed to create partition on disk '%1'. A telepítő nem tudta létrehozni a partíciót ezen a lemezen '%1'. @@ -1286,37 +1335,57 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> FillGlobalStorageJob - + Set partition information Partíció információk beállítása - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. %1 telepítése az <strong>új</strong> %2 partícióra. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - <strong>Új</strong> %2 partíció beállítása <strong>%1</strong> csatolási ponttal. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - %2 telepítése %3 <strong>%1</strong> rendszer partícióra. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - %3 partíció beállítása <strong>%1</strong> <strong>%2</strong> csatolási ponttal. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + %2 telepítése %3 <strong>%1</strong> rendszer partícióra. + + + Install boot loader on <strong>%1</strong>. Rendszerbetöltő telepítése ide <strong>%1</strong>. - + Setting up mount points. Csatlakozási pontok létrehozása @@ -1334,62 +1403,50 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Új&raindítás most - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Minden kész.</h1><br/>%1 telepítve lett a számítógépére. <br/>Most már használhatja az új rendszert. - + <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>Ezt bejelölve a rendszer újra fog indulni amikor a <span style="font-style:italic;">Kész</span> gombra kattint vagy bezárja a telepítőt.</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>Sikeres művelet.</h1><br/>%1 telepítve lett a számítógépére.<br/>Újraindítás után folytathatod az %2 éles környezetben. - + <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>Ezt bejelölve a rendszer újra fog indulni amikor a <span style="font-style:italic;">Kész</span>gombra kattint vagy bezárja a telepítőt.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Telepítés nem sikerült</h1><br/>%1 nem lett telepítve a számítógépére. <br/>A hibaüzenet: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>A telepítés hibába ütközött.</h1><br/>%1 nem lett telepítve a számítógépre.<br/>A hibaüzenet: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Befejezés + + + FinishedViewStep - - Setup Complete - Telepítés Sikerült - - - - Installation Complete - A telepítés befejeződött. - - - - The setup of %1 is complete. - A telepítésből %1 van kész. - - - - The installation of %1 is complete. - A %1 telepítése elkészült. + + Finish + Befejezés @@ -2256,7 +2313,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Ismeretlen hiba - + Password is empty @@ -2766,14 +2823,14 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> ProcessResult - + There was no output from the command. A parancsnak nem volt kimenete. - + Output: @@ -2782,52 +2839,52 @@ Kimenet: - + External command crashed. Külső parancs összeomlott. - + Command <i>%1</i> crashed. Parancs <i>%1</i> összeomlott. - + External command failed to start. A külső parancsot nem sikerült elindítani. - + Command <i>%1</i> failed to start. A(z) <i>%1</i> parancsot nem sikerült elindítani. - + Internal error when starting command. Belső hiba a parancs végrehajtásakor. - + Bad parameters for process job call. Hibás paraméterek a folyamat hívásához. - + External command failed to finish. Külső parancs nem fejeződött be. - + Command <i>%1</i> failed to finish in %2 seconds. A(z) <i>%1</i> parancsot nem sikerült befejezni %2 másodperc alatt. - + External command finished with errors. A külső parancs hibával fejeződött be. - + Command <i>%1</i> finished with exit code %2. A(z) <i>%1</i> parancs hibakóddal lépett ki: %2. @@ -3645,12 +3702,12 @@ Calamares hiba %1. UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Ha egynél több személy használja a számítógépet akkor létrehozhat több felhasználói fiókot telepítés után.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Ha egynél több személy használja a számítógépet akkor létrehozhat több felhasználói fiókot telepítés után.</small> @@ -3878,6 +3935,44 @@ Calamares hiba %1. + + calamares-sidebar + + + Show debug information + Hibakeresési információk mutatása + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index b790ef61bf..160ba1b68b 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information Informasi debug @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Instal @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Selesai @@ -255,170 +263,179 @@ Calamares::ViewManager - + Setup Failed Pengaturan Gagal - + Installation Failed Instalasi Gagal - + Would you like to paste the install log to the web? Maukah anda untuk menempelkan log instalasi ke situs? - + Error Kesalahan - - + + &Yes &Ya - - + + &No &Tidak - + &Close &Tutup - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Inisialisasi Calamares Gagal - + %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 tidak dapat terinstal. Calamares tidak dapat memuat seluruh modul konfigurasi. Terdapat masalah dengan Calamares karena sedang digunakan oleh distribusi. - + <br/>The following modules could not be loaded: <br/>Modul berikut tidak dapat dimuat. - + Continue with setup? Lanjutkan dengan setelan ini? - + Continue with installation? Lanjutkan instalasi? - + 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> Installer %1 akan membuat perubahan ke disk Anda untuk memasang %2.<br/><strong>Anda tidak dapat membatalkan perubahan tersebut.</strong> - + &Set up now - + &Install now &Instal sekarang - + Go &back &Kembali - + &Set up - + &Install &Instal - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Instalasi sudah lengkap. Tutup installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Batalkan instalasi tanpa mengubah sistem yang ada. - + &Next &Berikutnya - + &Back &Kembali - + &Done &Kelar - + &Cancel &Batal - + Cancel setup? - + Cancel installation? Batalkan instalasi? - + 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. Apakah Anda benar-benar ingin membatalkan proses instalasi ini? @@ -448,45 +465,15 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Tidak dapat mengambil pesan kesalahan Python. - - CalamaresUtils - - - Install log posted to: -%1 - Log instalasi terunggah ke: -%1 - - CalamaresWindow - - Show debug information - Tampilkan informasi debug - - - - &Back - &Kembali - - - - &Next - &Berikutnya - - - - &Cancel - &Batal - - - + %1 Setup Program - + %1 Installer Installer %1 @@ -808,50 +795,90 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. - + Your username is too long. Nama pengguna Anda terlalu panjang. - + '%1' is not allowed as username. '%1' tidak diperbolehkan sebagai nama pengguna. - + Your username must start with a lowercase letter or underscore. Nama penggunamu harus diawali dengan huruf kecil atau garis bawah. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Hostname Anda terlalu pendek. - + Your hostname is too long. Hostname Anda terlalu panjang. - + '%1' is not allowed as hostname. '%1' tidak diperbolehkan sebagai hostname. - + Only letters, numbers, underscore and hyphen are allowed. Hanya huruf, angka, garis bawah, dan tanda penghubung yang diperbolehkan. - + Your passwords do not match! Sandi Anda tidak sama! + + + Setup Failed + Pengaturan Gagal + + + + Installation Failed + Instalasi Gagal + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + Instalasi Lengkap + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + Instalasi %1 telah lengkap. + ContextualProcessJob @@ -942,22 +969,43 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. Membuat partisi %1 baru di %2. - + The installer failed to create partition on disk '%1'. Installer gagal untuk membuat partisi di disk '%1'. @@ -1284,37 +1332,57 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. FillGlobalStorageJob - + Set partition information Tetapkan informasi partisi - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Instal %1 pada partisi sistem %2 <strong>baru</strong> - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Setel partisi %2 <strong>baru</strong> dengan tempat kait <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Instal %2 pada sistem partisi %3 <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Setel partisi %3 <strong>%1</strong> dengan tempat kait <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Instal %2 pada sistem partisi %3 <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Instal boot loader di <strong>%1</strong>. - + Setting up mount points. Menyetel tempat kait. @@ -1332,62 +1400,50 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Mulai ulang seka&rang - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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>Selesai.</h1><br>%1 sudah terinstal di komputer Anda.<br/>Anda dapat memulai ulang ke sistem baru atau lanjut menggunakan lingkungan Live %2. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalasi Gagal</h1><br/>%1 tidak bisa diinstal pada komputermu.<br/>Pesan galatnya adalah: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Selesai + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - Instalasi Lengkap - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - Instalasi %1 telah lengkap. + + Finish + Selesai @@ -2245,7 +2301,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Ada kesalahan yang tidak diketahui - + Password is empty @@ -2755,14 +2811,14 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. ProcessResult - + There was no output from the command. Tidak ada keluaran dari perintah. - + Output: @@ -2771,52 +2827,52 @@ Keluaran: - + External command crashed. Perintah eksternal rusak. - + Command <i>%1</i> crashed. Perintah <i>%1</i> mogok. - + External command failed to start. Perintah eksternal gagal dimulai - + Command <i>%1</i> failed to start. Perintah <i>%1</i> gagal dimulai. - + Internal error when starting command. Terjadi kesalahan internal saat menjalankan perintah. - + Bad parameters for process job call. Parameter buruk untuk memproses panggilan tugas, - + External command failed to finish. Perintah eksternal gagal diselesaikan . - + Command <i>%1</i> failed to finish in %2 seconds. Perintah <i>%1</i> gagal untuk diselesaikan dalam %2 detik. - + External command finished with errors. Perintah eksternal diselesaikan dengan kesalahan . - + Command <i>%1</i> finished with exit code %2. Perintah <i>%1</i> diselesaikan dengan kode keluar %2. @@ -3634,12 +3690,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. 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 installation.</small> @@ -3878,6 +3934,44 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. + + calamares-sidebar + + + Show debug information + Tampilkan informasi debug + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_id_ID.ts b/lang/calamares_id_ID.ts new file mode 100644 index 0000000000..7f10fa7d05 --- /dev/null +++ b/lang/calamares_id_ID.ts @@ -0,0 +1,4217 @@ + + + + + AutoMountManagementJob + + + Manage auto-mount settings + + + + + 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. + + + + + 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. + + + + + BootLoaderModel + + + Master Boot Record of %1 + + + + + Boot Partition + + + + + System Partition + + + + + Do not install a boot loader + + + + + %1 (%2) + + + + + Calamares::BlankViewStep + + + Blank Page + + + + + Calamares::DebugWindow + + + Form + + + + + GlobalStorage + + + + + JobQueue + + + + + Modules + + + + + Type: + + + + + + none + + + + + Interface: + + + + + Tools + + + + + Reload Stylesheet + + + + + Widget Tree + + + + + Debug information + + + + + Calamares::ExecutionViewStep + + + Set up + + + + + Install + + + + + Calamares::FailJob + + + Job failed (%1) + + + + + Programmed job failure was explicitly requested. + + + + + Calamares::JobThread + + + Done + + + + + Calamares::NamedJob + + + Example job (%1) + + + + + Calamares::ProcessJob + + + Run command '%1' in target system. + + + + + Run command '%1'. + + + + + Running command %1 %2 + + + + + Calamares::PythonJob + + + Running %1 operation. + + + + + Bad working directory path + + + + + Working directory %1 for python job %2 is not readable. + + + + + Bad main script file + + + + + Main script file %1 for python job %2 is not readable. + + + + + Boost.Python error in job "%1". + + + + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + + + Calamares::RequirementsChecker + + + Requirements checking for module <i>%1</i> is complete. + + + + + Waiting for %n module(s). + + + + + + + (%n second(s)) + + + + + + + System-requirements checking is complete. + + + + + Calamares::ViewManager + + + Setup Failed + + + + + Installation Failed + + + + + Would you like to paste the install log to the web? + + + + + Error + + + + + + &Yes + + + + + + &No + + + + + &Close + + + + + Install Log Paste URL + + + + + The upload was unsuccessful. No web-paste was done. + + + + + Install log posted to + +%1 + +Link copied to clipboard + + + + + 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. + + + + + <br/>The following modules could not be loaded: + + + + + Continue with setup? + + + + + 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 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 + + + + + &Install now + + + + + Go &back + + + + + &Set up + + + + + &Install + + + + + Setup is complete. Close the setup program. + + + + + The installation is complete. Close the installer. + + + + + Cancel setup without changing the system. + + + + + Cancel installation without changing the system. + + + + + &Next + + + + + &Back + + + + + &Done + + + + + &Cancel + + + + + Cancel setup? + + + + + 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 install process? +The installer will quit and all changes will be lost. + + + + + CalamaresPython::Helper + + + Unknown exception type + + + + + unparseable Python error + + + + + unparseable Python traceback + + + + + Unfetchable Python error. + + + + + CalamaresWindow + + + %1 Setup Program + + + + + %1 Installer + + + + + CheckerContainer + + + Gathering system information... + + + + + ChoicePage + + + Form + + + + + Select storage de&vice: + + + + + + + + Current: + + + + + After: + + + + + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. + + + + + Reuse %1 as home partition for %2. + + + + + <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. + + + + + Boot loader location: + + + + + <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. + + + + + The EFI system partition at %1 will be used for starting %2. + + + + + 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. + + + + + + + + <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>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 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 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 is a part of an <strong>inactive RAID</strong> device. + + + + + No Swap + + + + + Reuse Swap + + + + + Swap (no Hibernate) + + + + + Swap (with Hibernate) + + + + + Swap to file + + + + + ClearMountsJob + + + Clear mounts for partitioning operations on %1 + + + + + Clearing mounts for partitioning operations on %1. + + + + + Cleared all mounts for %1 + + + + + ClearTempMountsJob + + + Clear all temporary mounts. + + + + + Clearing all temporary mounts. + + + + + Cannot get list of temporary mounts. + + + + + Cleared all temporary mounts. + + + + + CommandList + + + + Could not run command. + + + + + The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. + + + + + The command needs to know the user's name, but no username is defined. + + + + + Config + + + Set keyboard model to %1.<br/> + + + + + Set keyboard layout to %1/%2. + + + + + Set timezone to %1/%2. + + + + + The system language will be set to %1. + + + + + The numbers and dates locale will be set to %1. + + + + + Network Installation. (Disabled: Incorrect configuration) + + + + + Network Installation. (Disabled: Received invalid groups data) + + + + + Network Installation. (Disabled: internal error) + + + + + 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. <a href="#details">Details...</a> + + + + + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> + + + + + 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 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 %1 setup</h1> + + + + + <h1>Welcome to the Calamares installer for %1</h1> + + + + + <h1>Welcome to the %1 installer</h1> + + + + + Your username is too long. + + + + + '%1' is not allowed as username. + + + + + Your username must start with a lowercase letter or underscore. + + + + + Only lowercase letters, numbers, underscore and hyphen are allowed. + + + + + Your hostname is too short. + + + + + Your hostname is too long. + + + + + '%1' is not allowed as hostname. + + + + + Only letters, numbers, underscore and hyphen are allowed. + + + + + Your passwords do not match! + + + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + + + + ContextualProcessJob + + + Contextual Processes Job + + + + + CreatePartitionDialog + + + Create a Partition + + + + + Si&ze: + + + + + MiB + + + + + Partition &Type: + + + + + &Primary + + + + + E&xtended + + + + + Fi&le System: + + + + + LVM LV name + + + + + &Mount Point: + + + + + Flags: + + + + + En&crypt + + + + + Logical + + + + + Primary + + + + + GPT + + + + + Mountpoint already in use. Please select another one. + + + + + CreatePartitionJob + + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + + 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). + + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. + + + + + + Creating new %1 partition on %2. + + + + + The installer failed to create partition on disk '%1'. + + + + + CreatePartitionTableDialog + + + Create Partition Table + + + + + Creating a new partition table will delete all existing data on the disk. + + + + + What kind of partition table do you want to create? + + + + + Master Boot Record (MBR) + + + + + GUID Partition Table (GPT) + + + + + CreatePartitionTableJob + + + Create new %1 partition table on %2. + + + + + Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). + + + + + Creating new %1 partition table on %2. + + + + + The installer failed to create a partition table on %1. + + + + + CreateUserJob + + + Create user %1 + + + + + Create user <strong>%1</strong>. + + + + + Preserving home directory + + + + + + Creating user %1 + + + + + Configuring user %1 + + + + + Setting file permissions + + + + + CreateVolumeGroupDialog + + + Create Volume Group + + + + + CreateVolumeGroupJob + + + Create new volume group named %1. + + + + + Create new volume group named <strong>%1</strong>. + + + + + Creating new volume group named %1. + + + + + The installer failed to create a volume group named '%1'. + + + + + DeactivateVolumeGroupJob + + + + Deactivate volume group named %1. + + + + + Deactivate volume group named <strong>%1</strong>. + + + + + The installer failed to deactivate a volume group named %1. + + + + + DeletePartitionJob + + + Delete partition %1. + + + + + Delete partition <strong>%1</strong>. + + + + + Deleting partition %1. + + + + + The installer failed to delete partition %1. + + + + + DeviceInfoWidget + + + 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 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 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. + + + + + DeviceModel + + + %1 - %2 (%3) + device[name] - size[number] (device-node[name]) + + + + + %1 - (%2) + device[name] - (device-node[name]) + + + + + DracutLuksCfgJob + + + Write LUKS configuration for Dracut to %1 + + + + + Skip writing LUKS configuration for Dracut: "/" partition is not encrypted + + + + + Failed to open %1 + + + + + DummyCppJob + + + Dummy C++ Job + + + + + EditExistingPartitionDialog + + + Edit Existing Partition + + + + + Content: + + + + + &Keep + + + + + Format + + + + + Warning: Formatting the partition will erase all existing data. + + + + + &Mount Point: + + + + + Si&ze: + + + + + MiB + + + + + Fi&le System: + + + + + Flags: + + + + + Mountpoint already in use. Please select another one. + + + + + EncryptWidget + + + Form + + + + + En&crypt system + + + + + Passphrase + + + + + Confirm passphrase + + + + + + Please enter the same passphrase in both boxes. + + + + + FillGlobalStorageJob + + + 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. + + + + + 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. + + + + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + + + + + Install boot loader on <strong>%1</strong>. + + + + + Setting up mount points. + + + + + FinishedPage + + + Form + + + + + &Restart now + + + + + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. + + + + + <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> + + + + + <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. + + + + + <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> + + + + + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. + + + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + + + + FinishedQmlViewStep + + + Finish + + + + + FinishedViewStep + + + Finish + + + + + FormatPartitionJob + + + 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>. + + + + + Formatting partition %1 with file system %2. + + + + + The installer failed to format partition %1 on disk '%2'. + + + + + GeneralRequirements + + + has at least %1 GiB available drive space + + + + + There is not enough drive space. At least %1 GiB is required. + + + + + has at least %1 GiB working memory + + + + + The system does not have enough working memory. At least %1 GiB is required. + + + + + is plugged in to a power source + + + + + The system is not plugged in to a power source. + + + + + is connected to the Internet + + + + + The system is not connected to the Internet. + + + + + is running the installer as an administrator (root) + + + + + The setup program is not running with administrator rights. + + + + + The installer is not running with administrator rights. + + + + + 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 installer. + + + + + HostInfoJob + + + Collecting information about your machine. + + + + + IDJob + + + + + + OEM Batch Identifier + + + + + Could not create directories <code>%1</code>. + + + + + Could not open file <code>%1</code>. + + + + + Could not write to file <code>%1</code>. + + + + + InitcpioJob + + + Creating initramfs with mkinitcpio. + + + + + InitramfsJob + + + Creating initramfs. + + + + + InteractiveTerminalPage + + + Konsole not installed + + + + + Please install KDE Konsole and try again! + + + + + Executing script: &nbsp;<code>%1</code> + + + + + InteractiveTerminalViewStep + + + Script + + + + + KeyboardQmlViewStep + + + Keyboard + + + + + KeyboardViewStep + + + Keyboard + + + + + LCLocaleDialog + + + System locale setting + + + + + 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>. + + + + + &Cancel + + + + + &OK + + + + + LicensePage + + + Form + + + + + <h1>License Agreement</h1> + + + + + I accept the terms and conditions above. + + + + + Please review the End User License Agreements (EULAs). + + + + + 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. + + + + + 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. + + + + + LicenseViewStep + + + License + + + + + LicenseWidget + + + URL: %1 + + + + + <strong>%1 driver</strong><br/>by %2 + %1 is an untranslatable product name, example: Creative Audigy driver + + + + + <strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font> + %1 is usually a vendor name, example: Nvidia graphics driver + + + + + <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1 codec</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1 package</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1</strong><br/><font color="Grey">by %2</font> + + + + + File: %1 + + + + + Hide license text + + + + + Show the license text + + + + + Open license agreement in browser. + + + + + LocalePage + + + Region: + + + + + Zone: + + + + + + &Change... + + + + + LocaleQmlViewStep + + + Location + + + + + LocaleViewStep + + + Location + + + + + LuksBootKeyFileJob + + + Configuring LUKS key file. + + + + + + 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 + + + Generate machine-id. + + + + + Configuration Error + + + + + No root mount point is set for MachineId. + + + + + Map + + + Timezone: %1 + + + + + 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. + + + + + NetInstallViewStep + + + + Package selection + + + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + Communication + + + + + Development + + + + + Office + + + + + Multimedia + + + + + Internet + + + + + Theming + + + + + Gaming + + + + + Utilities + + + + + NotesQmlViewStep + + + Notes + + + + + OEMPage + + + Ba&tch: + + + + + <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> + + + + + <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html> + + + + + OEMViewStep + + + OEM Configuration + + + + + Set the OEM Batch Identifier to <code>%1</code>. + + + + + Offline + + + Select your preferred Region, or use the default one based on your current location. + + + + + + + Timezone: %1 + + + + + Select your preferred Zone within your Region. + + + + + Zones + + + + + You can fine-tune Language and Locale settings below. + + + + + PWQ + + + Password is too short + + + + + Password is too long + + + + + Password is too weak + + + + + Memory allocation error when setting '%1' + + + + + Memory allocation error + + + + + The password is the same as the old one + + + + + The password is a palindrome + + + + + The password differs with case changes only + + + + + The password is too similar to the old one + + + + + 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 forbidden words in some form + + + + + The password contains too few digits + + + + + The password contains too few uppercase letters + + + + + The password contains fewer than %n lowercase letters + + + + + + + The password contains too few lowercase letters + + + + + The password contains too few non-alphanumeric characters + + + + + The password is too short + + + + + The password does not contain enough character classes + + + + + The password contains too many same characters 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 uppercase letters + + + + + + + The password contains fewer than %n non-alphanumeric characters + + + + + + + The password is shorter than %n characters + + + + + + + The password is a rotated version of the previous one + + + + + The password contains fewer than %n character classes + + + + + + + The password contains more than %n same characters consecutively + + + + + + + The password contains more than %n characters of the same class consecutively + + + + + + + The password contains monotonic sequence longer than %n characters + + + + + + + The password contains too long of a monotonic character sequence + + + + + No password supplied + + + + + Cannot obtain random numbers from the RNG device + + + + + Password generation failed - required entropy too low for settings + + + + + The password fails the dictionary check - %1 + + + + + The password fails the dictionary check + + + + + Unknown setting - %1 + + + + + Unknown setting + + + + + Bad integer value of setting - %1 + + + + + Bad integer value + + + + + Setting %1 is not of integer type + + + + + Setting is not of integer type + + + + + Setting %1 is not of string type + + + + + Setting is not of string type + + + + + Opening the configuration file failed + + + + + The configuration file is malformed + + + + + Fatal failure + + + + + Unknown error + + + + + Password is empty + + + + + PackageChooserPage + + + Form + + + + + Product Name + + + + + TextLabel + + + + + Long Product Description + + + + + Package Selection + + + + + Please pick a product from the list. The selected product will be installed. + + + + + PackageChooserViewStep + + + Packages + + + + + PackageModel + + + Name + + + + + Description + + + + + Page_Keyboard + + + Form + + + + + Keyboard Model: + + + + + Type here to test your keyboard + + + + + Page_UserSetup + + + Form + + + + + What is your name? + + + + + Your Full Name + + + + + What name do you want to use to log in? + + + + + login + + + + + What is the name of this computer? + + + + + <small>This name will be used if you make the computer visible to others on a network.</small> + + + + + Computer Name + + + + + Choose a password to keep your account safe. + + + + + + <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> + + + + + + Password + + + + + + Repeat Password + + + + + When this box is checked, password-strength checking is done and you will not be able to use a weak password. + + + + + Require strong passwords. + + + + + Log in automatically without asking for the password. + + + + + Use the same password for the administrator account. + + + + + Choose a password for the administrator account. + + + + + + <small>Enter the same password twice, so that it can be checked for typing errors.</small> + + + + + PartitionLabelsView + + + Root + + + + + Home + + + + + Boot + + + + + EFI system + + + + + Swap + + + + + New partition for %1 + + + + + New partition + + + + + %1 %2 + size[number] filesystem[name] + + + + + PartitionModel + + + + Free Space + + + + + + New partition + + + + + Name + + + + + File System + + + + + Mount Point + + + + + Size + + + + + PartitionPage + + + Form + + + + + Storage de&vice: + + + + + &Revert All Changes + + + + + New Partition &Table + + + + + Cre&ate + + + + + &Edit + + + + + &Delete + + + + + New Volume Group + + + + + Resize Volume Group + + + + + Deactivate Volume Group + + + + + Remove Volume Group + + + + + I&nstall boot loader on: + + + + + Are you sure you want to create a new partition table on %1? + + + + + Can not create new partition + + + + + 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. + + + + + PartitionViewStep + + + Gathering system information... + + + + + Partitions + + + + + Install %1 <strong>alongside</strong> another operating system. + + + + + <strong>Erase</strong> disk and install %1. + + + + + <strong>Replace</strong> a partition with %1. + + + + + <strong>Manual</strong> partitioning. + + + + + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). + + + + + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. + + + + + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. + + + + + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). + + + + + Disk <strong>%1</strong> (%2) + + + + + Current: + + + + + After: + + + + + No EFI system partition configured + + + + + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. + + + + + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. + + + + + EFI system partition flag not set + + + + + 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>bios_grub</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. + + + + + PlasmaLnfJob + + + Plasma Look-and-Feel Job + + + + + + Could not select KDE Plasma Look-and-Feel package + + + + + 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. + + + + + 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 installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. + + + + + PlasmaLnfViewStep + + + Look-and-Feel + + + + + PreserveFiles + + + Saving files for later ... + + + + + No files configured to save for later. + + + + + Not all of the configured files could be preserved. + + + + + ProcessResult + + + +There was no output from the command. + + + + + +Output: + + + + + + External command crashed. + + + + + Command <i>%1</i> crashed. + + + + + External command failed to start. + + + + + Command <i>%1</i> failed to start. + + + + + Internal error when starting command. + + + + + Bad parameters for process job call. + + + + + External command failed to finish. + + + + + Command <i>%1</i> failed to finish in %2 seconds. + + + + + External command finished with errors. + + + + + Command <i>%1</i> finished with exit code %2. + + + + + QObject + + + %1 (%2) + + + + + unknown + + + + + extended + + + + + unformatted + + + + + swap + + + + + + Default + + + + + + + + File not found + + + + + Path <pre>%1</pre> must be an absolute path. + + + + + Directory not found + + + + + + Could not create new random file <pre>%1</pre>. + + + + + No product + + + + + No description provided. + + + + + (no mount point) + + + + + Unpartitioned space or unknown partition table + + + + + Recommended + + + <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> + + + + + RemoveUserJob + + + Remove live user from target system + + + + + RemoveVolumeGroupJob + + + + Remove Volume Group named %1. + + + + + Remove Volume Group named <strong>%1</strong>. + + + + + The installer failed to remove a volume group named '%1'. + + + + + ReplaceWidget + + + Form + + + + + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. + + + + + The selected item does not appear to be a valid partition. + + + + + %1 cannot be installed on empty space. Please select an existing partition. + + + + + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. + + + + + %1 cannot be installed on this partition. + + + + + Data partition (%1) + + + + + Unknown system partition (%1) + + + + + %1 system partition (%2) + + + + + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. + + + + + <strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. + + + + + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. + + + + + The EFI system partition at %1 will be used for starting %2. + + + + + EFI system partition: + + + + + Requirements + + + <p>This computer does not satisfy the minimum requirements for installing %1.<br/> + Installation cannot continue.</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> + + + + + ResizeFSJob + + + Resize Filesystem Job + + + + + Invalid configuration + + + + + The file-system resize job has an invalid configuration and will not run. + + + + + KPMCore not Available + + + + + Calamares cannot start KPMCore for the file-system resize job. + + + + + + + + + Resize Failed + + + + + 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 filesystem %1 cannot be resized. + + + + + + The device %1 cannot be resized. + + + + + The filesystem %1 must be resized, but cannot. + + + + + The device %1 must be resized, but cannot + + + + + ResizePartitionJob + + + Resize partition %1. + + + + + Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. + + + + + Resizing %2MiB partition %1 to %3MiB. + + + + + The installer failed to resize partition %1 on disk '%2'. + + + + + ResizeVolumeGroupDialog + + + Resize Volume Group + + + + + ResizeVolumeGroupJob + + + + Resize volume group named %1 from %2 to %3. + + + + + Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>. + + + + + The installer failed to resize a volume group named '%1'. + + + + + ResultsListDialog + + + For best results, please ensure that this computer: + + + + + System requirements + + + + + ResultsListWidget + + + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> + + + + + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> + + + + + 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 program will ask you some questions and set up %2 on your computer. + + + + + ScanningDialog + + + Scanning storage devices... + + + + + Partitioning + + + + + SetHostNameJob + + + Set hostname %1 + + + + + Set hostname <strong>%1</strong>. + + + + + Setting hostname %1. + + + + + + Internal Error + + + + + + Cannot write hostname to target system + + + + + SetKeyboardLayoutJob + + + Set keyboard model to %1, layout to %2-%3 + + + + + Failed to write keyboard configuration for the virtual console. + + + + + + + Failed to write to %1 + + + + + Failed to write keyboard configuration for X11. + + + + + Failed to write keyboard configuration to existing /etc/default directory. + + + + + SetPartFlagsJob + + + Set flags on partition %1. + + + + + Set flags on %1MiB %2 partition. + + + + + Set flags on new partition. + + + + + Clear flags on partition <strong>%1</strong>. + + + + + Clear flags on %1MiB <strong>%2</strong> partition. + + + + + Clear flags on new partition. + + + + + Flag partition <strong>%1</strong> as <strong>%2</strong>. + + + + + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. + + + + + Flag new partition as <strong>%1</strong>. + + + + + Clearing flags on partition <strong>%1</strong>. + + + + + Clearing flags on %1MiB <strong>%2</strong> partition. + + + + + Clearing flags on new partition. + + + + + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. + + + + + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. + + + + + Setting flags <strong>%1</strong> on new partition. + + + + + The installer failed to set flags on partition %1. + + + + + SetPasswordJob + + + Set password for user %1 + + + + + Setting password for user %1. + + + + + Bad destination system path. + + + + + rootMountPoint is %1 + + + + + Cannot disable root account. + + + + + passwd terminated with error code %1. + + + + + Cannot set password for user %1. + + + + + usermod terminated with error code %1. + + + + + SetTimezoneJob + + + Set timezone to %1/%2 + + + + + Cannot access selected timezone path. + + + + + Bad path: %1 + + + + + Cannot set timezone. + + + + + Link creation failed, target: %1; link name: %2 + + + + + Cannot set timezone, + + + + + Cannot open /etc/timezone for writing + + + + + SetupGroupsJob + + + Preparing groups. + + + + + + Could not create groups in target system + + + + + These groups are missing in the target system: %1 + + + + + SetupSudoJob + + + Configure <pre>sudo</pre> users. + + + + + Cannot chmod sudoers file. + + + + + Cannot create sudoers file for writing. + + + + + ShellProcessJob + + + Shell Processes Job + + + + + SlideCounter + + + %L1 / %L2 + slide counter, %1 of %2 (numeric) + + + + + SummaryPage + + + This is an overview of what will happen once you start the setup procedure. + + + + + This is an overview of what will happen once you start the install procedure. + + + + + SummaryViewStep + + + Summary + + + + + TrackingInstallJob + + + Installation feedback + + + + + Sending installation feedback. + + + + + Internal error in install-tracking. + + + + + HTTP request timed out. + + + + + TrackingKUserFeedbackJob + + + KDE user feedback + + + + + Configuring KDE user feedback. + + + + + + Error in KDE user feedback configuration. + + + + + Could not configure KDE user feedback correctly, script error %1. + + + + + Could not configure KDE user feedback correctly, Calamares error %1. + + + + + TrackingMachineUpdateManagerJob + + + Machine feedback + + + + + Configuring machine feedback. + + + + + + Error in machine feedback configuration. + + + + + Could not configure machine feedback correctly, script error %1. + + + + + Could not configure machine feedback correctly, Calamares error %1. + + + + + TrackingPage + + + Form + + + + + Placeholder + + + + + <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><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> + + + + + 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. + + + + + 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. + + + + + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. + + + + + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. + + + + + TrackingViewStep + + + Feedback + + + + + 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 installation.</small> + + + + + UsersQmlViewStep + + + Users + + + + + UsersViewStep + + + Users + + + + + VariantModel + + + Key + Column header for key/value + + + + + Value + Column header for key/value + + + + + VolumeGroupBaseDialog + + + Create Volume Group + + + + + List of Physical Volumes + + + + + Volume Group Name: + + + + + Volume Group Type: + + + + + Physical Extent Size: + + + + + MiB + + + + + Total Size: + + + + + Used Size: + + + + + Total Sectors: + + + + + Quantity of LVs: + + + + + WelcomePage + + + Form + + + + + + Select application and system language + + + + + &About + + + + + Open donations website + + + + + &Donate + + + + + Open help and support website + + + + + &Support + + + + + Open issues and bug-tracking website + + + + + &Known issues + + + + + Open release notes website + + + + + &Release notes + + + + + <h1>Welcome to the Calamares setup program for %1.</h1> + + + + + <h1>Welcome to %1 setup.</h1> + + + + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + + <h1>Welcome to the %1 installer.</h1> + + + + + %1 support + + + + + About %1 setup + + + + + About %1 installer + + + + + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.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. + + + + + WelcomeQmlViewStep + + + Welcome + + + + + WelcomeViewStep + + + Welcome + + + + + about + + + <h1>%1</h1><br/> + <strong>%2<br/> + for %3</strong><br/><br/> + Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> + and the <a href='https://www.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. + + + + + Back + + + + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + + + i18n + + + <h1>Languages</h1> </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>. + + + + + <h1>Locales</h1> </br> + The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>. + + + + + Back + + + + + keyboardq + + + Keyboard Model + + + + + Layouts + + + + + Keyboard Layout + + + + + Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. + + + + + Models + + + + + Variants + + + + + Keyboard Variant + + + + + Test your keyboard + + + + + localeq + + + Change + + + + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + release_notes + + + <h3>%1</h3> + <p>This an example QML file, showing options in RichText with Flickable content.</p> + + <p>QML with RichText can use HTML tags, Flickable content is useful for touchscreens.</p> + + <p><b>This is bold text</b></p> + <p><i>This is italic text</i></p> + <p><u>This is underlined text</u></p> + <p><center>This text will be center-aligned.</center></p> + <p><s>This is strikethrough</s></p> + + <p>Code example: + <code>ls -l /home</code></p> + + <p><b>Lists:</b></p> + <ul> + <li>Intel CPU systems</li> + <li>AMD CPU systems</li> + </ul> + + <p>The vertical scrollbar is adjustable, current width set to 10.</p> + + + + + Back + + + + + usersq + + + Pick your user name and credentials to login and perform admin tasks + + + + + What is your name? + + + + + Your Full Name + + + + + What name do you want to use to log in? + + + + + Login Name + + + + + If more than one person will use this computer, you can create multiple accounts after installation. + + + + + What is the name of this computer? + + + + + Computer Name + + + + + This name will be used if you make the computer visible to others on a network. + + + + + Choose a password to keep your account safe. + + + + + Password + + + + + Repeat Password + + + + + 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. + + + + + Validate passwords quality + + + + + When this box is checked, password-strength checking is done and you will not be able to use a weak password. + + + + + Log in automatically without asking for the password + + + + + Reuse user password as root password + + + + + Use the same password for the administrator account. + + + + + Choose a root password to keep your account safe. + + + + + Root Password + + + + + Repeat Root Password + + + + + Enter the same password twice, so that it can be checked for typing errors. + + + + + welcomeq + + + <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> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + + diff --git a/lang/calamares_ie.ts b/lang/calamares_ie.ts index 464dc395fc..873af5d969 100644 --- a/lang/calamares_ie.ts +++ b/lang/calamares_ie.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Configurar - + Install Installar @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Finit @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed Configuration ne successat - + Installation Failed Installation ne successat - + Would you like to paste the install log to the web? - + Error Errore - - + + &Yes &Yes - - + + &No &No - + &Close C&luder - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? Continuar li configuration? - + Continue with installation? Continuar li 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 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 &Configurar nu - + &Install now &Installar nu - + Go &back Ear &retro - + &Set up &Configurar - + &Install &Installar - + Setup is complete. Close the setup program. Configuration es completat. Ples cluder li configurator. - + The installation is complete. Close the installer. Installation es completat. Ples cluder li installator. - + Cancel setup without changing the system. Anullar li configuration sin modificationes del sistema. - + Cancel installation without changing the system. Anullar li installation sin modificationes del sistema. - + &Next &Sequent - + &Back &Retro - + &Done &Finir - + &Cancel A&nullar - + Cancel setup? Anullar li configuration? - + Cancel installation? Anullar li 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 install process? The installer will quit and all changes will be lost. @@ -449,44 +466,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - &Retro - - - - &Next - Ad ava&n - - - - &Cancel - A&nullar - - - + %1 Setup Program Configiration de %1 - + %1 Installer Installator de %1 @@ -807,50 +795,90 @@ The installer will quit and all changes will be lost. <h1>Benevenit al installator de %1</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + Configuration ne successat + + + + Installation Failed + Installation ne successat + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Configuration es completat + + + + Installation Complete + Installation es completat + + + + The setup of %1 is complete. + Li configuration de %1 es completat. + + + + The installation of %1 is complete. + Li installation de %1 es completat. + ContextualProcessJob @@ -941,22 +969,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. Creante un nov partition de %1 sur %2. - + The installer failed to create partition on disk '%1'. @@ -1283,37 +1332,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1331,62 +1400,50 @@ The installer will quit and all changes will be lost. &Reiniciar nu - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Finir + + + FinishedViewStep - - Setup Complete - Configuration es completat - - - - Installation Complete - Installation es completat - - - - The setup of %1 is complete. - Li configuration de %1 es completat. - - - - The installation of %1 is complete. - Li installation de %1 es completat. + + Finish + Finir @@ -2253,7 +2310,7 @@ The installer will quit and all changes will be lost. Ínconosset errore - + Password is empty Li contrasigne es vacui @@ -2763,65 +2820,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3637,12 +3694,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 installation.</small> @@ -3870,6 +3927,44 @@ Output: Retro + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts index 267dc3a7f5..a7c0f8d929 100644 --- a/lang/calamares_is.ts +++ b/lang/calamares_is.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Greinar viðmótshluta - + Debug information Villuleitarupplýsingar @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Setja upp - + Install Setja upp @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Búið @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed Uppsetning mistókst - + Installation Failed Uppsetning mistókst - + Would you like to paste the install log to the web? - + Error Villa - - + + &Yes &Já - - + + &No &Nei - + &Close &Loka - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Calamares uppsetning mistókst - + %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: - + Continue with setup? Halda áfram með uppsetningu? - + Continue with installation? Halda áfram með uppsetningu? - + 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> %1 uppsetningarforritið er um það bil að gera breytingar á diskinum til að setja upp %2.<br/><strong>Þú munt ekki geta afturkallað þessar breytingar.</strong> - + &Set up now &Setja upp núna - + &Install now Setja &inn núna - + Go &back Fara til &baka - + &Set up &Setja upp - + &Install &Setja upp - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Uppsetning er lokið. Lokaðu uppsetningarforritinu. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Hætta við uppsetningu ánþess að breyta kerfinu. - + &Next &Næst - + &Back &Til baka - + &Done &Búið - + &Cancel &Hætta við - + Cancel setup? Hætta við uppsetningu? - + Cancel installation? Hætta við uppsetningu? - + 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. Viltu virkilega að hætta við núverandi uppsetningarferli? @@ -450,44 +467,15 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Ósækjanleg Python villa. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - Birta villuleitarupplýsingar - - - - &Back - &Til baka - - - - &Next - &Næst - - - - &Cancel - &Hætta við - - - + %1 Setup Program - + %1 Installer %1 uppsetningarforrit @@ -808,50 +796,90 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. - + Your username is too long. Notandanafnið þitt er of langt. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Notandanafnið þitt er of stutt. - + Your hostname is too long. Notandanafnið þitt er of langt. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Lykilorð passa ekki! + + + Setup Failed + Uppsetning mistókst + + + + Installation Failed + Uppsetning mistókst + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Uppsetningu lokið + + + + Installation Complete + Uppsetningu lokið + + + + The setup of %1 is complete. + Uppsetningu á %1 er lokið. + + + + The installation of %1 is complete. + Uppsetningu á %1 er lokið. + ContextualProcessJob @@ -942,22 +970,43 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. Búa til nýja %1 disksneiðatöflu á %2. - + The installer failed to create partition on disk '%1'. Uppsetningarforritinu mistókst að búa til disksneið á diski '%1'. @@ -1284,37 +1333,57 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. FillGlobalStorageJob - + Set partition information Setja upplýsingar um disksneið - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Setja upp %1 á <strong>nýja</strong> %2 disk sneiðingu. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Setja upp <strong>nýtt</strong> %2 snið með tengipunkti <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Setja upp %2 á %3 disk sneiðingu <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Setja upp %3 snið <strong>%1</strong> með tengipunkti <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Setja upp %2 á %3 disk sneiðingu <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Setja ræsistjórann upp á <strong>%1</strong>. - + Setting up mount points. Set upp tengipunkta. @@ -1332,62 +1401,50 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. &Endurræsa núna - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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>Allt klárt.</h1><br/>%1 hefur verið sett upp á tölvunni þinni.<br/>Þú getur nú endurræst í nýja kerfið, eða halda áfram að nota %2 Lifandi umhverfi. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Ljúka + + + FinishedViewStep - - Setup Complete - Uppsetningu lokið - - - - Installation Complete - Uppsetningu lokið - - - - The setup of %1 is complete. - Uppsetningu á %1 er lokið. - - - - The installation of %1 is complete. - Uppsetningu á %1 er lokið. + + Finish + Ljúka @@ -2254,7 +2311,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Óþekkt villa - + Password is empty @@ -2764,65 +2821,65 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3638,12 +3695,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 installation.</small> @@ -3871,6 +3928,44 @@ Output: + + calamares-sidebar + + + Show debug information + Birta villuleitarupplýsingar + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts index 065bf0c41b..0a8fe85d03 100644 --- a/lang/calamares_it_IT.ts +++ b/lang/calamares_it_IT.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Albero dei Widget - + Debug information Informazioni di debug @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Impostazione - + Install Installa @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Fatto @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed Installazione fallita - + Installation Failed Installazione non riuscita - + Would you like to paste the install log to the web? Si vuole mettere il log di installazione sul web? - + Error Errore - - + + &Yes &Si - - + + &No &No - + &Close &Chiudi - + Install Log Paste URL URL di copia del log d'installazione - + The upload was unsuccessful. No web-paste was done. Il caricamento è fallito. Non è stata fatta la copia sul web. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Inizializzazione di Calamares fallita - + %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 non può essere installato. Calamares non ha potuto caricare tutti i moduli configurati. Questo è un problema del modo in cui Calamares viene utilizzato dalla distribuzione. - + <br/>The following modules could not be loaded: <br/>I seguenti moduli non possono essere caricati: - + Continue with setup? Procedere con la configurazione? - + Continue with installation? Continuare l'installazione? - + 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> Il programma d'installazione %1 sta per modificare il disco di per installare %2. Non sarà possibile annullare queste modifiche. - + 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> Il programma d'installazione %1 sta per eseguire delle modifiche al tuo disco per poter installare %2.<br/><strong> Non sarà possibile annullare tali modifiche.</strong> - + &Set up now &Installa adesso - + &Install now &Installa adesso - + Go &back &Indietro - + &Set up &Installazione - + &Install &Installa - + Setup is complete. Close the setup program. Installazione completata. Chiudere il programma d'installazione. - + The installation is complete. Close the installer. L'installazione è terminata. Chiudere il programma d'installazione. - + Cancel setup without changing the system. Annulla l'installazione senza modificare il sistema. - + Cancel installation without changing the system. Annullare l'installazione senza modificare il sistema. - + &Next &Avanti - + &Back &Indietro - + &Done &Fatto - + &Cancel &Annulla - + Cancel setup? Annullare l'installazione? - + Cancel installation? Annullare l'installazione? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Si vuole annullare veramente il processo di installazione? Il programma d'installazione verrà terminato e tutti i cambiamenti saranno persi. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Si vuole davvero annullare l'installazione in corso? @@ -450,45 +467,15 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Errore di Python non definibile. - - CalamaresUtils - - - Install log posted to: -%1 - Log d'installazione inviato a: -%1 - - CalamaresWindow - - Show debug information - Mostra le informazioni di debug - - - - &Back - &Indietro - - - - &Next - &Avanti - - - - &Cancel - &Annulla - - - + %1 Setup Program %1 Programma d'installazione - + %1 Installer %1 Programma di installazione @@ -809,50 +796,90 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Benvenuto nel programma di installazione di %1 - + Your username is too long. Il nome utente è troppo lungo. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. Il tuo username deve iniziare con una lettera minuscola o un trattino basso. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Solo lettere minuscole, numeri, trattini e trattini bassi sono permessi. - + Your hostname is too short. Hostname è troppo corto. - + Your hostname is too long. Hostname è troppo lungo. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. Solo lettere, numeri, trattini e trattini bassi sono permessi. - + Your passwords do not match! Le password non corrispondono! + + + Setup Failed + Installazione fallita + + + + Installation Failed + Installazione non riuscita + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Installazione completata + + + + Installation Complete + Installazione completata + + + + The setup of %1 is complete. + L'installazione di %1 è completa + + + + The installation of %1 is complete. + L'installazione di %1 è completata. + ContextualProcessJob @@ -943,22 +970,43 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Crea una nuova partizione da %2MiB su %4 (%3) con 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Crea una nuova partizione di <strong>%2MiB</strong> su <strong>%4</strong> (%3) con file system <strong>%1</strong>. - + + Creating new %1 partition on %2. Creazione della nuova partizione %1 su %2. - + The installer failed to create partition on disk '%1'. Il programma di installazione non è riuscito a creare la partizione sul disco '%1'. @@ -1285,37 +1333,57 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse FillGlobalStorageJob - + Set partition information Impostare informazioni partizione - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Installare %1 sulla <strong>nuova</strong> partizione di sistema %2. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Impostare la <strong>nuova</strong> %2 partizione con punto di mount <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Installare %2 sulla partizione di sistema %3 <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Impostare la partizione %3 <strong>%1</strong> con punto di montaggio <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Installare %2 sulla partizione di sistema %3 <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Installare il boot loader su <strong>%1</strong>. - + Setting up mount points. Impostazione dei punti di mount. @@ -1333,62 +1401,50 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse &Riavviare ora - + <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. - + <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> - + <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>Tutto fatto.</ h1><br/>%1 è stato installato sul computer.<br/>Ora è possibile riavviare il sistema, o continuare a utilizzare l'ambiente Live di %2 . - + <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> - + <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>Installation Failed</h1><br/>%1 has not been installed 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 - FinishedViewStep + FinishedQmlViewStep - + Finish Termina + + + FinishedViewStep - - Setup Complete - Installazione completata - - - - Installation Complete - Installazione completata - - - - The setup of %1 is complete. - L'installazione di %1 è completa - - - - The installation of %1 is complete. - L'installazione di %1 è completata. + + Finish + Termina @@ -2255,7 +2311,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Errore sconosciuto - + Password is empty Password vuota @@ -2765,13 +2821,13 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse ProcessResult - + There was no output from the command. Non c'era output dal comando. - + Output: @@ -2780,53 +2836,53 @@ Output: - + External command crashed. Il comando esterno si è arrestato. - + Command <i>%1</i> crashed. Il comando <i>%1</i> si è arrestato. - + External command failed to start. Il comando esterno non si è avviato. - + Command <i>%1</i> failed to start. Il comando %1 non si è avviato. - + Internal error when starting command. Errore interno all'avvio del comando. - + Bad parameters for process job call. Parametri errati per elaborare la chiamata al job. - + External command failed to finish. Il comando esterno non è stato portato a termine. - + Command <i>%1</i> failed to finish in %2 seconds. Il comando <i>%1</i> non è stato portato a termine in %2 secondi. - + External command finished with errors. Il comando esterno è terminato con errori. - + Command <i>%1</i> finished with exit code %2. Il comando <i>%1</i> è terminato con codice di uscita %2. @@ -3642,12 +3698,12 @@ Output: UsersPage - + <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>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> @@ -3875,6 +3931,44 @@ Output: Indietro + + calamares-sidebar + + + Show debug information + Mostra le informazioni di debug + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index da705cf7b6..2666b1df5a 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ ウィジェットツリー - + Debug information デバッグ情報 @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up セットアップ - + Install インストール @@ -143,7 +151,7 @@ Calamares::JobThread - + Done 完了 @@ -255,171 +263,180 @@ Calamares::ViewManager - + Setup Failed セットアップに失敗しました。 - + Installation Failed インストールに失敗 - + Would you like to paste the install log to the web? インストールログをWebに貼り付けますか？ - + Error エラー - - + + &Yes はい (&Y) - - + + &No いいえ (&N) - + &Close 閉じる (&C) - + Install Log Paste URL インストールログを貼り付けるURL - + The upload was unsuccessful. No web-paste was done. アップロードは失敗しました。 ウェブへの貼り付けは行われませんでした。 + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Calamares によるインストールに失敗しました。 - + %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 をインストールできません。Calamares はすべてのモジュールをロードすることをできませんでした。これは、Calamares のこのディストリビューションでの使用法による問題です。 - + <br/>The following modules could not be loaded: <br/>以下のモジュールがロードできませんでした。: - + Continue with setup? セットアップを続行しますか？ - + 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> %1 のセットアッププログラムは %2 のセットアップのためディスクの内容を変更します。<br/><strong>これらの変更は取り消しできません。</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 インストーラーは %2 をインストールするためディスクの内容を変更しようとしています。<br/><strong>これらの変更は取り消せません。</strong> - + &Set up now セットアップしています (&S) - + &Install now 今すぐインストール (&I) - + Go &back 戻る (&B) - + &Set up セットアップ （&S） - + &Install インストール (&I) - + Setup is complete. Close the setup program. セットアップが完了しました。プログラムを閉じます。 - + The installation is complete. Close the installer. インストールが完了しました。インストーラーを閉じます。 - + Cancel setup without changing the system. システムを変更することなくセットアップを中断します。 - + Cancel installation without changing the system. システムを変更しないでインストールを中止します。 - + &Next 次へ (&N) - + &Back 戻る (&B) - + &Done 実行 (&D) - + &Cancel 中止 (&C) - + Cancel setup? セットアップを中止しますか？ - + 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 install process? The installer will quit and all changes will be lost. 本当に現在の作業を中止しますか？ @@ -449,45 +466,15 @@ The installer will quit and all changes will be lost. 取得不能なPythonエラー。 - - CalamaresUtils - - - Install log posted to: -%1 - インストールログの投稿先: -%1 - - CalamaresWindow - - Show debug information - デバッグ情報を表示 - - - - &Back - 戻る (&B) - - - - &Next - 次へ (&N) - - - - &Cancel - 中止 (&C) - - - + %1 Setup Program %1 セットアッププログラム - + %1 Installer %1 インストーラー @@ -808,50 +795,91 @@ The installer will quit and all changes will be lost. <h1>%1 インストーラーへようこそ</h1> - + Your username is too long. ユーザー名が長すぎます。 - + '%1' is not allowed as username. '%1' はユーザー名として許可されていません。 - + Your username must start with a lowercase letter or underscore. ユーザー名はアルファベットの小文字または _ で始めてください。 - + Only lowercase letters, numbers, underscore and hyphen are allowed. 使用できるのはアルファベットの小文字と数字と _ と - だけです。 - + Your hostname is too short. ホスト名が短すぎます。 - + Your hostname is too long. ホスト名が長過ぎます。 - + '%1' is not allowed as hostname. '%1' はホスト名として許可されていません。 - + Only letters, numbers, underscore and hyphen are allowed. 使用できるのはアルファベットと数字と _ と - だけです。 - + Your passwords do not match! パスワードが一致していません！ + + + Setup Failed + セットアップに失敗しました。 + + + + Installation Failed + インストールに失敗 + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + セットアップが完了しました + + + + Installation Complete + インストールが完了 + + + + + The setup of %1 is complete. + %1 のセットアップが完了しました。 + + + + The installation of %1 is complete. + %1 のインストールは完了です。 + ContextualProcessJob @@ -942,22 +970,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). + + + + Create new %2MiB partition on %4 (%3) with file system %1. %4 (%3) に新たにファイルシステム %1 の %2MiB のパーティションが作成されます。 - + + 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>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Create new <strong>%4</strong> (%3) に新たにファイルシステム<strong>%1</strong>の <strong>%2MiB</strong> のパーティションが作成されます。 - + + Creating new %1 partition on %2. %2 に新しく %1 パーティションを作成しています。 - + The installer failed to create partition on disk '%1'. インストーラーはディスク '%1' にパーティションを作成することに失敗しました。 @@ -1284,37 +1333,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. <strong>新しい</strong> %2 システムパーティションに %1 をインストール。 - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - マウントポイント <strong>%1</strong> に<strong>新しく</strong> %2 パーティションをセットアップする。 + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - %3 システムパーティション <strong>%1</strong> に%2 をインストール。 + + 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>. + + + + + 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>. - パーティション <strong>%1</strong> マウントポイント <strong>%2</strong> に %3 をセットアップする。 + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + %3 システムパーティション <strong>%1</strong> に%2 をインストール。 + + + Install boot loader on <strong>%1</strong>. <strong>%1</strong> にブートローダーをインストール - + Setting up mount points. マウントポイントを設定する。 @@ -1332,63 +1401,50 @@ The installer will quit and all changes will be lost. 今すぐ再起動 (&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>すべて完了しました。</h1><br/>%1 はコンピュータにセットアップされました。<br/>今から新しいシステムを開始することができます。 - + <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>このボックスをチェックすると、 <span style="font-style:italic;">実行</span>をクリックするかプログラムを閉じると直ちにシステムが再起動します。</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>すべて完了しました。</h1><br/>%1 がコンピューターにインストールされました。<br/>再起動して新しいシステムを使用することもできますし、%2 ライブ環境の使用を続けることもできます。 - + <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>このボックスをチェックすると、 <span style="font-style:italic;">実行</span>をクリックするかインストーラーを閉じると直ちにシステムが再起動します。</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>セットアップに失敗しました。</h1><br/>%1 はコンピュータにセットアップされていません。<br/>エラーメッセージ: %2 - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>インストールに失敗しました</h1><br/>%1 はコンピュータにインストールされませんでした。<br/>エラーメッセージ: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish 終了 + + + FinishedViewStep - - Setup Complete - セットアップが完了しました - - - - Installation Complete - インストールが完了 - - - - - The setup of %1 is complete. - %1 のセットアップが完了しました。 - - - - The installation of %1 is complete. - %1 のインストールは完了です。 + + Finish + 終了 @@ -2249,7 +2305,7 @@ The installer will quit and all changes will be lost. 未知のエラー - + Password is empty パスワードが空です @@ -2759,14 +2815,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. コマンドから出力するものがありませんでした。 - + Output: @@ -2775,52 +2831,52 @@ Output: - + External command crashed. 外部コマンドがクラッシュしました。 - + Command <i>%1</i> crashed. コマンド <i>%1</i> がクラッシュしました。 - + External command failed to start. 外部コマンドの起動に失敗しました。 - + Command <i>%1</i> failed to start. コマンド <i>%1</i> の起動に失敗しました。 - + Internal error when starting command. コマンドが起動する際に内部エラーが発生しました。 - + Bad parameters for process job call. ジョブ呼び出しにおける不正なパラメータ - + External command failed to finish. 外部コマンドの終了に失敗しました。 - + Command <i>%1</i> failed to finish in %2 seconds. コマンド<i>%1</i> %2 秒以内に終了することに失敗しました。 - + External command finished with errors. 外部のコマンドがエラーで停止しました。 - + Command <i>%1</i> finished with exit code %2. コマンド <i>%1</i> が終了コード %2 で終了しました。. @@ -3639,12 +3695,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>もし複数の人間がこのコンピュータを使用する場合、セットアップの後で複数のアカウントを作成できます。</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>もし複数の人間がこのコンピュータを使用する場合、インストールの後で複数のアカウントを作成できます。</small> @@ -3883,6 +3939,44 @@ Output: 戻る + + calamares-sidebar + + + Show debug information + デバッグ情報を表示 + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts index 168dc518d4..57bbdb4af2 100644 --- a/lang/calamares_kk.ts +++ b/lang/calamares_kk.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information Жөндеу ақпараты @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Орнату @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Дайын @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed - + Would you like to paste the install log to the web? - + Error - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Алға - + &Back А&ртқа - + &Done - + &Cancel Ба&с тарту - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -449,44 +466,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - А&ртқа - - - - &Next - &Алға - - - - &Cancel - Ба&с тарту - - - + %1 Setup Program - + %1 Installer @@ -807,50 +795,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -941,22 +969,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1283,37 +1332,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1331,61 +1400,49 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. + + Finish @@ -2253,7 +2310,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2763,65 +2820,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3637,12 +3694,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 installation.</small> @@ -3870,6 +3927,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts index 404d086cf0..c12caa7157 100644 --- a/lang/calamares_kn.ts +++ b/lang/calamares_kn.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install ಸ್ಥಾಪಿಸು @@ -143,7 +151,7 @@ Calamares::JobThread - + Done @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed ಅನುಸ್ಥಾಪನೆ ವಿಫಲವಾಗಿದೆ - + Would you like to paste the install log to the web? - + Error ದೋಷ - - + + &Yes ಹೌದು - - + + &No ಇಲ್ಲ - + &Close ಮುಚ್ಚಿರಿ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next ಮುಂದಿನ - + &Back ಹಿಂದಿನ - + &Done - + &Cancel ರದ್ದುಗೊಳಿಸು - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -449,44 +466,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - ಹಿಂದಿನ - - - - &Next - ಮುಂದಿನ - - - - &Cancel - ರದ್ದುಗೊಳಿಸು - - - + %1 Setup Program - + %1 Installer @@ -807,50 +795,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + ಅನುಸ್ಥಾಪನೆ ವಿಫಲವಾಗಿದೆ + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -941,22 +969,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1283,37 +1332,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1331,61 +1400,49 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. + + Finish @@ -2253,7 +2310,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2763,65 +2820,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3637,12 +3694,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 installation.</small> @@ -3870,6 +3927,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts index d1d2ad0619..3ba7258914 100644 --- a/lang/calamares_ko.ts +++ b/lang/calamares_ko.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ 위젯 트리 - + Debug information 디버그 정보 @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up 설정 - + Install 설치 @@ -143,7 +151,7 @@ Calamares::JobThread - + Done 완료 @@ -255,171 +263,180 @@ Calamares::ViewManager - + Setup Failed 설치 실패 - + Installation Failed 설치 실패 - + Would you like to paste the install log to the web? 설치 로그를 웹에 붙여넣으시겠습니까? - + Error 오류 - - + + &Yes 예(&Y) - - + + &No 아니오(&N) - + &Close 닫기(&C) - + Install Log Paste URL 로그 붙여넣기 URL 설치 - + The upload was unsuccessful. No web-paste was done. 업로드에 실패했습니다. 웹 붙여넣기가 수행되지 않았습니다. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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 가 설치될 수 없습니다. 깔라마레스가 모든 구성된 모듈을 불러올 수 없었습니다. 이것은 깔라마레스가 배포판에서 사용되는 방식에서 발생한 문제입니다. - + <br/>The following modules could not be loaded: 다음 모듈 불러오기 실패: - + Continue with setup? 설치를 계속하시겠습니까? - + 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> %1 설치 프로그램이 %2을(를) 설정하기 위해 디스크를 변경하려고 하는 중입니다.<br/><strong>이러한 변경은 취소할 수 없습니다.</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 설치 관리자가 %2를 설치하기 위해 사용자의 디스크의 내용을 변경하려고 합니다. <br/> <strong>이 변경 작업은 되돌릴 수 없습니다.</strong> - + &Set up now 지금 설치 (&S) - + &Install now 지금 설치 (&I) - + Go &back 뒤로 이동 (&b) - + &Set up 설치 (&S) - + &Install 설치(&I) - + Setup is complete. Close the setup program. 설치가 완료 되었습니다. 설치 프로그램을 닫습니다. - + The installation is complete. Close the installer. 설치가 완료되었습니다. 설치 관리자를 닫습니다. - + Cancel setup without changing the system. 시스템을 변경 하지 않고 설치를 취소합니다. - + Cancel installation without changing the system. 시스템 변경 없이 설치를 취소합니다. - + &Next 다음 (&N) - + &Back 뒤로 (&B) - + &Done 완료 (&D) - + &Cancel 취소 (&C) - + Cancel setup? 설치를 취소 하시겠습니까? - + 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 install process? The installer will quit and all changes will be lost. 정말로 현재 설치 프로세스를 취소하시겠습니까? @@ -449,45 +466,15 @@ The installer will quit and all changes will be lost. 가져올 수 없는 파이썬 오류 - - CalamaresUtils - - - Install log posted to: -%1 - 설치 로그 게시 위치: -%1 - - CalamaresWindow - - Show debug information - 디버그 정보 보기 - - - - &Back - 뒤로 (&B) - - - - &Next - 다음 (&N) - - - - &Cancel - 취소 (&C) - - - + %1 Setup Program %1 설치 프로그램 - + %1 Installer %1 설치 관리자 @@ -808,50 +795,90 @@ The installer will quit and all changes will be lost. <h1>%1 설치 관리자에 오신 것을 환영합니다</h1> - + Your username is too long. 사용자 이름이 너무 깁니다. - + '%1' is not allowed as username. '%1'은 사용자 이름으로 허용되지 않습니다. - + Your username must start with a lowercase letter or underscore. 사용자 이름은 소문자 또는 밑줄로 시작해야 합니다. - + Only lowercase letters, numbers, underscore and hyphen are allowed. 소문자, 숫자, 밑줄 및 하이픈만 허용됩니다. - + Your hostname is too short. 호스트 이름이 너무 짧습니다. - + Your hostname is too long. 호스트 이름이 너무 깁니다. - + '%1' is not allowed as hostname. '%1'은 호스트 이름으로 허용되지 않습니다. - + Only letters, numbers, underscore and hyphen are allowed. 문자, 숫자, 밑줄 및 하이픈만 허용됩니다. - + Your passwords do not match! 암호가 일치하지 않습니다! + + + Setup Failed + 설치 실패 + + + + Installation Failed + 설치 실패 + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + 설치 완료 + + + + Installation Complete + 설치 완료 + + + + The setup of %1 is complete. + %1 설치가 완료되었습니다. + + + + The installation of %1 is complete. + %1의 설치가 완료되었습니다. + ContextualProcessJob @@ -942,22 +969,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). + + + + Create new %2MiB partition on %4 (%3) with file system %1. %1 파일 시스템으로 %4(%3)에 새 %2MiB 파티션을 만듭니다. - + + 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>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. <strong>%1</strong> 파일 시스템으로 <strong>%4</strong> (%3)에 새 <strong>%2MiB</strong> 파티션을 만듭니다. - + + Creating new %1 partition on %2. %2에 새로운 %1 파티션 테이블을 만드는 중입니다. - + The installer failed to create partition on disk '%1'. 디스크 '%1'에 파티션을 생성하지 못했습니다. @@ -1284,37 +1332,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. <strong>새</strong> %2 시스템 파티션에 %1를설치합니다. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - 마운트 위치 <strong>%1</strong>을 사용하여 <strong>새</strong> 파티션 %2를 설정합니다. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - 시스템 파티션 <strong>%1</strong>의 %3에 %2를 설치합니다. + + 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>. + + + + + 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>. - <strong>%2</strong> 마운트 위치를 사용하여 파티션 <strong>%1</strong>의 %3 을 설정합니다. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + 시스템 파티션 <strong>%1</strong>의 %3에 %2를 설치합니다. + + + Install boot loader on <strong>%1</strong>. <strong>%1</strong>에 부트 로더를 설치합니다. - + Setting up mount points. 마운트 위치를 설정 중입니다. @@ -1332,62 +1400,50 @@ The installer will quit and all changes will be lost. 지금 재시작 (&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>모두 완료.</h1><br/>%1이 컴퓨터에 설정되었습니다.<br/>이제 새 시스템을 사용할 수 있습니다. - + <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>이 확인란을 선택하면 <span style="font-style:italic;">완료</span>를 클릭하거나 설치 프로그램을 닫으면 시스템이 즉시 다시 시작됩니다.</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>모두 완료되었습니다.</h1><br/>%1이 컴퓨터에 설치되었습니다.<br/>이제 새 시스템으로 다시 시작하거나 %2 라이브 환경을 계속 사용할 수 있습니다. - + <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>이 확인란을 선택하면 <span style="font-style:italic;">완료</span>를 클릭하거나 설치 관리자를 닫으면 시스템이 즉시 다시 시작됩니다.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>설치 실패</h1><br/>%1이 컴퓨터에 설정되지 않았습니다.<br/>오류 메시지 : %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>설치에 실패했습니다.</h1><br/>%1이 컴퓨터에 설치되지 않았습니다.<br/>오류 메시지는 %2입니다. - FinishedViewStep + FinishedQmlViewStep - + Finish 완료 + + + FinishedViewStep - - Setup Complete - 설치 완료 - - - - Installation Complete - 설치 완료 - - - - The setup of %1 is complete. - %1 설치가 완료되었습니다. - - - - The installation of %1 is complete. - %1의 설치가 완료되었습니다. + + Finish + 완료 @@ -2247,7 +2303,7 @@ The installer will quit and all changes will be lost. 알 수 없는 오류 - + Password is empty 비밀번호가 비어 있습니다 @@ -2757,14 +2813,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. 명령으로부터 아무런 출력이 없습니다. - + Output: @@ -2773,52 +2829,52 @@ Output: - + External command crashed. 외부 명령이 실패했습니다. - + Command <i>%1</i> crashed. <i>%1</i> 명령이 실패했습니다. - + External command failed to start. 외부 명령을 시작하지 못했습니다. - + Command <i>%1</i> failed to start. <i>%1</i> 명령을 시작하지 못했습니다. - + Internal error when starting command. 명령을 시작하는 중에 내부 오류가 발생했습니다. - + Bad parameters for process job call. 프로세스 작업 호출에 대한 잘못된 매개 변수입니다. - + External command failed to finish. 외부 명령을 완료하지 못했습니다. - + Command <i>%1</i> failed to finish in %2 seconds. <i>%1</i> 명령을 %2초 안에 완료하지 못했습니다. - + External command finished with errors. 외부 명령이 오류와 함께 완료되었습니다. - + Command <i>%1</i> finished with exit code %2. <i>%1</i> 명령이 종료 코드 %2와 함께 완료되었습니다. @@ -3637,12 +3693,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>둘 이상의 사용자가 이 컴퓨터를 사용할 경우, 설정 후 계정을 여러 개 만들 수 있습니다.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>둘 이상의 사용자가 이 컴퓨터를 사용할 경우 설치 후 계정을 여러 개 만들 수 있습니다.</small> @@ -3881,6 +3937,44 @@ Output: 뒤로 + + calamares-sidebar + + + Show debug information + 디버그 정보 보기 + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts index b9ab3ef98a..2c6a263c2b 100644 --- a/lang/calamares_lo.ts +++ b/lang/calamares_lo.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +151,7 @@ Calamares::JobThread - + Done @@ -255,170 +263,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed - + Would you like to paste the install log to the web? - + Error - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -447,44 +464,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - - - - - &Next - - - - - &Cancel - - - - + %1 Setup Program - + %1 Installer @@ -805,50 +793,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -939,22 +967,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1281,37 +1330,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1329,61 +1398,49 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. + + Finish @@ -2242,7 +2299,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2752,65 +2809,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3626,12 +3683,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 installation.</small> @@ -3859,6 +3916,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index 76b151dfdf..0bf3751c7f 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Valdiklių medis - + Debug information Derinimo informacija @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Sąranka - + Install Diegimas @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Atlikta @@ -261,171 +269,180 @@ Calamares::ViewManager - + Setup Failed Sąranka patyrė nesėkmę - + Installation Failed Diegimas nepavyko - + Would you like to paste the install log to the web? Ar norėtumėte įdėti diegimo žurnalą į saityną? - + Error Klaida - - + + &Yes &Taip - - + + &No &Ne - + &Close &Užverti - + Install Log Paste URL Diegimo žurnalo įdėjimo URL - + The upload was unsuccessful. No web-paste was done. Įkėlimas buvo nesėkmingas. Nebuvo atlikta jokio įdėjimo į saityną. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Calamares inicijavimas nepavyko - + %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. Nepavyksta įdiegti %1. Calamares nepavyko įkelti visų sukonfigūruotų modulių. Tai yra problema, susijusi su tuo, kaip distribucija naudoja diegimo programą Calamares. - + <br/>The following modules could not be loaded: <br/>Nepavyko įkelti šių modulių: - + Continue with setup? Tęsti sąranką? - + Continue with installation? Tęsti diegimą? - + 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 sąrankos programa, siekdama nustatyti %2, ketina atlikti pakeitimus diske.<br/><strong>Šių pakeitimų nebegalėsite atšaukti.</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 diegimo programa, siekdama įdiegti %2, ketina atlikti pakeitimus diske.<br/><strong>Šių pakeitimų nebegalėsite atšaukti.</strong> - + &Set up now Nu&statyti dabar - + &Install now Į&diegti dabar - + Go &back &Grįžti - + &Set up Nu&statyti - + &Install Į&diegti - + Setup is complete. Close the setup program. Sąranka užbaigta. Užverkite sąrankos programą. - + The installation is complete. Close the installer. Diegimas užbaigtas. Užverkite diegimo programą. - + Cancel setup without changing the system. Atsisakyti sąrankos, nieko sistemoje nekeičiant. - + Cancel installation without changing the system. Atsisakyti diegimo, nieko sistemoje nekeičiant. - + &Next &Toliau - + &Back &Atgal - + &Done A&tlikta - + &Cancel A&tsisakyti - + Cancel setup? Atsisakyti sąrankos? - + Cancel installation? Atsisakyti diegimo? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Ar tikrai norite atsisakyti dabartinio sąrankos proceso? Sąrankos programa užbaigs darbą ir visi pakeitimai bus prarasti. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Ar tikrai norite atsisakyti dabartinio diegimo proceso? @@ -455,45 +472,15 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Neatgaunama Python klaida. - - CalamaresUtils - - - Install log posted to: -%1 - Diegimo žurnalas paskelbtas į: -%1 - - CalamaresWindow - - Show debug information - Rodyti derinimo informaciją - - - - &Back - &Atgal - - - - &Next - &Toliau - - - - &Cancel - A&tsisakyti - - - + %1 Setup Program %1 sąrankos programa - + %1 Installer %1 diegimo programa @@ -814,50 +801,90 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. <h1>Jus sveikina %1 diegimo programa</h1> - + Your username is too long. Jūsų naudotojo vardas yra pernelyg ilgas. - + '%1' is not allowed as username. „%1“ neleidžiama naudoti kaip naudotojo vardą. - + Your username must start with a lowercase letter or underscore. Jūsų naudotojo vardas privalo prasidėti mažąja raide arba pabraukimo brūkšniu. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Yra leidžiamos tik mažosios raidės, skaitmenys, pabraukimo brūkšniai ir brūkšneliai. - + Your hostname is too short. Jūsų kompiuterio vardas yra pernelyg trumpas. - + Your hostname is too long. Jūsų kompiuterio vardas yra pernelyg ilgas. - + '%1' is not allowed as hostname. „%1“ neleidžiama naudoti kaip kompiuterio vardą. - + Only letters, numbers, underscore and hyphen are allowed. 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! + + + Setup Failed + Sąranka patyrė nesėkmę + + + + Installation Failed + Diegimas nepavyko + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Sąranka užbaigta + + + + Installation Complete + Diegimas užbaigtas + + + + The setup of %1 is complete. + %1 sąranka yra užbaigta. + + + + The installation of %1 is complete. + %1 diegimas yra užbaigtas. + ContextualProcessJob @@ -948,22 +975,43 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Sukurti naują %2MiB skaidinį diske %4 (%3) su %1 failų sistema. - + + 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>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Sukurti naują <strong>%2MiB</strong> skaidinį diske <strong>%4</strong> (%3) su <strong>%1</strong> failų sistema. - + + Creating new %1 partition on %2. Kuriamas naujas %1 skaidinys ties %2. - + The installer failed to create partition on disk '%1'. Diegimo programai nepavyko sukurti skaidinio diske '%1'. @@ -1290,37 +1338,57 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. FillGlobalStorageJob - + Set partition information Nustatyti skaidinio informaciją - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Įdiegti %1 <strong>naujame</strong> %2 sistemos skaidinyje. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Nustatyti <strong>naują</strong> %2 skaidinį su prijungimo tašku <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Diegti %2 sistemą, %3 sistemos skaidinyje <strong>%1</strong>. + + 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>. + + + + + 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>. - Nustatyti %3 skaidinį <strong>%1</strong> su prijungimo tašku <strong>%2</strong>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + Diegti %2 sistemą, %3 sistemos skaidinyje <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Diegti paleidyklę skaidinyje <strong>%1</strong>. - + Setting up mount points. Nustatomi prijungimo taškai. @@ -1338,62 +1406,50 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. &Paleisti iš naujo dabar - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Viskas atlikta.</h1><br/>%1 sistema jūsų kompiuteryje jau nustatyta.<br/>Dabar galite pradėti naudotis savo naująja 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>Pažymėjus šį langelį, jūsų sistema nedelsiant pasileis iš naujo, kai spustelėsite <span style="font-style:italic;">Atlikta</span> ar užversite sąrankos programą.</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>Viskas atlikta.</h1><br/>%1 sistema jau įdiegta.<br/>Galite iš naujo paleisti kompiuterį dabar ir naudotis savo naująja sistema; arba galite tęsti naudojimąsi %2 sistema demonstracinėje aplinkoje. - + <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>Pažymėjus šį langelį, jūsų sistema nedelsiant pasileis iš naujo, kai spustelėsite <span style="font-style:italic;">Atlikta</span> ar užversite diegimo programą.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Sąranka nepavyko</h1><br/>%1 nebuvo nustatyta jūsų kompiuteryje.<br/>Klaidos pranešimas buvo: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Diegimas nepavyko</h1><br/>%1 nebuvo įdiegta jūsų kompiuteryje.<br/>Klaidos pranešimas buvo: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Pabaiga + + + FinishedViewStep - - Setup Complete - Sąranka užbaigta - - - - Installation Complete - Diegimas užbaigtas - - - - The setup of %1 is complete. - %1 sąranka yra užbaigta. - - - - The installation of %1 is complete. - %1 diegimas yra užbaigtas. + + Finish + Pabaiga @@ -2280,7 +2336,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Nežinoma klaida - + Password is empty Slaptažodis yra tuščias @@ -2790,14 +2846,14 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. ProcessResult - + There was no output from the command. Nebuvo jokios išvesties iš komandos. - + Output: @@ -2806,52 +2862,52 @@ Išvestis: - + External command crashed. Išorinė komanda užstrigo. - + Command <i>%1</i> crashed. Komanda <i>%1</i> užstrigo. - + External command failed to start. Nepavyko paleisti išorinės komandos. - + Command <i>%1</i> failed to start. Nepavyko paleisti komandos <i>%1</i>. - + Internal error when starting command. Paleidžiant komandą, įvyko vidinė klaida. - + Bad parameters for process job call. Blogi parametrai proceso užduoties iškvietai. - + External command failed to finish. Nepavyko pabaigti išorinės komandos. - + Command <i>%1</i> failed to finish in %2 seconds. Nepavyko per %2 sek. pabaigti komandos <i>%1</i>. - + External command finished with errors. Išorinė komanda pabaigta su klaidomis. - + Command <i>%1</i> finished with exit code %2. Komanda <i>%1</i> pabaigta su išėjimo kodu %2. @@ -3670,12 +3726,12 @@ Išvestis: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Jei šiuo kompiuteriu naudosis keli žmonės, po sąrankos galite sukurti papildomas paskyras.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Jei šiuo kompiuteriu naudosis keli žmonės, po diegimo galite sukurti papildomas paskyras.</small> @@ -3914,6 +3970,44 @@ Išvestis: Atgal + + calamares-sidebar + + + Show debug information + Rodyti derinimo informaciją + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_lv.ts b/lang/calamares_lv.ts index 68b3310afc..64f623b79b 100644 --- a/lang/calamares_lv.ts +++ b/lang/calamares_lv.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +151,7 @@ Calamares::JobThread - + Done @@ -259,170 +267,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed - + Would you like to paste the install log to the web? - + Error - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -451,44 +468,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - - - - - &Next - - - - - &Cancel - - - - + %1 Setup Program - + %1 Installer @@ -809,50 +797,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -943,22 +971,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1285,37 +1334,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1333,61 +1402,49 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. + + Finish @@ -2264,7 +2321,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2774,65 +2831,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3648,12 +3705,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 installation.</small> @@ -3881,6 +3938,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts index 44e810d598..dd96ecff36 100644 --- a/lang/calamares_mk.ts +++ b/lang/calamares_mk.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Инсталирај @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Готово @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed - + Would you like to paste the install log to the web? - + Error Грешка - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Инсталацијата е готова. Исклучете го инсталерот. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -449,44 +466,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - - - - - &Next - - - - - &Cancel - - - - + %1 Setup Program - + %1 Installer @@ -807,50 +795,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -941,22 +969,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1283,37 +1332,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1331,61 +1400,49 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. + + Finish @@ -2253,7 +2310,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2763,65 +2820,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3637,12 +3694,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 installation.</small> @@ -3870,6 +3927,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts index 89068f4e86..75ac2f8c05 100644 --- a/lang/calamares_ml.ts +++ b/lang/calamares_ml.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ വിഡ്ജറ്റ് ട്രീ - + Debug information ഡീബഗ് വിവരങ്ങൾ @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up സജ്ജമാക്കുക - + Install ഇൻസ്റ്റാൾ ചെയ്യുക @@ -143,7 +151,7 @@ Calamares::JobThread - + Done പൂർത്തിയായി @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed സജ്ജീകരണപ്രക്രിയ പരാജയപ്പെട്ടു - + Installation Failed ഇൻസ്റ്റളേഷൻ പരാജയപ്പെട്ടു - + Would you like to paste the install log to the web? ഇൻസ്റ്റാൾ ലോഗ് വെബിലേക്ക് പകർത്തണോ? - + Error പിശക് - - + + &Yes വേണം (&Y) - - + + &No വേണ്ട (&N) - + &Close അടയ്ക്കുക (&C) - + Install Log Paste URL ഇൻസ്റ്റാൾ ലോഗ് പകർപ്പിന്റെ വിലാസം - + The upload was unsuccessful. No web-paste was done. അപ്‌ലോഡ് പരാജയമായിരുന്നു. വെബിലേക്ക് പകർത്തിയില്ല. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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 ഇൻസ്റ്റാൾ ചെയ്യാൻ കഴിയില്ല. ക്രമീകരിച്ച എല്ലാ മൊഡ്യൂളുകളും ലോഡുചെയ്യാൻ കാലാമറെസിന് കഴിഞ്ഞില്ല. വിതരണത്തിൽ കാലാമറെസ് ഉപയോഗിക്കുന്ന രീതിയിലുള്ള ഒരു പ്രശ്നമാണിത്. - + <br/>The following modules could not be loaded: <br/>താഴെ പറയുന്ന മൊഡ്യൂളുകൾ ലഭ്യമാക്കാനായില്ല: - + Continue with setup? സജ്ജീകരണപ്രക്രിയ തുടരണോ? - + 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> %2 സജ്ജീകരിക്കുന്നതിന് %1 സജ്ജീകരണ പ്രോഗ്രാം നിങ്ങളുടെ ഡിസ്കിൽ മാറ്റങ്ങൾ വരുത്താൻ പോകുന്നു.<br/><strong>നിങ്ങൾക്ക് ഈ മാറ്റങ്ങൾ പഴയപടിയാക്കാൻ കഴിയില്ല</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> %2 ഇൻസ്റ്റാളുചെയ്യുന്നതിന് %1 ഇൻസ്റ്റാളർ നിങ്ങളുടെ ഡിസ്കിൽ മാറ്റങ്ങൾ വരുത്താൻ പോകുന്നു.<br/><strong>നിങ്ങൾക്ക് ഈ മാറ്റങ്ങൾ പഴയപടിയാക്കാൻ കഴിയില്ല.</strong> - + &Set up now ഉടൻ സജ്ജീകരിക്കുക (&S) - + &Install now ഉടൻ ഇൻസ്റ്റാൾ ചെയ്യുക (&I) - + Go &back പുറകോട്ടു പോകുക - + &Set up സജ്ജീകരിക്കുക (&S) - + &Install ഇൻസ്റ്റാൾ (&I) - + Setup is complete. Close the setup program. സജ്ജീകരണം പൂർത്തിയായി. പ്രയോഗം അടയ്ക്കുക. - + The installation is complete. Close the installer. ഇൻസ്റ്റളേഷൻ പൂർത്തിയായി. ഇൻസ്റ്റാളർ അടയ്ക്കുക - + Cancel setup without changing the system. സിസ്റ്റത്തിന് മാറ്റമൊന്നും വരുത്താതെ സജ്ജീകരണപ്രക്രിയ റദ്ദാക്കുക. - + Cancel installation without changing the system. സിസ്റ്റത്തിന് മാറ്റമൊന്നും വരുത്താതെ ഇൻസ്റ്റളേഷൻ റദ്ദാക്കുക. - + &Next അടുത്തത് (&N) - + &Back പുറകോട്ട് (&B) - + &Done ചെയ്‌തു - + &Cancel റദ്ദാക്കുക (&C) - + Cancel setup? സജ്ജീകരണം റദ്ദാക്കണോ? - + 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 install process? The installer will quit and all changes will be lost. നിലവിലുള്ള ഇൻസ്റ്റാൾ പ്രക്രിയ റദ്ദാക്കണോ? @@ -451,45 +468,15 @@ The installer will quit and all changes will be lost. ലഭ്യമാക്കാനാവാത്ത പൈത്തൺ പിഴവ്. - - CalamaresUtils - - - Install log posted to: -%1 - ഇൻസ്റ്റാൾ ലോഗ് ഇങ്ങോട്ട് സ്ഥാപിച്ചിരിക്കുന്നു -%1 - - CalamaresWindow - - Show debug information - ഡീബഗ് വിവരങ്ങൾ കാണിക്കുക - - - - &Back - പുറകോട്ട് (&B) - - - - &Next - അടുത്തത് (&N) - - - - &Cancel - റദ്ദാക്കുക (&C) - - - + %1 Setup Program %1 സജ്ജീകരണപ്രയോഗം - + %1 Installer %1 ഇൻസ്റ്റാളർ @@ -810,50 +797,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. നിങ്ങളുടെ ഉപയോക്തൃനാമം വളരെ വലുതാണ്. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. താങ്കളുടെ ഉപയോക്തൃനാമം ഒരു ചെറിയ അക്ഷരമോ അണ്ടർസ്കോറോ ഉപയോഗിച്ച് വേണം തുടങ്ങാൻ. - + Only lowercase letters, numbers, underscore and hyphen are allowed. ചെറിയ അക്ഷരങ്ങൾ, അക്കങ്ങൾ, അണ്ടർസ്കോർ, ഹൈഫൺ എന്നിവയേ അനുവദിച്ചിട്ടുള്ളൂ. - + Your hostname is too short. നിങ്ങളുടെ ഹോസ്റ്റ്നാമം വളരെ ചെറുതാണ് - + Your hostname is too long. നിങ്ങളുടെ ഹോസ്റ്റ്നാമം ദൈർഘ്യമേറിയതാണ് - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. അക്ഷരങ്ങൾ, അക്കങ്ങൾ, അണ്ടർസ്കോർ, ഹൈഫൺ എന്നിവയേ അനുവദിച്ചിട്ടുള്ളൂ. - + Your passwords do not match! നിങ്ങളുടെ പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല! + + + Setup Failed + സജ്ജീകരണപ്രക്രിയ പരാജയപ്പെട്ടു + + + + Installation Failed + ഇൻസ്റ്റളേഷൻ പരാജയപ്പെട്ടു + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + സജ്ജീകരണം പൂർത്തിയായി + + + + Installation Complete + ഇൻസ്റ്റാളേഷൻ പൂർത്തിയായി + + + + The setup of %1 is complete. + %1 ന്റെ സജ്ജീകരണം പൂർത്തിയായി. + + + + The installation of %1 is complete. + %1 ന്റെ ഇൻസ്റ്റാളേഷൻ പൂർത്തിയായി. + ContextualProcessJob @@ -944,22 +971,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). + + + + Create new %2MiB partition on %4 (%3) with file system %1. ഫയൽ സിസ്റ്റം %1 ഉപയോഗിച്ച് %4 (%3) ൽ പുതിയ %2MiB പാർട്ടീഷൻ സൃഷ്ടിക്കുക. - + + 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>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. ഫയൽ സിസ്റ്റം <strong>%1</strong> ഉപയോഗിച്ച് <strong>%4</strong> (%3) ൽ പുതിയ <strong>%2MiB</strong> പാർട്ടീഷൻ സൃഷ്ടിക്കുക. - + + Creating new %1 partition on %2. %2 ൽ പുതിയ %1 പാർട്ടീഷൻ സൃഷ്ടിക്കുന്നു. - + The installer failed to create partition on disk '%1'. '%1' ഡിസ്കിൽ പാർട്ടീഷൻ സൃഷ്ടിക്കുന്നതിൽ ഇൻസ്റ്റാളർ പരാജയപ്പെട്ടു. @@ -1286,37 +1334,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. <strong>പുതിയ</strong> %2 സിസ്റ്റം പാർട്ടീഷനിൽ %1 ഇൻസ്റ്റാൾ ചെയ്യുക. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - <strong>%1</strong> മൗണ്ട് പോയിന്റോട് കൂടി <strong>പുതിയ</strong> %2 പാർട്ടീഷൻ സജ്ജീകരിക്കുക. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - %3 സിസ്റ്റം പാർട്ടീഷൻ <strong>%1-ൽ</strong> %2 ഇൻസ്റ്റാൾ ചെയ്യുക. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - <strong>%2</strong> മൗണ്ട് പോയിന്റോട് കൂടി %3 പാർട്ടീഷൻ %1 സജ്ജീകരിക്കുക. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + %3 സിസ്റ്റം പാർട്ടീഷൻ <strong>%1-ൽ</strong> %2 ഇൻസ്റ്റാൾ ചെയ്യുക. + + + Install boot loader on <strong>%1</strong>. <strong>%1-ൽ</strong> ബൂട്ട് ലോഡർ ഇൻസ്റ്റാൾ ചെയ്യുക. - + Setting up mount points. മൗണ്ട് പോയിന്റുകൾ സജ്ജീകരിക്കുക. @@ -1334,62 +1402,50 @@ The installer will quit and all changes will be lost. ഇപ്പോൾ റീസ്റ്റാർട്ട് ചെയ്യുക (&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>എല്ലാം പൂർത്തിയായി.</h1><br/>%1 താങ്കളുടെ കമ്പ്യൂട്ടറിൽ സജ്ജമാക്കപ്പെട്ടിരിക്കുന്നു. <br/>താങ്കൾക്ക് താങ്കളുടെ പുതിയ സിസ്റ്റം ഉപയോഗിച്ച് തുടങ്ങാം. - + <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>ഈ ബോക്സിൽ ശെരിയിട്ടാൽ,നിങ്ങളുടെ സിസ്റ്റം <span style="font-style:italic;">പൂർത്തിയായി </span>അമർത്തുമ്പോഴോ സജ്ജീകരണ പ്രോഗ്രാം അടയ്ക്കുമ്പോഴോ ഉടൻ പുനരാരംഭിക്കും. - + <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>എല്ലാം പൂർത്തിയായി.</h1><br/> %1 നിങ്ങളുടെ കമ്പ്യൂട്ടറിൽ ഇൻസ്റ്റാൾ ചെയ്തു. <br/>നിങ്ങൾക്ക് ഇപ്പോൾ നിങ്ങളുടെ പുതിയ സിസ്റ്റത്തിലേക്ക് പുനരാരംഭിക്കാം അല്ലെങ്കിൽ %2 ലൈവ് എൻവയോൺമെൻറ് ഉപയോഗിക്കുന്നത് തുടരാം. - + <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>ഈ ബോക്സിൽ ശെരിയിട്ടാൽ,നിങ്ങളുടെ സിസ്റ്റം <span style="font-style:italic;">പൂർത്തിയായി </span>അമർത്തുമ്പോഴോ സജ്ജീകരണ പ്രോഗ്രാം അടയ്ക്കുമ്പോഴോ ഉടൻ പുനരാരംഭിക്കും. - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>സജ്ജീകരണം പരാജയപ്പെട്ടു</h1><br/>നിങ്ങളുടെ കമ്പ്യൂട്ടറിൽ %1 സജ്ജമാക്കിയിട്ടില്ല.<br/>പിശക് സന്ദേശം ഇതായിരുന്നു: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>ഇൻസ്റ്റാളേഷൻ പരാജയപ്പെട്ടു</h1><br/> നിങ്ങളുടെ കമ്പ്യൂട്ടറിൽ %1 സജ്ജമാക്കിയിട്ടില്ല.<br/>പിശക് സന്ദേശം ഇതായിരുന്നു: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish പൂർത്തിയാക്കുക + + + FinishedViewStep - - Setup Complete - സജ്ജീകരണം പൂർത്തിയായി - - - - Installation Complete - ഇൻസ്റ്റാളേഷൻ പൂർത്തിയായി - - - - The setup of %1 is complete. - %1 ന്റെ സജ്ജീകരണം പൂർത്തിയായി. - - - - The installation of %1 is complete. - %1 ന്റെ ഇൻസ്റ്റാളേഷൻ പൂർത്തിയായി. + + Finish + പൂർത്തിയാക്കുക @@ -2256,7 +2312,7 @@ The installer will quit and all changes will be lost. അപരിചിതമായ പിശക് - + Password is empty രഹസ്യവാക്ക് ശൂന്യമാണ് @@ -2766,14 +2822,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. ആജ്ഞയിൽ നിന്നും ഔട്ട്പുട്ടൊന്നുമില്ല. - + Output: @@ -2782,52 +2838,52 @@ Output: - + External command crashed. ബാഹ്യമായ ആജ്ഞ തകർന്നു. - + Command <i>%1</i> crashed. ആജ്ഞ <i>%1</i> പ്രവർത്തനരഹിതമായി. - + External command failed to start. ബാഹ്യമായ ആജ്ഞ ആരംഭിക്കുന്നതിൽ പരാജയപ്പെട്ടു. - + Command <i>%1</i> failed to start. <i>%1</i>ആജ്ഞ ആരംഭിക്കുന്നതിൽ പരാജയപ്പെട്ടു. - + Internal error when starting command. ആജ്ഞ ആരംഭിക്കുന്നതിൽ ആന്തരികമായ പിഴവ്. - + Bad parameters for process job call. പ്രക്രിയ ജോലി വിളിയ്ക്ക് ശരിയല്ലാത്ത പരാമീറ്ററുകൾ. - + External command failed to finish. ബാഹ്യമായ ആജ്ഞ പൂർത്തിയാവുന്നതിൽ പരാജയപ്പെട്ടു. - + Command <i>%1</i> failed to finish in %2 seconds. ആജ്ഞ <i>%1</i> %2 സെക്കൻഡുകൾക്കുള്ളിൽ പൂർത്തിയാവുന്നതിൽ പരാജയപ്പെട്ടു. - + External command finished with errors. ബാഹ്യമായ ആജ്ഞ പിഴവുകളോട് കൂടീ പൂർത്തിയായി. - + Command <i>%1</i> finished with exit code %2. ആജ്ഞ <i>%1</i> എക്സിറ്റ് കോഡ് %2ഓട് കൂടി പൂർത്തിയായി. @@ -3643,12 +3699,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>ഒന്നിലധികം ആളുകൾ ഈ കമ്പ്യൂട്ടർ ഉപയോഗിക്കുമെങ്കിൽ, താങ്കൾക്ക് സജ്ജീകരണത്തിന് ശേഷം നിരവധി അക്കൗണ്ടുകൾ സൃഷ്ടിക്കാം.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>ഒന്നിലധികം ആളുകൾ ഈ കമ്പ്യൂട്ടർ ഉപയോഗിക്കുമെങ്കിൽ, താങ്കൾക്ക് ഇൻസ്റ്റളേഷന് ശേഷം നിരവധി അക്കൗണ്ടുകൾ സൃഷ്ടിക്കാം.</small> @@ -3876,6 +3932,44 @@ Output: + + calamares-sidebar + + + Show debug information + ഡീബഗ് വിവരങ്ങൾ കാണിക്കുക + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts index 5b7196f5ad..402e61e30d 100644 --- a/lang/calamares_mr.ts +++ b/lang/calamares_mr.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information दोषमार्जन माहिती @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install अधिष्ठापना @@ -143,7 +151,7 @@ Calamares::JobThread - + Done पूर्ण झाली @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed अधिष्ठापना अयशस्वी झाली - + Would you like to paste the install log to the web? - + Error त्रुटी - - + + &Yes &होय - - + + &No &नाही - + &Close &बंद करा - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now &आता अधिष्ठापित करा - + Go &back &मागे जा - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. अधिष्ठापना संपूर्ण झाली. अधिष्ठापक बंद करा. - + Cancel setup without changing the system. - + Cancel installation without changing the system. प्रणालीत बदल न करता अधिष्टापना रद्द करा. - + &Next &पुढे - + &Back &मागे - + &Done &पूर्ण झाली - + &Cancel &रद्द करा - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -449,44 +466,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - दोषमार्जन माहिती दर्शवा - - - - &Back - &मागे - - - - &Next - &पुढे - - - - &Cancel - &रद्द करा - - - + %1 Setup Program - + %1 Installer %1 अधिष्ठापक @@ -807,50 +795,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. तुमचा वापरकर्तानाव खूप लांब आहे - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. तुमचा संगणकनाव खूप लहान आहे - + Your hostname is too long. तुमचा संगणकनाव खूप लांब आहे - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! तुमचा परवलीशब्द जुळत नाही + + + Setup Failed + + + + + Installation Failed + अधिष्ठापना अयशस्वी झाली + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -941,22 +969,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. %2 वर %1 हे नवीन विभाजन निर्माण करत आहे - + The installer failed to create partition on disk '%1'. @@ -1283,37 +1332,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1331,61 +1400,49 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. + + Finish @@ -2253,7 +2310,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2763,65 +2820,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3637,12 +3694,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 installation.</small> @@ -3870,6 +3927,44 @@ Output: + + calamares-sidebar + + + Show debug information + दोषमार्जन माहिती दर्शवा + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts index a416a08c5d..a6b94c9aec 100644 --- a/lang/calamares_nb.ts +++ b/lang/calamares_nb.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information Debug informasjon @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Installer @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Ferdig @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed Installasjon feilet - + Would you like to paste the install log to the web? - + Error Feil - - + + &Yes &Ja - - + + &No &Nei - + &Close &Lukk - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? Fortsette å sette opp? - + 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 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 vil nå gjøre endringer på harddisken, for å installere %2. <br/><strong>Du vil ikke kunne omgjøre disse endringene.</strong> - + &Set up now - + &Install now &Installer nå - + Go &back Gå &tilbake - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Installasjonen er fullført. Lukk installeringsprogrammet. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Neste - + &Back &Tilbake - + &Done &Ferdig - + &Cancel &Avbryt - + Cancel setup? - + Cancel installation? Avbryte installasjon? - + 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. Vil du virkelig avbryte installasjonen? @@ -450,44 +467,15 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.Ukjent Python feil. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - Vis feilrettingsinformasjon - - - - &Back - &Tilbake - - - - &Next - &Neste - - - - &Cancel - &Avbryt - - - + %1 Setup Program - + %1 Installer %1 Installasjonsprogram @@ -808,50 +796,90 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + Your username is too long. Brukernavnet ditt er for langt. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + Installasjon feilet + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + Installasjon fullført + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + Installasjonen av %1 er fullført. + ContextualProcessJob @@ -942,22 +970,43 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1284,37 +1333,57 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1332,63 +1401,51 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.&Start på nytt nå - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Innnstallasjonen mislyktes</h1><br/>%1 har ikke blitt installert på datamaskinen din.<br/>Feilmeldingen var: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - Installasjon fullført - - - - The setup of %1 is complete. + + Finish - - - The installation of %1 is complete. - Installasjonen av %1 er fullført. - FormatPartitionJob @@ -2254,7 +2311,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.Ukjent feil - + Password is empty @@ -2764,65 +2821,65 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Ugyldige parametere for prosessens oppgavekall - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3638,12 +3695,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 installation.</small> @@ -3871,6 +3928,44 @@ Output: + + calamares-sidebar + + + Show debug information + Vis feilrettingsinformasjon + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_ne.ts b/lang/calamares_ne.ts new file mode 100644 index 0000000000..8df2e202ea --- /dev/null +++ b/lang/calamares_ne.ts @@ -0,0 +1,4228 @@ + + + + + AutoMountManagementJob + + + Manage auto-mount settings + + + + + 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. + + + + + 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. + + + + + BootLoaderModel + + + Master Boot Record of %1 + + + + + Boot Partition + + + + + System Partition + + + + + Do not install a boot loader + + + + + %1 (%2) + + + + + Calamares::BlankViewStep + + + Blank Page + + + + + Calamares::DebugWindow + + + Form + + + + + GlobalStorage + + + + + JobQueue + + + + + Modules + + + + + Type: + + + + + + none + + + + + Interface: + + + + + Tools + + + + + Reload Stylesheet + + + + + Widget Tree + + + + + Debug information + + + + + Calamares::ExecutionViewStep + + + Set up + + + + + Install + + + + + Calamares::FailJob + + + Job failed (%1) + + + + + Programmed job failure was explicitly requested. + + + + + Calamares::JobThread + + + Done + + + + + Calamares::NamedJob + + + Example job (%1) + + + + + Calamares::ProcessJob + + + Run command '%1' in target system. + + + + + Run command '%1'. + + + + + Running command %1 %2 + + + + + Calamares::PythonJob + + + Running %1 operation. + + + + + Bad working directory path + + + + + Working directory %1 for python job %2 is not readable. + + + + + Bad main script file + + + + + Main script file %1 for python job %2 is not readable. + + + + + Boost.Python error in job "%1". + + + + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + + + Calamares::RequirementsChecker + + + Requirements checking for module <i>%1</i> is complete. + + + + + Waiting for %n module(s). + + + + + + + + (%n second(s)) + + + + + + + + System-requirements checking is complete. + + + + + Calamares::ViewManager + + + Setup Failed + + + + + Installation Failed + + + + + Would you like to paste the install log to the web? + + + + + Error + + + + + + &Yes + + + + + + &No + + + + + &Close + + + + + Install Log Paste URL + + + + + The upload was unsuccessful. No web-paste was done. + + + + + Install log posted to + +%1 + +Link copied to clipboard + + + + + 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. + + + + + <br/>The following modules could not be loaded: + + + + + Continue with setup? + + + + + 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 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 + + + + + &Install now + + + + + Go &back + + + + + &Set up + + + + + &Install + + + + + Setup is complete. Close the setup program. + + + + + The installation is complete. Close the installer. + + + + + Cancel setup without changing the system. + + + + + Cancel installation without changing the system. + + + + + &Next + + + + + &Back + + + + + &Done + + + + + &Cancel + + + + + Cancel setup? + + + + + 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 install process? +The installer will quit and all changes will be lost. + + + + + CalamaresPython::Helper + + + Unknown exception type + + + + + unparseable Python error + + + + + unparseable Python traceback + + + + + Unfetchable Python error. + + + + + CalamaresWindow + + + %1 Setup Program + + + + + %1 Installer + + + + + CheckerContainer + + + Gathering system information... + + + + + ChoicePage + + + Form + + + + + Select storage de&vice: + + + + + + + + Current: + + + + + After: + + + + + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. + + + + + Reuse %1 as home partition for %2. + + + + + <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. + + + + + Boot loader location: + + + + + <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. + + + + + The EFI system partition at %1 will be used for starting %2. + + + + + 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. + + + + + + + + <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>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 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 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 is a part of an <strong>inactive RAID</strong> device. + + + + + No Swap + + + + + Reuse Swap + + + + + Swap (no Hibernate) + + + + + Swap (with Hibernate) + + + + + Swap to file + + + + + ClearMountsJob + + + Clear mounts for partitioning operations on %1 + + + + + Clearing mounts for partitioning operations on %1. + + + + + Cleared all mounts for %1 + + + + + ClearTempMountsJob + + + Clear all temporary mounts. + + + + + Clearing all temporary mounts. + + + + + Cannot get list of temporary mounts. + + + + + Cleared all temporary mounts. + + + + + CommandList + + + + Could not run command. + + + + + The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. + + + + + The command needs to know the user's name, but no username is defined. + + + + + Config + + + Set keyboard model to %1.<br/> + + + + + Set keyboard layout to %1/%2. + + + + + Set timezone to %1/%2. + + + + + The system language will be set to %1. + + + + + The numbers and dates locale will be set to %1. + + + + + Network Installation. (Disabled: Incorrect configuration) + + + + + Network Installation. (Disabled: Received invalid groups data) + + + + + Network Installation. (Disabled: internal error) + + + + + 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. <a href="#details">Details...</a> + + + + + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> + + + + + 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 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 %1 setup</h1> + + + + + <h1>Welcome to the Calamares installer for %1</h1> + + + + + <h1>Welcome to the %1 installer</h1> + + + + + Your username is too long. + + + + + '%1' is not allowed as username. + + + + + Your username must start with a lowercase letter or underscore. + + + + + Only lowercase letters, numbers, underscore and hyphen are allowed. + + + + + Your hostname is too short. + + + + + Your hostname is too long. + + + + + '%1' is not allowed as hostname. + + + + + Only letters, numbers, underscore and hyphen are allowed. + + + + + Your passwords do not match! + + + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + + + + ContextualProcessJob + + + Contextual Processes Job + + + + + CreatePartitionDialog + + + Create a Partition + + + + + Si&ze: + + + + + MiB + + + + + Partition &Type: + + + + + &Primary + + + + + E&xtended + + + + + Fi&le System: + + + + + LVM LV name + + + + + &Mount Point: + + + + + Flags: + + + + + En&crypt + + + + + Logical + + + + + Primary + + + + + GPT + + + + + Mountpoint already in use. Please select another one. + + + + + CreatePartitionJob + + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + + 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). + + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. + + + + + + Creating new %1 partition on %2. + + + + + The installer failed to create partition on disk '%1'. + + + + + CreatePartitionTableDialog + + + Create Partition Table + + + + + Creating a new partition table will delete all existing data on the disk. + + + + + What kind of partition table do you want to create? + + + + + Master Boot Record (MBR) + + + + + GUID Partition Table (GPT) + + + + + CreatePartitionTableJob + + + Create new %1 partition table on %2. + + + + + Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). + + + + + Creating new %1 partition table on %2. + + + + + The installer failed to create a partition table on %1. + + + + + CreateUserJob + + + Create user %1 + + + + + Create user <strong>%1</strong>. + + + + + Preserving home directory + + + + + + Creating user %1 + + + + + Configuring user %1 + + + + + Setting file permissions + + + + + CreateVolumeGroupDialog + + + Create Volume Group + + + + + CreateVolumeGroupJob + + + Create new volume group named %1. + + + + + Create new volume group named <strong>%1</strong>. + + + + + Creating new volume group named %1. + + + + + The installer failed to create a volume group named '%1'. + + + + + DeactivateVolumeGroupJob + + + + Deactivate volume group named %1. + + + + + Deactivate volume group named <strong>%1</strong>. + + + + + The installer failed to deactivate a volume group named %1. + + + + + DeletePartitionJob + + + Delete partition %1. + + + + + Delete partition <strong>%1</strong>. + + + + + Deleting partition %1. + + + + + The installer failed to delete partition %1. + + + + + DeviceInfoWidget + + + 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 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 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. + + + + + DeviceModel + + + %1 - %2 (%3) + device[name] - size[number] (device-node[name]) + + + + + %1 - (%2) + device[name] - (device-node[name]) + + + + + DracutLuksCfgJob + + + Write LUKS configuration for Dracut to %1 + + + + + Skip writing LUKS configuration for Dracut: "/" partition is not encrypted + + + + + Failed to open %1 + + + + + DummyCppJob + + + Dummy C++ Job + + + + + EditExistingPartitionDialog + + + Edit Existing Partition + + + + + Content: + + + + + &Keep + + + + + Format + + + + + Warning: Formatting the partition will erase all existing data. + + + + + &Mount Point: + + + + + Si&ze: + + + + + MiB + + + + + Fi&le System: + + + + + Flags: + + + + + Mountpoint already in use. Please select another one. + + + + + EncryptWidget + + + Form + + + + + En&crypt system + + + + + Passphrase + + + + + Confirm passphrase + + + + + + Please enter the same passphrase in both boxes. + + + + + FillGlobalStorageJob + + + 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. + + + + + 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. + + + + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + + + + + Install boot loader on <strong>%1</strong>. + + + + + Setting up mount points. + + + + + FinishedPage + + + Form + + + + + &Restart now + + + + + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. + + + + + <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> + + + + + <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. + + + + + <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> + + + + + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. + + + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + + + + FinishedQmlViewStep + + + Finish + + + + + FinishedViewStep + + + Finish + + + + + FormatPartitionJob + + + 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>. + + + + + Formatting partition %1 with file system %2. + + + + + The installer failed to format partition %1 on disk '%2'. + + + + + GeneralRequirements + + + has at least %1 GiB available drive space + + + + + There is not enough drive space. At least %1 GiB is required. + + + + + has at least %1 GiB working memory + + + + + The system does not have enough working memory. At least %1 GiB is required. + + + + + is plugged in to a power source + + + + + The system is not plugged in to a power source. + + + + + is connected to the Internet + + + + + The system is not connected to the Internet. + + + + + is running the installer as an administrator (root) + + + + + The setup program is not running with administrator rights. + + + + + The installer is not running with administrator rights. + + + + + 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 installer. + + + + + HostInfoJob + + + Collecting information about your machine. + + + + + IDJob + + + + + + OEM Batch Identifier + + + + + Could not create directories <code>%1</code>. + + + + + Could not open file <code>%1</code>. + + + + + Could not write to file <code>%1</code>. + + + + + InitcpioJob + + + Creating initramfs with mkinitcpio. + + + + + InitramfsJob + + + Creating initramfs. + + + + + InteractiveTerminalPage + + + Konsole not installed + + + + + Please install KDE Konsole and try again! + + + + + Executing script: &nbsp;<code>%1</code> + + + + + InteractiveTerminalViewStep + + + Script + + + + + KeyboardQmlViewStep + + + Keyboard + + + + + KeyboardViewStep + + + Keyboard + + + + + LCLocaleDialog + + + System locale setting + + + + + 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>. + + + + + &Cancel + + + + + &OK + + + + + LicensePage + + + Form + + + + + <h1>License Agreement</h1> + + + + + I accept the terms and conditions above. + + + + + Please review the End User License Agreements (EULAs). + + + + + 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. + + + + + 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. + + + + + LicenseViewStep + + + License + + + + + LicenseWidget + + + URL: %1 + + + + + <strong>%1 driver</strong><br/>by %2 + %1 is an untranslatable product name, example: Creative Audigy driver + + + + + <strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font> + %1 is usually a vendor name, example: Nvidia graphics driver + + + + + <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1 codec</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1 package</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1</strong><br/><font color="Grey">by %2</font> + + + + + File: %1 + + + + + Hide license text + + + + + Show the license text + + + + + Open license agreement in browser. + + + + + LocalePage + + + Region: + + + + + Zone: + + + + + + &Change... + + + + + LocaleQmlViewStep + + + Location + + + + + LocaleViewStep + + + Location + + + + + LuksBootKeyFileJob + + + Configuring LUKS key file. + + + + + + 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 + + + Generate machine-id. + + + + + Configuration Error + + + + + No root mount point is set for MachineId. + + + + + Map + + + Timezone: %1 + + + + + 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. + + + + + NetInstallViewStep + + + + Package selection + + + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + Communication + + + + + Development + + + + + Office + + + + + Multimedia + + + + + Internet + + + + + Theming + + + + + Gaming + + + + + Utilities + + + + + NotesQmlViewStep + + + Notes + + + + + OEMPage + + + Ba&tch: + + + + + <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> + + + + + <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html> + + + + + OEMViewStep + + + OEM Configuration + + + + + Set the OEM Batch Identifier to <code>%1</code>. + + + + + Offline + + + Select your preferred Region, or use the default one based on your current location. + + + + + + + Timezone: %1 + + + + + Select your preferred Zone within your Region. + + + + + Zones + + + + + You can fine-tune Language and Locale settings below. + + + + + PWQ + + + Password is too short + + + + + Password is too long + + + + + Password is too weak + + + + + Memory allocation error when setting '%1' + + + + + Memory allocation error + + + + + The password is the same as the old one + + + + + The password is a palindrome + + + + + The password differs with case changes only + + + + + The password is too similar to the old one + + + + + 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 forbidden words in some form + + + + + The password contains too few digits + + + + + The password contains too few uppercase letters + + + + + The password contains fewer than %n lowercase letters + + + + + + + + The password contains too few lowercase letters + + + + + The password contains too few non-alphanumeric characters + + + + + The password is too short + + + + + The password does not contain enough character classes + + + + + The password contains too many same characters 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 uppercase letters + + + + + + + + The password contains fewer than %n non-alphanumeric characters + + + + + + + + The password is shorter than %n characters + + + + + + + + The password is a rotated version of the previous one + + + + + The password contains fewer than %n character classes + + + + + + + + The password contains more than %n same characters consecutively + + + + + + + + The password contains more than %n characters of the same class consecutively + + + + + + + + The password contains monotonic sequence longer than %n characters + + + + + + + + The password contains too long of a monotonic character sequence + + + + + No password supplied + + + + + Cannot obtain random numbers from the RNG device + + + + + Password generation failed - required entropy too low for settings + + + + + The password fails the dictionary check - %1 + + + + + The password fails the dictionary check + + + + + Unknown setting - %1 + + + + + Unknown setting + + + + + Bad integer value of setting - %1 + + + + + Bad integer value + + + + + Setting %1 is not of integer type + + + + + Setting is not of integer type + + + + + Setting %1 is not of string type + + + + + Setting is not of string type + + + + + Opening the configuration file failed + + + + + The configuration file is malformed + + + + + Fatal failure + + + + + Unknown error + + + + + Password is empty + + + + + PackageChooserPage + + + Form + + + + + Product Name + + + + + TextLabel + + + + + Long Product Description + + + + + Package Selection + + + + + Please pick a product from the list. The selected product will be installed. + + + + + PackageChooserViewStep + + + Packages + + + + + PackageModel + + + Name + + + + + Description + + + + + Page_Keyboard + + + Form + + + + + Keyboard Model: + + + + + Type here to test your keyboard + + + + + Page_UserSetup + + + Form + + + + + What is your name? + + + + + Your Full Name + + + + + What name do you want to use to log in? + + + + + login + + + + + What is the name of this computer? + + + + + <small>This name will be used if you make the computer visible to others on a network.</small> + + + + + Computer Name + + + + + Choose a password to keep your account safe. + + + + + + <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> + + + + + + Password + + + + + + Repeat Password + + + + + When this box is checked, password-strength checking is done and you will not be able to use a weak password. + + + + + Require strong passwords. + + + + + Log in automatically without asking for the password. + + + + + Use the same password for the administrator account. + + + + + Choose a password for the administrator account. + + + + + + <small>Enter the same password twice, so that it can be checked for typing errors.</small> + + + + + PartitionLabelsView + + + Root + + + + + Home + + + + + Boot + + + + + EFI system + + + + + Swap + + + + + New partition for %1 + + + + + New partition + + + + + %1 %2 + size[number] filesystem[name] + + + + + PartitionModel + + + + Free Space + + + + + + New partition + + + + + Name + + + + + File System + + + + + Mount Point + + + + + Size + + + + + PartitionPage + + + Form + + + + + Storage de&vice: + + + + + &Revert All Changes + + + + + New Partition &Table + + + + + Cre&ate + + + + + &Edit + + + + + &Delete + + + + + New Volume Group + + + + + Resize Volume Group + + + + + Deactivate Volume Group + + + + + Remove Volume Group + + + + + I&nstall boot loader on: + + + + + Are you sure you want to create a new partition table on %1? + + + + + Can not create new partition + + + + + 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. + + + + + PartitionViewStep + + + Gathering system information... + + + + + Partitions + + + + + Install %1 <strong>alongside</strong> another operating system. + + + + + <strong>Erase</strong> disk and install %1. + + + + + <strong>Replace</strong> a partition with %1. + + + + + <strong>Manual</strong> partitioning. + + + + + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). + + + + + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. + + + + + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. + + + + + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). + + + + + Disk <strong>%1</strong> (%2) + + + + + Current: + + + + + After: + + + + + No EFI system partition configured + + + + + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. + + + + + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. + + + + + EFI system partition flag not set + + + + + 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>bios_grub</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. + + + + + PlasmaLnfJob + + + Plasma Look-and-Feel Job + + + + + + Could not select KDE Plasma Look-and-Feel package + + + + + 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. + + + + + 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 installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. + + + + + PlasmaLnfViewStep + + + Look-and-Feel + + + + + PreserveFiles + + + Saving files for later ... + + + + + No files configured to save for later. + + + + + Not all of the configured files could be preserved. + + + + + ProcessResult + + + +There was no output from the command. + + + + + +Output: + + + + + + External command crashed. + + + + + Command <i>%1</i> crashed. + + + + + External command failed to start. + + + + + Command <i>%1</i> failed to start. + + + + + Internal error when starting command. + + + + + Bad parameters for process job call. + + + + + External command failed to finish. + + + + + Command <i>%1</i> failed to finish in %2 seconds. + + + + + External command finished with errors. + + + + + Command <i>%1</i> finished with exit code %2. + + + + + QObject + + + %1 (%2) + + + + + unknown + + + + + extended + + + + + unformatted + + + + + swap + + + + + + Default + + + + + + + + File not found + + + + + Path <pre>%1</pre> must be an absolute path. + + + + + Directory not found + + + + + + Could not create new random file <pre>%1</pre>. + + + + + No product + + + + + No description provided. + + + + + (no mount point) + + + + + Unpartitioned space or unknown partition table + + + + + Recommended + + + <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> + + + + + RemoveUserJob + + + Remove live user from target system + + + + + RemoveVolumeGroupJob + + + + Remove Volume Group named %1. + + + + + Remove Volume Group named <strong>%1</strong>. + + + + + The installer failed to remove a volume group named '%1'. + + + + + ReplaceWidget + + + Form + + + + + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. + + + + + The selected item does not appear to be a valid partition. + + + + + %1 cannot be installed on empty space. Please select an existing partition. + + + + + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. + + + + + %1 cannot be installed on this partition. + + + + + Data partition (%1) + + + + + Unknown system partition (%1) + + + + + %1 system partition (%2) + + + + + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. + + + + + <strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. + + + + + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. + + + + + The EFI system partition at %1 will be used for starting %2. + + + + + EFI system partition: + + + + + Requirements + + + <p>This computer does not satisfy the minimum requirements for installing %1.<br/> + Installation cannot continue.</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> + + + + + ResizeFSJob + + + Resize Filesystem Job + + + + + Invalid configuration + + + + + The file-system resize job has an invalid configuration and will not run. + + + + + KPMCore not Available + + + + + Calamares cannot start KPMCore for the file-system resize job. + + + + + + + + + Resize Failed + + + + + 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 filesystem %1 cannot be resized. + + + + + + The device %1 cannot be resized. + + + + + The filesystem %1 must be resized, but cannot. + + + + + The device %1 must be resized, but cannot + + + + + ResizePartitionJob + + + Resize partition %1. + + + + + Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. + + + + + Resizing %2MiB partition %1 to %3MiB. + + + + + The installer failed to resize partition %1 on disk '%2'. + + + + + ResizeVolumeGroupDialog + + + Resize Volume Group + + + + + ResizeVolumeGroupJob + + + + Resize volume group named %1 from %2 to %3. + + + + + Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>. + + + + + The installer failed to resize a volume group named '%1'. + + + + + ResultsListDialog + + + For best results, please ensure that this computer: + + + + + System requirements + + + + + ResultsListWidget + + + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> + + + + + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> + + + + + 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 program will ask you some questions and set up %2 on your computer. + + + + + ScanningDialog + + + Scanning storage devices... + + + + + Partitioning + + + + + SetHostNameJob + + + Set hostname %1 + + + + + Set hostname <strong>%1</strong>. + + + + + Setting hostname %1. + + + + + + Internal Error + + + + + + Cannot write hostname to target system + + + + + SetKeyboardLayoutJob + + + Set keyboard model to %1, layout to %2-%3 + + + + + Failed to write keyboard configuration for the virtual console. + + + + + + + Failed to write to %1 + + + + + Failed to write keyboard configuration for X11. + + + + + Failed to write keyboard configuration to existing /etc/default directory. + + + + + SetPartFlagsJob + + + Set flags on partition %1. + + + + + Set flags on %1MiB %2 partition. + + + + + Set flags on new partition. + + + + + Clear flags on partition <strong>%1</strong>. + + + + + Clear flags on %1MiB <strong>%2</strong> partition. + + + + + Clear flags on new partition. + + + + + Flag partition <strong>%1</strong> as <strong>%2</strong>. + + + + + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. + + + + + Flag new partition as <strong>%1</strong>. + + + + + Clearing flags on partition <strong>%1</strong>. + + + + + Clearing flags on %1MiB <strong>%2</strong> partition. + + + + + Clearing flags on new partition. + + + + + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. + + + + + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. + + + + + Setting flags <strong>%1</strong> on new partition. + + + + + The installer failed to set flags on partition %1. + + + + + SetPasswordJob + + + Set password for user %1 + + + + + Setting password for user %1. + + + + + Bad destination system path. + + + + + rootMountPoint is %1 + + + + + Cannot disable root account. + + + + + passwd terminated with error code %1. + + + + + Cannot set password for user %1. + + + + + usermod terminated with error code %1. + + + + + SetTimezoneJob + + + Set timezone to %1/%2 + + + + + Cannot access selected timezone path. + + + + + Bad path: %1 + + + + + Cannot set timezone. + + + + + Link creation failed, target: %1; link name: %2 + + + + + Cannot set timezone, + + + + + Cannot open /etc/timezone for writing + + + + + SetupGroupsJob + + + Preparing groups. + + + + + + Could not create groups in target system + + + + + These groups are missing in the target system: %1 + + + + + SetupSudoJob + + + Configure <pre>sudo</pre> users. + + + + + Cannot chmod sudoers file. + + + + + Cannot create sudoers file for writing. + + + + + ShellProcessJob + + + Shell Processes Job + + + + + SlideCounter + + + %L1 / %L2 + slide counter, %1 of %2 (numeric) + + + + + SummaryPage + + + This is an overview of what will happen once you start the setup procedure. + + + + + This is an overview of what will happen once you start the install procedure. + + + + + SummaryViewStep + + + Summary + + + + + TrackingInstallJob + + + Installation feedback + + + + + Sending installation feedback. + + + + + Internal error in install-tracking. + + + + + HTTP request timed out. + + + + + TrackingKUserFeedbackJob + + + KDE user feedback + + + + + Configuring KDE user feedback. + + + + + + Error in KDE user feedback configuration. + + + + + Could not configure KDE user feedback correctly, script error %1. + + + + + Could not configure KDE user feedback correctly, Calamares error %1. + + + + + TrackingMachineUpdateManagerJob + + + Machine feedback + + + + + Configuring machine feedback. + + + + + + Error in machine feedback configuration. + + + + + Could not configure machine feedback correctly, script error %1. + + + + + Could not configure machine feedback correctly, Calamares error %1. + + + + + TrackingPage + + + Form + + + + + Placeholder + + + + + <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><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> + + + + + 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. + + + + + 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. + + + + + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. + + + + + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. + + + + + TrackingViewStep + + + Feedback + + + + + 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 installation.</small> + + + + + UsersQmlViewStep + + + Users + + + + + UsersViewStep + + + Users + + + + + VariantModel + + + Key + Column header for key/value + + + + + Value + Column header for key/value + + + + + VolumeGroupBaseDialog + + + Create Volume Group + + + + + List of Physical Volumes + + + + + Volume Group Name: + + + + + Volume Group Type: + + + + + Physical Extent Size: + + + + + MiB + + + + + Total Size: + + + + + Used Size: + + + + + Total Sectors: + + + + + Quantity of LVs: + + + + + WelcomePage + + + Form + + + + + + Select application and system language + + + + + &About + + + + + Open donations website + + + + + &Donate + + + + + Open help and support website + + + + + &Support + + + + + Open issues and bug-tracking website + + + + + &Known issues + + + + + Open release notes website + + + + + &Release notes + + + + + <h1>Welcome to the Calamares setup program for %1.</h1> + + + + + <h1>Welcome to %1 setup.</h1> + + + + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + + <h1>Welcome to the %1 installer.</h1> + + + + + %1 support + + + + + About %1 setup + + + + + About %1 installer + + + + + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.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. + + + + + WelcomeQmlViewStep + + + Welcome + + + + + WelcomeViewStep + + + Welcome + + + + + about + + + <h1>%1</h1><br/> + <strong>%2<br/> + for %3</strong><br/><br/> + Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> + and the <a href='https://www.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. + + + + + Back + + + + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + + + i18n + + + <h1>Languages</h1> </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>. + + + + + <h1>Locales</h1> </br> + The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>. + + + + + Back + + + + + keyboardq + + + Keyboard Model + + + + + Layouts + + + + + Keyboard Layout + + + + + Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. + + + + + Models + + + + + Variants + + + + + Keyboard Variant + + + + + Test your keyboard + + + + + localeq + + + Change + + + + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + release_notes + + + <h3>%1</h3> + <p>This an example QML file, showing options in RichText with Flickable content.</p> + + <p>QML with RichText can use HTML tags, Flickable content is useful for touchscreens.</p> + + <p><b>This is bold text</b></p> + <p><i>This is italic text</i></p> + <p><u>This is underlined text</u></p> + <p><center>This text will be center-aligned.</center></p> + <p><s>This is strikethrough</s></p> + + <p>Code example: + <code>ls -l /home</code></p> + + <p><b>Lists:</b></p> + <ul> + <li>Intel CPU systems</li> + <li>AMD CPU systems</li> + </ul> + + <p>The vertical scrollbar is adjustable, current width set to 10.</p> + + + + + Back + + + + + usersq + + + Pick your user name and credentials to login and perform admin tasks + + + + + What is your name? + + + + + Your Full Name + + + + + What name do you want to use to log in? + + + + + Login Name + + + + + If more than one person will use this computer, you can create multiple accounts after installation. + + + + + What is the name of this computer? + + + + + Computer Name + + + + + This name will be used if you make the computer visible to others on a network. + + + + + Choose a password to keep your account safe. + + + + + Password + + + + + Repeat Password + + + + + 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. + + + + + Validate passwords quality + + + + + When this box is checked, password-strength checking is done and you will not be able to use a weak password. + + + + + Log in automatically without asking for the password + + + + + Reuse user password as root password + + + + + Use the same password for the administrator account. + + + + + Choose a root password to keep your account safe. + + + + + Root Password + + + + + Repeat Root Password + + + + + Enter the same password twice, so that it can be checked for typing errors. + + + + + welcomeq + + + <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> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + + diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts index 6cd62c736a..add06a9efe 100644 --- a/lang/calamares_ne_NP.ts +++ b/lang/calamares_ne_NP.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +151,7 @@ Calamares::JobThread - + Done सकियो @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed - + Would you like to paste the install log to the web? - + Error - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. सेटअप सकियो । सेटअप प्रोग्राम बन्द गर्नु होस  - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -449,44 +466,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - - - - - &Next - - - - - &Cancel - - - - + %1 Setup Program - + %1 Installer @@ -807,50 +795,90 @@ The installer will quit and all changes will be lost. %1 को Installerमा स्वागत छ । - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! पासवर्डहरू मिलेन ।  + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -941,22 +969,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1283,37 +1332,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1331,61 +1400,49 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. + + Finish @@ -2253,7 +2310,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2763,65 +2820,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3637,12 +3694,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 installation.</small> @@ -3870,6 +3927,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts index 6d848dbaf2..f88a2eeada 100644 --- a/lang/calamares_nl.ts +++ b/lang/calamares_nl.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Widget-boom - + Debug information Debug informatie @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Inrichten - + Install Installeer @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Gereed @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Voorbereiding mislukt - + Installation Failed Installatie Mislukt - + Would you like to paste the install log to the web? Wil je het installatielogboek plakken naar het web? - + Error Fout - - + + &Yes &ja - - + + &No &Nee - + &Close &Sluiten - + Install Log Paste URL URL voor het verzenden van het installatielogboek - + The upload was unsuccessful. No web-paste was done. Het uploaden is mislukt. Web-plakken niet gedaan. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Calamares Initialisatie mislukt - + %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 kan niet worden geïnstalleerd. Calamares kon niet alle geconfigureerde modules laden. Dit is een probleem met hoe Calamares wordt gebruikt door de distributie. - + <br/>The following modules could not be loaded: <br/>The volgende modules konden niet worden geladen: - + Continue with setup? Doorgaan met installatie? - + Continue with installation? Doorgaan met installatie? - + 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> Het %1 voorbereidingsprogramma zal nu aanpassingen maken aan je schijf om %2 te installeren.<br/><strong>Deze veranderingen kunnen niet ongedaan gemaakt worden.</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> Het %1 installatieprogramma zal nu aanpassingen maken aan je schijf om %2 te installeren.<br/><strong>Deze veranderingen kunnen niet ongedaan gemaakt worden.</strong> - + &Set up now Nu &Inrichten - + &Install now Nu &installeren - + Go &back Ga &terug - + &Set up &Inrichten - + &Install &Installeer - + Setup is complete. Close the setup program. De voorbereiding is voltooid. Sluit het voorbereidingsprogramma. - + The installation is complete. Close the installer. De installatie is voltooid. Sluit het installatie-programma. - + Cancel setup without changing the system. Voorbereiding afbreken zonder aanpassingen aan het systeem. - + Cancel installation without changing the system. Installatie afbreken zonder aanpassingen aan het systeem. - + &Next &Volgende - + &Back &Terug - + &Done Voltooi&d - + &Cancel &Afbreken - + Cancel setup? Voorbereiding afbreken? - + Cancel installation? Installatie afbreken? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Wil je het huidige voorbereidingsproces echt afbreken? Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Wil je het huidige installatieproces echt afbreken? @@ -451,45 +468,15 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Onbekende Python fout. - - CalamaresUtils - - - Install log posted to: -%1 - Installatielogboek geposte naar: -%1 - - CalamaresWindow - - Show debug information - Toon debug informatie - - - - &Back - &Terug - - - - &Next - &Volgende - - - - &Cancel - &Afbreken - - - + %1 Setup Program %1 Voorbereidingsprogramma - + %1 Installer %1 Installatieprogramma @@ -810,50 +797,90 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. <h1>Welkom in het %1 installatieprogramma.</h1> - + Your username is too long. De gebruikersnaam is te lang. - + '%1' is not allowed as username. De gebruikersnaam '%1' is niet toegestaan. - + Your username must start with a lowercase letter or underscore. Je gebruikersnaam moet beginnen met een kleine letter of laag streepje. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Alleen kleine letters, nummerse en (laag) streepjes zijn toegestaan. - + Your hostname is too short. De hostnaam is te kort. - + Your hostname is too long. De hostnaam is te lang. - + '%1' is not allowed as hostname. De hostnaam '%1' is niet toegestaan. - + Only letters, numbers, underscore and hyphen are allowed. Alleen letters, nummers en (laag) streepjes zijn toegestaan. - + Your passwords do not match! Je wachtwoorden komen niet overeen! + + + Setup Failed + Voorbereiding mislukt + + + + Installation Failed + Installatie Mislukt + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Voorbereiden voltooid + + + + Installation Complete + Installatie Afgerond. + + + + The setup of %1 is complete. + De voorbereiden van %1 is voltooid. + + + + The installation of %1 is complete. + De installatie van %1 is afgerond. + ContextualProcessJob @@ -944,22 +971,43 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Maak nieuwe %2MiB partitie aan op %4 (%3) met bestandsysteem %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Maak een nieuwe <strong>%2MiB</strong> partitie aan op <strong>%4</strong> (%3) met bestandsysteem <strong>%1</strong>. - + + Creating new %1 partition on %2. Nieuwe %1 partitie aanmaken op %2. - + The installer failed to create partition on disk '%1'. Het installatieprogramma kon geen partitie aanmaken op schijf '%1'. @@ -1286,37 +1334,57 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. FillGlobalStorageJob - + Set partition information Instellen partitie-informatie - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Installeer %1 op <strong>nieuwe</strong> %2 systeempartitie. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Maak <strong>nieuwe</strong> %2 partitie met aankoppelpunt <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Installeer %2 op %3 systeempartitie <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Stel %3 partitie <strong>%1</strong> in met aankoppelpunt <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Installeer %2 op %3 systeempartitie <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Installeer bootloader op <strong>%1</strong>. - + Setting up mount points. Aankoppelpunten instellen. @@ -1334,62 +1402,50 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. &Nu herstarten - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Klaar.</h1><br/>%1 is op je computer geïnstalleerd.<br/>Je mag nu beginnen met het gebruiken van je nieuwe systeem. - + <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>Wanneer dit vakje aangevinkt is, zal het systeem herstarten van zodra je op <span style=" font-style:italic;">Voltooid</span> klikt, of het voorbereidingsprogramma afsluit.</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>Klaar.</h1><br/>%1 is op je computer geïnstalleerd.<br/>Je mag je nieuwe systeem nu herstarten of de %2 Live omgeving blijven gebruiken. - + <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>Wanneer dit vakje aangevinkt is, zal het systeem herstarten van zodra je op <span style=" font-style:italic;">Voltooid</span> klikt, of het installatieprogramma afsluit.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Installatie Mislukt</h1><br/>%1 werd niet op de computer geïnstalleerd. <br/>De foutboodschap was: %2 - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installatie Mislukt</h1><br/>%1 werd niet op de computer geïnstalleerd. <br/>De foutboodschap was: %2 - FinishedViewStep + FinishedQmlViewStep - + Finish Beëindigen + + + FinishedViewStep - - Setup Complete - Voorbereiden voltooid - - - - Installation Complete - Installatie Afgerond. - - - - The setup of %1 is complete. - De voorbereiden van %1 is voltooid. - - - - The installation of %1 is complete. - De installatie van %1 is afgerond. + + Finish + Beëindigen @@ -2256,7 +2312,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Onbekende fout - + Password is empty Wachtwoord is leeg @@ -2766,14 +2822,14 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. ProcessResult - + There was no output from the command. Er was geen uitvoer van de opdracht. - + Output: @@ -2782,52 +2838,52 @@ Uitvoer: - + External command crashed. Externe opdracht is vastgelopen. - + Command <i>%1</i> crashed. Opdracht <i>%1</i> is vastgelopen. - + External command failed to start. Externe opdracht kon niet worden gestart. - + Command <i>%1</i> failed to start. Opdracht <i>%1</i> kon niet worden gestart. - + Internal error when starting command. Interne fout bij het starten van de opdracht. - + Bad parameters for process job call. Onjuiste parameters voor procestaak - + External command failed to finish. Externe opdracht is niet correct beëindigd. - + Command <i>%1</i> failed to finish in %2 seconds. Opdracht <i>%1</i> is niet beëindigd in %2 seconden. - + External command finished with errors. Externe opdracht beëindigd met fouten. - + Command <i>%1</i> finished with exit code %2. Opdracht <i>%1</i> beëindigd met foutcode %2. @@ -3644,12 +3700,12 @@ De installatie kan niet doorgaan. UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Als meer dan één persoon deze computer zal gebruiken, kan je meerdere accounts aanmaken na installatie.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Als meer dan één persoon deze computer zal gebruiken, kan je meerdere accounts aanmaken na installatie.</small> @@ -3877,6 +3933,44 @@ De installatie kan niet doorgaan. Terug + + calamares-sidebar + + + Show debug information + Toon debug informatie + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts index a89ba07712..8aeb73ff15 100644 --- a/lang/calamares_pl.ts +++ b/lang/calamares_pl.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information Informacje debugowania @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Zainstaluj @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Ukończono @@ -261,170 +269,179 @@ Calamares::ViewManager - + Setup Failed Nieudane ustawianie - + Installation Failed Wystąpił błąd instalacji - + Would you like to paste the install log to the web? - + Error Błąd - - + + &Yes &Tak - - + + &No &Nie - + &Close Zam&knij - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Błąd inicjacji programu Calamares - + %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 nie może zostać zainstalowany. Calamares nie mógł wczytać wszystkich skonfigurowanych modułów. Jest to problem ze sposobem, w jaki Calamares jest używany przez dystrybucję. - + <br/>The following modules could not be loaded: <br/>Następujące moduły nie mogły zostać wczytane: - + Continue with setup? Kontynuować z programem instalacyjnym? - + 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 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> Instalator %1 zamierza przeprowadzić zmiany na Twoim dysku, aby zainstalować %2.<br/><strong>Nie będziesz mógł cofnąć tych zmian.</strong> - + &Set up now - + &Install now &Zainstaluj teraz - + Go &back &Cofnij się - + &Set up - + &Install Za&instaluj - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Instalacja ukończona pomyślnie. Możesz zamknąć instalator. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Anuluj instalację bez dokonywania zmian w systemie. - + &Next &Dalej - + &Back &Wstecz - + &Done &Ukończono - + &Cancel &Anuluj - + Cancel setup? Anulować ustawianie? - + Cancel installation? Anulować instalację? - + 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. Czy na pewno chcesz anulować obecny proces instalacji? @@ -454,44 +471,15 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Nieosiągalny błąd Pythona. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - Pokaż informacje debugowania - - - - &Back - &Wstecz - - - - &Next - &Dalej - - - - &Cancel - &Anuluj - - - + %1 Setup Program - + %1 Installer Instalator %1 @@ -812,50 +800,90 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. - + Your username is too long. Twoja nazwa użytkownika jest za długa. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Twoja nazwa komputera jest za krótka. - + Your hostname is too long. Twoja nazwa komputera jest za długa. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Twoje hasła nie są zgodne! + + + Setup Failed + Nieudane ustawianie + + + + Installation Failed + Wystąpił błąd instalacji + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Ustawianie ukończone + + + + Installation Complete + Instalacja zakończona + + + + The setup of %1 is complete. + Ustawianie %1 jest ukończone. + + + + The installation of %1 is complete. + Instalacja %1 ukończyła się pomyślnie. + ContextualProcessJob @@ -946,22 +974,43 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. Tworzenie nowej partycji %1 na %2. - + The installer failed to create partition on disk '%1'. Instalator nie mógł utworzyć partycji na dysku '%1'. @@ -1288,37 +1337,57 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. FillGlobalStorageJob - + Set partition information Ustaw informacje partycji - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Zainstaluj %1 na <strong>nowej</strong> partycji systemowej %2. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Ustaw <strong>nową</strong> partycję %2 z punktem montowania <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Zainstaluj %2 na partycji systemowej %3 <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Ustaw partycję %3 <strong>%1</strong> z punktem montowania <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Zainstaluj %2 na partycji systemowej %3 <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Zainstaluj program rozruchowy na <strong>%1</strong>. - + Setting up mount points. Ustawianie punktów montowania. @@ -1336,62 +1405,50 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.&Uruchom ponownie teraz - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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>Wszystko gotowe.</h1><br/>%1 został zainstalowany na Twoim komputerze.<br/>Możesz teraz ponownie uruchomić komputer, aby przejść do nowego systemu, albo kontynuować używanie środowiska live %2. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalacja nie powiodła się</h1><br/>Nie udało się zainstalować %1 na Twoim komputerze.<br/>Komunikat o błędzie: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Koniec + + + FinishedViewStep - - Setup Complete - Ustawianie ukończone - - - - Installation Complete - Instalacja zakończona - - - - The setup of %1 is complete. - Ustawianie %1 jest ukończone. - - - - The installation of %1 is complete. - Instalacja %1 ukończyła się pomyślnie. + + Finish + Koniec @@ -2276,7 +2333,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Nieznany błąd - + Password is empty @@ -2786,14 +2843,14 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. ProcessResult - + There was no output from the command. W wyniku polecenia nie ma żadnego rezultatu. - + Output: @@ -2802,52 +2859,52 @@ Wyjście: - + External command crashed. Zewnętrzne polecenie zakończone niepowodzeniem. - + Command <i>%1</i> crashed. Wykonanie polecenia <i>%1</i> nie powiodło się. - + External command failed to start. Nie udało się uruchomić zewnętrznego polecenia. - + Command <i>%1</i> failed to start. Polecenie <i>%1</i> nie zostało uruchomione. - + Internal error when starting command. Wystąpił wewnętrzny błąd podczas uruchamiania polecenia. - + Bad parameters for process job call. Błędne parametry wywołania zadania. - + External command failed to finish. Nie udało się ukończyć zewnętrznego polecenia. - + Command <i>%1</i> failed to finish in %2 seconds. Nie udało się ukończyć polecenia <i>%1</i> w ciągu %2 sekund. - + External command finished with errors. Ukończono zewnętrzne polecenie z błędami. - + Command <i>%1</i> finished with exit code %2. Polecenie <i>%1</i> zostało ukończone z błędem o kodzie %2. @@ -3664,12 +3721,12 @@ i nie uruchomi się 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 installation.</small> @@ -3897,6 +3954,44 @@ i nie uruchomi się + + calamares-sidebar + + + Show debug information + Pokaż informacje debugowania + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index a2253b970c..524f0dfac3 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Árvore de widgets - + Debug information Informações de depuração @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Configurar - + Install Instalar @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Concluído @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed A Configuração Falhou - + Installation Failed Falha na Instalação - + Would you like to paste the install log to the web? Deseja colar o registro de instalação na web? - + Error Erro - - + + &Yes &Sim - - + + &No &Não - + &Close &Fechar - + Install Log Paste URL Colar URL de Registro de Instalação - + The upload was unsuccessful. No web-paste was done. Não foi possível fazer o upload. Nenhuma colagem foi feita na web. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Falha na inicialização do Calamares - + %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 não pôde ser instalado. O Calamares não conseguiu carregar todos os módulos configurados. Este é um problema com o modo em que o Calamares está sendo utilizado pela distribuição. - + <br/>The following modules could not be loaded: <br/>Os seguintes módulos não puderam ser carregados: - + Continue with setup? Continuar com configuração? - + Continue with installation? Continuar com a instalação? - + 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> O programa de configuração %1 está prestes a fazer mudanças no seu disco de modo a configurar %2.<br/><strong>Você não será capaz de desfazer estas mudanças.</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> O instalador %1 está prestes a fazer alterações no disco a fim de instalar %2.<br/><strong>Você não será capaz de desfazer estas mudanças.</strong> - + &Set up now &Configurar agora - + &Install now &Instalar agora - + Go &back &Voltar - + &Set up &Configurar - + &Install &Instalar - + Setup is complete. Close the setup program. A configuração está completa. Feche o programa de configuração. - + The installation is complete. Close the installer. A instalação está completa. Feche o instalador. - + Cancel setup without changing the system. Cancelar configuração sem alterar o sistema. - + Cancel installation without changing the system. Cancelar instalação sem modificar o sistema. - + &Next &Próximo - + &Back &Voltar - + &Done &Concluído - + &Cancel &Cancelar - + Cancel setup? Cancelar a configuração? - + Cancel installation? Cancelar a instalação? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Você realmente quer cancelar o processo atual de configuração? O programa de configuração será fechado e todas as mudanças serão perdidas. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Você deseja realmente cancelar a instalação atual? @@ -451,45 +468,15 @@ O instalador será fechado e todas as alterações serão perdidas.Erro inbuscável do Python. - - CalamaresUtils - - - Install log posted to: -%1 - Registro de instalação colado em: -%1 - - CalamaresWindow - - Show debug information - Exibir informações de depuração - - - - &Back - &Voltar - - - - &Next - &Próximo - - - - &Cancel - &Cancelar - - - + %1 Setup Program Programa de configuração %1 - + %1 Installer Instalador %1 @@ -810,50 +797,90 @@ O instalador será fechado e todas as alterações serão perdidas.<h1>Bem-vindo ao instalador de %1</h1> - + Your username is too long. O nome de usuário é grande demais. - + '%1' is not allowed as username. '%1' não é permitido como nome de usuário. - + Your username must start with a lowercase letter or underscore. Seu nome de usuário deve começar com uma letra minúscula ou com um sublinhado. - + Only lowercase letters, numbers, underscore and hyphen are allowed. É permitido apenas letras minúsculas, números, sublinhado e hífen. - + Your hostname is too short. O nome da máquina é muito curto. - + Your hostname is too long. O nome da máquina é muito grande. - + '%1' is not allowed as hostname. '%1' não é permitido como nome da máquina. - + Only letters, numbers, underscore and hyphen are allowed. É permitido apenas letras, números, sublinhado e hífen. - + Your passwords do not match! As senhas não estão iguais! + + + Setup Failed + A Configuração Falhou + + + + Installation Failed + Falha na Instalação + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Configuração Concluída + + + + Installation Complete + Instalação Completa + + + + The setup of %1 is complete. + A configuração de %1 está concluída. + + + + The installation of %1 is complete. + A instalação do %1 está completa. + ContextualProcessJob @@ -944,22 +971,43 @@ O instalador será fechado e todas as alterações serão perdidas. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Criar nova partição de %2MiB em %4 (%3) com o sistema de arquivos %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Criar nova partição de <strong>%2MiB</strong> em <strong>%4</strong> (%3) com o sistema de arquivos <strong>%1</strong>. - + + Creating new %1 partition on %2. Criando nova partição %1 em %2. - + The installer failed to create partition on disk '%1'. O instalador não conseguiu criar partições no disco '%1'. @@ -1286,37 +1334,57 @@ O instalador será fechado e todas as alterações serão perdidas. FillGlobalStorageJob - + Set partition information Definir informações da partição - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Instalar %1 em <strong>nova</strong> partição %2 do sistema. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Configurar <strong>nova</strong> partição %2 com ponto de montagem <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Instalar %2 na partição %3 do sistema <strong>%1</strong>. + + 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>. + + + + + 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>. - Configurar partição %3 <strong>%1</strong> com ponto de montagem <strong>%2</strong>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + Instalar %2 na partição %3 do sistema <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Instalar gerenciador de inicialização em <strong>%1</strong>. - + Setting up mount points. Configurando pontos de montagem. @@ -1334,62 +1402,50 @@ O instalador será fechado e todas as alterações serão perdidas.&Reiniciar agora - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Tudo concluído.</h1><br/>%1 foi configurado no seu computador.<br/>Agora você pode começar a usar seu novo 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 essa caixa for marcada, seu sistema irá reiniciar imediatamente quando você clicar em <span style="font-style:italic;">Concluído</span> ou fechar o programa de configuração.</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>Tudo pronto.</h1><br/>%1 foi instalado no seu computador.<br/>Agora você pode reiniciar seu novo sistema ou continuar usando o ambiente Live %2. - + <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 essa caixa for marcada, seu sistema irá reiniciar imediatamente quando você clicar em <span style="font-style:italic;">Concluído</span> ou fechar o instalador.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>A configuração falhou</h1><br/>%1 não foi configurado no seu computador.<br/>A mensagem de erro foi: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>A instalação falhou</h1><br/>%1 não foi instalado em seu computador.<br/>A mensagem de erro foi: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Concluir + + + FinishedViewStep - - Setup Complete - Configuração Concluída - - - - Installation Complete - Instalação Completa - - - - The setup of %1 is complete. - A configuração de %1 está concluída. - - - - The installation of %1 is complete. - A instalação do %1 está completa. + + Finish + Concluir @@ -2258,7 +2314,7 @@ O instalador será fechado e todas as alterações serão perdidas.Erro desconhecido - + Password is empty A senha está em branco @@ -2768,14 +2824,14 @@ O instalador será fechado e todas as alterações serão perdidas. ProcessResult - + There was no output from the command. Não houve saída do comando. - + Output: @@ -2784,52 +2840,52 @@ Saída: - + External command crashed. O comando externo falhou. - + Command <i>%1</i> crashed. O comando <i>%1</i> falhou. - + External command failed to start. O comando externo falhou ao iniciar. - + Command <i>%1</i> failed to start. O comando <i>%1</i> falhou ao iniciar. - + Internal error when starting command. Erro interno ao iniciar o comando. - + Bad parameters for process job call. Parâmetros ruins para a chamada da tarefa do processo. - + External command failed to finish. O comando externo falhou ao finalizar. - + Command <i>%1</i> failed to finish in %2 seconds. O comando <i>%1</i> falhou ao finalizar em %2 segundos. - + External command finished with errors. O comando externo foi concluído com erros. - + Command <i>%1</i> finished with exit code %2. O comando <i>%1</i> foi concluído com o código %2. @@ -3648,12 +3704,12 @@ Saída: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Se mais de uma pessoa for utilizar este computador, você poderá criar múltiplas contas após terminar a configuração.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Se mais de uma pessoa for utilizar este computador, você poderá criar múltiplas contas após terminar de instalar.</small> @@ -3892,6 +3948,44 @@ Saída: Voltar + + calamares-sidebar + + + Show debug information + Exibir informações de depuração + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index bc16f043e7..ecd1f3c641 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Árvore de Widgets - + Debug information Informação de depuração @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Configuração - + Install Instalar @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Concluído @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Falha de Instalação - + Installation Failed Falha na Instalação - + Would you like to paste the install log to the web? Deseja colar o registo de instalação na Web? - + Error Erro - - + + &Yes &Sim - - + + &No &Não - + &Close &Fechar - + Install Log Paste URL Instalar o Registo Colar URL - + The upload was unsuccessful. No web-paste was done. O carregamento não teve êxito. Nenhuma pasta da web foi feita. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Falha na Inicialização do Calamares - + %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 não pode ser instalado. O Calamares não foi capaz de carregar todos os módulos configurados. Isto é um problema da maneira como o Calamares é usado pela distribuição. - + <br/>The following modules could not be loaded: <br/>Os módulos seguintes não puderam ser carregados: - + Continue with setup? Continuar com a configuração? - + Continue with installation? Continuar com a instalação? - + 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> O programa de instalação %1 está prestes a fazer alterações no seu disco para configurar o %2.<br/><strong>Você não poderá desfazer essas alterações.</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> O %1 instalador está prestes a fazer alterações ao seu disco em ordem para instalar %2.<br/><strong>Não será capaz de desfazer estas alterações.</strong> - + &Set up now &Instalar agora - + &Install now &Instalar agora - + Go &back Voltar &atrás - + &Set up &Instalar - + &Install &Instalar - + Setup is complete. Close the setup program. Instalação completa. Feche o programa de instalação. - + The installation is complete. Close the installer. A instalação está completa. Feche o instalador. - + Cancel setup without changing the system. Cancelar instalação sem alterar o sistema. - + Cancel installation without changing the system. Cancelar instalar instalação sem modificar o sistema. - + &Next &Próximo - + &Back &Voltar - + &Done &Feito - + &Cancel &Cancelar - + Cancel setup? Cancelar instalação? - + Cancel installation? Cancelar a instalação? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Quer mesmo cancelar o processo de instalação atual? O programa de instalação irá fechar todas as alterações serão perdidas. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Tem a certeza que pretende cancelar o atual processo de instalação? @@ -451,45 +468,15 @@ O instalador será encerrado e todas as alterações serão perdidas.Erro inatingível do Python. - - CalamaresUtils - - - Install log posted to: -%1 - Instalar registo publicado em: -%1 - - CalamaresWindow - - Show debug information - Mostrar informação de depuração - - - - &Back - &Voltar - - - - &Next - &Seguinte - - - - &Cancel - &Cancelar - - - + %1 Setup Program %1 Programa de Instalação - + %1 Installer %1 Instalador @@ -810,50 +797,90 @@ O instalador será encerrado e todas as alterações serão perdidas.<h1>Bem-vindo ao instalador do %1</h1> - + Your username is too long. O seu nome de utilizador é demasiado longo. - + '%1' is not allowed as username. '%1' não é permitido como nome de utilizador. - + Your username must start with a lowercase letter or underscore. O seu nome de utilizador deve começar com uma letra minúscula ou underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Apenas letras minúsculas, números, underscore e hífen são permitidos. - + Your hostname is too short. O nome da sua máquina é demasiado curto. - + Your hostname is too long. O nome da sua máquina é demasiado longo. - + '%1' is not allowed as hostname. '%1' não é permitido como nome da máquina. - + Only letters, numbers, underscore and hyphen are allowed. Apenas letras, números, underscore e hífen são permitidos. - + Your passwords do not match! As suas palavras-passe não coincidem! + + + Setup Failed + Falha de Instalação + + + + Installation Failed + Falha na Instalação + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Instalação Completa + + + + Installation Complete + Instalação Completa + + + + The setup of %1 is complete. + A instalação de %1 está completa. + + + + The installation of %1 is complete. + A instalação de %1 está completa. + ContextualProcessJob @@ -944,22 +971,43 @@ O instalador será encerrado e todas as alterações serão perdidas. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Criar nova partição de %2MiB em %4 (%3) com o sistema de ficheiros %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Criar nova partição de <strong>%2MiB</strong> em <strong>%4</strong> (%3) com o sistema de ficheiros <strong>%1</strong>. - + + Creating new %1 partition on %2. Criando nova partição %1 em %2. - + The installer failed to create partition on disk '%1'. O instalador falhou a criação da partição no disco '%1'. @@ -1286,37 +1334,57 @@ O instalador será encerrado e todas as alterações serão perdidas. FillGlobalStorageJob - + Set partition information Definir informação da partição - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Instalar %1 na <strong>nova</strong> %2 partição de sistema. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Criar <strong>nova</strong> %2 partição com ponto de montagem <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Instalar %2 em %3 partição de sistema <strong>%1</strong>. + + 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>. + + + + + 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>. - Criar %3 partitição <strong>%1</strong> com ponto de montagem <strong>%2</strong>. + + Install %2 on %3 system partition <strong>%1</strong>. + Instalar %2 em %3 partição de sistema <strong>%1</strong>. - + Install boot loader on <strong>%1</strong>. Instalar carregador de arranque em <strong>%1</strong>. - + Setting up mount points. Definindo pontos de montagem. @@ -1334,62 +1402,50 @@ O instalador será encerrado e todas as alterações serão perdidas.&Reiniciar agora - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Tudo concluído.</h1><br/>%1 foi configurado no seu computador.<br/>Pode agora começar a utilizar o seu novo 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 esta caixa for marcada, o seu sistema irá reiniciar imediatamente quando clicar em <span style="font-style:italic;">Concluído</span> ou fechar o programa de configuração.</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>Tudo feito</h1><br/>%1 foi instalado no seu computador.<br/>Pode agora reiniciar para o seu novo sistema, ou continuar a usar o %2 ambiente Live. - + <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 esta caixa for marcada, o seu sistema irá reiniciar imediatamente quando clicar em <span style="font-style:italic;">Concluído</span> ou fechar o instalador.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Falha na configuração</h1><br/>%1 não foi configurado no seu computador.<br/>A mensagem de erro foi: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalação Falhada</h1><br/>%1 não foi instalado no seu computador.<br/>A mensagem de erro foi: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Finalizar + + + FinishedViewStep - - Setup Complete - Instalação Completa - - - - Installation Complete - Instalação Completa - - - - The setup of %1 is complete. - A instalação de %1 está completa. - - - - The installation of %1 is complete. - A instalação de %1 está completa. + + Finish + Finalizar @@ -2258,7 +2314,7 @@ O instalador será encerrado e todas as alterações serão perdidas.Erro desconhecido - + Password is empty Palavra-passe está vazia @@ -2768,14 +2824,14 @@ O instalador será encerrado e todas as alterações serão perdidas. ProcessResult - + There was no output from the command. O comando não produziu saída de dados. - + Output: @@ -2784,52 +2840,52 @@ Saída de Dados: - + External command crashed. O comando externo "crashou". - + Command <i>%1</i> crashed. Comando <i>%1</i> "crashou". - + External command failed to start. Comando externo falhou ao iniciar. - + Command <i>%1</i> failed to start. Comando <i>%1</i> falhou a inicialização. - + Internal error when starting command. Erro interno ao iniciar comando. - + Bad parameters for process job call. Maus parâmetros para chamada de processamento de tarefa. - + External command failed to finish. Comando externo falhou a finalização. - + Command <i>%1</i> failed to finish in %2 seconds. Comando <i>%1</i> falhou ao finalizar em %2 segundos. - + External command finished with errors. Comando externo finalizou com erros. - + Command <i>%1</i> finished with exit code %2. Comando <i>%1</i> finalizou com código de saída %2. @@ -3648,12 +3704,12 @@ Saída de Dados: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Se mais de uma pessoa usar este computador, você pode criar várias contas após a configuração.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Se mais de uma pessoa usar este computador, você pode criar várias contas após a instalação.</small> @@ -3892,6 +3948,44 @@ Saída de Dados: Voltar + + calamares-sidebar + + + Show debug information + Mostrar informação de depuração + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts index 41eac83e09..8df2b6084d 100644 --- a/lang/calamares_ro.ts +++ b/lang/calamares_ro.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Lista widget - + Debug information Informație pentru depanare @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Setat - + Install Instalează @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Gata @@ -259,170 +267,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed Instalare eșuată - + Would you like to paste the install log to the web? - + Error Eroare - - + + &Yes &Da - - + + &No &Nu - + &Close În&chide - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? Continuați configurarea? - + 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 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> Programul de instalare %1 este pregătit să facă schimbări pe discul dumneavoastră pentru a instala %2.<br/><strong>Nu veți putea anula aceste schimbări.</strong> - + &Set up now - + &Install now &Instalează acum - + Go &back Î&napoi - + &Set up - + &Install Instalează - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Instalarea este completă. Închide instalatorul. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Anulează instalarea fără schimbarea sistemului. - + &Next &Următorul - + &Back &Înapoi - + &Done &Gata - + &Cancel &Anulează - + Cancel setup? - + Cancel installation? Anulez instalarea? - + 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. Doriți să anulați procesul curent de instalare? @@ -452,44 +469,15 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Eroare Python nepreluabilă - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - Arată informația de depanare - - - - &Back - &Înapoi - - - - &Next - &Următorul - - - - &Cancel - &Anulează - - - + %1 Setup Program - + %1 Installer Program de instalare %1 @@ -810,50 +798,90 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. - + Your username is too long. Numele de utilizator este prea lung. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Hostname este prea scurt. - + Your hostname is too long. Hostname este prea lung. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Parolele nu se potrivesc! + + + Setup Failed + + + + + Installation Failed + Instalare eșuată + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + Instalarea s-a terminat + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + Instalarea este %1 completă. + ContextualProcessJob @@ -944,22 +972,43 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. Se creează nouă partiție %1 pe %2. - + The installer failed to create partition on disk '%1'. Programul de instalare nu a putut crea partiția pe discul „%1”. @@ -1286,37 +1335,57 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. FillGlobalStorageJob - + Set partition information Setează informația pentru partiție - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Instalează %1 pe <strong>noua</strong> partiție de sistem %2. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Setează <strong>noua</strong> partiție %2 cu punctul de montare <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Instalează %2 pe partiția de sistem %3 <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Setează partiția %3 <strong>%1</strong> cu punctul de montare <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Instalează %2 pe partiția de sistem %3 <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Instalează bootloader-ul pe <strong>%1</strong>. - + Setting up mount points. Se setează puncte de montare. @@ -1334,62 +1403,50 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.&Repornește acum - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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>Gata.</h1><br/>%1 a fost instalat pe calculatorul dumneavoastră.<br/>Puteți reporni noul sistem, sau puteți continua să folosiți sistemul de operare portabil %2. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalarea a eșuat</h1><br/>%1 nu a mai fost instalat pe acest calculator.<br/>Mesajul de eroare era: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Termină + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - Instalarea s-a terminat - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - Instalarea este %1 completă. + + Finish + Termină @@ -2268,7 +2325,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Eroare necunoscuta - + Password is empty @@ -2778,14 +2835,14 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. ProcessResult - + There was no output from the command. Nu a existat nici o iesire din comanda - + Output: @@ -2794,52 +2851,52 @@ Output - + External command crashed. Comanda externă a eșuat. - + Command <i>%1</i> crashed. Comanda <i>%1</i> a eșuat. - + External command failed to start. Comanda externă nu a putut fi pornită. - + Command <i>%1</i> failed to start. Comanda <i>%1</i> nu a putut fi pornită. - + Internal error when starting command. Eroare internă la pornirea comenzii. - + Bad parameters for process job call. Parametri proști pentru apelul sarcinii de proces. - + External command failed to finish. Finalizarea comenzii externe a eșuat. - + Command <i>%1</i> failed to finish in %2 seconds. Comanda <i>%1</i> nu a putut fi finalizată în %2 secunde. - + External command finished with errors. Comanda externă finalizată cu erori. - + Command <i>%1</i> finished with exit code %2. Comanda <i>%1</i> finalizată cu codul de ieșire %2. @@ -3655,12 +3712,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 installation.</small> @@ -3888,6 +3945,44 @@ Output + + calamares-sidebar + + + Show debug information + Arată informația de depanare + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts index b288da02ee..ef195144f6 100644 --- a/lang/calamares_ru.ts +++ b/lang/calamares_ru.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Дерево виджетов - + Debug information Отладочная информация @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Настроить - + Install Установить @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Готово @@ -261,171 +269,180 @@ Calamares::ViewManager - + Setup Failed Сбой установки - + Installation Failed Установка завершилась неудачей - + Would you like to paste the install log to the web? Разместить журнал установки в интернете? - + Error Ошибка - - + + &Yes &Да - - + + &No &Нет - + &Close &Закрыть - + Install Log Paste URL Адрес для отправки журнала установки - + The upload was unsuccessful. No web-paste was done. Загрузка не удалась. Веб-вставка не была завершена. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Ошибка инициализации Calamares - + %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. Calamares не удалось загрузить все сконфигурированные модули. Эта проблема вызвана тем, как ваш дистрибутив использует Calamares. - + <br/>The following modules could not be loaded: <br/>Не удалось загрузить следующие модули: - + Continue with setup? Продолжить установку? - + 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> Программа установки %1 готова внести изменения на Ваш диск, чтобы установить %2.<br/><strong>Отменить эти изменения будет невозможно.</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 готова внести изменения на Ваш диск, чтобы установить %2.<br/><strong>Отменить эти изменения будет невозможно.</strong> - + &Set up now &Настроить сейчас - + &Install now Приступить к &установке - + Go &back &Назад - + &Set up &Настроить - + &Install &Установить - + Setup is complete. Close the setup program. Установка завершена. Закройте программу установки. - + The installation is complete. Close the installer. Установка завершена. Закройте установщик. - + Cancel setup without changing the system. Отменить установку без изменения системы. - + Cancel installation without changing the system. Отменить установку без изменения системы. - + &Next &Далее - + &Back &Назад - + &Done &Готово - + &Cancel О&тмена - + Cancel setup? Отменить установку? - + 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 install process? The installer will quit and all changes will be lost. Действительно прервать процесс установки? Программа установки сразу прекратит работу, все изменения будут потеряны. @@ -454,45 +471,15 @@ The installer will quit and all changes will be lost. Неизвестная ошибка Python - - CalamaresUtils - - - Install log posted to: -%1 - Установочный журнал размещён на: -n%1 - - CalamaresWindow - - Show debug information - Показать отладочную информацию - - - - &Back - &Назад - - - - &Next - &Далее - - - - &Cancel - &Отмена - - - + %1 Setup Program Программа установки %1 - + %1 Installer Программа установки %1 @@ -813,50 +800,90 @@ n%1 <h1>Добро пожаловать в программу установки %1 .</h1> - + Your username is too long. Ваше имя пользователя слишком длинное. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. Ваше имя пользователя должно начинаться со строчной буквы или подчеркивания. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Допускаются только строчные буквы, числа, символы подчёркивания и дефисы. - + Your hostname is too short. Имя вашего компьютера слишком коротко. - + Your hostname is too long. Имя вашего компьютера слишком длинное. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. Допускаются только буквы, цифры, символы подчёркивания и дефисы. - + Your passwords do not match! Пароли не совпадают! + + + Setup Failed + Сбой установки + + + + Installation Failed + Установка завершилась неудачей + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Установка завершена + + + + Installation Complete + Установка завершена + + + + The setup of %1 is complete. + Установка %1 завершена. + + + + The installation of %1 is complete. + Установка %1 завершена. + ContextualProcessJob @@ -947,22 +974,43 @@ n%1 CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Создать новый раздел %2 MiB на %4 (%3) с файловой системой %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Создать новый раздел <strong>%2 MiB</strong> на <strong>%4</strong> (%3) с файловой системой <strong>%1</strong>. - + + Creating new %1 partition on %2. Создается новый %1 раздел на %2. - + The installer failed to create partition on disk '%1'. Программа установки не смогла создать раздел на диске '%1'. @@ -1289,37 +1337,57 @@ n%1 FillGlobalStorageJob - + 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. Установить %1 на <strong>новый</strong> системный раздел %2. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Настроить <strong>новый</strong> %2 раздел с точкой монтирования <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Установить %2 на %3 системный раздел <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Настроить %3 раздел <strong>%1</strong> с точкой монтирования <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Установить %2 на %3 системный раздел <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Установить загрузчик на <strong>%1</strong>. - + Setting up mount points. Настраиваются точки монтирования. @@ -1337,62 +1405,50 @@ n%1 П&ерезагрузить - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Готово.</h1><br/>Система %1 установлена на ваш компьютер.<br/>Можете перезагрузить компьютер и начать использовать вашу новую систему. - + <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>Если этот флажок установлен, ваша система будет перезагружена сразу после нажатия кнопки <span style="font-style:italic;">Готово</span> или закрытия программы установки.</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>Готово.</h1><br/>Система %1 установлена на Ваш компьютер.<br/>Вы можете перезагрузить компьютер и использовать Вашу новую систему или продолжить работу в Live окружении %2. - + <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>Если этот флажок установлен, ваша система будет перезагружена сразу после нажатия кнопки <span style=" font-style:italic;">Готово</span> или закрытия программы установки.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Сбой установки</h1><br/>Система %1 не была установлена на ваш компьютер.<br/>Сообщение об ошибке: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Сбой установки</h1><br/>Не удалось установить %1 на ваш компьютер.<br/>Сообщение об ошибке: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Завершить + + + FinishedViewStep - - Setup Complete - Установка завершена - - - - Installation Complete - Установка завершена - - - - The setup of %1 is complete. - Установка %1 завершена. - - - - The installation of %1 is complete. - Установка %1 завершена. + + Finish + Завершить @@ -2277,7 +2333,7 @@ n%1 Неизвестная ошибка - + Password is empty Пустой пароль @@ -2787,14 +2843,14 @@ n%1 ProcessResult - + There was no output from the command. Вывода из команды не последовало. - + Output: @@ -2803,52 +2859,52 @@ Output: - + External command crashed. Сбой внешней команды. - + Command <i>%1</i> crashed. Сбой команды <i>%1</i>. - + External command failed to start. Не удалось запустить внешнюю команду. - + Command <i>%1</i> failed to start. Не удалось запустить команду <i>%1</i>. - + Internal error when starting command. Внутренняя ошибка при запуске команды. - + Bad parameters for process job call. Неверные параметры для вызова процесса. - + External command failed to finish. Не удалось завершить внешнюю команду. - + Command <i>%1</i> failed to finish in %2 seconds. Команда <i>%1</i> не завершилась за %2 с. - + External command finished with errors. Внешняя команда завершилась с ошибками. - + Command <i>%1</i> finished with exit code %2. Команда <i>%1</i> завершилась с кодом %2. @@ -3665,12 +3721,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Если этот компьютер будет использоваться несколькими людьми, вы сможете создать учетные записи для них после установки.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Если этот компьютер используется несколькими людьми, Вы сможете создать соответствующие учетные записи сразу после установки.</small> @@ -3898,6 +3954,44 @@ Output: Назад + + calamares-sidebar + + + Show debug information + Показать отладочную информацию + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts new file mode 100644 index 0000000000..085f79c070 --- /dev/null +++ b/lang/calamares_si.ts @@ -0,0 +1,4228 @@ + + + + + AutoMountManagementJob + + + Manage auto-mount settings + + + + + 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. + + + + + 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. + + + + + BootLoaderModel + + + Master Boot Record of %1 + + + + + Boot Partition + + + + + System Partition + + + + + Do not install a boot loader + + + + + %1 (%2) + + + + + Calamares::BlankViewStep + + + Blank Page + + + + + Calamares::DebugWindow + + + Form + + + + + GlobalStorage + + + + + JobQueue + + + + + Modules + + + + + Type: + + + + + + none + + + + + Interface: + + + + + Tools + + + + + Reload Stylesheet + + + + + Widget Tree + + + + + Debug information + + + + + Calamares::ExecutionViewStep + + + Set up + + + + + Install + + + + + Calamares::FailJob + + + Job failed (%1) + + + + + Programmed job failure was explicitly requested. + + + + + Calamares::JobThread + + + Done + + + + + Calamares::NamedJob + + + Example job (%1) + + + + + Calamares::ProcessJob + + + Run command '%1' in target system. + + + + + Run command '%1'. + + + + + Running command %1 %2 + + + + + Calamares::PythonJob + + + Running %1 operation. + + + + + Bad working directory path + + + + + Working directory %1 for python job %2 is not readable. + + + + + Bad main script file + + + + + Main script file %1 for python job %2 is not readable. + + + + + Boost.Python error in job "%1". + + + + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + + + Calamares::RequirementsChecker + + + Requirements checking for module <i>%1</i> is complete. + + + + + Waiting for %n module(s). + + + + + + + + (%n second(s)) + + + + + + + + System-requirements checking is complete. + + + + + Calamares::ViewManager + + + Setup Failed + + + + + Installation Failed + + + + + Would you like to paste the install log to the web? + + + + + Error + + + + + + &Yes + + + + + + &No + + + + + &Close + + + + + Install Log Paste URL + + + + + The upload was unsuccessful. No web-paste was done. + + + + + Install log posted to + +%1 + +Link copied to clipboard + + + + + 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. + + + + + <br/>The following modules could not be loaded: + + + + + Continue with setup? + + + + + 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 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 + + + + + &Install now + + + + + Go &back + + + + + &Set up + + + + + &Install + + + + + Setup is complete. Close the setup program. + + + + + The installation is complete. Close the installer. + + + + + Cancel setup without changing the system. + + + + + Cancel installation without changing the system. + + + + + &Next + + + + + &Back + + + + + &Done + + + + + &Cancel + + + + + Cancel setup? + + + + + 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 install process? +The installer will quit and all changes will be lost. + + + + + CalamaresPython::Helper + + + Unknown exception type + + + + + unparseable Python error + + + + + unparseable Python traceback + + + + + Unfetchable Python error. + + + + + CalamaresWindow + + + %1 Setup Program + + + + + %1 Installer + + + + + CheckerContainer + + + Gathering system information... + + + + + ChoicePage + + + Form + + + + + Select storage de&vice: + + + + + + + + Current: + + + + + After: + + + + + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. + + + + + Reuse %1 as home partition for %2. + + + + + <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. + + + + + Boot loader location: + + + + + <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. + + + + + The EFI system partition at %1 will be used for starting %2. + + + + + 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. + + + + + + + + <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>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 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 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 is a part of an <strong>inactive RAID</strong> device. + + + + + No Swap + + + + + Reuse Swap + + + + + Swap (no Hibernate) + + + + + Swap (with Hibernate) + + + + + Swap to file + + + + + ClearMountsJob + + + Clear mounts for partitioning operations on %1 + + + + + Clearing mounts for partitioning operations on %1. + + + + + Cleared all mounts for %1 + + + + + ClearTempMountsJob + + + Clear all temporary mounts. + + + + + Clearing all temporary mounts. + + + + + Cannot get list of temporary mounts. + + + + + Cleared all temporary mounts. + + + + + CommandList + + + + Could not run command. + + + + + The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. + + + + + The command needs to know the user's name, but no username is defined. + + + + + Config + + + Set keyboard model to %1.<br/> + + + + + Set keyboard layout to %1/%2. + + + + + Set timezone to %1/%2. + + + + + The system language will be set to %1. + + + + + The numbers and dates locale will be set to %1. + + + + + Network Installation. (Disabled: Incorrect configuration) + + + + + Network Installation. (Disabled: Received invalid groups data) + + + + + Network Installation. (Disabled: internal error) + + + + + 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. <a href="#details">Details...</a> + + + + + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> + + + + + 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 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 %1 setup</h1> + + + + + <h1>Welcome to the Calamares installer for %1</h1> + + + + + <h1>Welcome to the %1 installer</h1> + + + + + Your username is too long. + + + + + '%1' is not allowed as username. + + + + + Your username must start with a lowercase letter or underscore. + + + + + Only lowercase letters, numbers, underscore and hyphen are allowed. + + + + + Your hostname is too short. + + + + + Your hostname is too long. + + + + + '%1' is not allowed as hostname. + + + + + Only letters, numbers, underscore and hyphen are allowed. + + + + + Your passwords do not match! + + + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + + + + ContextualProcessJob + + + Contextual Processes Job + + + + + CreatePartitionDialog + + + Create a Partition + + + + + Si&ze: + + + + + MiB + + + + + Partition &Type: + + + + + &Primary + + + + + E&xtended + + + + + Fi&le System: + + + + + LVM LV name + + + + + &Mount Point: + + + + + Flags: + + + + + En&crypt + + + + + Logical + + + + + Primary + + + + + GPT + + + + + Mountpoint already in use. Please select another one. + + + + + CreatePartitionJob + + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + + 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). + + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. + + + + + + Creating new %1 partition on %2. + + + + + The installer failed to create partition on disk '%1'. + + + + + CreatePartitionTableDialog + + + Create Partition Table + + + + + Creating a new partition table will delete all existing data on the disk. + + + + + What kind of partition table do you want to create? + + + + + Master Boot Record (MBR) + + + + + GUID Partition Table (GPT) + + + + + CreatePartitionTableJob + + + Create new %1 partition table on %2. + + + + + Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). + + + + + Creating new %1 partition table on %2. + + + + + The installer failed to create a partition table on %1. + + + + + CreateUserJob + + + Create user %1 + + + + + Create user <strong>%1</strong>. + + + + + Preserving home directory + + + + + + Creating user %1 + + + + + Configuring user %1 + + + + + Setting file permissions + + + + + CreateVolumeGroupDialog + + + Create Volume Group + + + + + CreateVolumeGroupJob + + + Create new volume group named %1. + + + + + Create new volume group named <strong>%1</strong>. + + + + + Creating new volume group named %1. + + + + + The installer failed to create a volume group named '%1'. + + + + + DeactivateVolumeGroupJob + + + + Deactivate volume group named %1. + + + + + Deactivate volume group named <strong>%1</strong>. + + + + + The installer failed to deactivate a volume group named %1. + + + + + DeletePartitionJob + + + Delete partition %1. + + + + + Delete partition <strong>%1</strong>. + + + + + Deleting partition %1. + + + + + The installer failed to delete partition %1. + + + + + DeviceInfoWidget + + + 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 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 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. + + + + + DeviceModel + + + %1 - %2 (%3) + device[name] - size[number] (device-node[name]) + + + + + %1 - (%2) + device[name] - (device-node[name]) + + + + + DracutLuksCfgJob + + + Write LUKS configuration for Dracut to %1 + + + + + Skip writing LUKS configuration for Dracut: "/" partition is not encrypted + + + + + Failed to open %1 + + + + + DummyCppJob + + + Dummy C++ Job + + + + + EditExistingPartitionDialog + + + Edit Existing Partition + + + + + Content: + + + + + &Keep + + + + + Format + + + + + Warning: Formatting the partition will erase all existing data. + + + + + &Mount Point: + + + + + Si&ze: + + + + + MiB + + + + + Fi&le System: + + + + + Flags: + + + + + Mountpoint already in use. Please select another one. + + + + + EncryptWidget + + + Form + + + + + En&crypt system + + + + + Passphrase + + + + + Confirm passphrase + + + + + + Please enter the same passphrase in both boxes. + + + + + FillGlobalStorageJob + + + 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. + + + + + 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. + + + + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + + + + + Install boot loader on <strong>%1</strong>. + + + + + Setting up mount points. + + + + + FinishedPage + + + Form + + + + + &Restart now + + + + + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. + + + + + <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> + + + + + <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. + + + + + <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> + + + + + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. + + + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + + + + FinishedQmlViewStep + + + Finish + + + + + FinishedViewStep + + + Finish + + + + + FormatPartitionJob + + + 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>. + + + + + Formatting partition %1 with file system %2. + + + + + The installer failed to format partition %1 on disk '%2'. + + + + + GeneralRequirements + + + has at least %1 GiB available drive space + + + + + There is not enough drive space. At least %1 GiB is required. + + + + + has at least %1 GiB working memory + + + + + The system does not have enough working memory. At least %1 GiB is required. + + + + + is plugged in to a power source + + + + + The system is not plugged in to a power source. + + + + + is connected to the Internet + + + + + The system is not connected to the Internet. + + + + + is running the installer as an administrator (root) + + + + + The setup program is not running with administrator rights. + + + + + The installer is not running with administrator rights. + + + + + 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 installer. + + + + + HostInfoJob + + + Collecting information about your machine. + + + + + IDJob + + + + + + OEM Batch Identifier + + + + + Could not create directories <code>%1</code>. + + + + + Could not open file <code>%1</code>. + + + + + Could not write to file <code>%1</code>. + + + + + InitcpioJob + + + Creating initramfs with mkinitcpio. + + + + + InitramfsJob + + + Creating initramfs. + + + + + InteractiveTerminalPage + + + Konsole not installed + + + + + Please install KDE Konsole and try again! + + + + + Executing script: &nbsp;<code>%1</code> + + + + + InteractiveTerminalViewStep + + + Script + + + + + KeyboardQmlViewStep + + + Keyboard + + + + + KeyboardViewStep + + + Keyboard + + + + + LCLocaleDialog + + + System locale setting + + + + + 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>. + + + + + &Cancel + + + + + &OK + + + + + LicensePage + + + Form + + + + + <h1>License Agreement</h1> + + + + + I accept the terms and conditions above. + + + + + Please review the End User License Agreements (EULAs). + + + + + 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. + + + + + 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. + + + + + LicenseViewStep + + + License + + + + + LicenseWidget + + + URL: %1 + + + + + <strong>%1 driver</strong><br/>by %2 + %1 is an untranslatable product name, example: Creative Audigy driver + + + + + <strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font> + %1 is usually a vendor name, example: Nvidia graphics driver + + + + + <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1 codec</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1 package</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1</strong><br/><font color="Grey">by %2</font> + + + + + File: %1 + + + + + Hide license text + + + + + Show the license text + + + + + Open license agreement in browser. + + + + + LocalePage + + + Region: + + + + + Zone: + + + + + + &Change... + + + + + LocaleQmlViewStep + + + Location + + + + + LocaleViewStep + + + Location + + + + + LuksBootKeyFileJob + + + Configuring LUKS key file. + + + + + + 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 + + + Generate machine-id. + + + + + Configuration Error + + + + + No root mount point is set for MachineId. + + + + + Map + + + Timezone: %1 + + + + + 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. + + + + + NetInstallViewStep + + + + Package selection + + + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + Communication + + + + + Development + + + + + Office + + + + + Multimedia + + + + + Internet + + + + + Theming + + + + + Gaming + + + + + Utilities + + + + + NotesQmlViewStep + + + Notes + + + + + OEMPage + + + Ba&tch: + + + + + <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> + + + + + <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html> + + + + + OEMViewStep + + + OEM Configuration + + + + + Set the OEM Batch Identifier to <code>%1</code>. + + + + + Offline + + + Select your preferred Region, or use the default one based on your current location. + + + + + + + Timezone: %1 + + + + + Select your preferred Zone within your Region. + + + + + Zones + + + + + You can fine-tune Language and Locale settings below. + + + + + PWQ + + + Password is too short + + + + + Password is too long + + + + + Password is too weak + + + + + Memory allocation error when setting '%1' + + + + + Memory allocation error + + + + + The password is the same as the old one + + + + + The password is a palindrome + + + + + The password differs with case changes only + + + + + The password is too similar to the old one + + + + + 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 forbidden words in some form + + + + + The password contains too few digits + + + + + The password contains too few uppercase letters + + + + + The password contains fewer than %n lowercase letters + + + + + + + + The password contains too few lowercase letters + + + + + The password contains too few non-alphanumeric characters + + + + + The password is too short + + + + + The password does not contain enough character classes + + + + + The password contains too many same characters 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 uppercase letters + + + + + + + + The password contains fewer than %n non-alphanumeric characters + + + + + + + + The password is shorter than %n characters + + + + + + + + The password is a rotated version of the previous one + + + + + The password contains fewer than %n character classes + + + + + + + + The password contains more than %n same characters consecutively + + + + + + + + The password contains more than %n characters of the same class consecutively + + + + + + + + The password contains monotonic sequence longer than %n characters + + + + + + + + The password contains too long of a monotonic character sequence + + + + + No password supplied + + + + + Cannot obtain random numbers from the RNG device + + + + + Password generation failed - required entropy too low for settings + + + + + The password fails the dictionary check - %1 + + + + + The password fails the dictionary check + + + + + Unknown setting - %1 + + + + + Unknown setting + + + + + Bad integer value of setting - %1 + + + + + Bad integer value + + + + + Setting %1 is not of integer type + + + + + Setting is not of integer type + + + + + Setting %1 is not of string type + + + + + Setting is not of string type + + + + + Opening the configuration file failed + + + + + The configuration file is malformed + + + + + Fatal failure + + + + + Unknown error + + + + + Password is empty + + + + + PackageChooserPage + + + Form + + + + + Product Name + + + + + TextLabel + + + + + Long Product Description + + + + + Package Selection + + + + + Please pick a product from the list. The selected product will be installed. + + + + + PackageChooserViewStep + + + Packages + + + + + PackageModel + + + Name + + + + + Description + + + + + Page_Keyboard + + + Form + + + + + Keyboard Model: + + + + + Type here to test your keyboard + + + + + Page_UserSetup + + + Form + + + + + What is your name? + + + + + Your Full Name + + + + + What name do you want to use to log in? + + + + + login + + + + + What is the name of this computer? + + + + + <small>This name will be used if you make the computer visible to others on a network.</small> + + + + + Computer Name + + + + + Choose a password to keep your account safe. + + + + + + <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> + + + + + + Password + + + + + + Repeat Password + + + + + When this box is checked, password-strength checking is done and you will not be able to use a weak password. + + + + + Require strong passwords. + + + + + Log in automatically without asking for the password. + + + + + Use the same password for the administrator account. + + + + + Choose a password for the administrator account. + + + + + + <small>Enter the same password twice, so that it can be checked for typing errors.</small> + + + + + PartitionLabelsView + + + Root + + + + + Home + + + + + Boot + + + + + EFI system + + + + + Swap + + + + + New partition for %1 + + + + + New partition + + + + + %1 %2 + size[number] filesystem[name] + + + + + PartitionModel + + + + Free Space + + + + + + New partition + + + + + Name + + + + + File System + + + + + Mount Point + + + + + Size + + + + + PartitionPage + + + Form + + + + + Storage de&vice: + + + + + &Revert All Changes + + + + + New Partition &Table + + + + + Cre&ate + + + + + &Edit + + + + + &Delete + + + + + New Volume Group + + + + + Resize Volume Group + + + + + Deactivate Volume Group + + + + + Remove Volume Group + + + + + I&nstall boot loader on: + + + + + Are you sure you want to create a new partition table on %1? + + + + + Can not create new partition + + + + + 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. + + + + + PartitionViewStep + + + Gathering system information... + + + + + Partitions + + + + + Install %1 <strong>alongside</strong> another operating system. + + + + + <strong>Erase</strong> disk and install %1. + + + + + <strong>Replace</strong> a partition with %1. + + + + + <strong>Manual</strong> partitioning. + + + + + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). + + + + + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. + + + + + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. + + + + + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). + + + + + Disk <strong>%1</strong> (%2) + + + + + Current: + + + + + After: + + + + + No EFI system partition configured + + + + + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. + + + + + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. + + + + + EFI system partition flag not set + + + + + 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>bios_grub</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. + + + + + PlasmaLnfJob + + + Plasma Look-and-Feel Job + + + + + + Could not select KDE Plasma Look-and-Feel package + + + + + 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. + + + + + 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 installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. + + + + + PlasmaLnfViewStep + + + Look-and-Feel + + + + + PreserveFiles + + + Saving files for later ... + + + + + No files configured to save for later. + + + + + Not all of the configured files could be preserved. + + + + + ProcessResult + + + +There was no output from the command. + + + + + +Output: + + + + + + External command crashed. + + + + + Command <i>%1</i> crashed. + + + + + External command failed to start. + + + + + Command <i>%1</i> failed to start. + + + + + Internal error when starting command. + + + + + Bad parameters for process job call. + + + + + External command failed to finish. + + + + + Command <i>%1</i> failed to finish in %2 seconds. + + + + + External command finished with errors. + + + + + Command <i>%1</i> finished with exit code %2. + + + + + QObject + + + %1 (%2) + + + + + unknown + + + + + extended + + + + + unformatted + + + + + swap + + + + + + Default + + + + + + + + File not found + + + + + Path <pre>%1</pre> must be an absolute path. + + + + + Directory not found + + + + + + Could not create new random file <pre>%1</pre>. + + + + + No product + + + + + No description provided. + + + + + (no mount point) + + + + + Unpartitioned space or unknown partition table + + + + + Recommended + + + <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> + + + + + RemoveUserJob + + + Remove live user from target system + + + + + RemoveVolumeGroupJob + + + + Remove Volume Group named %1. + + + + + Remove Volume Group named <strong>%1</strong>. + + + + + The installer failed to remove a volume group named '%1'. + + + + + ReplaceWidget + + + Form + + + + + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. + + + + + The selected item does not appear to be a valid partition. + + + + + %1 cannot be installed on empty space. Please select an existing partition. + + + + + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. + + + + + %1 cannot be installed on this partition. + + + + + Data partition (%1) + + + + + Unknown system partition (%1) + + + + + %1 system partition (%2) + + + + + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. + + + + + <strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. + + + + + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. + + + + + The EFI system partition at %1 will be used for starting %2. + + + + + EFI system partition: + + + + + Requirements + + + <p>This computer does not satisfy the minimum requirements for installing %1.<br/> + Installation cannot continue.</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> + + + + + ResizeFSJob + + + Resize Filesystem Job + + + + + Invalid configuration + + + + + The file-system resize job has an invalid configuration and will not run. + + + + + KPMCore not Available + + + + + Calamares cannot start KPMCore for the file-system resize job. + + + + + + + + + Resize Failed + + + + + 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 filesystem %1 cannot be resized. + + + + + + The device %1 cannot be resized. + + + + + The filesystem %1 must be resized, but cannot. + + + + + The device %1 must be resized, but cannot + + + + + ResizePartitionJob + + + Resize partition %1. + + + + + Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. + + + + + Resizing %2MiB partition %1 to %3MiB. + + + + + The installer failed to resize partition %1 on disk '%2'. + + + + + ResizeVolumeGroupDialog + + + Resize Volume Group + + + + + ResizeVolumeGroupJob + + + + Resize volume group named %1 from %2 to %3. + + + + + Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>. + + + + + The installer failed to resize a volume group named '%1'. + + + + + ResultsListDialog + + + For best results, please ensure that this computer: + + + + + System requirements + + + + + ResultsListWidget + + + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> + + + + + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> + + + + + 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 program will ask you some questions and set up %2 on your computer. + + + + + ScanningDialog + + + Scanning storage devices... + + + + + Partitioning + + + + + SetHostNameJob + + + Set hostname %1 + + + + + Set hostname <strong>%1</strong>. + + + + + Setting hostname %1. + + + + + + Internal Error + + + + + + Cannot write hostname to target system + + + + + SetKeyboardLayoutJob + + + Set keyboard model to %1, layout to %2-%3 + + + + + Failed to write keyboard configuration for the virtual console. + + + + + + + Failed to write to %1 + + + + + Failed to write keyboard configuration for X11. + + + + + Failed to write keyboard configuration to existing /etc/default directory. + + + + + SetPartFlagsJob + + + Set flags on partition %1. + + + + + Set flags on %1MiB %2 partition. + + + + + Set flags on new partition. + + + + + Clear flags on partition <strong>%1</strong>. + + + + + Clear flags on %1MiB <strong>%2</strong> partition. + + + + + Clear flags on new partition. + + + + + Flag partition <strong>%1</strong> as <strong>%2</strong>. + + + + + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. + + + + + Flag new partition as <strong>%1</strong>. + + + + + Clearing flags on partition <strong>%1</strong>. + + + + + Clearing flags on %1MiB <strong>%2</strong> partition. + + + + + Clearing flags on new partition. + + + + + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. + + + + + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. + + + + + Setting flags <strong>%1</strong> on new partition. + + + + + The installer failed to set flags on partition %1. + + + + + SetPasswordJob + + + Set password for user %1 + + + + + Setting password for user %1. + + + + + Bad destination system path. + + + + + rootMountPoint is %1 + + + + + Cannot disable root account. + + + + + passwd terminated with error code %1. + + + + + Cannot set password for user %1. + + + + + usermod terminated with error code %1. + + + + + SetTimezoneJob + + + Set timezone to %1/%2 + + + + + Cannot access selected timezone path. + + + + + Bad path: %1 + + + + + Cannot set timezone. + + + + + Link creation failed, target: %1; link name: %2 + + + + + Cannot set timezone, + + + + + Cannot open /etc/timezone for writing + + + + + SetupGroupsJob + + + Preparing groups. + + + + + + Could not create groups in target system + + + + + These groups are missing in the target system: %1 + + + + + SetupSudoJob + + + Configure <pre>sudo</pre> users. + + + + + Cannot chmod sudoers file. + + + + + Cannot create sudoers file for writing. + + + + + ShellProcessJob + + + Shell Processes Job + + + + + SlideCounter + + + %L1 / %L2 + slide counter, %1 of %2 (numeric) + + + + + SummaryPage + + + This is an overview of what will happen once you start the setup procedure. + + + + + This is an overview of what will happen once you start the install procedure. + + + + + SummaryViewStep + + + Summary + + + + + TrackingInstallJob + + + Installation feedback + + + + + Sending installation feedback. + + + + + Internal error in install-tracking. + + + + + HTTP request timed out. + + + + + TrackingKUserFeedbackJob + + + KDE user feedback + + + + + Configuring KDE user feedback. + + + + + + Error in KDE user feedback configuration. + + + + + Could not configure KDE user feedback correctly, script error %1. + + + + + Could not configure KDE user feedback correctly, Calamares error %1. + + + + + TrackingMachineUpdateManagerJob + + + Machine feedback + + + + + Configuring machine feedback. + + + + + + Error in machine feedback configuration. + + + + + Could not configure machine feedback correctly, script error %1. + + + + + Could not configure machine feedback correctly, Calamares error %1. + + + + + TrackingPage + + + Form + + + + + Placeholder + + + + + <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><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> + + + + + 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. + + + + + 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. + + + + + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. + + + + + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. + + + + + TrackingViewStep + + + Feedback + + + + + 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 installation.</small> + + + + + UsersQmlViewStep + + + Users + + + + + UsersViewStep + + + Users + + + + + VariantModel + + + Key + Column header for key/value + + + + + Value + Column header for key/value + + + + + VolumeGroupBaseDialog + + + Create Volume Group + + + + + List of Physical Volumes + + + + + Volume Group Name: + + + + + Volume Group Type: + + + + + Physical Extent Size: + + + + + MiB + + + + + Total Size: + + + + + Used Size: + + + + + Total Sectors: + + + + + Quantity of LVs: + + + + + WelcomePage + + + Form + + + + + + Select application and system language + + + + + &About + + + + + Open donations website + + + + + &Donate + + + + + Open help and support website + + + + + &Support + + + + + Open issues and bug-tracking website + + + + + &Known issues + + + + + Open release notes website + + + + + &Release notes + + + + + <h1>Welcome to the Calamares setup program for %1.</h1> + + + + + <h1>Welcome to %1 setup.</h1> + + + + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + + <h1>Welcome to the %1 installer.</h1> + + + + + %1 support + + + + + About %1 setup + + + + + About %1 installer + + + + + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.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. + + + + + WelcomeQmlViewStep + + + Welcome + + + + + WelcomeViewStep + + + Welcome + + + + + about + + + <h1>%1</h1><br/> + <strong>%2<br/> + for %3</strong><br/><br/> + Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> + and the <a href='https://www.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. + + + + + Back + + + + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + + + i18n + + + <h1>Languages</h1> </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>. + + + + + <h1>Locales</h1> </br> + The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>. + + + + + Back + + + + + keyboardq + + + Keyboard Model + + + + + Layouts + + + + + Keyboard Layout + + + + + Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. + + + + + Models + + + + + Variants + + + + + Keyboard Variant + + + + + Test your keyboard + + + + + localeq + + + Change + + + + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + release_notes + + + <h3>%1</h3> + <p>This an example QML file, showing options in RichText with Flickable content.</p> + + <p>QML with RichText can use HTML tags, Flickable content is useful for touchscreens.</p> + + <p><b>This is bold text</b></p> + <p><i>This is italic text</i></p> + <p><u>This is underlined text</u></p> + <p><center>This text will be center-aligned.</center></p> + <p><s>This is strikethrough</s></p> + + <p>Code example: + <code>ls -l /home</code></p> + + <p><b>Lists:</b></p> + <ul> + <li>Intel CPU systems</li> + <li>AMD CPU systems</li> + </ul> + + <p>The vertical scrollbar is adjustable, current width set to 10.</p> + + + + + Back + + + + + usersq + + + Pick your user name and credentials to login and perform admin tasks + + + + + What is your name? + + + + + Your Full Name + + + + + What name do you want to use to log in? + + + + + Login Name + + + + + If more than one person will use this computer, you can create multiple accounts after installation. + + + + + What is the name of this computer? + + + + + Computer Name + + + + + This name will be used if you make the computer visible to others on a network. + + + + + Choose a password to keep your account safe. + + + + + Password + + + + + Repeat Password + + + + + 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. + + + + + Validate passwords quality + + + + + When this box is checked, password-strength checking is done and you will not be able to use a weak password. + + + + + Log in automatically without asking for the password + + + + + Reuse user password as root password + + + + + Use the same password for the administrator account. + + + + + Choose a root password to keep your account safe. + + + + + Root Password + + + + + Repeat Root Password + + + + + Enter the same password twice, so that it can be checked for typing errors. + + + + + welcomeq + + + <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> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + + diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts index 7909483f21..c93cfe9924 100644 --- a/lang/calamares_sk.ts +++ b/lang/calamares_sk.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Strom miniaplikácií - + Debug information Ladiace informácie @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Inštalácia - + Install Inštalácia @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Hotovo @@ -261,171 +269,180 @@ Calamares::ViewManager - + Setup Failed Inštalácia zlyhala - + Installation Failed Inštalácia zlyhala - + Would you like to paste the install log to the web? Chceli by ste vložiť záznam z inštalácie na web? - + Error Chyba - - + + &Yes _Áno - - + + &No _Nie - + &Close _Zavrieť - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. Odovzdanie nebolo úspešné. Nebolo dokončené žiadne webové vloženie. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Zlyhala inicializácia inštalátora Calamares - + %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. Nie je možné nainštalovať %1. Calamares nemohol načítať všetky konfigurované moduly. Je problém s tým, ako sa Calamares používa pri distribúcii. - + <br/>The following modules could not be loaded: <br/>Nebolo možné načítať nasledujúce moduly - + Continue with setup? Pokračovať v inštalácii? - + Continue with installation? Pokračovať v inštalácii? - + 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> Inštalačný program distribúcie %1 sa chystá vykonať zmeny na vašom disku, aby nainštaloval distribúciu %2. <br/><strong>Tieto zmeny nebudete môcť vrátiť späť.</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> Inštalátor distribúcie %1 sa chystá vykonať zmeny na vašom disku, aby nainštaloval distribúciu %2. <br/><strong>Tieto zmeny nebudete môcť vrátiť späť.</strong> - + &Set up now &Inštalovať teraz - + &Install now &Inštalovať teraz - + Go &back Prejsť s&päť - + &Set up &Inštalovať - + &Install _Inštalovať - + Setup is complete. Close the setup program. Inštalácia je dokončená. Zavrite inštalačný program. - + The installation is complete. Close the installer. Inštalácia je dokončená. Zatvorí inštalátor. - + Cancel setup without changing the system. Zrušenie inštalácie bez zmien v systéme. - + Cancel installation without changing the system. Zruší inštaláciu bez zmeny systému. - + &Next Ď&alej - + &Back &Späť - + &Done _Dokončiť - + &Cancel &Zrušiť - + Cancel setup? Zrušiť inštaláciu? - + Cancel installation? Zrušiť inštaláciu? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Naozaj chcete zrušiť aktuálny priebeh inštalácie? Inštalačný program bude ukončený a zmeny budú stratené. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Skutočne chcete zrušiť aktuálny priebeh inštalácie? @@ -455,45 +472,15 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Nezískateľná chyba jazyka Python. - - CalamaresUtils - - - Install log posted to: -%1 - Záznam o inštalácii bol odoslaný do: -%1 - - CalamaresWindow - - Show debug information - Zobraziť ladiace informácie - - - - &Back - &Späť - - - - &Next - Ď&alej - - - - &Cancel - &Zrušiť - - - + %1 Setup Program Inštalačný program distribúcie %1 - + %1 Installer Inštalátor distribúcie %1 @@ -815,50 +802,90 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. <h1>Vitajte v inštalátore distribúcie %1</h1> - + Your username is too long. Vaše používateľské meno je príliš dlhé. - + '%1' is not allowed as username. „%1“ nie je možné použiť ako používateľské meno. - + Your username must start with a lowercase letter or underscore. Vaše používateľské meno musí začínať malým písmenom alebo podčiarkovníkom. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Sú povolené iba malé písmená, číslice, podtržníky a pomlčky. - + Your hostname is too short. Váš názov hostiteľa je príliš krátky. - + Your hostname is too long. Váš názov hostiteľa je príliš dlhý. - + '%1' is not allowed as hostname. „%1“ nie je možné použiť ako názov hostiteľa. - + Only letters, numbers, underscore and hyphen are allowed. Sú povolené iba písmená, číslice, podtržníky a pomlčky. - + Your passwords do not match! Vaše heslá sa nezhodujú! + + + Setup Failed + Inštalácia zlyhala + + + + Installation Failed + Inštalácia zlyhala + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Inštalácia dokončená + + + + Installation Complete + Inštalácia dokončená + + + + The setup of %1 is complete. + Inštalácia distribúcie %1 je dokončená. + + + + The installation of %1 is complete. + Inštalácia distribúcie %1s je dokončená. + ContextualProcessJob @@ -949,22 +976,43 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Vytvorenie nového %2MiB oddielu na zariadení %4 (%3) so systémom súborov %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Vytvorenie nového <strong>%2MiB</strong> oddielu na zariadení <strong>%4</strong> (%3) so systémom súborov <strong>%1</strong>. - + + Creating new %1 partition on %2. Vytvára sa nový %1 oddiel na zariadení %2. - + The installer failed to create partition on disk '%1'. Inštalátor zlyhal pri vytváraní oddielu na disku „%1“. @@ -1291,37 +1339,57 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. FillGlobalStorageJob - + Set partition information Nastaviť informácie o oddieli - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Inštalovať distribúciu %1 na <strong>novom</strong> %2 systémovom oddieli. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Nastaviť <strong>nový</strong> %2 oddiel s bodom pripojenia <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Inštalovať distribúciu %2 na %3 systémovom oddieli <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Nastaviť %3 oddiel <strong>%1</strong> s bodom pripojenia <strong>%2</strong>. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Inštalovať distribúciu %2 na %3 systémovom oddieli <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Inštalovať zavádzač do <strong>%1</strong>. - + Setting up mount points. Nastavujú sa body pripojení. @@ -1339,62 +1407,50 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. &Reštartovať teraz - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Všetko je dokončené.</h1><br/>Distribúcia %1 bola nainštalovaná do vášho počítača.<br/>Teraz môžete začať používať váš nový systém. - + <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>Keď je zaškrtnuté toto políčko, váš systém sa okamžite reštartuje po stlačení tlačidla <span style="font-style:italic;">Dokončiť</span> alebo zatvorení inštalačného programu.</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>Všetko je dokončené.</h1><br/>Distribúcia %1 bola nainštalovaná do vášho počítača.<br/>Teraz môžete reštartovať počítač a spustiť váš nový systém, alebo pokračovať v používaní živého prostredia distribúcie %2. - + <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>Keď je zaškrtnuté toto políčko, váš systém sa okamžite reštartuje po stlačení tlačidla <span style="font-style:italic;">Dokončiť</span> alebo zatvorení inštalátora.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Inštalácia zlyhala</h1><br/>Distribúcia %1 nebola nainštalovaná do vášho počítača.<br/>Chybová hláška: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Inštalácia zlyhala</h1><br/>Distribúcia %1 nebola nainštalovaná do vášho počítača.<br/>Chybová hláška: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Dokončenie + + + FinishedViewStep - - Setup Complete - Inštalácia dokončená - - - - Installation Complete - Inštalácia dokončená - - - - The setup of %1 is complete. - Inštalácia distribúcie %1 je dokončená. - - - - The installation of %1 is complete. - Inštalácia distribúcie %1s je dokončená. + + Finish + Dokončenie @@ -2280,7 +2336,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Neznáma chyba - + Password is empty Heslo je prázdne @@ -2790,14 +2846,14 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. ProcessResult - + There was no output from the command. Žiadny výstup z príkazu. - + Output: @@ -2806,52 +2862,52 @@ Výstup: - + External command crashed. Externý príkaz nečakane skončil. - + Command <i>%1</i> crashed. Príkaz <i>%1</i> nečakane skončil. - + External command failed to start. Zlyhalo spustenie externého príkazu. - + Command <i>%1</i> failed to start. Zlyhalo spustenie príkazu <i>%1</i> . - + Internal error when starting command. Počas spúšťania príkazu sa vyskytla interná chyba. - + Bad parameters for process job call. Nesprávne parametre pre volanie úlohy procesu. - + External command failed to finish. Zlyhalo dokončenie externého príkazu. - + Command <i>%1</i> failed to finish in %2 seconds. Zlyhalo dokončenie príkazu <i>%1</i> počas doby %2 sekúnd. - + External command finished with errors. Externý príkaz bol dokončený s chybami. - + Command <i>%1</i> finished with exit code %2. Príkaz <i>%1</i> skončil s ukončovacím kódom %2. @@ -3670,12 +3726,12 @@ Výstup: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Ak bude tento počítač používať viac ako jedna osoba, môžete nastaviť viacero účtov po inštalácii.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Ak bude tento počítač používať viac ako jedna osoba, môžete nastaviť viacero účtov po inštalácii.</small> @@ -3913,6 +3969,44 @@ Výstup: Späť + + calamares-sidebar + + + Show debug information + Zobraziť ladiace informácie + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts index 2f79463624..7a8bc6a57e 100644 --- a/lang/calamares_sl.ts +++ b/lang/calamares_sl.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Namesti @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Končano @@ -261,170 +269,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed Namestitev je spodletela - + Would you like to paste the install log to the web? - + Error Napaka - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Naprej - + &Back &Nazaj - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? Preklic namestitve? - + 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. Ali res želite preklicati trenutni namestitveni proces? @@ -454,44 +471,15 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - &Nazaj - - - - &Next - &Naprej - - - - &Cancel - - - - + %1 Setup Program - + %1 Installer %1 Namestilnik @@ -812,50 +800,90 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + Namestitev je spodletela + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -946,22 +974,43 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. Namestilniku ni uspelo ustvariti razdelka na disku '%1'. @@ -1288,37 +1337,57 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. FillGlobalStorageJob - + Set partition information Nastavi informacije razdelka - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1336,62 +1405,50 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Končano + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - + + Finish + Končano @@ -2276,7 +2333,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Password is empty @@ -2786,65 +2843,65 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Nepravilni parametri za klic procesa opravila. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3660,12 +3717,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 installation.</small> @@ -3893,6 +3950,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts index a24410640e..3dcf7ddf19 100644 --- a/lang/calamares_sq.ts +++ b/lang/calamares_sq.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Pemë Widget-esh - + Debug information Të dhëna diagnostikimi @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Ujdise - + Install Instalim @@ -143,7 +151,7 @@ Calamares::JobThread - + Done U bë @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Rregullimi Dështoi - + Installation Failed Instalimi Dështoi - + Would you like to paste the install log to the web? Do të donit të hidhet në web regjistri i instalimit? - + Error Gabim - - + + &Yes &Po - - + + &No &Jo - + &Close &Mbylle - + Install Log Paste URL URL Ngjitjeje Regjistri Instalimi - + The upload was unsuccessful. No web-paste was done. Ngarkimi s’qe i suksesshëm. S’u bë hedhje në web. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Gatitja e Calamares-it Dështoi - + %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 s’mund të instalohet. Calamares s’qe në gjendje të ngarkonte krejt modulet e formësuar. Ky është një problem që lidhet me mënyrën se si përdoret Calamares nga shpërndarja. - + <br/>The following modules could not be loaded: <br/>S’u ngarkuan dot modulet vijues: - + Continue with setup? Të vazhdohet me rregullimin? - + Continue with installation? Të vazhdohet me instalimin? - + 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> Programi i rregullimit %1 është një hap larg nga bërja e ndryshimeve në diskun tuaj, që të mund të rregullojë %2.<br/><strong>S’do të jeni në gjendje t’i zhbëni këto ndryshime.</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> Instaluesi %1 është një hap larg nga bërja e ndryshimeve në diskun tuaj, që të mund të instalojë %2.<br/><strong>S’do të jeni në gjendje t’i zhbëni këto ndryshime.</strong> - + &Set up now &Rregulloje tani - + &Install now &Instaloje tani - + Go &back Kthehu &mbrapsht - + &Set up &Rregulloje - + &Install &Instaloje - + Setup is complete. Close the setup program. Rregullimi është i plotë. Mbylleni programin e rregullimit. - + The installation is complete. Close the installer. Instalimi u plotësua. Mbylleni instaluesin. - + Cancel setup without changing the system. Anuloje rregullimin pa ndryshuar sistemin. - + Cancel installation without changing the system. Anuloje instalimin pa ndryshuar sistemin. - + &Next Pas&uesi - + &Back &Mbrapsht - + &Done &U bë - + &Cancel &Anuloje - + Cancel setup? Të anulohet rregullimi? - + Cancel installation? Të anulohet instalimi? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Doni vërtet të anulohet procesi i tanishëm i rregullimit? Programi i rregullimit do të mbyllet dhe krejt ndryshimet do të humbin. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Doni vërtet të anulohet procesi i tanishëm i instalimit? @@ -451,45 +468,15 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Gabim Python mosprurjeje kodi. - - CalamaresUtils - - - Install log posted to: -%1 - Regjistri i instalimit u postua te: -%1 - - CalamaresWindow - - Show debug information - Shfaq të dhëna diagnostikimi - - - - &Back - &Mbrapsht - - - - &Next - Pas&uesi - - - - &Cancel - &Anuloje - - - + %1 Setup Program Programi i Rregullimit të %1 - + %1 Installer Instalues %1 @@ -810,50 +797,90 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. <h1>Mirë se vini te instaluesi i %1</h1> - + Your username is too long. Emri juaj i përdoruesit është shumë i gjatë. - + '%1' is not allowed as username. '%1' s’lejohet si emër përdoruesi. - + Your username must start with a lowercase letter or underscore. Emri juaj i përdoruesit duhet të fillojë me një shkronjë të vogël ose nënvijë. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Lejohen vetëm shkronja të vogla, numra, nënvijë dhe vijë ndarëse. - + Your hostname is too short. Strehëemri juaj është shumë i shkurtër. - + Your hostname is too long. Strehëemri juaj është shumë i gjatë. - + '%1' is not allowed as hostname. '%1' s’lejohet si strehëemër. - + Only letters, numbers, underscore and hyphen are allowed. Lejohen vetëm shkronja, numra, nënvijë dhe vijë ndarëse. - + Your passwords do not match! Fjalëkalimet tuaj s’përputhen! + + + Setup Failed + Rregullimi Dështoi + + + + Installation Failed + Instalimi Dështoi + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Rregullim i Plotësuar + + + + Installation Complete + Instalimi u Plotësua + + + + The setup of %1 is complete. + Rregullimi i %1 u plotësua. + + + + The installation of %1 is complete. + Instalimi i %1 u plotësua. + ContextualProcessJob @@ -944,22 +971,43 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Krijo pjesë të re %2MiB te %4 (%3) me sistem kartelash %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Krijo pjesë të re <strong>%2MiB</strong> te <strong>%4</strong> (%3) me sistem kartelash <strong>%1</strong>. - + + Creating new %1 partition on %2. Po krijohet pjesë e re %1 te %2. - + The installer failed to create partition on disk '%1'. Instaluesi s’arriti të krijojë pjesë në diskun '%1'. @@ -1286,37 +1334,57 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. FillGlobalStorageJob - + Set partition information Caktoni të dhëna pjese - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Instaloje %1 në pjesë sistemi <strong>të re</strong> %2. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Rregullo pjesë të <strong>re</strong> %2 me pikë montimi <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Instaloje %2 te pjesa e sistemit %3 <strong>%1</strong>. + + 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>. + + + + + 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>. - Rregullo pjesë %3 <strong>%1</strong> me pikë montimi <strong>%2</strong>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + Instaloje %2 te pjesa e sistemit %3 <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Instalo ngarkues nisjesh në <strong>%1</strong>. - + Setting up mount points. Po rregullohen pika montimesh. @@ -1334,62 +1402,50 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. &Rinise tani - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Kaq qe.</h1><br/>%1 u rregullua në kompjuterin tuaj.<br/>Tani mundeni të filloni të përdorni sistemin tuaj të ri. - + <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>Kur i vihet shenjë kësaj kutie, sistemi juaj do të riniset menjëherë, kur klikoni mbi <span style=" font-style:italic;">U bë</span> ose mbyllni programin e rregullimit.</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>Kaq qe.</h1><br/>%1 është instaluar në kompjuterin tuaj.<br/>Tani mundeni ta rinisni me sistemin tuaj të ri, ose të vazhdoni përdorimin e mjedisit %2 Live. - + <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>Kur i vihet shenjë kësaj kutie, sistemi juaj do të riniset menjëherë, kur klikoni mbi <span style=" font-style:italic;">U bë</span> ose mbyllni instaluesin.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Rregullimi Dështoi</h1><br/>%1 s’u rregullua në kompjuterin tuaj.<br/>Mesazhi i gabimit qe: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalimi Dështoi</h1><br/>%1 s’u instalua në kompjuterin tuaj.<br/>Mesazhi i gabimit qe: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Përfundim + + + FinishedViewStep - - Setup Complete - Rregullim i Plotësuar - - - - Installation Complete - Instalimi u Plotësua - - - - The setup of %1 is complete. - Rregullimi i %1 u plotësua. - - - - The installation of %1 is complete. - Instalimi i %1 u plotësua. + + Finish + Përfundim @@ -2256,7 +2312,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Gabim i panjohur - + Password is empty Fjalëkalimi është i zbrazët @@ -2766,14 +2822,14 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. ProcessResult - + There was no output from the command. S’pati përfundim nga urdhri. - + Output: @@ -2782,52 +2838,52 @@ Përfundim: - + External command crashed. Urdhri i jashtëm u vithis. - + Command <i>%1</i> crashed. Urdhri <i>%1</i> u vithis. - + External command failed to start. Dështoi nisja e urdhrit të jashtëm. - + Command <i>%1</i> failed to start. Dështoi nisja e urdhrit <i>%1</i>. - + Internal error when starting command. Gabim i brendshëm kur niset urdhri. - + Bad parameters for process job call. Parametra të gabuar për thirrje akti procesi. - + External command failed to finish. S’u arrit të përfundohej urdhër i jashtëm. - + Command <i>%1</i> failed to finish in %2 seconds. Urdhri <i>%1</i> s’arriti të përfundohej në %2 sekonda. - + External command finished with errors. Urdhri i jashtë përfundoi me gabime. - + Command <i>%1</i> finished with exit code %2. Urdhri <i>%1</i> përfundoi me kod daljeje %2. @@ -3646,12 +3702,12 @@ Përfundim: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni disa llogari, pas rregullimit.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni disa llogari, pas instalimit.</small> @@ -3890,6 +3946,44 @@ Përfundim: Mbrapsht + + calamares-sidebar + + + Show debug information + Shfaq të dhëna diagnostikimi + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts index 03e85739ea..0909db92a0 100644 --- a/lang/calamares_sr.ts +++ b/lang/calamares_sr.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Инсталирај @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Завршено @@ -259,170 +267,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed Инсталација није успела - + Would you like to paste the install log to the web? - + Error Грешка - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? Наставити са подешавањем? - + 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 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 - + &Install now &Инсталирај сада - + Go &back Иди &назад - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Следеће - + &Back &Назад - + &Done - + &Cancel &Откажи - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. Да ли стварно желите да прекинете текући процес инсталације? @@ -452,44 +469,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - &Назад - - - - &Next - &Следеће - - - - &Cancel - &Откажи - - - + %1 Setup Program - + %1 Installer %1 инсталер @@ -810,50 +798,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. Ваше корисничко име је предугачко. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Име вашег "домаћина" - hostname је прекратко. - + Your hostname is too long. Ваше име домаћина је предуго - hostname - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Лозинке се не поклапају! + + + Setup Failed + + + + + Installation Failed + Инсталација није успела + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -944,22 +972,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. Инсталација није успела да направи партицију на диску '%1'. @@ -1286,37 +1335,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1334,62 +1403,50 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Заврши + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - + + Finish + Заврши @@ -2265,7 +2322,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2775,65 +2832,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Лоши параметри при позиву посла процеса. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3649,12 +3706,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 installation.</small> @@ -3882,6 +3939,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts index b3879c3660..2d4f052273 100644 --- a/lang/calamares_sr@latin.ts +++ b/lang/calamares_sr@latin.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Instaliraj @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Gotovo @@ -259,170 +267,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed Neuspješna instalacija - + Would you like to paste the install log to the web? - + Error Greška - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Dalje - + &Back &Nazad - + &Done - + &Cancel &Prekini - + Cancel setup? - + Cancel installation? Prekini instalaciju? - + 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. Da li stvarno želite prekinuti trenutni proces instalacije? @@ -452,44 +469,15 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. Unfetchable Python error. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - &Nazad - - - - &Next - &Dalje - - - - &Cancel - &Prekini - - - + %1 Setup Program - + %1 Installer %1 Instaler @@ -810,50 +798,90 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Vaše lozinke se ne poklapaju + + + Setup Failed + + + + + Installation Failed + Neuspješna instalacija + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -944,22 +972,43 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. Instaler nije uspeo napraviti particiju na disku '%1'. @@ -1286,37 +1335,57 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1334,62 +1403,50 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Završi + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - + + Finish + Završi @@ -2265,7 +2322,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Password is empty @@ -2775,65 +2832,65 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Pogrešni parametri kod poziva funkcije u procesu. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3649,12 +3706,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 installation.</small> @@ -3882,6 +3939,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index a583bf156d..907373b3f2 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Widgetträd - + Debug information Avlusningsinformation @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Inställningar - + Install Installera @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Klar @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed Inställningarna misslyckades - + Installation Failed Installationen misslyckades - + Would you like to paste the install log to the web? Vill du ladda upp installationsloggen på webben? - + Error Fel - - + + &Yes &Ja - - + + &No &Nej - + &Close &Stäng - + Install Log Paste URL URL till installationslogg - + The upload was unsuccessful. No web-paste was done. Sändningen misslyckades. Ingenting sparades på webbplatsen. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Initieringen av Calamares misslyckades - + %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 kan inte installeras. Calamares kunde inte ladda alla konfigurerade moduler. Detta är ett problem med hur Calamares används av distributionen. - + <br/>The following modules could not be loaded: <br/>Följande moduler kunde inte hämtas: - + Continue with setup? Fortsätt med installation? - + Continue with installation? Vill du fortsätta med installationen? - + 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-installeraren är på väg att göra ändringar på disk för att installera %2.<br/><strong>Du kommer inte att kunna ångra dessa ändringar.</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-installeraren är på väg att göra ändringar för att installera %2.<br/><strong>Du kommer inte att kunna ångra dessa ändringar.</strong> - + &Set up now &Installera nu - + &Install now &Installera nu - + Go &back Gå &bakåt - + &Set up &Installera - + &Install &Installera - + Setup is complete. Close the setup program. Installationen är klar. Du kan avsluta installationsprogrammet. - + The installation is complete. Close the installer. Installationen är klar. Du kan avsluta installationshanteraren. - + Cancel setup without changing the system. Avbryt inställningarna utan att förändra systemet. - + Cancel installation without changing the system. Avbryt installationen utan att förändra systemet. - + &Next &Nästa - + &Back &Bakåt - + &Done &Klar - + &Cancel Avbryt - + Cancel setup? Avbryt inställningarna? - + Cancel installation? Avbryt installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Vill du verkligen avbryta den nuvarande uppstartsprocessen? Uppstartsprogrammet kommer avsluta och alla ändringar kommer förloras. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Är du säker på att du vill avsluta installationen i förtid? @@ -450,45 +467,15 @@ Alla ändringar kommer att gå förlorade. Ohämtbart Pythonfel - - CalamaresUtils - - - Install log posted to: -%1 - Installationslogg postad till: -%1 - - CalamaresWindow - - Show debug information - Visa avlusningsinformation - - - - &Back - &Bakåt - - - - &Next - &Nästa - - - - &Cancel - &Avsluta - - - + %1 Setup Program %1 Installationsprogram - + %1 Installer %1-installationsprogram @@ -809,50 +796,90 @@ Alla ändringar kommer att gå förlorade. <h1>Välkommen till %1-installeraren</h1> - + Your username is too long. Ditt användarnamn är för långt. - + '%1' is not allowed as username. '%1' är inte tillåtet som användarnamn. - + Your username must start with a lowercase letter or underscore. Ditt användarnamn måste börja med en liten bokstav eller ett understreck. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Endast små bokstäver, nummer, understreck och bindestreck är tillåtet. - + Your hostname is too short. Ditt värdnamn är för kort. - + Your hostname is too long. Ditt värdnamn är för långt. - + '%1' is not allowed as hostname. '%1' är inte tillåtet som värdnamn. - + Only letters, numbers, underscore and hyphen are allowed. Endast bokstäver, nummer, understreck och bindestreck är tillåtet. - + Your passwords do not match! Lösenorden överensstämmer inte! + + + Setup Failed + Inställningarna misslyckades + + + + Installation Failed + Installationen misslyckades + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Inställningarna är klara + + + + Installation Complete + Installationen är klar + + + + The setup of %1 is complete. + Inställningarna för %1 är klara. + + + + The installation of %1 is complete. + Installationen av %1 är klar. + ContextualProcessJob @@ -943,22 +970,43 @@ Alla ändringar kommer att gå förlorade. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Skapa ny %2MiB partition på %4 (%3) med filsystem %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Skapa ny <strong>%2MiB</strong>partition på <strong>%4</strong> (%3) med filsystem <strong>%1</strong>. - + + Creating new %1 partition on %2. Skapar ny %1 partition på %2. - + The installer failed to create partition on disk '%1'. Installationsprogrammet kunde inte skapa partition på disk '%1'. @@ -1285,37 +1333,57 @@ Alla ändringar kommer att gå förlorade. FillGlobalStorageJob - + Set partition information Ange partitionsinformation - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Installera %1 på <strong>ny</strong> %2 system partition. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Skapa <strong> ny </strong> %2 partition med monteringspunkt <strong> %1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Installera %2 på %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. - Skapa %3 partition <strong>%1</strong> med monteringspunkt <strong>%2</strong>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + Installera %2 på %3 system partition <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Installera uppstartshanterare på <strong>%1</strong>. - + Setting up mount points. Ställer in monteringspunkter. @@ -1333,62 +1401,50 @@ Alla ändringar kommer att gå förlorade. Sta&rta om nu - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Allt klart.</h1><br/>%1 har installerats på din dator.<br/>Du kan nu börja använda ditt nya system. - + <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>När denna ruta är ikryssad kommer systemet starta om omedelbart när du klickar på <span style="font-style:italic;">Klar</span> eller stänger installationsprogrammet.</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>Klappat och klart.</h1><br/>%1 har installerats på din dator.<br/>Du kan nu starta om till ditt nya system, eller fortsätta att använda %2 i liveläge. - + <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>När denna ruta är ikryssad kommer systemet starta om omedelbart när du klickar på <span style="font-style:italic;">Klar</span> eller stänger installationsprogrammet.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Installationen misslyckades</h1> <br/>%1 har inte blivit installerad på din dator. <br/>Felmeddelandet var: %2 - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installationen misslyckades</h1> <br/>%1 har inte blivit installerad på din dator. <br/>Felmeddelandet var: %2 - FinishedViewStep + FinishedQmlViewStep - + Finish Slutför + + + FinishedViewStep - - Setup Complete - Inställningarna är klara - - - - Installation Complete - Installationen är klar - - - - The setup of %1 is complete. - Inställningarna för %1 är klara. - - - - The installation of %1 is complete. - Installationen av %1 är klar. + + Finish + Slutför @@ -2258,7 +2314,7 @@ Sök på kartan genom att dra Okänt fel - + Password is empty Lösenordet är blankt @@ -2768,14 +2824,14 @@ Sök på kartan genom att dra ProcessResult - + There was no output from the command. Det kom ingen utdata från kommandot. - + Output: @@ -2784,52 +2840,52 @@ Utdata: - + External command crashed. Externt kommando kraschade. - + Command <i>%1</i> crashed. Kommando <i>%1</i> kraschade. - + External command failed to start. Externt kommando misslyckades med att starta - + Command <i>%1</i> failed to start. Kommando <i>%1</i> misslyckades med att starta.  - + Internal error when starting command. Internt fel under kommandostart. - + Bad parameters for process job call. Ogiltiga parametrar för processens uppgiftsanrop. - + External command failed to finish. Fel inträffade när externt kommando kördes. - + Command <i>%1</i> failed to finish in %2 seconds. Kommando <i>%1</i> misslyckades att slutföras på %2 sekunder. - + External command finished with errors. Externt kommando kördes färdigt med fel. - + Command <i>%1</i> finished with exit code %2. Kommando <i>%1</i>avslutades under körning med avslutningskod %2. @@ -3648,12 +3704,12 @@ Installationen kan inte fortsätta.</p> UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Om mer än en person skall använda datorn så kan du skapa flera användarkonton när inställningarna är klara.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Om mer än en person skall använda datorn så kan du skapa flera användarkonton när installationen är klar.</small> @@ -3892,6 +3948,44 @@ Installationen kan inte fortsätta.</p> Bakåt + + calamares-sidebar + + + Show debug information + Visa avlusningsinformation + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_te.ts b/lang/calamares_te.ts index 0d96c73537..acbe41d0d8 100644 --- a/lang/calamares_te.ts +++ b/lang/calamares_te.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -111,7 +119,7 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి విడ్జెట్ ట్రీ - + Debug information డీబగ్ సమాచారం @@ -119,12 +127,12 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి Calamares::ExecutionViewStep - + Set up సెట్ అప్ - + Install ఇన్‌స్టాల్ @@ -145,7 +153,7 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి Calamares::JobThread - + Done ముగించు @@ -259,170 +267,179 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి Calamares::ViewManager - + Setup Failed - + Installation Failed - + Would you like to paste the install log to the web? - + Error లోపం - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -451,44 +468,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - - - - - &Next - - - - - &Cancel - - - - + %1 Setup Program - + %1 Installer @@ -809,50 +797,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -943,22 +971,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1285,37 +1334,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1333,61 +1402,49 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. + + Finish @@ -2255,7 +2312,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2765,65 +2822,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3639,12 +3696,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 installation.</small> @@ -3872,6 +3929,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts index 512bdb8eb9..7c5eb677b8 100644 --- a/lang/calamares_tg.ts +++ b/lang/calamares_tg.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Дарахти виҷетҳо - + Debug information Иттилооти ислоҳи нуқсонҳо @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Танзимкунӣ - + Install Насбкунӣ @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Анҷоми кор @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Танзимкунӣ қатъ шуд - + Installation Failed Насбкунӣ қатъ шуд - + Would you like to paste the install log to the web? Шумо мехоҳед, ки сабти рӯйдодҳои насбро ба шабака нусха бардоред? - + Error Хато - - + + &Yes &Ҳа - - + + &No &Не - + &Close &Пӯшидан - + Install Log Paste URL Гузоштани нишонии URL-и сабти рӯйдодҳои насб - + The upload was unsuccessful. No web-paste was done. Боркунӣ иҷро нашуд. Гузариш ба шабака иҷро нашуд. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Омодашавии Calamares қатъ шуд - + %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 насб карда намешавад. Calamares ҳамаи модулҳои танзимкардашударо бор карда натавонист. Ин мушкилие мебошад, ки бо ҳамин роҳ Calamares дар дистрибутиви ҷорӣ кор мекунад. - + <br/>The following modules could not be loaded: <br/>Модулҳои зерин бор карда намешаванд: - + Continue with setup? Танзимкуниро идома медиҳед? - + 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> Барномаи танзимкунии %1 барои танзим кардани %2 ба диски компютери шумо тағйиротро ворид мекунад.<br/><strong>Шумо ин тағйиротро ботил карда наметавонед.</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 барои насб кардани %2 ба диски компютери шумо тағйиротро ворид мекунад.<br/><strong>Шумо ин тағйиротро ботил карда наметавонед.</strong> - + &Set up now &Ҳозир танзим карда шавад - + &Install now &Ҳозир насб карда шавад - + Go &back &Бозгашт - + &Set up &Танзим кардан - + &Install &Насб кардан - + Setup is complete. Close the setup program. Танзим ба анҷом расид. Барномаи танзимкуниро пӯшед. - + The installation is complete. Close the installer. Насб ба анҷом расид. Барномаи насбкуниро пӯшед. - + Cancel setup without changing the system. Бекор кардани танзимкунӣ бе тағйирдиҳии низом. - + Cancel installation without changing the system. Бекор кардани насбкунӣ бе тағйирдиҳии низом. - + &Next &Навбатӣ - + &Back &Ба қафо - + &Done &Анҷоми кор - + &Cancel &Бекор кардан - + Cancel setup? Танзимкуниро бекор мекунед? - + 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 install process? The installer will quit and all changes will be lost. Шумо дар ҳақиқат мехоҳед, ки раванди насбкунии ҷориро бекор намоед? @@ -451,46 +468,15 @@ The installer will quit and all changes will be lost. Хатои кашиданашавандаи Python. - - CalamaresUtils - - - Install log posted to: -%1 - Сабти рӯйдодҳои насб ба нишонии зерин гузошта шуд: -%1 - - CalamaresWindow - - Show debug information - Намоиши иттилооти -ислоҳи нуқсонҳо - - - - &Back - &Ба қафо - - - - &Next - &Навбатӣ - - - - &Cancel - &Бекор кардан - - - + %1 Setup Program Барномаи танзимкунии %1 - + %1 Installer Насбкунандаи %1 @@ -811,50 +797,90 @@ The installer will quit and all changes will be lost. <h1>Хуш омадед ба насбкунандаи %1</h1> - + Your username is too long. Номи корбари шумо хеле дароз аст. - + '%1' is not allowed as username. '%1' ҳамчун номи корбар истифода намешавад. - + Your username must start with a lowercase letter or underscore. Номи корбари шумо бояд бо ҳарфи хурд ё зерхат сар шавад. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Шумо метавонед танҳо ҳарфҳои хурд, рақамҳо, зерхат ва нимтиреро истифода баред. - + Your hostname is too short. Номи мизбони шумо хеле кӯтоҳ аст. - + Your hostname is too long. Номи мизбони шумо хеле дароз аст. - + '%1' is not allowed as hostname. '%1' ҳамчун номи мизбон истифода намешавад. - + Only letters, numbers, underscore and hyphen are allowed. Шумо метавонед танҳо ҳарфҳо, рақамҳо, зерхат ва нимтиреро истифода баред. - + Your passwords do not match! Ниҳонвожаҳои шумо мувофиқат намекунанд! + + + Setup Failed + Танзимкунӣ қатъ шуд + + + + Installation Failed + Насбкунӣ қатъ шуд + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Анҷоми танзимкунӣ + + + + Installation Complete + Насбкунӣ ба анҷом расид + + + + The setup of %1 is complete. + Танзимкунии %1 ба анҷом расид. + + + + The installation of %1 is complete. + Насбкунии %1 ба анҷом расид. + ContextualProcessJob @@ -945,22 +971,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). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Қисми диски нав бо ҳаҷми %2MiB дар %4 (%3) бо низоми файлии %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Қисми диски нав бо ҳаҷми <strong>%2MiB</strong> дар <strong>%4</strong> (%3) бо низоми файлии <strong>%1</strong> эҷод карда мешавад. - + + Creating new %1 partition on %2. Эҷодкунии қисми диски нави %1 дар %2. - + The installer failed to create partition on disk '%1'. Насбкунанда қисми дискро дар '%1' эҷод карда натавонист. @@ -1287,37 +1334,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. Насбкунии %1 дар қисми диски низомии <strong>нави</strong> %2. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Қисми диски <strong>нави</strong> %2 бо нуқтаи васли <strong>%1</strong> танзим карда мешавад. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Насбкунии %2 дар қисми диски низомии %3 <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Қисми диски %3 <strong>%1</strong> бо нуқтаи васли <strong>%2</strong> танзим карда мешавад. + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Насбкунии %2 дар қисми диски низомии %3 <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Боркунандаи роҳандозӣ дар <strong>%1</strong> насб карда мешавад. - + Setting up mount points. Танзимкунии нуқтаҳои васл. @@ -1335,62 +1402,50 @@ The installer will quit and all changes will be lost. &Ҳозир аз нав оғоз карда шавад - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Ҳамааш тайёр.</h1><br/>%1 дар компютери шумо танзим карда шуд.<br/>Акнун шумо метавонед истифодаи низоми навро оғоз намоед. - + <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>Агар ин имконро интихоб кунед, низоми шумо пас аз зер кардани тугмаи <span style="font-style:italic;">Анҷоми кор</span> ё пӯшидани барномаи танзимкунӣ дарҳол аз нав оғоз карда мешавад.</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>Ҳамааш тайёр.</h1><br/>%1 дар компютери шумо насб карда шуд.<br/>Акнун шумо метавонед компютерро аз нав оғоз карда, ба низоми нав ворид шавед ё истифодаи муҳити зиндаи %2-ро идома диҳед. - + <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>Агар ин имконро интихоб кунед, низоми шумо пас аз зер кардани тугмаи <span style="font-style:italic;">Анҷоми кор</span> ё пӯшидани насбкунанда дарҳол аз нав оғоз карда мешавад.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Танзимкунӣ қатъ шуд</h1><br/>%1 дар компютери шумо танзим карда нашуд.<br/>Паёми хато: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Насбкунӣ қатъ шуд</h1><br/>%1 дар компютери шумо насб карда нашуд.<br/>Паёми хато: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Анҷом + + + FinishedViewStep - - Setup Complete - Анҷоми танзимкунӣ - - - - Installation Complete - Насбкунӣ ба анҷом расид - - - - The setup of %1 is complete. - Танзимкунии %1 ба анҷом расид. - - - - The installation of %1 is complete. - Насбкунии %1 ба анҷом расид. + + Finish + Анҷом @@ -2259,7 +2314,7 @@ The installer will quit and all changes will be lost. Хатои номаълум - + Password is empty Ниҳонвожаро ворид накардед @@ -2769,14 +2824,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. Фармони иҷрошуда ягон натиҷа надод. - + Output: @@ -2785,52 +2840,52 @@ Output: - + External command crashed. Фармони берунӣ иҷро нашуд. - + Command <i>%1</i> crashed. Фармони <i>%1</i> иҷро нашуд. - + External command failed to start. Фармони берунӣ оғоз нашуд. - + Command <i>%1</i> failed to start. Фармони <i>%1</i> оғоз нашуд. - + Internal error when starting command. Ҳангоми оғоз кардани фармон хатои дохилӣ ба миён омад. - + Bad parameters for process job call. Имконоти нодуруст барои дархости вазифаи раванд. - + External command failed to finish. Фармони берунӣ ба анҷом нарасид. - + Command <i>%1</i> failed to finish in %2 seconds. Фармони <i>%1</i> дар муддати %2 сония ба анҷом нарасид. - + External command finished with errors. Фармони берунӣ бо хатоҳо ба анҷом расид. - + Command <i>%1</i> finished with exit code %2. Фармони <i>%1</i> бо рамзи барориши %2 ба анҷом расид. @@ -3649,12 +3704,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Агар зиёда аз як корбар ин компютерро истифода барад, шумо метавонед баъд аз танзимкунӣ якчанд ҳисобро эҷод намоед.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Агар зиёда аз як корбар ин компютерро истифода барад, шумо метавонед баъд аз насбкунӣ якчанд ҳисобро эҷод намоед.</small> @@ -3892,6 +3947,45 @@ Output: Ба қафо + + calamares-sidebar + + + Show debug information + Намоиши иттилооти +ислоҳи нуқсонҳо + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts index 0bd3b7fe19..120620f91b 100644 --- a/lang/calamares_th.ts +++ b/lang/calamares_th.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information ข้อมูลดีบั๊ก @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install ติดตั้ง @@ -143,7 +151,7 @@ Calamares::JobThread - + Done เสร็จสิ้น @@ -255,170 +263,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed การติดตั้งล้มเหลว - + Would you like to paste the install log to the web? - + Error ข้อผิดพลาด - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? ดำเนินการติดตั้งต่อหรือไม่? - + 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 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 กำลังพยายามที่จะทำการเปลี่ยนแปลงในดิสก์ของคุณเพื่อติดตั้ง %2<br/><strong>คุณจะไม่สามารถยกเลิกการเปลี่ยนแปลงเหล่านี้ได้</strong> - + &Set up now - + &Install now &ติดตั้งตอนนี้ - + Go &back กลั&บไป - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &N ถัดไป - + &Back &B ย้อนกลับ - + &Done - + &Cancel &C ยกเลิก - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. คุณต้องการยกเลิกกระบวนการติดตั้งที่กำลังดำเนินการอยู่หรือไม่? @@ -448,44 +465,15 @@ The installer will quit and all changes will be lost. ข้อผิดพลาด Unfetchable Python - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - แสดงข้อมูลการดีบั๊ก - - - - &Back - &B ย้อนกลับ - - - - &Next - &N ถัดไป - - - - &Cancel - &C ยกเลิก - - - + %1 Setup Program - + %1 Installer ตัวติดตั้ง %1 @@ -806,50 +794,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. ชื่อผู้ใช้ของคุณยาวเกินไป - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. ชื่อโฮสต์ของคุณสั้นเกินไป - + Your hostname is too long. ชื่อโฮสต์ของคุณยาวเกินไป - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! รหัสผ่านของคุณไม่ตรงกัน! + + + Setup Failed + + + + + Installation Failed + การติดตั้งล้มเหลว + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + การติดตั้งเสร็จสิ้น + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + การติดตั้ง %1 เสร็จสิ้น + ContextualProcessJob @@ -940,22 +968,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. ตัวติดตั้งไม่สามารถสร้างพาร์ทิชันบนดิสก์ '%1' @@ -1282,37 +1331,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1330,62 +1399,50 @@ The installer will quit and all changes will be lost. &R เริ่มต้นใหม่ทันที - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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>เสร็จสิ้น</h1><br/>%1 ติดตั้งบนคอมพิวเตอร์ของคุณเรียบร้อย<br/>คุณสามารถเริ่มทำงานเพื่อเข้าระบบใหม่ของคุณ หรือดำเนินการใช้ %2 Live environment ต่อไป - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>การติดตั้งไม่สำเร็จ</h1><br/>%1 ไม่ได้ถูกติดตั้งลงบนคอมพิวเตอร์ของคุณ<br/>ข้อความข้อผิดพลาดคือ: %2 - FinishedViewStep + FinishedQmlViewStep - + Finish สิ้นสุด + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - การติดตั้งเสร็จสิ้น - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. - การติดตั้ง %1 เสร็จสิ้น + + Finish + สิ้นสุด @@ -2243,7 +2300,7 @@ The installer will quit and all changes will be lost. ข้อผิดพลาดที่ไม่รู้จัก - + Password is empty รหัสผ่านว่าง @@ -2753,65 +2810,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. พารามิเตอร์ไม่ถูกต้องสำหรับการเรียกการทำงาน - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3627,12 +3684,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 installation.</small> @@ -3860,6 +3917,44 @@ Output: + + calamares-sidebar + + + Show debug information + แสดงข้อมูลการดีบั๊ก + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index 0df78b0c75..6d20b7370d 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Gereç Ağacı - + Debug information Hata ayıklama bilgisi @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Kur - + Install Sistem Kuruluyor @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Sistem kurulumu tamamlandı, kurulum aracından çıkabilirsiniz. @@ -257,171 +265,180 @@ Calamares::ViewManager - + Setup Failed Kurulum Başarısız - + Installation Failed Kurulum Başarısız - + Would you like to paste the install log to the web? Kurulum günlüğünü web'e yapıştırmak ister misiniz? - + Error Hata - - + + &Yes &Evet - - + + &No &Hayır - + &Close &Kapat - + Install Log Paste URL Günlük Yapıştırma URL'sini Yükle - + The upload was unsuccessful. No web-paste was done. Yükleme başarısız oldu. Web yapıştırması yapılmadı. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Calamares Başlatılamadı - + %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. - + <br/>The following modules could not be loaded: <br/>Aşağıdaki modüller yüklenemedi: - + Continue with setup? Kuruluma devam et? - + Continue with installation? Kurulum devam etsin mi? - + 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 ayarlamak 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> - + &Set up now &Şimdi kur - + &Install now &Şimdi yükle - + Go &back Geri &git - + &Set up &Kur - + &Install &Yükle - + Setup is complete. Close the setup program. Kurulum tamamlandı. Kurulum programını kapatın. - + The installation is complete. Close the installer. Yükleme işi tamamlandı. Sistem yükleyiciyi kapatın. - + Cancel setup without changing the system. Sistemi değiştirmeden kurulumu iptal edin. - + Cancel installation without changing the system. Sistemi değiştirmeden kurulumu iptal edin. - + &Next &Sonraki - + &Back &Geri - + &Done &Tamam - + &Cancel &Vazgeç - + Cancel setup? Kurulum iptal edilsin mi? - + Cancel installation? Yüklemeyi iptal et? - + 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. - + 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? @@ -451,45 +468,15 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Okunamayan Python hatası. - - CalamaresUtils - - - Install log posted to: -%1 - Kurulum günlüğü gönderildi: -%1 - - CalamaresWindow - - Show debug information - Hata ayıklama bilgisini göster - - - - &Back - &Geri - - - - &Next - &Sonraki - - - - &Cancel - &Vazgeç - - - + %1 Setup Program %1 Kurulum Uygulaması - + %1 Installer %1 Yükleniyor @@ -813,50 +800,90 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.<h1>%1 Sistem Yükleyiciye Hoşgeldiniz</h1> - + Your username is too long. Kullanıcı adınız çok uzun. - + '%1' is not allowed as username. '%1' kullanıcı adı olarak izin verilmiyor. - + Your username must start with a lowercase letter or underscore. Kullanıcı adınız küçük harf veya alt çizgi ile başlamalıdır. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Sadece küçük harflere, sayılara, alt çizgi ve kısa çizgilere izin verilir. - + Your hostname is too short. Makine adınız çok kısa. - + Your hostname is too long. Makine adınız çok uzun. - + '%1' is not allowed as hostname. '%1' ana bilgisayar adı olarak kullanılamaz. - + Only letters, numbers, underscore and hyphen are allowed. Sadece harfler, rakamlar, alt çizgi ve kısa çizgi izin verilir. - + Your passwords do not match! Parolanız eşleşmiyor! + + + Setup Failed + Kurulum Başarısız + + + + Installation Failed + Kurulum Başarısız + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Kurulum Tamanlandı + + + + Installation Complete + Kurulum Tamamlandı + + + + The setup of %1 is complete. + %1 kurulumu tamamlandı. + + + + The installation of %1 is complete. + Kurulum %1 oranında tamamlandı. + ContextualProcessJob @@ -947,22 +974,43 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + 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. - + + 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>%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. - + + Creating new %1 partition on %2. %2 üzerinde %1 yeni disk bölümü oluştur. - + The installer failed to create partition on disk '%1'. Yükleyici '%1' diski üzerinde yeni bölüm oluşturamadı. @@ -1289,37 +1337,57 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. FillGlobalStorageJob - + Set partition information Bölüm bilgilendirmesini ayarla - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. %2 <strong>yeni</strong> sistem diskine %1 yükle. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - %2 <strong>yeni</strong> disk bölümünü <strong>%1</strong> ile ayarlayıp bağla. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - %3 <strong>%1</strong> sistem diskine %2 yükle. + + 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>. + + + + + 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>. - %3 diskine<strong>%1</strong> ile <strong>%2</strong> bağlama noktası ayarla. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + %3 <strong>%1</strong> sistem diskine %2 yükle. + + + Install boot loader on <strong>%1</strong>. <strong>%1</strong> üzerine sistem ön yükleyiciyi kur. - + Setting up mount points. Bağlama noktalarını ayarla. @@ -1337,62 +1405,50 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.&Şimdi yeniden başlat - + <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. - + <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> - + <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. - + <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> butonu tıklandığında ya da sistem yükleyici kapatıldığında bilgisayarınız 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. - + <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. - FinishedViewStep + FinishedQmlViewStep - + Finish Kurulum Tamam + + + FinishedViewStep - - Setup Complete - Kurulum Tamanlandı - - - - Installation Complete - Kurulum Tamamlandı - - - - The setup of %1 is complete. - %1 kurulumu tamamlandı. - - - - The installation of %1 is complete. - Kurulum %1 oranında tamamlandı. + + Finish + Kurulum Tamam @@ -2262,7 +2318,7 @@ Sistem güç kaynağına bağlı değil. Bilinmeyen hata - + Password is empty Şifre boş @@ -2773,14 +2829,14 @@ Sistem güç kaynağına bağlı değil. ProcessResult - + There was no output from the command. Komut çıktısı yok. - + Output: @@ -2789,52 +2845,52 @@ Output: - + External command crashed. Harici komut çöktü. - + Command <i>%1</i> crashed. Komut <i>%1</i> çöktü. - + External command failed to start. Harici komut başlatılamadı. - + Command <i>%1</i> failed to start. Komut <i>%1</i> başlatılamadı. - + Internal error when starting command. Komut başlatılırken dahili hata. - + Bad parameters for process job call. Çalışma adımları başarısız oldu. - + External command failed to finish. Harici komut başarısız oldu. - + Command <i>%1</i> failed to finish in %2 seconds. Komut <i>%1</i> %2 saniyede başarısız oldu. - + External command finished with errors. Harici komut hatalarla bitti. - + Command <i>%1</i> finished with exit code %2. Komut <i>%1</i> %2 çıkış kodu ile tamamlandı @@ -3655,12 +3711,12 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. UsersPage - + <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>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> @@ -3899,6 +3955,44 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Geri + + calamares-sidebar + + + Show debug information + Hata ayıklama bilgisini göster + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts index 6b687aaba4..9748c6f25c 100644 --- a/lang/calamares_uk.ts +++ b/lang/calamares_uk.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Дерево віджетів - + Debug information Діагностична інформація @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Налаштувати - + Install Встановити @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Готово @@ -261,171 +269,180 @@ Calamares::ViewManager - + Setup Failed Помилка встановлення - + Installation Failed Помилка під час встановлення - + Would you like to paste the install log to the web? Хочете викласти журнал встановлення у мережі? - + Error Помилка - - + + &Yes &Так - - + + &No &Ні - + &Close &Закрити - + Install Log Paste URL Адреса для вставлення журналу встановлення - + The upload was unsuccessful. No web-paste was done. Не вдалося вивантажити дані. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Помилка ініціалізації Calamares - + %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 неможливо встановити. Calamares не зміг завантажити всі налаштовані модулі. Ця проблема зв'язана з тим, як Calamares використовується дистрибутивом. - + <br/>The following modules could not be loaded: <br/>Не вдалося завантажити наступні модулі: - + Continue with setup? Продовжити встановлення? - + 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> Програма налаштування %1 збирається внести зміни до вашого диска, щоб налаштувати %2. <br/><strong> Ви не зможете скасувати ці зміни.</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 має намір внести зміни до розподілу вашого диска, щоб встановити %2.<br/><strong>Ці зміни неможливо буде скасувати.</strong> - + &Set up now &Налаштувати зараз - + &Install now &Встановити зараз - + Go &back Перейти &назад - + &Set up &Налаштувати - + &Install &Встановити - + Setup is complete. Close the setup program. Встановлення виконано. Закрити програму встановлення. - + The installation is complete. Close the installer. Встановлення виконано. Завершити роботу засобу встановлення. - + Cancel setup without changing the system. Скасувати налаштування без зміни системи. - + Cancel installation without changing the system. Скасувати встановлення без зміни системи. - + &Next &Вперед - + &Back &Назад - + &Done &Закінчити - + &Cancel &Скасувати - + Cancel setup? Скасувати налаштування? - + 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 install process? The installer will quit and all changes will be lost. Чи ви насправді бажаєте скасувати процес встановлення? @@ -455,45 +472,15 @@ The installer will quit and all changes will be lost. Помилка Python, інформацію про яку неможливо отримати. - - CalamaresUtils - - - Install log posted to: -%1 - Журнал встановлення викладено за адресою: -%1 - - CalamaresWindow - - Show debug information - Показати діагностичну інформацію - - - - &Back - &Назад - - - - &Next - &Вперед - - - - &Cancel - &Скасувати - - - + %1 Setup Program Програма для налаштовування %1 - + %1 Installer Засіб встановлення %1 @@ -814,50 +801,90 @@ The installer will quit and all changes will be lost. <h1>Ласкаво просимо до засобу встановлення %1</h1> - + Your username is too long. Ваше ім'я задовге. - + '%1' is not allowed as username. «%1» не можна використовувати як ім'я користувача. - + Your username must start with a lowercase letter or underscore. Ваше ім'я користувача має починатися із малої літери або символу підкреслювання. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Можна використовувати лише латинські літери нижнього регістру, цифри, символи підкреслювання та дефіси. - + Your hostname is too short. Назва вузла є надто короткою. - + Your hostname is too long. Назва вузла є надто довгою. - + '%1' is not allowed as hostname. «%1» не можна використовувати як назву вузла. - + Only letters, numbers, underscore and hyphen are allowed. Можна використовувати лише латинські літери, цифри, символи підкреслювання та дефіси. - + Your passwords do not match! Паролі не збігаються! + + + Setup Failed + Помилка встановлення + + + + Installation Failed + Помилка під час встановлення + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Налаштовування завершено + + + + Installation Complete + Встановлення завершено + + + + The setup of %1 is complete. + Налаштовування %1 завершено. + + + + The installation of %1 is complete. + Встановлення %1 завершено. + ContextualProcessJob @@ -948,22 +975,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). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Створити розділ у %2 МіБ на %4 (%3) із файловою системою %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Створити розділ у <strong>%2 МіБ</strong> на <strong>%4</strong> (%3) із файловою системою <strong>%1</strong>. - + + Creating new %1 partition on %2. Створення нового розділу %1 на %2. - + The installer failed to create partition on disk '%1'. Засобу встановлення не вдалося створити розділ на диску «%1». @@ -1290,37 +1338,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. Встановити %1 на <strong>новий</strong> системний розділ %2. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Налаштувати <strong>новий</strong> розділ %2 з точкою підключення <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Встановити %2 на системний розділ %3 <strong>%1</strong>. + + 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>. + + + + + 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>. - Налаштувати розділ %3 <strong>%1</strong> з точкою підключення <strong>%2</strong>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + Встановити %2 на системний розділ %3 <strong>%1</strong>. + + + Install boot loader on <strong>%1</strong>. Встановити завантажувач на <strong>%1</strong>. - + Setting up mount points. Налаштування точок підключення. @@ -1338,62 +1406,50 @@ The installer will quit and all changes will be lost. &Перезавантажити зараз - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Виконано.</h1><br/>На вашому комп'ютері було налаштовано %1.<br/>Можете починати користуватися вашою новою системою. - + <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>Якщо позначено цей пункт, вашу систему буде негайно перезапущено після натискання кнопки <span style="font-style:italic;">Закінчити</span> або закриття вікна програми для налаштовування.</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>Все зроблено.</h1><br/>%1 встановлено на ваш комп'ютер.<br/>Ви можете перезавантажитися до вашої нової системи або продовжити використання Live-середовища %2. - + <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>Якщо позначено цей пункт, вашу систему буде негайно перезапущено після натискання кнопки <span style="font-style:italic;">Закінчити</span> або закриття вікна засобу встановлення.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Не вдалося налаштувати</h1><br/>%1 не було налаштовано на вашому комп'ютері.<br/>Повідомлення про помилку: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Встановлення зазнало невдачі</h1><br/>%1 не було встановлено на Ваш комп'ютер.<br/>Повідомлення про помилку: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Завершити + + + FinishedViewStep - - Setup Complete - Налаштовування завершено - - - - Installation Complete - Встановлення завершено - - - - The setup of %1 is complete. - Налаштовування %1 завершено. - - - - The installation of %1 is complete. - Встановлення %1 завершено. + + Finish + Завершити @@ -2281,7 +2337,7 @@ The installer will quit and all changes will be lost. Невідома помилка - + Password is empty Пароль є порожнім @@ -2791,14 +2847,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. У результаті виконання команди не отримано виведених даних. - + Output: @@ -2807,52 +2863,52 @@ Output: - + External command crashed. Виконання зовнішньої команди завершилося помилкою. - + Command <i>%1</i> crashed. Аварійне завершення виконання команди <i>%1</i>. - + External command failed to start. Не вдалося виконати зовнішню команду. - + Command <i>%1</i> failed to start. Не вдалося виконати команду <i>%1</i>. - + Internal error when starting command. Внутрішня помилка під час спроби виконати команду. - + Bad parameters for process job call. Неправильні параметри виклику завдання обробки. - + External command failed to finish. Не вдалося завершити виконання зовнішньої команди. - + Command <i>%1</i> failed to finish in %2 seconds. Не вдалося завершити виконання команди <i>%1</i> за %2 секунд. - + External command finished with errors. Виконання зовнішньої команди завершено із помилками. - + Command <i>%1</i> finished with exit code %2. Виконання команди <i>%1</i> завершено повідомленням із кодом виходу %2. @@ -3671,12 +3727,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Якщо за цим комп'ютером працюватимуть декілька користувачів, ви можете створити декілька облікових записів після налаштовування.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Якщо за цим комп'ютером працюватимуть декілька користувачів, ви можете створити декілька облікових записів після встановлення.</small> @@ -3914,6 +3970,44 @@ Output: Назад + + calamares-sidebar + + + Show debug information + Показати діагностичну інформацію + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts index f4b419e382..0acd364cb8 100644 --- a/lang/calamares_ur.ts +++ b/lang/calamares_ur.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +151,7 @@ Calamares::JobThread - + Done @@ -257,170 +265,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed - + Would you like to paste the install log to the web? - + Error - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -449,44 +466,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - - - - - &Next - - - - - &Cancel - - - - + %1 Setup Program - + %1 Installer @@ -807,50 +795,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -941,22 +969,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1283,37 +1332,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1331,61 +1400,49 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. + + Finish @@ -2253,7 +2310,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2763,65 +2820,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3637,12 +3694,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 installation.</small> @@ -3870,6 +3927,44 @@ Output: واپس + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts index e5238b63a4..130ea84331 100644 --- a/lang/calamares_uz.ts +++ b/lang/calamares_uz.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ - + Debug information @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +151,7 @@ Calamares::JobThread - + Done @@ -255,170 +263,179 @@ Calamares::ViewManager - + Setup Failed - + Installation Failed - + Would you like to paste the install log to the web? - + Error - - + + &Yes - - + + &No - + &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. + Install log posted to + +%1 + +Link copied to clipboard + + + + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -447,44 +464,15 @@ The installer will quit and all changes will be lost. - - CalamaresUtils - - - Install log posted to: -%1 - - - CalamaresWindow - - Show debug information - - - - - &Back - - - - - &Next - - - - - &Cancel - - - - + %1 Setup Program - + %1 Installer @@ -805,50 +793,90 @@ The installer will quit and all changes will be lost. - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + ContextualProcessJob @@ -939,22 +967,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). + + + + 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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1281,37 +1330,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - - Install %2 on %3 system partition <strong>%1</strong>. + + 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>. + + + + + 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>. + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + + Install %2 on %3 system partition <strong>%1</strong>. + + + + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1329,61 +1398,49 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <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> - + <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. - + <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> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish + + + FinishedViewStep - - Setup Complete - - - - - Installation Complete - - - - - The setup of %1 is complete. - - - - - The installation of %1 is complete. + + Finish @@ -2242,7 +2299,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2752,65 +2809,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -3626,12 +3683,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 installation.</small> @@ -3859,6 +3916,44 @@ Output: + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts index c01659a58b..719af5c43d 100644 --- a/lang/calamares_vi.ts +++ b/lang/calamares_vi.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ Cây công cụ - + Debug information Thông tin gỡ lỗi @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up Thiết lập - + Install Cài đặt @@ -143,7 +151,7 @@ Calamares::JobThread - + Done Xong @@ -255,171 +263,180 @@ Calamares::ViewManager - + Setup Failed Thiết lập không thành công - + Installation Failed Cài đặt thất bại - + Would you like to paste the install log to the web? Bạn có muốn gửi nhật ký cài đặt lên web không? - + Error Lỗi - - + + &Yes &Có - - + + &No &Không - + &Close Đón&g - + Install Log Paste URL URL để gửi nhật ký cài đặt - + The upload was unsuccessful. No web-paste was done. Tải lên không thành công. Không có quá trình gửi lên web nào được thực hiện. + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Khởi tạo không thành công - + %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 không thể được cài đặt.Không thể tải tất cả các mô-đun đã định cấu hình. Đây là vấn đề với cách phân phối sử dụng. - + <br/>The following modules could not be loaded: <br/> Không thể tải các mô-đun sau: - + Continue with setup? Tiếp tục thiết lập? - + Continue with installation? Tiếp tục cài đặt? - + 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> Chương trình thiết lập %1 sắp thực hiện các thay đổi đối với đĩa của bạn để thiết lập %2. <br/> <strong> Bạn sẽ không thể hoàn tác các thay đổi này. </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> Trình cài đặt %1 sắp thực hiện các thay đổi đối với đĩa của bạn để cài đặt %2. <br/> <strong> Bạn sẽ không thể hoàn tác các thay đổi này. </strong> - + &Set up now &Thiết lập ngay - + &Install now &Cài đặt ngay - + Go &back &Quay lại - + &Set up &Thiết lập - + &Install &Cài đặt - + Setup is complete. Close the setup program. Thiết lập hoàn tất. Đóng chương trình cài đặt. - + The installation is complete. Close the installer. Quá trình cài đặt hoàn tất. Đóng trình cài đặt. - + Cancel setup without changing the system. Hủy thiết lập mà không thay đổi hệ thống. - + Cancel installation without changing the system. Hủy cài đặt mà không thay đổi hệ thống. - + &Next &Tiếp - + &Back &Quay lại - + &Done &Xong - + &Cancel &Hủy - + Cancel setup? Hủy thiết lập? - + Cancel installation? Hủy cài đặt? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Bạn có thực sự muốn hủy quá trình thiết lập hiện tại không? Chương trình thiết lập sẽ thoát và tất cả các thay đổi sẽ bị mất. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Bạn có thực sự muốn hủy quá trình cài đặt hiện tại không? @@ -449,45 +466,15 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Lỗi Python không thể try cập. - - CalamaresUtils - - - Install log posted to: -%1 - Cài đặt nhật ký được đăng lên: -%1 - - CalamaresWindow - - Show debug information - Hiện thông tin gỡ lỗi - - - - &Back - Trở &về - - - - &Next - &Tiếp theo - - - - &Cancel - &Hủy bỏ - - - + %1 Setup Program %1 Thiết lập chương trình - + %1 Installer %1 cài đặt hệ điều hành @@ -808,50 +795,90 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< <h1>Chào mừng đến với bộ cài đặt %1 </h1> - + Your username is too long. Tên bạn hơi dài. - + '%1' is not allowed as username. '%1' không được phép dùng làm tên. - + Your username must start with a lowercase letter or underscore. Tên người dùng của bạn phải bắt đầu bằng chữ cái viết thường hoặc dấu gạch dưới. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Chỉ cho phép các chữ cái viết thường, số, gạch dưới và gạch nối. - + Your hostname is too short. Tên máy chủ quá ngắn. - + Your hostname is too long. Tên máy chủ quá dài. - + '%1' is not allowed as hostname. '%1' không được phép dùng làm tên máy chủ. - + Only letters, numbers, underscore and hyphen are allowed. 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! + + + Setup Failed + Thiết lập không thành công + + + + Installation Failed + Cài đặt thất bại + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + Thiết lập xong + + + + Installation Complete + Cài đặt xong + + + + The setup of %1 is complete. + Thiết lập %1 đã xong. + + + + The installation of %1 is complete. + Cài đặt của %1 đã xong. + ContextualProcessJob @@ -942,22 +969,43 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< CreatePartitionJob - + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + Create new %2MiB partition on %4 (%3) with file system %1. Tạo phân vùng %2MiB mới trên %4 (%3) với hệ thống tệp %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Tạo phân vùng <strong>%2MiB </strong> mới trên <strong>%4 </strong> (%3) với hệ thống tệp <strong>%1 </strong>. - + + Creating new %1 partition on %2. Tạo phân vùng %1 mới trên %2. - + The installer failed to create partition on disk '%1'. Trình cài đặt không tạo được phân vùng trên đĩa '%1'. @@ -1284,37 +1332,57 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< FillGlobalStorageJob - + Set partition information Đặt thông tin phân vùng - + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + Install %1 on <strong>new</strong> %2 system partition. Cài đặt %1 trên phân vùng hệ thống <strong> mới </strong> %2. - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - Thiết lập phân vùng <strong> mới </strong> %2 với điểm gắn kết <strong> %1 </strong>. + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - Cài đặt %2 trên phân vùng hệ thống %3 <strong> %1 </strong>. + + 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>. + - - Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - Thiết lập phân vùng %3 <strong> %1 </strong> với điểm gắn kết <strong> %2 </strong>. + + 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. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + Cài đặt %2 trên phân vùng hệ thống %3 <strong> %1 </strong>. + + + Install boot loader on <strong>%1</strong>. Cài đặt trình tải khởi động trên <strong> %1 </strong>. - + Setting up mount points. Thiết lập điểm gắn kết. @@ -1332,62 +1400,50 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< &Khởi động lại ngay - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Hoàn thành.</h1><br/>%1 đã được cài đặt thành công.<br/>Hãy khởi động lại máy tính. - + <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>Tích chọn để khởi động lại sau khi ấn <span style="font-style:italic;">Hoàn thành</span> hoặc đóng phần mềm thiết lập.</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>Hoàn thành.</h1><br/>%1 đã được cài đặt trên máy.<br/>hãy khởi động lại, hoặc cũng có thể tiếp tục sử dụng %2 môi trường USB. - + <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>Tích chọn để khởi động lại sau khi ấn <span style="font-style:italic;">Hoàn thành</span> hoặc đóng phần mềm cài đặt.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Thiết lập lỗi</h1><br/>%1 đã không được thiết lập trên máy tính.<br/>tin báo lỗi: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Cài đặt lỗi</h1><br/>%1 chưa được cài đặt trên máy tính<br/>Tin báo lỗi: %2. - FinishedViewStep + FinishedQmlViewStep - + Finish Hoàn thành + + + FinishedViewStep - - Setup Complete - Thiết lập xong - - - - Installation Complete - Cài đặt xong - - - - The setup of %1 is complete. - Thiết lập %1 đã xong. - - - - The installation of %1 is complete. - Cài đặt của %1 đã xong. + + Finish + Hoàn thành @@ -2247,7 +2303,7 @@ 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 @@ -2757,14 +2813,14 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< ProcessResult - + There was no output from the command. Không có đầu ra từ lệnh. - + Output: @@ -2773,52 +2829,52 @@ Output: - + External command crashed. Lệnh bên ngoài bị lỗi. - + Command <i>%1</i> crashed. Lệnh <i>%1</i> bị lỗi. - + External command failed to start. Lệnh ngoài không thể bắt đầu. - + Command <i>%1</i> failed to start. Lệnh <i>%1</i> không thể bắt đầu. - + Internal error when starting command. Lỗi nội bộ khi bắt đầu lệnh. - + Bad parameters for process job call. Tham số không hợp lệ cho lệnh gọi công việc của quy trình. - + External command failed to finish. Không thể hoàn tất lệnh bên ngoài. - + Command <i>%1</i> failed to finish in %2 seconds. Lệnh <i>%1</i> không thể hoàn thành trong %2 giây. - + External command finished with errors. Lệnh bên ngoài kết thúc với lỗi. - + Command <i>%1</i> finished with exit code %2. Lệnh <i>%1</i> hoàn thành với lỗi %2. @@ -3637,12 +3693,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small> Nếu nhiều người cùng sử dụng máy tính này, bạn có thể tạo nhiều tài khoản sau khi thiết lập. </small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small> Nếu nhiều người cùng sử dụng máy tính này, bạn có thể tạo nhiều tài khoản sau khi cài đặt. </small> @@ -3880,6 +3936,44 @@ Output: Quay lại + + calamares-sidebar + + + Show debug information + Hiện thông tin gỡ lỗi + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_zh.ts b/lang/calamares_zh.ts new file mode 100644 index 0000000000..3b29572d73 --- /dev/null +++ b/lang/calamares_zh.ts @@ -0,0 +1,4217 @@ + + + + + AutoMountManagementJob + + + Manage auto-mount settings + + + + + 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. + + + + + 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. + + + + + BootLoaderModel + + + Master Boot Record of %1 + + + + + Boot Partition + + + + + System Partition + + + + + Do not install a boot loader + + + + + %1 (%2) + + + + + Calamares::BlankViewStep + + + Blank Page + + + + + Calamares::DebugWindow + + + Form + + + + + GlobalStorage + + + + + JobQueue + + + + + Modules + + + + + Type: + + + + + + none + + + + + Interface: + + + + + Tools + + + + + Reload Stylesheet + + + + + Widget Tree + + + + + Debug information + + + + + Calamares::ExecutionViewStep + + + Set up + + + + + Install + + + + + Calamares::FailJob + + + Job failed (%1) + + + + + Programmed job failure was explicitly requested. + + + + + Calamares::JobThread + + + Done + + + + + Calamares::NamedJob + + + Example job (%1) + + + + + Calamares::ProcessJob + + + Run command '%1' in target system. + + + + + Run command '%1'. + + + + + Running command %1 %2 + + + + + Calamares::PythonJob + + + Running %1 operation. + + + + + Bad working directory path + + + + + Working directory %1 for python job %2 is not readable. + + + + + Bad main script file + + + + + Main script file %1 for python job %2 is not readable. + + + + + Boost.Python error in job "%1". + + + + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + + + Calamares::RequirementsChecker + + + Requirements checking for module <i>%1</i> is complete. + + + + + Waiting for %n module(s). + + + + + + + (%n second(s)) + + + + + + + System-requirements checking is complete. + + + + + Calamares::ViewManager + + + Setup Failed + + + + + Installation Failed + + + + + Would you like to paste the install log to the web? + + + + + Error + + + + + + &Yes + + + + + + &No + + + + + &Close + + + + + Install Log Paste URL + + + + + The upload was unsuccessful. No web-paste was done. + + + + + Install log posted to + +%1 + +Link copied to clipboard + + + + + 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. + + + + + <br/>The following modules could not be loaded: + + + + + Continue with setup? + + + + + 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 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 + + + + + &Install now + + + + + Go &back + + + + + &Set up + + + + + &Install + + + + + Setup is complete. Close the setup program. + + + + + The installation is complete. Close the installer. + + + + + Cancel setup without changing the system. + + + + + Cancel installation without changing the system. + + + + + &Next + + + + + &Back + + + + + &Done + + + + + &Cancel + + + + + Cancel setup? + + + + + 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 install process? +The installer will quit and all changes will be lost. + + + + + CalamaresPython::Helper + + + Unknown exception type + + + + + unparseable Python error + + + + + unparseable Python traceback + + + + + Unfetchable Python error. + + + + + CalamaresWindow + + + %1 Setup Program + + + + + %1 Installer + + + + + CheckerContainer + + + Gathering system information... + + + + + ChoicePage + + + Form + + + + + Select storage de&vice: + + + + + + + + Current: + + + + + After: + + + + + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. + + + + + Reuse %1 as home partition for %2. + + + + + <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. + + + + + Boot loader location: + + + + + <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. + + + + + The EFI system partition at %1 will be used for starting %2. + + + + + 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. + + + + + + + + <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>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 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 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 is a part of an <strong>inactive RAID</strong> device. + + + + + No Swap + + + + + Reuse Swap + + + + + Swap (no Hibernate) + + + + + Swap (with Hibernate) + + + + + Swap to file + + + + + ClearMountsJob + + + Clear mounts for partitioning operations on %1 + + + + + Clearing mounts for partitioning operations on %1. + + + + + Cleared all mounts for %1 + + + + + ClearTempMountsJob + + + Clear all temporary mounts. + + + + + Clearing all temporary mounts. + + + + + Cannot get list of temporary mounts. + + + + + Cleared all temporary mounts. + + + + + CommandList + + + + Could not run command. + + + + + The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. + + + + + The command needs to know the user's name, but no username is defined. + + + + + Config + + + Set keyboard model to %1.<br/> + + + + + Set keyboard layout to %1/%2. + + + + + Set timezone to %1/%2. + + + + + The system language will be set to %1. + + + + + The numbers and dates locale will be set to %1. + + + + + Network Installation. (Disabled: Incorrect configuration) + + + + + Network Installation. (Disabled: Received invalid groups data) + + + + + Network Installation. (Disabled: internal error) + + + + + 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. <a href="#details">Details...</a> + + + + + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> + + + + + 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 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 %1 setup</h1> + + + + + <h1>Welcome to the Calamares installer for %1</h1> + + + + + <h1>Welcome to the %1 installer</h1> + + + + + Your username is too long. + + + + + '%1' is not allowed as username. + + + + + Your username must start with a lowercase letter or underscore. + + + + + Only lowercase letters, numbers, underscore and hyphen are allowed. + + + + + Your hostname is too short. + + + + + Your hostname is too long. + + + + + '%1' is not allowed as hostname. + + + + + Only letters, numbers, underscore and hyphen are allowed. + + + + + Your passwords do not match! + + + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + + + + ContextualProcessJob + + + Contextual Processes Job + + + + + CreatePartitionDialog + + + Create a Partition + + + + + Si&ze: + + + + + MiB + + + + + Partition &Type: + + + + + &Primary + + + + + E&xtended + + + + + Fi&le System: + + + + + LVM LV name + + + + + &Mount Point: + + + + + Flags: + + + + + En&crypt + + + + + Logical + + + + + Primary + + + + + GPT + + + + + Mountpoint already in use. Please select another one. + + + + + CreatePartitionJob + + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + + 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). + + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. + + + + + + Creating new %1 partition on %2. + + + + + The installer failed to create partition on disk '%1'. + + + + + CreatePartitionTableDialog + + + Create Partition Table + + + + + Creating a new partition table will delete all existing data on the disk. + + + + + What kind of partition table do you want to create? + + + + + Master Boot Record (MBR) + + + + + GUID Partition Table (GPT) + + + + + CreatePartitionTableJob + + + Create new %1 partition table on %2. + + + + + Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). + + + + + Creating new %1 partition table on %2. + + + + + The installer failed to create a partition table on %1. + + + + + CreateUserJob + + + Create user %1 + + + + + Create user <strong>%1</strong>. + + + + + Preserving home directory + + + + + + Creating user %1 + + + + + Configuring user %1 + + + + + Setting file permissions + + + + + CreateVolumeGroupDialog + + + Create Volume Group + + + + + CreateVolumeGroupJob + + + Create new volume group named %1. + + + + + Create new volume group named <strong>%1</strong>. + + + + + Creating new volume group named %1. + + + + + The installer failed to create a volume group named '%1'. + + + + + DeactivateVolumeGroupJob + + + + Deactivate volume group named %1. + + + + + Deactivate volume group named <strong>%1</strong>. + + + + + The installer failed to deactivate a volume group named %1. + + + + + DeletePartitionJob + + + Delete partition %1. + + + + + Delete partition <strong>%1</strong>. + + + + + Deleting partition %1. + + + + + The installer failed to delete partition %1. + + + + + DeviceInfoWidget + + + 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 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 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. + + + + + DeviceModel + + + %1 - %2 (%3) + device[name] - size[number] (device-node[name]) + + + + + %1 - (%2) + device[name] - (device-node[name]) + + + + + DracutLuksCfgJob + + + Write LUKS configuration for Dracut to %1 + + + + + Skip writing LUKS configuration for Dracut: "/" partition is not encrypted + + + + + Failed to open %1 + + + + + DummyCppJob + + + Dummy C++ Job + + + + + EditExistingPartitionDialog + + + Edit Existing Partition + + + + + Content: + + + + + &Keep + + + + + Format + + + + + Warning: Formatting the partition will erase all existing data. + + + + + &Mount Point: + + + + + Si&ze: + + + + + MiB + + + + + Fi&le System: + + + + + Flags: + + + + + Mountpoint already in use. Please select another one. + + + + + EncryptWidget + + + Form + + + + + En&crypt system + + + + + Passphrase + + + + + Confirm passphrase + + + + + + Please enter the same passphrase in both boxes. + + + + + FillGlobalStorageJob + + + 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. + + + + + 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. + + + + + 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>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + + + + + Install boot loader on <strong>%1</strong>. + + + + + Setting up mount points. + + + + + FinishedPage + + + Form + + + + + &Restart now + + + + + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. + + + + + <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> + + + + + <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. + + + + + <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> + + + + + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. + + + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + + + + FinishedQmlViewStep + + + Finish + + + + + FinishedViewStep + + + Finish + + + + + FormatPartitionJob + + + 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>. + + + + + Formatting partition %1 with file system %2. + + + + + The installer failed to format partition %1 on disk '%2'. + + + + + GeneralRequirements + + + has at least %1 GiB available drive space + + + + + There is not enough drive space. At least %1 GiB is required. + + + + + has at least %1 GiB working memory + + + + + The system does not have enough working memory. At least %1 GiB is required. + + + + + is plugged in to a power source + + + + + The system is not plugged in to a power source. + + + + + is connected to the Internet + + + + + The system is not connected to the Internet. + + + + + is running the installer as an administrator (root) + + + + + The setup program is not running with administrator rights. + + + + + The installer is not running with administrator rights. + + + + + 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 installer. + + + + + HostInfoJob + + + Collecting information about your machine. + + + + + IDJob + + + + + + OEM Batch Identifier + + + + + Could not create directories <code>%1</code>. + + + + + Could not open file <code>%1</code>. + + + + + Could not write to file <code>%1</code>. + + + + + InitcpioJob + + + Creating initramfs with mkinitcpio. + + + + + InitramfsJob + + + Creating initramfs. + + + + + InteractiveTerminalPage + + + Konsole not installed + + + + + Please install KDE Konsole and try again! + + + + + Executing script: &nbsp;<code>%1</code> + + + + + InteractiveTerminalViewStep + + + Script + + + + + KeyboardQmlViewStep + + + Keyboard + + + + + KeyboardViewStep + + + Keyboard + + + + + LCLocaleDialog + + + System locale setting + + + + + 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>. + + + + + &Cancel + + + + + &OK + + + + + LicensePage + + + Form + + + + + <h1>License Agreement</h1> + + + + + I accept the terms and conditions above. + + + + + Please review the End User License Agreements (EULAs). + + + + + 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. + + + + + 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. + + + + + LicenseViewStep + + + License + + + + + LicenseWidget + + + URL: %1 + + + + + <strong>%1 driver</strong><br/>by %2 + %1 is an untranslatable product name, example: Creative Audigy driver + + + + + <strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font> + %1 is usually a vendor name, example: Nvidia graphics driver + + + + + <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1 codec</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1 package</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1</strong><br/><font color="Grey">by %2</font> + + + + + File: %1 + + + + + Hide license text + + + + + Show the license text + + + + + Open license agreement in browser. + + + + + LocalePage + + + Region: + + + + + Zone: + + + + + + &Change... + + + + + LocaleQmlViewStep + + + Location + + + + + LocaleViewStep + + + Location + + + + + LuksBootKeyFileJob + + + Configuring LUKS key file. + + + + + + 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 + + + Generate machine-id. + + + + + Configuration Error + + + + + No root mount point is set for MachineId. + + + + + Map + + + Timezone: %1 + + + + + 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. + + + + + NetInstallViewStep + + + + Package selection + + + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + Communication + + + + + Development + + + + + Office + + + + + Multimedia + + + + + Internet + + + + + Theming + + + + + Gaming + + + + + Utilities + + + + + NotesQmlViewStep + + + Notes + + + + + OEMPage + + + Ba&tch: + + + + + <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> + + + + + <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html> + + + + + OEMViewStep + + + OEM Configuration + + + + + Set the OEM Batch Identifier to <code>%1</code>. + + + + + Offline + + + Select your preferred Region, or use the default one based on your current location. + + + + + + + Timezone: %1 + + + + + Select your preferred Zone within your Region. + + + + + Zones + + + + + You can fine-tune Language and Locale settings below. + + + + + PWQ + + + Password is too short + + + + + Password is too long + + + + + Password is too weak + + + + + Memory allocation error when setting '%1' + + + + + Memory allocation error + + + + + The password is the same as the old one + + + + + The password is a palindrome + + + + + The password differs with case changes only + + + + + The password is too similar to the old one + + + + + 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 forbidden words in some form + + + + + The password contains too few digits + + + + + The password contains too few uppercase letters + + + + + The password contains fewer than %n lowercase letters + + + + + + + The password contains too few lowercase letters + + + + + The password contains too few non-alphanumeric characters + + + + + The password is too short + + + + + The password does not contain enough character classes + + + + + The password contains too many same characters 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 uppercase letters + + + + + + + The password contains fewer than %n non-alphanumeric characters + + + + + + + The password is shorter than %n characters + + + + + + + The password is a rotated version of the previous one + + + + + The password contains fewer than %n character classes + + + + + + + The password contains more than %n same characters consecutively + + + + + + + The password contains more than %n characters of the same class consecutively + + + + + + + The password contains monotonic sequence longer than %n characters + + + + + + + The password contains too long of a monotonic character sequence + + + + + No password supplied + + + + + Cannot obtain random numbers from the RNG device + + + + + Password generation failed - required entropy too low for settings + + + + + The password fails the dictionary check - %1 + + + + + The password fails the dictionary check + + + + + Unknown setting - %1 + + + + + Unknown setting + + + + + Bad integer value of setting - %1 + + + + + Bad integer value + + + + + Setting %1 is not of integer type + + + + + Setting is not of integer type + + + + + Setting %1 is not of string type + + + + + Setting is not of string type + + + + + Opening the configuration file failed + + + + + The configuration file is malformed + + + + + Fatal failure + + + + + Unknown error + + + + + Password is empty + + + + + PackageChooserPage + + + Form + + + + + Product Name + + + + + TextLabel + + + + + Long Product Description + + + + + Package Selection + + + + + Please pick a product from the list. The selected product will be installed. + + + + + PackageChooserViewStep + + + Packages + + + + + PackageModel + + + Name + + + + + Description + + + + + Page_Keyboard + + + Form + + + + + Keyboard Model: + + + + + Type here to test your keyboard + + + + + Page_UserSetup + + + Form + + + + + What is your name? + + + + + Your Full Name + + + + + What name do you want to use to log in? + + + + + login + + + + + What is the name of this computer? + + + + + <small>This name will be used if you make the computer visible to others on a network.</small> + + + + + Computer Name + + + + + Choose a password to keep your account safe. + + + + + + <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> + + + + + + Password + + + + + + Repeat Password + + + + + When this box is checked, password-strength checking is done and you will not be able to use a weak password. + + + + + Require strong passwords. + + + + + Log in automatically without asking for the password. + + + + + Use the same password for the administrator account. + + + + + Choose a password for the administrator account. + + + + + + <small>Enter the same password twice, so that it can be checked for typing errors.</small> + + + + + PartitionLabelsView + + + Root + + + + + Home + + + + + Boot + + + + + EFI system + + + + + Swap + + + + + New partition for %1 + + + + + New partition + + + + + %1 %2 + size[number] filesystem[name] + + + + + PartitionModel + + + + Free Space + + + + + + New partition + + + + + Name + + + + + File System + + + + + Mount Point + + + + + Size + + + + + PartitionPage + + + Form + + + + + Storage de&vice: + + + + + &Revert All Changes + + + + + New Partition &Table + + + + + Cre&ate + + + + + &Edit + + + + + &Delete + + + + + New Volume Group + + + + + Resize Volume Group + + + + + Deactivate Volume Group + + + + + Remove Volume Group + + + + + I&nstall boot loader on: + + + + + Are you sure you want to create a new partition table on %1? + + + + + Can not create new partition + + + + + 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. + + + + + PartitionViewStep + + + Gathering system information... + + + + + Partitions + + + + + Install %1 <strong>alongside</strong> another operating system. + + + + + <strong>Erase</strong> disk and install %1. + + + + + <strong>Replace</strong> a partition with %1. + + + + + <strong>Manual</strong> partitioning. + + + + + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). + + + + + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. + + + + + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. + + + + + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). + + + + + Disk <strong>%1</strong> (%2) + + + + + Current: + + + + + After: + + + + + No EFI system partition configured + + + + + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. + + + + + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. + + + + + EFI system partition flag not set + + + + + 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>bios_grub</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. + + + + + PlasmaLnfJob + + + Plasma Look-and-Feel Job + + + + + + Could not select KDE Plasma Look-and-Feel package + + + + + 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. + + + + + 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 installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. + + + + + PlasmaLnfViewStep + + + Look-and-Feel + + + + + PreserveFiles + + + Saving files for later ... + + + + + No files configured to save for later. + + + + + Not all of the configured files could be preserved. + + + + + ProcessResult + + + +There was no output from the command. + + + + + +Output: + + + + + + External command crashed. + + + + + Command <i>%1</i> crashed. + + + + + External command failed to start. + + + + + Command <i>%1</i> failed to start. + + + + + Internal error when starting command. + + + + + Bad parameters for process job call. + + + + + External command failed to finish. + + + + + Command <i>%1</i> failed to finish in %2 seconds. + + + + + External command finished with errors. + + + + + Command <i>%1</i> finished with exit code %2. + + + + + QObject + + + %1 (%2) + + + + + unknown + + + + + extended + + + + + unformatted + + + + + swap + + + + + + Default + + + + + + + + File not found + + + + + Path <pre>%1</pre> must be an absolute path. + + + + + Directory not found + + + + + + Could not create new random file <pre>%1</pre>. + + + + + No product + + + + + No description provided. + + + + + (no mount point) + + + + + Unpartitioned space or unknown partition table + + + + + Recommended + + + <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> + + + + + RemoveUserJob + + + Remove live user from target system + + + + + RemoveVolumeGroupJob + + + + Remove Volume Group named %1. + + + + + Remove Volume Group named <strong>%1</strong>. + + + + + The installer failed to remove a volume group named '%1'. + + + + + ReplaceWidget + + + Form + + + + + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. + + + + + The selected item does not appear to be a valid partition. + + + + + %1 cannot be installed on empty space. Please select an existing partition. + + + + + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. + + + + + %1 cannot be installed on this partition. + + + + + Data partition (%1) + + + + + Unknown system partition (%1) + + + + + %1 system partition (%2) + + + + + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. + + + + + <strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. + + + + + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. + + + + + The EFI system partition at %1 will be used for starting %2. + + + + + EFI system partition: + + + + + Requirements + + + <p>This computer does not satisfy the minimum requirements for installing %1.<br/> + Installation cannot continue.</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> + + + + + ResizeFSJob + + + Resize Filesystem Job + + + + + Invalid configuration + + + + + The file-system resize job has an invalid configuration and will not run. + + + + + KPMCore not Available + + + + + Calamares cannot start KPMCore for the file-system resize job. + + + + + + + + + Resize Failed + + + + + 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 filesystem %1 cannot be resized. + + + + + + The device %1 cannot be resized. + + + + + The filesystem %1 must be resized, but cannot. + + + + + The device %1 must be resized, but cannot + + + + + ResizePartitionJob + + + Resize partition %1. + + + + + Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. + + + + + Resizing %2MiB partition %1 to %3MiB. + + + + + The installer failed to resize partition %1 on disk '%2'. + + + + + ResizeVolumeGroupDialog + + + Resize Volume Group + + + + + ResizeVolumeGroupJob + + + + Resize volume group named %1 from %2 to %3. + + + + + Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>. + + + + + The installer failed to resize a volume group named '%1'. + + + + + ResultsListDialog + + + For best results, please ensure that this computer: + + + + + System requirements + + + + + ResultsListWidget + + + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> + + + + + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> + + + + + 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 program will ask you some questions and set up %2 on your computer. + + + + + ScanningDialog + + + Scanning storage devices... + + + + + Partitioning + + + + + SetHostNameJob + + + Set hostname %1 + + + + + Set hostname <strong>%1</strong>. + + + + + Setting hostname %1. + + + + + + Internal Error + + + + + + Cannot write hostname to target system + + + + + SetKeyboardLayoutJob + + + Set keyboard model to %1, layout to %2-%3 + + + + + Failed to write keyboard configuration for the virtual console. + + + + + + + Failed to write to %1 + + + + + Failed to write keyboard configuration for X11. + + + + + Failed to write keyboard configuration to existing /etc/default directory. + + + + + SetPartFlagsJob + + + Set flags on partition %1. + + + + + Set flags on %1MiB %2 partition. + + + + + Set flags on new partition. + + + + + Clear flags on partition <strong>%1</strong>. + + + + + Clear flags on %1MiB <strong>%2</strong> partition. + + + + + Clear flags on new partition. + + + + + Flag partition <strong>%1</strong> as <strong>%2</strong>. + + + + + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. + + + + + Flag new partition as <strong>%1</strong>. + + + + + Clearing flags on partition <strong>%1</strong>. + + + + + Clearing flags on %1MiB <strong>%2</strong> partition. + + + + + Clearing flags on new partition. + + + + + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. + + + + + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. + + + + + Setting flags <strong>%1</strong> on new partition. + + + + + The installer failed to set flags on partition %1. + + + + + SetPasswordJob + + + Set password for user %1 + + + + + Setting password for user %1. + + + + + Bad destination system path. + + + + + rootMountPoint is %1 + + + + + Cannot disable root account. + + + + + passwd terminated with error code %1. + + + + + Cannot set password for user %1. + + + + + usermod terminated with error code %1. + + + + + SetTimezoneJob + + + Set timezone to %1/%2 + + + + + Cannot access selected timezone path. + + + + + Bad path: %1 + + + + + Cannot set timezone. + + + + + Link creation failed, target: %1; link name: %2 + + + + + Cannot set timezone, + + + + + Cannot open /etc/timezone for writing + + + + + SetupGroupsJob + + + Preparing groups. + + + + + + Could not create groups in target system + + + + + These groups are missing in the target system: %1 + + + + + SetupSudoJob + + + Configure <pre>sudo</pre> users. + + + + + Cannot chmod sudoers file. + + + + + Cannot create sudoers file for writing. + + + + + ShellProcessJob + + + Shell Processes Job + + + + + SlideCounter + + + %L1 / %L2 + slide counter, %1 of %2 (numeric) + + + + + SummaryPage + + + This is an overview of what will happen once you start the setup procedure. + + + + + This is an overview of what will happen once you start the install procedure. + + + + + SummaryViewStep + + + Summary + + + + + TrackingInstallJob + + + Installation feedback + + + + + Sending installation feedback. + + + + + Internal error in install-tracking. + + + + + HTTP request timed out. + + + + + TrackingKUserFeedbackJob + + + KDE user feedback + + + + + Configuring KDE user feedback. + + + + + + Error in KDE user feedback configuration. + + + + + Could not configure KDE user feedback correctly, script error %1. + + + + + Could not configure KDE user feedback correctly, Calamares error %1. + + + + + TrackingMachineUpdateManagerJob + + + Machine feedback + + + + + Configuring machine feedback. + + + + + + Error in machine feedback configuration. + + + + + Could not configure machine feedback correctly, script error %1. + + + + + Could not configure machine feedback correctly, Calamares error %1. + + + + + TrackingPage + + + Form + + + + + Placeholder + + + + + <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><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> + + + + + 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. + + + + + 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. + + + + + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. + + + + + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. + + + + + TrackingViewStep + + + Feedback + + + + + 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 installation.</small> + + + + + UsersQmlViewStep + + + Users + + + + + UsersViewStep + + + Users + + + + + VariantModel + + + Key + Column header for key/value + + + + + Value + Column header for key/value + + + + + VolumeGroupBaseDialog + + + Create Volume Group + + + + + List of Physical Volumes + + + + + Volume Group Name: + + + + + Volume Group Type: + + + + + Physical Extent Size: + + + + + MiB + + + + + Total Size: + + + + + Used Size: + + + + + Total Sectors: + + + + + Quantity of LVs: + + + + + WelcomePage + + + Form + + + + + + Select application and system language + + + + + &About + + + + + Open donations website + + + + + &Donate + + + + + Open help and support website + + + + + &Support + + + + + Open issues and bug-tracking website + + + + + &Known issues + + + + + Open release notes website + + + + + &Release notes + + + + + <h1>Welcome to the Calamares setup program for %1.</h1> + + + + + <h1>Welcome to %1 setup.</h1> + + + + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + + <h1>Welcome to the %1 installer.</h1> + + + + + %1 support + + + + + About %1 setup + + + + + About %1 installer + + + + + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.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. + + + + + WelcomeQmlViewStep + + + Welcome + + + + + WelcomeViewStep + + + Welcome + + + + + about + + + <h1>%1</h1><br/> + <strong>%2<br/> + for %3</strong><br/><br/> + Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> + and the <a href='https://www.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. + + + + + Back + + + + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + + + i18n + + + <h1>Languages</h1> </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>. + + + + + <h1>Locales</h1> </br> + The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>. + + + + + Back + + + + + keyboardq + + + Keyboard Model + + + + + Layouts + + + + + Keyboard Layout + + + + + Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. + + + + + Models + + + + + Variants + + + + + Keyboard Variant + + + + + Test your keyboard + + + + + localeq + + + Change + + + + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + release_notes + + + <h3>%1</h3> + <p>This an example QML file, showing options in RichText with Flickable content.</p> + + <p>QML with RichText can use HTML tags, Flickable content is useful for touchscreens.</p> + + <p><b>This is bold text</b></p> + <p><i>This is italic text</i></p> + <p><u>This is underlined text</u></p> + <p><center>This text will be center-aligned.</center></p> + <p><s>This is strikethrough</s></p> + + <p>Code example: + <code>ls -l /home</code></p> + + <p><b>Lists:</b></p> + <ul> + <li>Intel CPU systems</li> + <li>AMD CPU systems</li> + </ul> + + <p>The vertical scrollbar is adjustable, current width set to 10.</p> + + + + + Back + + + + + usersq + + + Pick your user name and credentials to login and perform admin tasks + + + + + What is your name? + + + + + Your Full Name + + + + + What name do you want to use to log in? + + + + + Login Name + + + + + If more than one person will use this computer, you can create multiple accounts after installation. + + + + + What is the name of this computer? + + + + + Computer Name + + + + + This name will be used if you make the computer visible to others on a network. + + + + + Choose a password to keep your account safe. + + + + + Password + + + + + Repeat Password + + + + + 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. + + + + + Validate passwords quality + + + + + When this box is checked, password-strength checking is done and you will not be able to use a weak password. + + + + + Log in automatically without asking for the password + + + + + Reuse user password as root password + + + + + Use the same password for the administrator account. + + + + + Choose a root password to keep your account safe. + + + + + Root Password + + + + + Repeat Root Password + + + + + Enter the same password twice, so that it can be checked for typing errors. + + + + + welcomeq + + + <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> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + + diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts index bf07ffb42b..d8d256e1cf 100644 --- a/lang/calamares_zh_CN.ts +++ b/lang/calamares_zh_CN.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -110,7 +118,7 @@ 树形控件 - + Debug information 调试信息 @@ -118,12 +126,12 @@ Calamares::ExecutionViewStep - + Set up 建立 - + Install 安装 @@ -144,7 +152,7 @@ Calamares::JobThread - + Done 完成 @@ -256,171 +264,180 @@ Calamares::ViewManager - + Setup Failed 安装失败 - + Installation Failed 安装失败 - + Would you like to paste the install log to the web? 需要将安装日志粘贴到网页吗？ - + Error 错误 - - + + &Yes &是 - - + + &No &否 - + &Close &关闭 - + Install Log Paste URL 安装日志粘贴 URL - + The upload was unsuccessful. No web-paste was done. 上传失败，未完成网页粘贴。 + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Calamares初始化失败 - + %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无法安装。 Calamares无法加载所有已配置的模块。这个问题是发行版配置Calamares不当导致的。 - + <br/>The following modules could not be loaded: <br/>无法加载以下模块： - + Continue with setup? 要继续安装吗？ - + 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> 为了安装%2, %1 安装程序即将对磁盘进行更改。<br/><strong>这些更改无法撤销。</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 安装程序将在您的磁盘上做出变更以安装 %2。<br/><strong>您将无法复原这些变更。</strong> - + &Set up now 现在安装(&S) - + &Install now 现在安装 (&I) - + Go &back 返回 (&B) - + &Set up 安装(&S) - + &Install 安装(&I) - + Setup is complete. Close the setup program. 安装完成。关闭安装程序。 - + The installation is complete. Close the installer. 安装已完成。请关闭安装程序。 - + Cancel setup without changing the system. 取消安装，保持系统不变。 - + Cancel installation without changing the system. 取消安装，并不做任何更改。 - + &Next 下一步(&N) - + &Back 后退(&B) - + &Done &完成 - + &Cancel 取消(&C) - + Cancel setup? 取消安装？ - + 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 install process? The installer will quit and all changes will be lost. 确定要取消当前的安装吗？ @@ -450,45 +467,15 @@ The installer will quit and all changes will be lost. 无法获取的 Python 错误。 - - CalamaresUtils - - - Install log posted to: -%1 - 安装日志发布到： -%1 - - CalamaresWindow - - Show debug information - 显示调试信息 - - - - &Back - 后退(&B) - - - - &Next - 下一步(&N) - - - - &Cancel - 取消(&C) - - - + %1 Setup Program %1 安装程序 - + %1 Installer %1 安装程序 @@ -811,50 +798,90 @@ The installer will quit and all changes will be lost. <h1>欢迎使用 %1 安装程序</h1> - + Your username is too long. 用户名太长。 - + '%1' is not allowed as username. '%1' 不允许作为用户名。 - + Your username must start with a lowercase letter or underscore. 用户名必须以小写字母或下划线"_"开头 - + Only lowercase letters, numbers, underscore and hyphen are allowed. 只允许小写字母、数组、下划线"_" 和 连字符"-" - + Your hostname is too short. 主机名太短。 - + Your hostname is too long. 主机名太长。 - + '%1' is not allowed as hostname. '%1' 不允许作为主机名。 - + Only letters, numbers, underscore and hyphen are allowed. 只允许字母、数组、下划线"_" 和 连字符"-" - + Your passwords do not match! 密码不匹配！ + + + Setup Failed + 安装失败 + + + + Installation Failed + 安装失败 + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + 安装完成 + + + + Installation Complete + 安装完成 + + + + The setup of %1 is complete. + %1 安装完成。 + + + + The installation of %1 is complete. + %1 的安装操作已完成。 + ContextualProcessJob @@ -945,22 +972,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). + + + + Create new %2MiB partition on %4 (%3) with file system %1. 在 %4 (%3) 上创建新的 %2MiB 分区，文件系统为 %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). + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. 在<strong>%4</strong>(%3)上创建一个<strong>%2MiB</strong>的%1分区。 - + + Creating new %1 partition on %2. 正在 %2 上创建新的 %1 分区。 - + The installer failed to create partition on disk '%1'. 安装程序在磁盘“%1”创建分区失败。 @@ -1288,37 +1336,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. 在 <strong>新的</strong>系统分区 %2 上安装 %1。 - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - 设置 <strong>新的</strong> 含挂载点 <strong>%1</strong> 的 %2 分区。 + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - 在 %3 系统割区 <strong>%1</strong> 上安装 %2。 + + 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>. + + + + + 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>. - 为分区 %3 <strong>%1</strong> 设置挂载点 <strong>%2</strong>。 + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + 在 %3 系统割区 <strong>%1</strong> 上安装 %2。 + + + Install boot loader on <strong>%1</strong>. 在 <strong>%1</strong>上安装引导程序。 - + Setting up mount points. 正在设置挂载点。 @@ -1336,62 +1404,50 @@ The installer will quit and all changes will be lost. 现在重启(&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>安装成功！</h1><br/>%1 已安装在您的电脑上了。<br/>您现在可以重新启动到新系统。 - + <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>当选中此项时，系统会在您关闭安装器或点击 <span style=" font-style:italic;">完成</span> 按钮时立即重启</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>安装成功！</h1><br/>%1 已安装在您的电脑上了。<br/>您现在可以重新启动到新系统，或是继续使用 %2 Live 环境。 - + <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>当选中此项时，系统会在您关闭安装器或点击 <span style=" font-style:italic;">完成</span> 按钮时立即重启</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>安装失败</h1><br/>%1 未在你的电脑上安装。<br/>错误信息：%2。 - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>安装失败</h1><br/>%1 未在你的电脑上安装。<br/>错误信息：%2。 - FinishedViewStep + FinishedQmlViewStep - + Finish 结束 + + + FinishedViewStep - - Setup Complete - 安装完成 - - - - Installation Complete - 安装完成 - - - - The setup of %1 is complete. - %1 安装完成。 - - - - The installation of %1 is complete. - %1 的安装操作已完成。 + + Finish + 结束 @@ -2251,7 +2307,7 @@ The installer will quit and all changes will be lost. 未知错误 - + Password is empty 密码是空 @@ -2761,14 +2817,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. 命令没有输出。 - + Output: @@ -2777,52 +2833,52 @@ Output: - + External command crashed. 外部命令已崩溃。 - + Command <i>%1</i> crashed. 命令 <i>%1</i> 已崩溃。 - + External command failed to start. 无法启动外部命令。 - + Command <i>%1</i> failed to start. 无法启动命令 <i>%1</i>。 - + Internal error when starting command. 启动命令时出现内部错误。 - + Bad parameters for process job call. 呼叫进程任务出现错误参数 - + External command failed to finish. 外部命令未成功完成。 - + Command <i>%1</i> failed to finish in %2 seconds. 命令 <i>%1</i> 未能在 %2 秒内完成。 - + External command finished with errors. 外部命令已完成，但出现了错误。 - + Command <i>%1</i> finished with exit code %2. 命令 <i>%1</i> 以退出代码 %2 完成。 @@ -3643,12 +3699,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>如果有多人要使用此计算机，您可以在安装后创建多个账户。</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>如果有多人要使用此计算机，您可以在安装后创建多个账户。</small> @@ -3887,6 +3943,44 @@ Output: 后退 + + calamares-sidebar + + + Show debug information + 显示调试信息 + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts index 6e06682d86..0c0883d180 100644 --- a/lang/calamares_zh_TW.ts +++ b/lang/calamares_zh_TW.ts @@ -1,6 +1,14 @@ + + AutoMountManagementJob + + + Manage auto-mount settings + + + BootInfoWidget @@ -109,7 +117,7 @@ 小工具樹 - + Debug information 除錯資訊 @@ -117,12 +125,12 @@ Calamares::ExecutionViewStep - + Set up 設定 - + Install 安裝 @@ -143,7 +151,7 @@ Calamares::JobThread - + Done 完成 @@ -255,171 +263,180 @@ Calamares::ViewManager - + Setup Failed 設定失敗 - + Installation Failed 安裝失敗 - + Would you like to paste the install log to the web? 想要將安裝紀錄檔貼到網路上嗎？ - + Error 錯誤 - - + + &Yes 是(&Y) - - + + &No 否(&N) - + &Close 關閉(&C) - + Install Log Paste URL 安裝紀錄檔張貼 URL - + The upload was unsuccessful. No web-paste was done. 上傳不成功。並未完成網路張貼。 + Install log posted to + +%1 + +Link copied to clipboard + + + + Calamares Initialization Failed Calamares 初始化失敗 - + %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 無法安裝。Calamares 無法載入所有已設定的模組。散佈版使用 Calamares 的方式有問題。 - + <br/>The following modules could not be loaded: <br/>以下的模組無法載入： - + Continue with setup? 繼續安裝？ - + 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> %1 設定程式將在您的磁碟上做出變更以設定 %2。<br/><strong>您將無法復原這些變更。</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 安裝程式將在您的磁碟上做出變更以安裝 %2。<br/><strong>您將無法復原這些變更。</strong> - + &Set up now 馬上進行設定 (&S) - + &Install now 現在安裝 (&I) - + Go &back 上一步 (&B) - + &Set up 設定 (&S) - + &Install 安裝(&I) - + Setup is complete. Close the setup program. 設定完成。關閉設定程式。 - + The installation is complete. Close the installer. 安裝完成。關閉安裝程式。 - + Cancel setup without changing the system. 取消安裝，不更改系統。 - + Cancel installation without changing the system. 不變更系統並取消安裝。 - + &Next 下一步 (&N) - + &Back 返回 (&B) - + &Done 完成(&D) - + &Cancel 取消(&C) - + Cancel setup? 取消設定？ - + 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 install process? The installer will quit and all changes will be lost. 您真的想要取消目前的安裝程序嗎？ @@ -449,45 +466,15 @@ The installer will quit and all changes will be lost. 無法讀取的 Python 錯誤。 - - CalamaresUtils - - - Install log posted to: -%1 - 安裝紀錄檔已張貼到： -%1 - - CalamaresWindow - - Show debug information - 顯示除錯資訊 - - - - &Back - 返回 (&B) - - - - &Next - 下一步 (&N) - - - - &Cancel - 取消(&C) - - - + %1 Setup Program %1 設定程式 - + %1 Installer %1 安裝程式 @@ -808,50 +795,90 @@ The installer will quit and all changes will be lost. <h1>歡迎使用 %1 安裝程式</h1> - + Your username is too long. 您的使用者名稱太長了。 - + '%1' is not allowed as username. 「%1」無法作為使用者名稱。 - + Your username must start with a lowercase letter or underscore. 您的使用者名稱必須以小寫字母或底線開頭。 - + Only lowercase letters, numbers, underscore and hyphen are allowed. 僅允許小寫字母、數字、底線與連接號。 - + Your hostname is too short. 您的主機名稱太短了。 - + Your hostname is too long. 您的主機名稱太長了。 - + '%1' is not allowed as hostname. 「%1」無法作為主機名稱。 - + Only letters, numbers, underscore and hyphen are allowed. 僅允許字母、數字、底線與連接號。 - + Your passwords do not match! 密碼不符！ + + + Setup Failed + 設定失敗 + + + + Installation Failed + 安裝失敗 + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + 設定完成 + + + + Installation Complete + 安裝完成 + + + + The setup of %1 is complete. + %1 的設定完成。 + + + + The installation of %1 is complete. + %1 的安裝已完成。 + ContextualProcessJob @@ -942,22 +969,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). + + + + Create new %2MiB partition on %4 (%3) with file system %1. 使用檔案系統 %1 在 %4 (%3) 建立新的 %2MiB 分割區。 - + + 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>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. 使用檔案系統 <strong>%1</strong> 在 <strong>%4</strong> (%3) 建立新的 <strong>%2MiB</strong> 分割區。 - + + Creating new %1 partition on %2. 正在於 %2 建立新的 %1 分割區。 - + The installer failed to create partition on disk '%1'. 安裝程式在磁碟 '%1' 上建立分割區失敗。 @@ -1284,37 +1332,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + 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. 在 <strong>新的</strong>系統分割區 %2 上安裝 %1。 - - Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - 設定 <strong>新的</strong> 不含掛載點 <strong>%1</strong> 的 %2 分割區。 + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + - - Install %2 on %3 system partition <strong>%1</strong>. - 在 %3 系統分割區 <strong>%1</strong> 上安裝 %2。 + + 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>. + + + + + 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>. - 為分割區 %3 <strong>%1</strong> 設定掛載點 <strong>%2</strong>。 + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + - + + Install %2 on %3 system partition <strong>%1</strong>. + 在 %3 系統分割區 <strong>%1</strong> 上安裝 %2。 + + + Install boot loader on <strong>%1</strong>. 安裝開機載入器於 <strong>%1</strong>。 - + Setting up mount points. 正在設定掛載點。 @@ -1332,62 +1400,50 @@ The installer will quit and all changes will be lost. 現在重新啟動 (&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>都完成了。</h1><br/>%1 已經在您的電腦上設定好了。<br/>您現在可能會想要開始使用您的新系統。 - + <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>當這個勾選框被選取時，您的系統將會在按下<span style="font-style:italic;">完成</span>或關閉設定程式時立刻重新啟動。</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>都完成了。</h1><br/>%1 已經安裝在您的電腦上了。<br/>您現在可能會想要重新啟動到您的新系統中，或是繼續使用 %2 Live 環境。 - + <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>當這個勾選框被選取時，您的系統將會在按下<span style="font-style:italic;">完成</span>或關閉安裝程式時立刻重新啟動。</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>設定失敗</h1><br/>%1 並未在您的電腦設定好。<br/>錯誤訊息為：%2。 - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>安裝失敗</h1><br/>%1 並未安裝到您的電腦上。<br/>錯誤訊息為：%2。 - FinishedViewStep + FinishedQmlViewStep - + Finish 完成 + + + FinishedViewStep - - Setup Complete - 設定完成 - - - - Installation Complete - 安裝完成 - - - - The setup of %1 is complete. - %1 的設定完成。 - - - - The installation of %1 is complete. - %1 的安裝已完成。 + + Finish + 完成 @@ -2247,7 +2303,7 @@ The installer will quit and all changes will be lost. 未知的錯誤 - + Password is empty 密碼為空 @@ -2757,14 +2813,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. 指令沒有輸出。 - + Output: @@ -2773,52 +2829,52 @@ Output: - + External command crashed. 外部指令當機。 - + Command <i>%1</i> crashed. 指令 <i>%1</i> 已當機。 - + External command failed to start. 外部指令啟動失敗。 - + Command <i>%1</i> failed to start. 指令 <i>%1</i> 啟動失敗。 - + Internal error when starting command. 當啟動指令時發生內部錯誤。 - + Bad parameters for process job call. 呼叫程序的參數無效。 - + External command failed to finish. 外部指令結束失敗。 - + Command <i>%1</i> failed to finish in %2 seconds. 指令 <i>%1</i> 在結束 %2 秒內失敗。 - + External command finished with errors. 外部指令結束時發生錯誤。 - + Command <i>%1</i> finished with exit code %2. 指令 <i>%1</i> 結束時有錯誤碼 %2。 @@ -3637,12 +3693,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>如果將會有多於一人使用這臺電腦，您可以在安裝後設定多個帳號。</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>如果將會有多於一人使用這臺電腦，您可以在安裝後設定多個帳號。</small> @@ -3881,6 +3937,44 @@ Output: 返回 + + calamares-sidebar + + + Show debug information + 顯示除錯資訊 + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + i18n From 862584786669dacca4a997edfe4372d54a22331e Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sun, 14 Mar 2021 16:17:09 +0100 Subject: [PATCH 245/318] i18n: [desktop] Automatic merge of Transifex translations --- calamares.desktop | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) mode change 100755 => 100644 calamares.desktop diff --git a/calamares.desktop b/calamares.desktop old mode 100755 new mode 100644 index cd8a353c9c..834c4a5182 --- a/calamares.desktop +++ b/calamares.desktop @@ -1,4 +1,3 @@ -#!/usr/bin/env xdg-open [Desktop Entry] Type=Application Version=1.0 @@ -6,7 +5,7 @@ Name=Install System GenericName=System Installer Keywords=calamares;system;installer; TryExec=calamares -Exec=sh -c "pkexec calamares" +Exec=pkexec /usr/bin/calamares Comment=Calamares — System Installer Icon=calamares Terminal=false From 3fafeaf09abdd253dc82ff65484fa1822125820e Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sun, 14 Mar 2021 16:17:09 +0100 Subject: [PATCH 246/318] i18n: [dummypythonqt] Automatic merge of Transifex translations --- .../dummypythonqt/lang/dummypythonqt.pot | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/modules/dummypythonqt/lang/dummypythonqt.pot b/src/modules/dummypythonqt/lang/dummypythonqt.pot index d7e755c11c..57546f55e1 100644 --- a/src/modules/dummypythonqt/lang/dummypythonqt.pot +++ b/src/modules/dummypythonqt/lang/dummypythonqt.pot @@ -2,41 +2,41 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-04 22:02+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" #: src/modules/dummypythonqt/main.py:75 msgid "Click me!" -msgstr "" +msgstr "Click me!" #: src/modules/dummypythonqt/main.py:85 msgid "A new QLabel." -msgstr "" +msgstr "A new QLabel." #: src/modules/dummypythonqt/main.py:88 msgid "Dummy PythonQt ViewStep" -msgstr "" +msgstr "Dummy PythonQt ViewStep" #: src/modules/dummypythonqt/main.py:174 msgid "The Dummy PythonQt Job" -msgstr "" +msgstr "The Dummy PythonQt Job" #: src/modules/dummypythonqt/main.py:177 msgid "This is the Dummy PythonQt Job. The dummy job says: {}" -msgstr "" +msgstr "This is the Dummy PythonQt Job. The dummy job says: {}" #: src/modules/dummypythonqt/main.py:181 msgid "A status message for Dummy PythonQt Job." -msgstr "" +msgstr "A status message for Dummy PythonQt Job." From d9ab35f4cca2ecdfd126787032afbc28c907c5fc Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sun, 14 Mar 2021 16:17:09 +0100 Subject: [PATCH 247/318] i18n: [python] Automatic merge of Transifex translations --- lang/python.pot | 16 +- lang/python/ar/LC_MESSAGES/python.po | 16 +- lang/python/as/LC_MESSAGES/python.po | 16 +- lang/python/ast/LC_MESSAGES/python.po | 16 +- lang/python/az/LC_MESSAGES/python.po | 16 +- lang/python/az_AZ/LC_MESSAGES/python.po | 16 +- lang/python/be/LC_MESSAGES/python.po | 16 +- lang/python/bg/LC_MESSAGES/python.po | 16 +- lang/python/bn/LC_MESSAGES/python.po | 16 +- lang/python/ca/LC_MESSAGES/python.po | 16 +- lang/python/ca@valencia/LC_MESSAGES/python.po | 16 +- lang/python/cs_CZ/LC_MESSAGES/python.po | 16 +- lang/python/da/LC_MESSAGES/python.po | 16 +- lang/python/de/LC_MESSAGES/python.po | 16 +- lang/python/el/LC_MESSAGES/python.po | 16 +- lang/python/en_GB/LC_MESSAGES/python.po | 16 +- lang/python/eo/LC_MESSAGES/python.po | 16 +- lang/python/es/LC_MESSAGES/python.po | 16 +- lang/python/es_MX/LC_MESSAGES/python.po | 16 +- lang/python/es_PR/LC_MESSAGES/python.po | 16 +- lang/python/et/LC_MESSAGES/python.po | 16 +- lang/python/eu/LC_MESSAGES/python.po | 16 +- lang/python/fa/LC_MESSAGES/python.po | 16 +- lang/python/fi_FI/LC_MESSAGES/python.po | 16 +- lang/python/fr/LC_MESSAGES/python.po | 16 +- lang/python/fr_CH/LC_MESSAGES/python.po | 16 +- lang/python/fur/LC_MESSAGES/python.po | 16 +- lang/python/gl/LC_MESSAGES/python.po | 16 +- lang/python/gu/LC_MESSAGES/python.po | 16 +- lang/python/he/LC_MESSAGES/python.po | 16 +- lang/python/hi/LC_MESSAGES/python.po | 16 +- lang/python/hr/LC_MESSAGES/python.po | 16 +- lang/python/hu/LC_MESSAGES/python.po | 16 +- lang/python/id/LC_MESSAGES/python.po | 16 +- lang/python/id_ID/LC_MESSAGES/python.po | 345 +++++++++++++++++ lang/python/ie/LC_MESSAGES/python.po | 16 +- lang/python/is/LC_MESSAGES/python.po | 16 +- lang/python/it_IT/LC_MESSAGES/python.po | 16 +- lang/python/ja/LC_MESSAGES/python.po | 16 +- lang/python/kk/LC_MESSAGES/python.po | 16 +- lang/python/kn/LC_MESSAGES/python.po | 16 +- lang/python/ko/LC_MESSAGES/python.po | 16 +- lang/python/lo/LC_MESSAGES/python.po | 16 +- lang/python/lt/LC_MESSAGES/python.po | 16 +- lang/python/lv/LC_MESSAGES/python.po | 16 +- lang/python/mk/LC_MESSAGES/python.po | 16 +- lang/python/ml/LC_MESSAGES/python.po | 16 +- lang/python/mr/LC_MESSAGES/python.po | 16 +- lang/python/nb/LC_MESSAGES/python.po | 16 +- lang/python/ne/LC_MESSAGES/python.po | 347 ++++++++++++++++++ lang/python/ne_NP/LC_MESSAGES/python.po | 16 +- lang/python/nl/LC_MESSAGES/python.po | 16 +- lang/python/pl/LC_MESSAGES/python.po | 16 +- lang/python/pt_BR/LC_MESSAGES/python.po | 16 +- lang/python/pt_PT/LC_MESSAGES/python.po | 16 +- lang/python/ro/LC_MESSAGES/python.po | 16 +- lang/python/ru/LC_MESSAGES/python.po | 16 +- lang/python/si/LC_MESSAGES/python.po | 347 ++++++++++++++++++ lang/python/sk/LC_MESSAGES/python.po | 16 +- lang/python/sl/LC_MESSAGES/python.po | 16 +- lang/python/sq/LC_MESSAGES/python.po | 16 +- lang/python/sr/LC_MESSAGES/python.po | 16 +- lang/python/sr@latin/LC_MESSAGES/python.po | 16 +- lang/python/sv/LC_MESSAGES/python.po | 16 +- lang/python/te/LC_MESSAGES/python.po | 16 +- lang/python/tg/LC_MESSAGES/python.po | 16 +- lang/python/th/LC_MESSAGES/python.po | 16 +- lang/python/tr_TR/LC_MESSAGES/python.po | 16 +- lang/python/uk/LC_MESSAGES/python.po | 16 +- lang/python/ur/LC_MESSAGES/python.po | 16 +- lang/python/uz/LC_MESSAGES/python.po | 16 +- lang/python/vi/LC_MESSAGES/python.po | 16 +- lang/python/zh/LC_MESSAGES/python.po | 345 +++++++++++++++++ lang/python/zh_CN/LC_MESSAGES/python.po | 16 +- lang/python/zh_TW/LC_MESSAGES/python.po | 16 +- 75 files changed, 1952 insertions(+), 568 deletions(-) create mode 100644 lang/python/id_ID/LC_MESSAGES/python.po create mode 100644 lang/python/ne/LC_MESSAGES/python.po create mode 100644 lang/python/si/LC_MESSAGES/python.po create mode 100644 lang/python/zh/LC_MESSAGES/python.po diff --git a/lang/python.pot b/lang/python.pot index af652f0938..1345aeb3fc 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,22 +26,22 @@ msgstr "Configure GRUB." msgid "Mounting partitions." msgstr "Mounting partitions." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Configuration Error" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "No partitions are defined for 
{!s}
to use." @@ -213,7 +213,7 @@ msgstr "Configuring mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "No root mount point is given for 
{!s}
to use." @@ -304,7 +304,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Removing one package." msgstr[1] "Removing %(num)d packages." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Install bootloader." diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po index 90be91e0b9..a161e69e1f 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: aboodilankaboot, 2019\n" "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n" @@ -30,22 +30,22 @@ msgstr "" msgid "Mounting partitions." msgstr "جاري تركيب الأقسام" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "خطأ في الضبط" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -302,7 +302,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "تثبيت محمل الإقلاع" diff --git a/lang/python/as/LC_MESSAGES/python.po b/lang/python/as/LC_MESSAGES/python.po index 950ae66e52..9c4a1172c1 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Deep Jyoti Choudhury , 2020\n" "Language-Team: Assamese (https://www.transifex.com/calamares/teams/20061/as/)\n" @@ -29,22 +29,22 @@ msgstr "GRUB কনফিগাৰ কৰক।" msgid "Mounting partitions." msgstr "বিভাজন মাউন্ট্ কৰা।" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "কনফিগাৰেচন ত্ৰুটি" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।" @@ -213,7 +213,7 @@ msgstr "mkinitcpio কনফিগাৰ কৰি আছে।" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "ব্যৱহাৰৰ বাবে 
{!s}
ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।" @@ -300,7 +300,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Removing one package." msgstr[1] "%(num)d পেকেজবোৰ আতৰোৱা হৈ আছে।" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "বুতলোডাৰ ইন্স্তল কৰক।" diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po index ee640c712c..ecc658fd0c 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: enolp , 2020\n" "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -212,7 +212,7 @@ msgstr "Configurando mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -297,7 +297,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Desaniciando un paquete." msgstr[1] "Desaniciando %(num)d paquetes." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Instalando'l xestor d'arrinque." diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po index 5a03b748d6..008666012b 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: xxmn77 , 2020\n" "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n" @@ -29,22 +29,22 @@ msgstr "GRUB tənzimləmələri" msgid "Mounting partitions." msgstr "Disk bölmələri qoşulur." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Tənzimləmə xətası" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
istifadə etmək üçün bölmələr təyin edilməyib" @@ -220,7 +220,7 @@ msgstr "mkinitcpio tənzimlənir." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -310,7 +310,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Bir paket silinir" msgstr[1] "%(num)d paket silinir." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Önyükləyici qurulur." diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po index 027e819d5f..6c5d277e1f 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: xxmn77 , 2020\n" "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n" @@ -29,22 +29,22 @@ msgstr "GRUB tənzimləmələri" msgid "Mounting partitions." msgstr "Disk bölmələri qoşulur." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Tənzimləmə xətası" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
istifadə etmək üçün bölmələr təyin edilməyib" @@ -220,7 +220,7 @@ msgstr "mkinitcpio tənzimlənir." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -310,7 +310,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Bir paket silinir" msgstr[1] "%(num)d paket silinir." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Önyükləyici qurulur." diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po index 49e6423e67..834db9fedb 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Źmicier Turok , 2020\n" "Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n" @@ -29,22 +29,22 @@ msgstr "Наладзіць GRUB." msgid "Mounting partitions." msgstr "Мантаванне раздзелаў." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Памылка канфігурацыі" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Раздзелы для 
{!s}
не вызначаныя." @@ -215,7 +215,7 @@ msgstr "Наладка mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Каранёвы пункт мантавання для
{!s}
не пададзены." @@ -306,7 +306,7 @@ msgstr[1] "Выдаленне %(num)d пакункаў." msgstr[2] "Выдаленне %(num)d пакункаў." msgstr[3] "Выдаленне %(num)d пакункаў." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Усталяваць загрузчык." diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po index 37a2ce7a8c..fa64c358b6 100644 --- a/lang/python/bg/LC_MESSAGES/python.po +++ b/lang/python/bg/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Georgi Georgiev (Жоро) , 2020\n" "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -293,7 +293,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Премахване на един пакет." msgstr[1] "Премахване на %(num)d пакети." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/bn/LC_MESSAGES/python.po b/lang/python/bn/LC_MESSAGES/python.po index bc8b6fc1aa..9c50ff4ddf 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 508a8b0ef95404aa3dc5178f0ccada5e_017b8a4 , 2020\n" "Language-Team: Bengali (https://www.transifex.com/calamares/teams/20061/bn/)\n" @@ -29,22 +29,22 @@ msgstr "কনফিগার করুন জিআরইউবি।" msgid "Mounting partitions." msgstr "মাউন্ট করছে পার্টিশনগুলো।" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "কনফিগারেশন ত্রুটি" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
{!এস}
ব্যবহার করার জন্য।" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -294,7 +294,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po index adaf50b332..c119de08f6 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Davidmp , 2020\n" "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n" @@ -29,22 +29,22 @@ msgstr "Configura el GRUB." msgid "Mounting partitions." msgstr "Es munten les particions." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Error de configuració" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "No s'han definit particions perquè les usi 
{!s}
." @@ -218,7 +218,7 @@ msgstr "Es configura mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -311,7 +311,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Se suprimeix un paquet." msgstr[1] "Se suprimeixen %(num)d paquets." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "S'instal·la el carregador d'arrencada." diff --git a/lang/python/ca@valencia/LC_MESSAGES/python.po b/lang/python/ca@valencia/LC_MESSAGES/python.po index 6767bc2ec6..65b88c1b86 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Raul , 2021\n" "Language-Team: Catalan (Valencian) (https://www.transifex.com/calamares/teams/20061/ca@valencia/)\n" @@ -29,22 +29,22 @@ msgstr "Configura el GRUB" msgid "Mounting partitions." msgstr "S'estan muntant les particions." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "S'ha produït un error en la configuració." -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "No s'han definit particions perquè les use 
{!s}
." @@ -220,7 +220,7 @@ msgstr "S'està configurant mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -313,7 +313,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "S’està eliminant un paquet." msgstr[1] "S’està eliminant %(num)d paquets." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Instal·la el carregador d'arrancada." diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po index 0de915a1a3..127e4e82f5 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Pavel Borecki , 2020\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n" @@ -31,22 +31,22 @@ msgstr "Nastavování zavaděče GRUB." msgid "Mounting partitions." msgstr "Připojování oddílů." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Chyba nastavení" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Pro 
{!s}
nejsou zadány žádné oddíly." @@ -220,7 +220,7 @@ msgstr "Nastavování mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Pro 
{!s}
není zadán žádný přípojný bod." @@ -317,7 +317,7 @@ 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/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Instalace zavaděče systému." diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po index 6187e31b99..42997f18fa 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: scootergrisen, 2020\n" "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n" @@ -30,22 +30,22 @@ msgstr "Konfigurer GRUB." msgid "Mounting partitions." msgstr "Monterer partitioner." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Fejl ved konfiguration" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Der er ikke angivet nogle partitioner som 
{!s}
kan bruge." @@ -218,7 +218,7 @@ msgstr "Konfigurerer mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -309,7 +309,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Fjerner én pakke." msgstr[1] "Fjerner %(num)d pakker." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Installér bootloader." diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po index cb7264aedb..725c69d2df 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Andreas Eitel , 2020\n" "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n" @@ -31,22 +31,22 @@ msgstr "GRUB konfigurieren." msgid "Mounting partitions." msgstr "Hänge Partitionen ein." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Konfigurationsfehler" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Für 
{!s}
sind keine zu verwendenden Partitionen definiert." @@ -222,7 +222,7 @@ msgstr "Konfiguriere mkinitcpio. " #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -316,7 +316,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Entferne ein Paket" msgstr[1] "Entferne %(num)d Pakete." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Installiere Bootloader." diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po index 742f337a6e..89a4bec841 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Efstathios Iosifidis , 2017\n" "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -293,7 +293,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po index 3e84dc7dc0..25e68de3a1 100644 --- a/lang/python/en_GB/LC_MESSAGES/python.po +++ b/lang/python/en_GB/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Jason Collins , 2018\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -293,7 +293,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Removing one package." msgstr[1] "Removing %(num)d packages." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po index 7cc9bfc850..71d1598512 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kurt Ankh Phoenix , 2018\n" "Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -293,7 +293,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Forigante unu pakaĵo." msgstr[1] "Forigante %(num)d pakaĵoj." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po index a33951bb22..bd8470f0c0 100644 --- a/lang/python/es/LC_MESSAGES/python.po +++ b/lang/python/es/LC_MESSAGES/python.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Pier Jose Gotta Perez , 2020\n" "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n" @@ -34,22 +34,22 @@ msgstr "Configure GRUB - menú de arranque multisistema -" msgid "Mounting partitions." msgstr "Montando particiones" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Error de configuración" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "No hay definidas particiones en 1{!s}1 para usar." @@ -227,7 +227,7 @@ msgstr "Configurando mkinitcpio - sistema de arranque básico -." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -323,7 +323,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Eliminando un paquete." msgstr[1] "Eliminando %(num)d paquetes." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Instalar gestor de arranque." diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po index 14297508ef..10cb57b525 100644 --- a/lang/python/es_MX/LC_MESSAGES/python.po +++ b/lang/python/es_MX/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Logan 8192 , 2018\n" "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n" @@ -30,22 +30,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -294,7 +294,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Removiendo un paquete." msgstr[1] "Removiendo %(num)dpaquetes." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po index 36aee838f0..3906ff2a15 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -289,7 +289,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po index 84b937110c..dd11cd504b 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Madis Otenurm, 2019\n" "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -293,7 +293,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Eemaldan ühe paketi." msgstr[1] "Eemaldan %(num)d paketti." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po index 92215fb2db..a8a763cddc 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Ander Elortondo, 2019\n" "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -294,7 +294,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Pakete bat kentzen." msgstr[1] "%(num)dpakete kentzen." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po index 859496b544..d8eaa23635 100644 --- a/lang/python/fa/LC_MESSAGES/python.po +++ b/lang/python/fa/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: alireza jamshidi , 2020\n" "Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n" @@ -30,22 +30,22 @@ msgstr "در حال پیکربندی گراب." msgid "Mounting partitions." msgstr "در حال سوار کردن افرازها." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "خطای پیکربندی" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "هیچ افرازی برای استفادهٔ 
{!s}
تعریف نشده." @@ -214,7 +214,7 @@ msgstr "پیکربندی mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ 
{!s}
داده نشده." @@ -298,7 +298,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "در حال برداشتن یک بسته." msgstr[1] "در حال برداشتن %(num)d بسته." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "نصب بارکنندهٔ راه‌اندازی." diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po index 051b1582ab..9f4a671f8c 100644 --- a/lang/python/fi_FI/LC_MESSAGES/python.po +++ b/lang/python/fi_FI/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kimmo Kujansuu , 2020\n" "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n" @@ -29,22 +29,22 @@ msgstr "Määritä GRUB." msgid "Mounting partitions." msgstr "Yhdistä osiot." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Määritysvirhe" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Ei ole määritetty käyttämään osioita 
{!s}
." @@ -215,7 +215,7 @@ msgstr "Määritetään mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -304,7 +304,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Removing one package." msgstr[1] "Poistaa %(num)d paketteja." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Asenna bootloader." diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po index 95f04d4715..6a3db6c8bc 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Arnaud Ferraris , 2019\n" "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n" @@ -37,22 +37,22 @@ msgstr "Configuration du GRUB." msgid "Mounting partitions." msgstr "Montage des partitions." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Erreur de configuration" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" "Aucune partition n'est définie pour être utilisée par 
{!s}
." @@ -226,7 +226,7 @@ msgstr "Configuration de mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -320,7 +320,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Suppression d'un paquet." msgstr[1] "Suppression de %(num)d paquets." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Installation du bootloader." diff --git a/lang/python/fr_CH/LC_MESSAGES/python.po b/lang/python/fr_CH/LC_MESSAGES/python.po index 06e78d855d..938df68cdc 100644 --- a/lang/python/fr_CH/LC_MESSAGES/python.po +++ b/lang/python/fr_CH/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: French (Switzerland) (https://www.transifex.com/calamares/teams/20061/fr_CH/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -289,7 +289,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/fur/LC_MESSAGES/python.po b/lang/python/fur/LC_MESSAGES/python.po index d7735d883a..c47de86ab5 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Fabio Tomat , 2020\n" "Language-Team: Friulian (https://www.transifex.com/calamares/teams/20061/fur/)\n" @@ -29,22 +29,22 @@ msgstr "Configure GRUB." msgid "Mounting partitions." msgstr "Montaç des partizions." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Erôr di configurazion" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "No je stade definide nissune partizion di doprâ par 
{!s}
." @@ -219,7 +219,7 @@ msgstr "Daûr a configurâ di mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -310,7 +310,7 @@ 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/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Instale il bootloader." diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po index 0cf230c2fc..6fd93ff6ea 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Xosé, 2018\n" "Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -294,7 +294,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "A retirar un paquete." msgstr[1] "A retirar %(num)d paquetes." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po index c5de4c5295..ac7503bf98 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -289,7 +289,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po index 459e858b32..2d56896b1a 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Yaron Shahrabani , 2020\n" "Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n" @@ -31,22 +31,22 @@ msgstr "הגדרת GRUB." msgid "Mounting partitions." msgstr "מחיצות מעוגנות." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "שגיאת הגדרות" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "לא הוגדרו מחיצות לשימוש של 
{!s}
." @@ -216,7 +216,7 @@ msgstr "mkinitcpio מותקן." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "לא סופקה נקודת עגינת שורש לשימוש של 
{!s}
." @@ -309,7 +309,7 @@ msgstr[1] "מתבצעת הסרה של %(num)d חבילות." msgstr[2] "מתבצעת הסרה של %(num)d חבילות." msgstr[3] "מתבצעת הסרה של %(num)d חבילות." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "התקנת מנהל אתחול." diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po index 4b06e51214..17548934d3 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Panwar108 , 2020\n" "Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n" @@ -29,22 +29,22 @@ msgstr "GRUB विन्यस्त करना।" msgid "Mounting partitions." msgstr "विभाजन माउंट करना।" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "विन्यास त्रुटि" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।" @@ -214,7 +214,7 @@ msgstr "mkinitcpio को विन्यस्त करना।" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -302,7 +302,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "एक पैकेज हटाया जा रहा है।" msgstr[1] "%(num)d पैकेज हटाए जा रहे हैं।" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "बूट लोडर इंस्टॉल करना।" diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po index ebb1b31b56..20a9c53bde 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Lovro Kudelić , 2020\n" "Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n" @@ -29,22 +29,22 @@ msgstr "Konfigurirajte GRUB." msgid "Mounting partitions." msgstr "Montiranje particija." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Greška konfiguracije" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nema definiranih particija za 
{!s}
korištenje." @@ -217,7 +217,7 @@ msgstr "Konfiguriranje mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -311,7 +311,7 @@ msgstr[0] "Uklanjam paket." msgstr[1] "Uklanjam %(num)d pakete." msgstr[2] "Uklanjam %(num)d pakete." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Instaliram bootloader." diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po index 5a6f163979..a4a8ec01fb 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Lajos Pasztor , 2019\n" "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n" @@ -32,22 +32,22 @@ msgstr "GRUB konfigurálása." msgid "Mounting partitions." msgstr "Partíciók csatolása." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Konfigurációs hiba" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nincsenek partíciók meghatározva a 
{!s}
használatához." @@ -219,7 +219,7 @@ msgstr "mkinitcpio konfigurálása." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Nincs root csatolási pont megadva a 
{!s}
használatához." @@ -309,7 +309,7 @@ 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/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Rendszerbetöltő telepítése." diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po index c316ef562f..c07ac963cd 100644 --- a/lang/python/id/LC_MESSAGES/python.po +++ b/lang/python/id/LC_MESSAGES/python.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Drajat Hasan , 2021\n" "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n" @@ -32,22 +32,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Kesalahan Konfigurasi" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -212,7 +212,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -294,7 +294,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "mencopot %(num)d paket" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/id_ID/LC_MESSAGES/python.po b/lang/python/id_ID/LC_MESSAGES/python.po new file mode 100644 index 0000000000..d13214e2c5 --- /dev/null +++ b/lang/python/id_ID/LC_MESSAGES/python.po @@ -0,0 +1,345 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"PO-Revision-Date: 2017-08-09 10:34+0000\n" +"Language-Team: Indonesian (Indonesia) (https://www.transifex.com/calamares/teams/20061/id_ID/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: id_ID\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/modules/grubcfg/main.py:28 +msgid "Configure GRUB." +msgstr "" + +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +msgstr "" + +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/initcpiocfg/main.py:202 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/networkcfg/main.py:39 +msgid "Configuration Error" +msgstr "" + +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 +#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/fstab/main.py:374 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "" + +#: src/modules/services-systemd/main.py:26 +msgid "Configure systemd services" +msgstr "" + +#: src/modules/services-systemd/main.py:59 +#: src/modules/services-openrc/main.py:93 +msgid "Cannot modify service" +msgstr "" + +#: src/modules/services-systemd/main.py:60 +msgid "" +"systemctl {arg!s} call in chroot returned error code {num!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:63 +#: src/modules/services-systemd/main.py:67 +msgid "Cannot enable systemd service {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:65 +msgid "Cannot enable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:69 +msgid "Cannot disable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot mask systemd unit {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:73 +msgid "" +"Unknown systemd commands {command!s} and " +"{suffix!s} for unit {name!s}." +msgstr "" + +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "" + +#: src/modules/unpackfs/main.py:35 +msgid "Filling up filesystems." +msgstr "" + +#: src/modules/unpackfs/main.py:255 +msgid "rsync failed with error code {}." +msgstr "" + +#: src/modules/unpackfs/main.py:300 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "" + +#: src/modules/unpackfs/main.py:315 +msgid "Starting to unpack {}" +msgstr "" + +#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464 +msgid "Failed to unpack image \"{}\"" +msgstr "" + +#: src/modules/unpackfs/main.py:431 +msgid "No mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:432 +msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:437 +msgid "Bad mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:438 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458 +#: src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "" + +#: src/modules/unpackfs/main.py:455 +msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "" + +#: src/modules/unpackfs/main.py:459 +msgid "The source filesystem \"{}\" does not exist" +msgstr "" + +#: src/modules/unpackfs/main.py:465 +msgid "" +"Failed to find unsquashfs, make sure you have the squashfs-tools package " +"installed" +msgstr "" + +#: src/modules/unpackfs/main.py:479 +msgid "The destination \"{}\" in the target system is not a directory" +msgstr "" + +#: src/modules/displaymanager/main.py:514 +msgid "Cannot write KDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:515 +msgid "KDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:576 +msgid "Cannot write LXDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:577 +msgid "LXDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:660 +msgid "Cannot write LightDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:661 +msgid "LightDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:735 +msgid "Cannot configure LightDM" +msgstr "" + +#: src/modules/displaymanager/main.py:736 +msgid "No LightDM greeter installed." +msgstr "" + +#: src/modules/displaymanager/main.py:767 +msgid "Cannot write SLIM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:768 +msgid "SLIM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:894 +msgid "No display managers selected for the displaymanager module." +msgstr "" + +#: src/modules/displaymanager/main.py:895 +msgid "" +"The displaymanagers list is empty or undefined in both globalstorage and " +"displaymanager.conf." +msgstr "" + +#: src/modules/displaymanager/main.py:977 +msgid "Display manager configuration was incomplete" +msgstr "" + +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "" + +#: src/modules/initcpiocfg/main.py:203 +#: src/modules/luksopenswaphookcfg/main.py:91 +#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/networkcfg/main.py:40 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "" + +#: src/modules/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "" + +#: src/modules/rawfs/main.py:26 +msgid "Installing data." +msgstr "" + +#: src/modules/services-openrc/main.py:29 +msgid "Configure OpenRC services" +msgstr "" + +#: src/modules/services-openrc/main.py:57 +msgid "Cannot add service {name!s} to run-level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:59 +msgid "Cannot remove service {name!s} from run-level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:61 +msgid "" +"Unknown service-action {arg!s} for service {name!s} in run-" +"level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:94 +msgid "" +"rc-update {arg!s} call in chroot returned error code {num!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:101 +msgid "Target runlevel does not exist" +msgstr "" + +#: src/modules/services-openrc/main.py:102 +msgid "" +"The path for runlevel {level!s} is {path!s}, which does not " +"exist." +msgstr "" + +#: src/modules/services-openrc/main.py:110 +msgid "Target service does not exist" +msgstr "" + +#: src/modules/services-openrc/main.py:111 +msgid "" +"The path for service {name!s} is {path!s}, which does not " +"exist." +msgstr "" + +#: src/modules/plymouthcfg/main.py:27 +msgid "Configure Plymouth theme" +msgstr "" + +#: src/modules/packages/main.py:50 src/modules/packages/main.py:59 +#: src/modules/packages/main.py:69 +msgid "Install packages." +msgstr "" + +#: src/modules/packages/main.py:57 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:62 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:65 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" + +#: src/modules/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "" + +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "" + +#: src/modules/mkinitfs/main.py:27 +msgid "Creating initramfs with mkinitfs." +msgstr "" + +#: src/modules/mkinitfs/main.py:49 +msgid "Failed to run mkinitfs on the target" +msgstr "" + +#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 +msgid "The exit code was {}" +msgstr "" + +#: src/modules/dracut/main.py:27 +msgid "Creating initramfs with dracut." +msgstr "" + +#: src/modules/dracut/main.py:49 +msgid "Failed to run dracut on the target" +msgstr "" + +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "" + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "" + +#: src/modules/fstab/main.py:29 +msgid "Writing fstab." +msgstr "" + +#: src/modules/dummypython/main.py:35 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93 +#: src/modules/dummypython/main.py:94 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "" + +#: src/modules/networkcfg/main.py:28 +msgid "Saving network configuration." +msgstr "" diff --git a/lang/python/ie/LC_MESSAGES/python.po b/lang/python/ie/LC_MESSAGES/python.po index bed8a60f6f..a12ad39053 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Caarmi, 2020\n" "Language-Team: Interlingue (https://www.transifex.com/calamares/teams/20061/ie/)\n" @@ -29,22 +29,22 @@ msgstr "Configurante GRUB." msgid "Mounting partitions." msgstr "Montente partitiones." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Errore de configuration" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Null partition es definit por usa de 
{!s}
." @@ -211,7 +211,7 @@ msgstr "Configurante mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -297,7 +297,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Installante li bootloader." diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po index e16bdf652d..27baf76572 100644 --- a/lang/python/is/LC_MESSAGES/python.po +++ b/lang/python/is/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kristján Magnússon, 2018\n" "Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -293,7 +293,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Fjarlægi einn pakka." msgstr[1] "Fjarlægi %(num)d pakka." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po index c44b547246..0fd943b0d5 100644 --- a/lang/python/it_IT/LC_MESSAGES/python.po +++ b/lang/python/it_IT/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Saverio , 2020\n" "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n" @@ -31,22 +31,22 @@ msgstr "Configura GRUB." msgid "Mounting partitions." msgstr "Montaggio partizioni." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Errore di Configurazione" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nessuna partizione definita per l'uso con 
{!s}
." @@ -221,7 +221,7 @@ msgstr "Configurazione di mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Nessun punto di mount root è dato in l'uso per 
{!s}
" @@ -311,7 +311,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Rimuovendo un pacchetto." msgstr[1] "Rimozione di %(num)d pacchetti." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Installa il bootloader." diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po index fbc9e50e07..bed2831d91 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: UTUMI Hirosi , 2020\n" "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n" @@ -31,22 +31,22 @@ msgstr "GRUBを設定にします。" msgid "Mounting partitions." msgstr "パーティションのマウント。" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "コンフィグレーションエラー" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
に使用するパーティションが定義されていません。" @@ -214,7 +214,7 @@ msgstr "mkinitcpioを設定しています。" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr " 
{!s}
を使用するのにルートマウントポイントが与えられていません。" @@ -297,7 +297,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] " %(num)d パッケージを削除しています。" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "ブートローダーをインストール" diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po index ee07acf3eb..c9dfa28756 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -289,7 +289,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po index 9b70d0a974..031fb8b703 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Kannada (https://www.transifex.com/calamares/teams/20061/kn/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -289,7 +289,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po index 0adc5b53a2..66dab263f7 100644 --- a/lang/python/ko/LC_MESSAGES/python.po +++ b/lang/python/ko/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: JungHee Lee , 2020\n" "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n" @@ -30,22 +30,22 @@ msgstr "GRUB 구성" msgid "Mounting partitions." msgstr "파티션 마운트 중." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "구성 오류" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "사용할 
{!s}
에 대해 정의된 파티션이 없음." @@ -214,7 +214,7 @@ msgstr "mkinitcpio 구성 중." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "
{!s}
에서 사용할 루트 마운트 지점이 제공되지 않음." @@ -298,7 +298,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "부트로더 설치." diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po index 3ea4b76c1f..806ae45326 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -287,7 +287,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po index 6eb6d82cb0..2414ce45c3 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Moo, 2020\n" "Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n" @@ -30,22 +30,22 @@ msgstr "Konfigūruoti GRUB." msgid "Mounting partitions." msgstr "Prijungiami skaidiniai." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Konfigūracijos klaida" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nėra apibrėžta jokių skaidinių, skirtų 
{!s}
naudojimui." @@ -218,7 +218,7 @@ msgstr "Konfigūruojama mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -315,7 +315,7 @@ msgstr[1] "Šalinami %(num)d paketai." msgstr[2] "Šalinama %(num)d paketų." msgstr[3] "Šalinama %(num)d paketų." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Įdiegti paleidyklę." diff --git a/lang/python/lv/LC_MESSAGES/python.po b/lang/python/lv/LC_MESSAGES/python.po index 09a8a92d9f..4244d3f241 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Latvian (https://www.transifex.com/calamares/teams/20061/lv/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -291,7 +291,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po index 9c761a0bda..719bec2e04 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Martin Ristovski , 2018\n" "Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -293,7 +293,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/ml/LC_MESSAGES/python.po b/lang/python/ml/LC_MESSAGES/python.po index fe9ef95440..869a934c9f 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Balasankar C , 2019\n" "Language-Team: Malayalam (https://www.transifex.com/calamares/teams/20061/ml/)\n" @@ -30,22 +30,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "ക്രമീകരണത്തിൽ പിഴവ്" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -294,7 +294,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ." diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po index ec4c3ff70b..496df5d1fb 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -289,7 +289,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po index 53e91b22f8..fd1c4d9fb8 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\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://www.transifex.com/calamares/teams/20061/nb/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -293,7 +293,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/ne/LC_MESSAGES/python.po b/lang/python/ne/LC_MESSAGES/python.po new file mode 100644 index 0000000000..3cc33bd071 --- /dev/null +++ b/lang/python/ne/LC_MESSAGES/python.po @@ -0,0 +1,347 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"PO-Revision-Date: 2017-08-09 10:34+0000\n" +"Language-Team: Nepali (https://www.transifex.com/calamares/teams/20061/ne/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ne\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/grubcfg/main.py:28 +msgid "Configure GRUB." +msgstr "" + +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +msgstr "" + +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/initcpiocfg/main.py:202 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/networkcfg/main.py:39 +msgid "Configuration Error" +msgstr "" + +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 +#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/fstab/main.py:374 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "" + +#: src/modules/services-systemd/main.py:26 +msgid "Configure systemd services" +msgstr "" + +#: src/modules/services-systemd/main.py:59 +#: src/modules/services-openrc/main.py:93 +msgid "Cannot modify service" +msgstr "" + +#: src/modules/services-systemd/main.py:60 +msgid "" +"systemctl {arg!s} call in chroot returned error code {num!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:63 +#: src/modules/services-systemd/main.py:67 +msgid "Cannot enable systemd service {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:65 +msgid "Cannot enable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:69 +msgid "Cannot disable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot mask systemd unit {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:73 +msgid "" +"Unknown systemd commands {command!s} and " +"{suffix!s} for unit {name!s}." +msgstr "" + +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "" + +#: src/modules/unpackfs/main.py:35 +msgid "Filling up filesystems." +msgstr "" + +#: src/modules/unpackfs/main.py:255 +msgid "rsync failed with error code {}." +msgstr "" + +#: src/modules/unpackfs/main.py:300 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "" + +#: src/modules/unpackfs/main.py:315 +msgid "Starting to unpack {}" +msgstr "" + +#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464 +msgid "Failed to unpack image \"{}\"" +msgstr "" + +#: src/modules/unpackfs/main.py:431 +msgid "No mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:432 +msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:437 +msgid "Bad mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:438 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458 +#: src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "" + +#: src/modules/unpackfs/main.py:455 +msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "" + +#: src/modules/unpackfs/main.py:459 +msgid "The source filesystem \"{}\" does not exist" +msgstr "" + +#: src/modules/unpackfs/main.py:465 +msgid "" +"Failed to find unsquashfs, make sure you have the squashfs-tools package " +"installed" +msgstr "" + +#: src/modules/unpackfs/main.py:479 +msgid "The destination \"{}\" in the target system is not a directory" +msgstr "" + +#: src/modules/displaymanager/main.py:514 +msgid "Cannot write KDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:515 +msgid "KDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:576 +msgid "Cannot write LXDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:577 +msgid "LXDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:660 +msgid "Cannot write LightDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:661 +msgid "LightDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:735 +msgid "Cannot configure LightDM" +msgstr "" + +#: src/modules/displaymanager/main.py:736 +msgid "No LightDM greeter installed." +msgstr "" + +#: src/modules/displaymanager/main.py:767 +msgid "Cannot write SLIM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:768 +msgid "SLIM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:894 +msgid "No display managers selected for the displaymanager module." +msgstr "" + +#: src/modules/displaymanager/main.py:895 +msgid "" +"The displaymanagers list is empty or undefined in both globalstorage and " +"displaymanager.conf." +msgstr "" + +#: src/modules/displaymanager/main.py:977 +msgid "Display manager configuration was incomplete" +msgstr "" + +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "" + +#: src/modules/initcpiocfg/main.py:203 +#: src/modules/luksopenswaphookcfg/main.py:91 +#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/networkcfg/main.py:40 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "" + +#: src/modules/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "" + +#: src/modules/rawfs/main.py:26 +msgid "Installing data." +msgstr "" + +#: src/modules/services-openrc/main.py:29 +msgid "Configure OpenRC services" +msgstr "" + +#: src/modules/services-openrc/main.py:57 +msgid "Cannot add service {name!s} to run-level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:59 +msgid "Cannot remove service {name!s} from run-level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:61 +msgid "" +"Unknown service-action {arg!s} for service {name!s} in run-" +"level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:94 +msgid "" +"rc-update {arg!s} call in chroot returned error code {num!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:101 +msgid "Target runlevel does not exist" +msgstr "" + +#: src/modules/services-openrc/main.py:102 +msgid "" +"The path for runlevel {level!s} is {path!s}, which does not " +"exist." +msgstr "" + +#: src/modules/services-openrc/main.py:110 +msgid "Target service does not exist" +msgstr "" + +#: src/modules/services-openrc/main.py:111 +msgid "" +"The path for service {name!s} is {path!s}, which does not " +"exist." +msgstr "" + +#: src/modules/plymouthcfg/main.py:27 +msgid "Configure Plymouth theme" +msgstr "" + +#: src/modules/packages/main.py:50 src/modules/packages/main.py:59 +#: src/modules/packages/main.py:69 +msgid "Install packages." +msgstr "" + +#: src/modules/packages/main.py:57 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:62 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:65 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "" + +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "" + +#: src/modules/mkinitfs/main.py:27 +msgid "Creating initramfs with mkinitfs." +msgstr "" + +#: src/modules/mkinitfs/main.py:49 +msgid "Failed to run mkinitfs on the target" +msgstr "" + +#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 +msgid "The exit code was {}" +msgstr "" + +#: src/modules/dracut/main.py:27 +msgid "Creating initramfs with dracut." +msgstr "" + +#: src/modules/dracut/main.py:49 +msgid "Failed to run dracut on the target" +msgstr "" + +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "" + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "" + +#: src/modules/fstab/main.py:29 +msgid "Writing fstab." +msgstr "" + +#: src/modules/dummypython/main.py:35 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93 +#: src/modules/dummypython/main.py:94 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "" + +#: src/modules/networkcfg/main.py:28 +msgid "Saving network configuration." +msgstr "" diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po index 9e7a074948..eabefb956a 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Nepali (Nepal) (https://www.transifex.com/calamares/teams/20061/ne_NP/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -289,7 +289,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po index 1694f3e991..75e43b7bef 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Adriaan de Groot , 2020\n" "Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n" @@ -30,22 +30,22 @@ msgstr "GRUB instellen." msgid "Mounting partitions." msgstr "Partities mounten." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Configuratiefout" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Geen partities gedefinieerd voor 
{!s}
om te gebruiken." @@ -223,7 +223,7 @@ msgstr "Instellen van mkinitcpio" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -314,7 +314,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Pakket verwijderen." msgstr[1] "%(num)d pakketten verwijderen." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Installeer bootloader" diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po index 0022ca568c..f6e8c43637 100644 --- a/lang/python/pl/LC_MESSAGES/python.po +++ b/lang/python/pl/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Piotr Strębski , 2020\n" "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n" @@ -31,22 +31,22 @@ msgstr "Konfiguracja GRUB." msgid "Mounting partitions." msgstr "Montowanie partycji." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Błąd konfiguracji" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -217,7 +217,7 @@ msgstr "Konfigurowanie mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -305,7 +305,7 @@ msgstr[1] "Usuwanie %(num)d pakietów." msgstr[2] "Usuwanie %(num)d pakietów." msgstr[3] "Usuwanie %(num)d pakietów." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Instalacja programu rozruchowego." diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po index d03394be12..894c1defd4 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Guilherme, 2020\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n" @@ -30,22 +30,22 @@ msgstr "Configurar GRUB." msgid "Mounting partitions." msgstr "Montando partições." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Erro de Configuração." -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Sem partições definidas para uso por 
{!s}
." @@ -219,7 +219,7 @@ msgstr "Configurando mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -314,7 +314,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Removendo um pacote." msgstr[1] "Removendo %(num)d pacotes." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Instalar bootloader." diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po index 2b492a4feb..6998406929 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Hugo Carvalho , 2020\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n" @@ -31,22 +31,22 @@ msgstr "Configurar o GRUB." msgid "Mounting partitions." msgstr "A montar partições." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Erro de configuração" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nenhuma partição está definida para 
{!s}
usar." @@ -222,7 +222,7 @@ msgstr "A configurar o mkintcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Nenhum ponto de montagem root é fornecido para 
{!s}
usar." @@ -315,7 +315,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "A remover um pacote." msgstr[1] "A remover %(num)d pacotes." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Instalar o carregador de arranque." diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po index 40ab5198bc..962e340df9 100644 --- a/lang/python/ro/LC_MESSAGES/python.po +++ b/lang/python/ro/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Sebastian Brici , 2018\n" "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n" @@ -30,22 +30,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -296,7 +296,7 @@ msgstr[0] "Se elimină un pachet." msgstr[1] "Se elimină %(num)d pachet." msgstr[2] "Se elimină %(num)d de pachete." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po index 4fee3f3d89..39d136eca5 100644 --- a/lang/python/ru/LC_MESSAGES/python.po +++ b/lang/python/ru/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: ZIzA, 2020\n" "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n" @@ -30,22 +30,22 @@ msgstr "Настройте GRUB." msgid "Mounting partitions." msgstr "Монтирование разделов." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Ошибка конфигурации" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Не определены разделы для использования 
{!S}
." @@ -211,7 +211,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -299,7 +299,7 @@ msgstr[1] "Удаление %(num)d пакетов." msgstr[2] "Удаление %(num)d пакетов." msgstr[3] "Удаление %(num)d пакетов." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Установить загрузчик." diff --git a/lang/python/si/LC_MESSAGES/python.po b/lang/python/si/LC_MESSAGES/python.po new file mode 100644 index 0000000000..2cddc8df4d --- /dev/null +++ b/lang/python/si/LC_MESSAGES/python.po @@ -0,0 +1,347 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"PO-Revision-Date: 2017-08-09 10:34+0000\n" +"Language-Team: Sinhala (https://www.transifex.com/calamares/teams/20061/si/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: si\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/grubcfg/main.py:28 +msgid "Configure GRUB." +msgstr "" + +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +msgstr "" + +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/initcpiocfg/main.py:202 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/networkcfg/main.py:39 +msgid "Configuration Error" +msgstr "" + +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 +#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/fstab/main.py:374 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "" + +#: src/modules/services-systemd/main.py:26 +msgid "Configure systemd services" +msgstr "" + +#: src/modules/services-systemd/main.py:59 +#: src/modules/services-openrc/main.py:93 +msgid "Cannot modify service" +msgstr "" + +#: src/modules/services-systemd/main.py:60 +msgid "" +"systemctl {arg!s} call in chroot returned error code {num!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:63 +#: src/modules/services-systemd/main.py:67 +msgid "Cannot enable systemd service {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:65 +msgid "Cannot enable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:69 +msgid "Cannot disable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot mask systemd unit {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:73 +msgid "" +"Unknown systemd commands {command!s} and " +"{suffix!s} for unit {name!s}." +msgstr "" + +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "" + +#: src/modules/unpackfs/main.py:35 +msgid "Filling up filesystems." +msgstr "" + +#: src/modules/unpackfs/main.py:255 +msgid "rsync failed with error code {}." +msgstr "" + +#: src/modules/unpackfs/main.py:300 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "" + +#: src/modules/unpackfs/main.py:315 +msgid "Starting to unpack {}" +msgstr "" + +#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464 +msgid "Failed to unpack image \"{}\"" +msgstr "" + +#: src/modules/unpackfs/main.py:431 +msgid "No mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:432 +msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:437 +msgid "Bad mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:438 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458 +#: src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "" + +#: src/modules/unpackfs/main.py:455 +msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "" + +#: src/modules/unpackfs/main.py:459 +msgid "The source filesystem \"{}\" does not exist" +msgstr "" + +#: src/modules/unpackfs/main.py:465 +msgid "" +"Failed to find unsquashfs, make sure you have the squashfs-tools package " +"installed" +msgstr "" + +#: src/modules/unpackfs/main.py:479 +msgid "The destination \"{}\" in the target system is not a directory" +msgstr "" + +#: src/modules/displaymanager/main.py:514 +msgid "Cannot write KDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:515 +msgid "KDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:576 +msgid "Cannot write LXDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:577 +msgid "LXDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:660 +msgid "Cannot write LightDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:661 +msgid "LightDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:735 +msgid "Cannot configure LightDM" +msgstr "" + +#: src/modules/displaymanager/main.py:736 +msgid "No LightDM greeter installed." +msgstr "" + +#: src/modules/displaymanager/main.py:767 +msgid "Cannot write SLIM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:768 +msgid "SLIM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:894 +msgid "No display managers selected for the displaymanager module." +msgstr "" + +#: src/modules/displaymanager/main.py:895 +msgid "" +"The displaymanagers list is empty or undefined in both globalstorage and " +"displaymanager.conf." +msgstr "" + +#: src/modules/displaymanager/main.py:977 +msgid "Display manager configuration was incomplete" +msgstr "" + +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "" + +#: src/modules/initcpiocfg/main.py:203 +#: src/modules/luksopenswaphookcfg/main.py:91 +#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/networkcfg/main.py:40 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "" + +#: src/modules/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "" + +#: src/modules/rawfs/main.py:26 +msgid "Installing data." +msgstr "" + +#: src/modules/services-openrc/main.py:29 +msgid "Configure OpenRC services" +msgstr "" + +#: src/modules/services-openrc/main.py:57 +msgid "Cannot add service {name!s} to run-level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:59 +msgid "Cannot remove service {name!s} from run-level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:61 +msgid "" +"Unknown service-action {arg!s} for service {name!s} in run-" +"level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:94 +msgid "" +"rc-update {arg!s} call in chroot returned error code {num!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:101 +msgid "Target runlevel does not exist" +msgstr "" + +#: src/modules/services-openrc/main.py:102 +msgid "" +"The path for runlevel {level!s} is {path!s}, which does not " +"exist." +msgstr "" + +#: src/modules/services-openrc/main.py:110 +msgid "Target service does not exist" +msgstr "" + +#: src/modules/services-openrc/main.py:111 +msgid "" +"The path for service {name!s} is {path!s}, which does not " +"exist." +msgstr "" + +#: src/modules/plymouthcfg/main.py:27 +msgid "Configure Plymouth theme" +msgstr "" + +#: src/modules/packages/main.py:50 src/modules/packages/main.py:59 +#: src/modules/packages/main.py:69 +msgid "Install packages." +msgstr "" + +#: src/modules/packages/main.py:57 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:62 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:65 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "" + +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "" + +#: src/modules/mkinitfs/main.py:27 +msgid "Creating initramfs with mkinitfs." +msgstr "" + +#: src/modules/mkinitfs/main.py:49 +msgid "Failed to run mkinitfs on the target" +msgstr "" + +#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 +msgid "The exit code was {}" +msgstr "" + +#: src/modules/dracut/main.py:27 +msgid "Creating initramfs with dracut." +msgstr "" + +#: src/modules/dracut/main.py:49 +msgid "Failed to run dracut on the target" +msgstr "" + +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "" + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "" + +#: src/modules/fstab/main.py:29 +msgid "Writing fstab." +msgstr "" + +#: src/modules/dummypython/main.py:35 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93 +#: src/modules/dummypython/main.py:94 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "" + +#: src/modules/networkcfg/main.py:28 +msgid "Saving network configuration." +msgstr "" diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po index 94b05a6e72..df3e12fb73 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Dušan Kazik , 2020\n" "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n" @@ -29,22 +29,22 @@ msgstr "Konfigurácia zavádzača GRUB." msgid "Mounting partitions." msgstr "Pripájanie oddielov." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Chyba konfigurácie" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nie sú určené žiadne oddiely na použitie pre 
{!s}
." @@ -213,7 +213,7 @@ msgstr "Konfigurácia mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Nie je zadaný žiadny bod pripojenia na použitie pre 
{!s}
." @@ -301,7 +301,7 @@ 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/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Inštalácia zavádzača." diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po index 9d99bcc23a..c9e2d93fd7 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -293,7 +293,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po index 57647c7e94..dce2a61161 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Besnik Bleta , 2020\n" "Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n" @@ -29,22 +29,22 @@ msgstr "Formësoni GRUB-in." msgid "Mounting partitions." msgstr "Po montohen pjesë." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Gabim Formësimi" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "S’ka pjesë të përkufizuara për 
{!s}
për t’u përdorur." @@ -218,7 +218,7 @@ msgstr "Po formësohet mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -311,7 +311,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Po hiqet një paketë." msgstr[1] "Po hiqen %(num)d paketa." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Instalo ngarkues nisjesh." diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po index 5cfb7e7b2e..80deb2340c 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Slobodan Simić , 2020\n" "Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n" @@ -29,22 +29,22 @@ msgstr "Подеси ГРУБ" msgid "Mounting partitions." msgstr "Монтирање партиција." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Грешка поставе" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -295,7 +295,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po index b24ee6c150..af221bf28e 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -291,7 +291,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po index 002b8d523b..26193da007 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Luna Jernberg , 2020\n" "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n" @@ -31,22 +31,22 @@ msgstr "Konfigurera GRUB." msgid "Mounting partitions." msgstr "Monterar partitioner." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Konfigurationsfel" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Inga partitioner är definerade för 
{!s}
att använda." @@ -219,7 +219,7 @@ msgstr "Konfigurerar mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -311,7 +311,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Tar bort ett paket." msgstr[1] "Tar bort %(num)d paket." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Installera starthanterare." diff --git a/lang/python/te/LC_MESSAGES/python.po b/lang/python/te/LC_MESSAGES/python.po index 1713b5fa68..fbeb6e9f62 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Telugu (https://www.transifex.com/calamares/teams/20061/te/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -289,7 +289,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/tg/LC_MESSAGES/python.po b/lang/python/tg/LC_MESSAGES/python.po index 2032d929c9..fd7e50aa0e 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Victor Ibragimov , 2020\n" "Language-Team: Tajik (https://www.transifex.com/calamares/teams/20061/tg/)\n" @@ -29,22 +29,22 @@ msgstr "Танзимоти GRUB." msgid "Mounting partitions." msgstr "Васлкунии қисмҳои диск." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Хатои танзимкунӣ" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Ягон қисми диск барои истифодаи 
{!s}
муайян карда нашуд." @@ -219,7 +219,7 @@ msgstr "Танзимкунии mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Нуқтаи васли реша (root) барои истифодаи 
{!s}
дода нашуд." @@ -311,7 +311,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Тозакунии як баста" msgstr[1] "Тозакунии %(num)d баста." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Насбкунии боркунандаи роҳандозӣ." diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po index 352e885b51..62d6347888 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -287,7 +287,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po index 1b07518a8d..1cd7b3ca47 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Demiray Muhterem , 2020\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n" @@ -30,22 +30,22 @@ msgstr "GRUB'u yapılandır." msgid "Mounting partitions." msgstr "Disk bölümlemeleri bağlanıyor." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Yapılandırma Hatası" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
kullanması için hiçbir bölüm tanımlanmadı." @@ -218,7 +218,7 @@ msgstr "Mkinitcpio yapılandırılıyor." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "
{!s}
kullanması için kök bağlama noktası verilmedi." @@ -306,7 +306,7 @@ 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/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Önyükleyici kuruluyor" diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po index 6ea133537c..e925155626 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Yuri Chornoivan , 2020\n" "Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n" @@ -31,22 +31,22 @@ msgstr "Налаштовування GRUB." msgid "Mounting partitions." msgstr "Монтування розділів." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Помилка налаштовування" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Не визначено розділів для використання 
{!s}
." @@ -224,7 +224,7 @@ msgstr "Налаштовуємо mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -321,7 +321,7 @@ msgstr[1] "Вилучаємо %(num)d пакунки." msgstr[2] "Вилучаємо %(num)d пакунків." msgstr[3] "Вилучаємо один пакунок." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Встановити завантажувач." diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po index 8c71d0c6d1..73fb106cbf 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -289,7 +289,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po index 88dd3a1b51..cdb117a1ff 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -287,7 +287,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "" diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po index e6989fb298..727c12ae56 100644 --- a/lang/python/vi/LC_MESSAGES/python.po +++ b/lang/python/vi/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: T. Tran , 2020\n" "Language-Team: Vietnamese (https://www.transifex.com/calamares/teams/20061/vi/)\n" @@ -29,22 +29,22 @@ msgstr "Cấu hình GRUB" msgid "Mounting partitions." msgstr "Đang gắn kết các phân vùng." -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Lỗi cấu hình" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "Không có phân vùng nào được định nghĩa cho 
{!s}
để dùng." @@ -215,7 +215,7 @@ msgstr "Đang cấu hình mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Không có điểm kết nối gốc cho 
{!s}
để dùng." @@ -305,7 +305,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng." -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "Đang cài đặt bộ khởi động." diff --git a/lang/python/zh/LC_MESSAGES/python.po b/lang/python/zh/LC_MESSAGES/python.po new file mode 100644 index 0000000000..797480febb --- /dev/null +++ b/lang/python/zh/LC_MESSAGES/python.po @@ -0,0 +1,345 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"PO-Revision-Date: 2017-08-09 10:34+0000\n" +"Language-Team: Chinese (https://www.transifex.com/calamares/teams/20061/zh/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/modules/grubcfg/main.py:28 +msgid "Configure GRUB." +msgstr "" + +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +msgstr "" + +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/initcpiocfg/main.py:202 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/networkcfg/main.py:39 +msgid "Configuration Error" +msgstr "" + +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 +#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/fstab/main.py:374 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "" + +#: src/modules/services-systemd/main.py:26 +msgid "Configure systemd services" +msgstr "" + +#: src/modules/services-systemd/main.py:59 +#: src/modules/services-openrc/main.py:93 +msgid "Cannot modify service" +msgstr "" + +#: src/modules/services-systemd/main.py:60 +msgid "" +"systemctl {arg!s} call in chroot returned error code {num!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:63 +#: src/modules/services-systemd/main.py:67 +msgid "Cannot enable systemd service {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:65 +msgid "Cannot enable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:69 +msgid "Cannot disable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot mask systemd unit {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:73 +msgid "" +"Unknown systemd commands {command!s} and " +"{suffix!s} for unit {name!s}." +msgstr "" + +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "" + +#: src/modules/unpackfs/main.py:35 +msgid "Filling up filesystems." +msgstr "" + +#: src/modules/unpackfs/main.py:255 +msgid "rsync failed with error code {}." +msgstr "" + +#: src/modules/unpackfs/main.py:300 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "" + +#: src/modules/unpackfs/main.py:315 +msgid "Starting to unpack {}" +msgstr "" + +#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464 +msgid "Failed to unpack image \"{}\"" +msgstr "" + +#: src/modules/unpackfs/main.py:431 +msgid "No mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:432 +msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:437 +msgid "Bad mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:438 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458 +#: src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "" + +#: src/modules/unpackfs/main.py:455 +msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "" + +#: src/modules/unpackfs/main.py:459 +msgid "The source filesystem \"{}\" does not exist" +msgstr "" + +#: src/modules/unpackfs/main.py:465 +msgid "" +"Failed to find unsquashfs, make sure you have the squashfs-tools package " +"installed" +msgstr "" + +#: src/modules/unpackfs/main.py:479 +msgid "The destination \"{}\" in the target system is not a directory" +msgstr "" + +#: src/modules/displaymanager/main.py:514 +msgid "Cannot write KDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:515 +msgid "KDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:576 +msgid "Cannot write LXDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:577 +msgid "LXDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:660 +msgid "Cannot write LightDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:661 +msgid "LightDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:735 +msgid "Cannot configure LightDM" +msgstr "" + +#: src/modules/displaymanager/main.py:736 +msgid "No LightDM greeter installed." +msgstr "" + +#: src/modules/displaymanager/main.py:767 +msgid "Cannot write SLIM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:768 +msgid "SLIM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:894 +msgid "No display managers selected for the displaymanager module." +msgstr "" + +#: src/modules/displaymanager/main.py:895 +msgid "" +"The displaymanagers list is empty or undefined in both globalstorage and " +"displaymanager.conf." +msgstr "" + +#: src/modules/displaymanager/main.py:977 +msgid "Display manager configuration was incomplete" +msgstr "" + +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "" + +#: src/modules/initcpiocfg/main.py:203 +#: src/modules/luksopenswaphookcfg/main.py:91 +#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/networkcfg/main.py:40 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "" + +#: src/modules/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "" + +#: src/modules/rawfs/main.py:26 +msgid "Installing data." +msgstr "" + +#: src/modules/services-openrc/main.py:29 +msgid "Configure OpenRC services" +msgstr "" + +#: src/modules/services-openrc/main.py:57 +msgid "Cannot add service {name!s} to run-level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:59 +msgid "Cannot remove service {name!s} from run-level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:61 +msgid "" +"Unknown service-action {arg!s} for service {name!s} in run-" +"level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:94 +msgid "" +"rc-update {arg!s} call in chroot returned error code {num!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:101 +msgid "Target runlevel does not exist" +msgstr "" + +#: src/modules/services-openrc/main.py:102 +msgid "" +"The path for runlevel {level!s} is {path!s}, which does not " +"exist." +msgstr "" + +#: src/modules/services-openrc/main.py:110 +msgid "Target service does not exist" +msgstr "" + +#: src/modules/services-openrc/main.py:111 +msgid "" +"The path for service {name!s} is {path!s}, which does not " +"exist." +msgstr "" + +#: src/modules/plymouthcfg/main.py:27 +msgid "Configure Plymouth theme" +msgstr "" + +#: src/modules/packages/main.py:50 src/modules/packages/main.py:59 +#: src/modules/packages/main.py:69 +msgid "Install packages." +msgstr "" + +#: src/modules/packages/main.py:57 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:62 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:65 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" + +#: src/modules/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "" + +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "" + +#: src/modules/mkinitfs/main.py:27 +msgid "Creating initramfs with mkinitfs." +msgstr "" + +#: src/modules/mkinitfs/main.py:49 +msgid "Failed to run mkinitfs on the target" +msgstr "" + +#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 +msgid "The exit code was {}" +msgstr "" + +#: src/modules/dracut/main.py:27 +msgid "Creating initramfs with dracut." +msgstr "" + +#: src/modules/dracut/main.py:49 +msgid "Failed to run dracut on the target" +msgstr "" + +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "" + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "" + +#: src/modules/fstab/main.py:29 +msgid "Writing fstab." +msgstr "" + +#: src/modules/dummypython/main.py:35 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93 +#: src/modules/dummypython/main.py:94 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "" + +#: src/modules/networkcfg/main.py:28 +msgid "Saving network configuration." +msgstr "" diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po index 67c0163cb6..bd8cd6074c 100644 --- a/lang/python/zh_CN/LC_MESSAGES/python.po +++ b/lang/python/zh_CN/LC_MESSAGES/python.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 玉堂白鹤 , 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n" @@ -33,22 +33,22 @@ msgstr "配置 GRUB." msgid "Mounting partitions." msgstr "挂载分区。" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "配置错误" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "没有分配分区给 
{!s}
。" @@ -215,7 +215,7 @@ msgstr "配置 mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr " 未设置 
{!s}
要使用的根挂载点。" @@ -297,7 +297,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "移除%(num)d软件包。" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "安装启动加载器。" diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po index 6c497b8bc6..e59cb57003 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: 2020-12-07 17:09+0100\n" +"POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 黃柏諺 , 2020\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n" @@ -30,22 +30,22 @@ msgstr "設定 GRUB。" msgid "Mounting partitions." msgstr "正在掛載分割區。" -#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 +#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "設定錯誤" -#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:362 +#: src/modules/fstab/main.py:374 msgid "No partitions are defined for 
{!s}
to use." msgstr "沒有分割區被定義為 
{!s}
以供使用。" @@ -212,7 +212,7 @@ msgstr "正在設定 mkinitcpio。" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "沒有給定的根掛載點 
{!s}
以供使用。" @@ -294,7 +294,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "正在移除 %(num)d 軟體包。" -#: src/modules/bootloader/main.py:42 +#: src/modules/bootloader/main.py:43 msgid "Install bootloader." msgstr "安裝開機載入程式。" From cc310a04b8f22bcb03c285f481581f4acdcb8c97 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 16:32:02 +0100 Subject: [PATCH 248/318] [users] Fix schema to match actual field names --- src/modules/users/users.schema.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/users/users.schema.yaml b/src/modules/users/users.schema.yaml index 5870a7e0ab..b96b2abd81 100644 --- a/src/modules/users/users.schema.yaml +++ b/src/modules/users/users.schema.yaml @@ -46,14 +46,14 @@ properties: # Presets # # TODO: lift up somewhere, since this will return in many modules; - # the type for each field (fullname, loginname) is a + # the type for each field (fullName, loginName) is a # preset-description (value, editable). presets: type: object additionalProperties: false properties: - fullname: { type: object } - loginname: { type: object } + fullName: { type: object } + loginName: { type: object } required: - defaultGroups From f62bb70b28e061522b0d869825003c9ae99730c4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 16:36:00 +0100 Subject: [PATCH 249/318] CI: add -m shortcut to test individual modules --- ci/configvalidator.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ci/configvalidator.py b/ci/configvalidator.py index cde3527f63..efd488fbf7 100644 --- a/ci/configvalidator.py +++ b/ci/configvalidator.py @@ -13,6 +13,7 @@ Usage: configvalidator.py ... + configvalidator.py -m configvalidator.py -x Exits with value 0 on success, otherwise: @@ -22,6 +23,8 @@ 4 if files have invalid syntax 5 if files fail to validate Use -x as only command-line argument to check the imports only. + +Use -m as shorthand for standard paths in src/modules// """ # The schemata originally lived outside the Calamares repository, @@ -65,8 +68,13 @@ print(usage) exit(ERR_USAGE) -schema_file_name = sys.argv[1] -config_file_names = sys.argv[2:] +if len(sys.argv) == 3 and sys.argv[1] == "-m": + module = sys.argv[2] + schema_file_name = f"src/modules/{module}/{module}.schema.yaml" + config_file_names = [ f"src/modules/{module}/{module}.conf" ] +else: + schema_file_name = sys.argv[1] + config_file_names = sys.argv[2:] if not exists(schema_file_name): print(usage) From 1998405dbbf9bf276bc208ddd15a0c05c17ea2bc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 21:35:56 +0100 Subject: [PATCH 250/318] [libcalamaresui] Fix up test for logfile - this test would fail if the logfile already exists for any reason (including "I just ran the test") - remove the file before expecting an empty logfile - improve messages; a missing logfile is not a "things cannot work" situation, it's a warning --- src/libcalamaresui/utils/Paste.cpp | 5 +++-- src/libcalamaresui/utils/TestPaste.cpp | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index ea20dc8b2b..2f0cfa1434 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -28,10 +28,11 @@ using namespace CalamaresUtils::Units; STATICTEST QByteArray logFileContents() { - QFile pasteSourceFile( Logger::logFile() ); + const QString name = Logger::logFile(); + QFile pasteSourceFile( name ); if ( !pasteSourceFile.open( QIODevice::ReadOnly | QIODevice::Text ) ) { - cError() << "Could not open log file"; + cWarning() << "Could not open log file" << name; return QByteArray(); } QFileInfo fi( pasteSourceFile ); diff --git a/src/libcalamaresui/utils/TestPaste.cpp b/src/libcalamaresui/utils/TestPaste.cpp index ff75be02d8..d21d6b81e5 100644 --- a/src/libcalamaresui/utils/TestPaste.cpp +++ b/src/libcalamaresui/utils/TestPaste.cpp @@ -35,15 +35,16 @@ private Q_SLOTS: void TestPaste::testGetLogFile() { + QFile::remove( Logger::logFile() ); // This test assumes nothing **else** has set up logging yet - QByteArray b = logFileContents(); - QVERIFY( b.isEmpty() ); + QByteArray contentsOfLogfileBefore = logFileContents(); + QVERIFY( contentsOfLogfileBefore.isEmpty() ); Logger::setupLogLevel( Logger::LOGDEBUG ); Logger::setupLogfile(); - b = logFileContents(); - QVERIFY( !b.isEmpty() ); + QByteArray contentsOfLogfileAfterSetup = logFileContents(); + QVERIFY( !contentsOfLogfileAfterSetup.isEmpty() ); } void From a5091c8c3b2ae15e255ff22acfa9d46ad4e37eec Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 21:49:15 +0100 Subject: [PATCH 251/318] Docs: massage the release-howto notes --- CHANGES | 3 +++ ci/RELEASE.md | 54 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/CHANGES b/CHANGES index 32f248d918..99a59ef19f 100644 --- a/CHANGES +++ b/CHANGES @@ -12,6 +12,7 @@ website will have to do for older versions. This release contains contributions from (alphabetically by first name): - Anke Boersma - Anubhav Choudhary + - Neal Gompa ## Core ## - Uploading your log files (in case of installation failure) has been @@ -23,6 +24,8 @@ This release contains contributions from (alphabetically by first name): ## Modules ## - A new QML-based *finishedq* module has been added. (Thanks Anke) + - The *packages* module no longer supports *urpmi*; no Calamares- + consumers with that package manager seem to exist. (Thanks Neal) - The *users* module now can set a fixed username and prevent editing. The *presets* configuration entry in `users.conf` can set a *loginName* and a *fullName* and (independently) enable or disable editing of diff --git a/ci/RELEASE.md b/ci/RELEASE.md index 3bb6b1b9ec..628f5c7731 100644 --- a/ci/RELEASE.md +++ b/ci/RELEASE.md @@ -11,8 +11,29 @@ > > Most things are automated through the release script [RELEASE.sh](RELEASE.sh) +## (0) During a release cycle + +* Fetch latest translations from Transifex. We only push / pull translations + from *calamares* branch, so longer-lived branches (e.g. 3.1.x) don't get + translation updates. This is to keep the translation workflow simple. + The script automatically commits changes to the translations. It's ok + to do this during a release cycle. Run `sh ci/txpull.sh` + to fetch translations and commit the changes in one go. +* Push the strings to Transifex. From a checkout, run `ci/txpush.sh` +* Update the list of enabled translation languages in `CMakeLists.txt`. + Check the [translation site][transifex] for the list of languages with + fairly complete translations, or use `ci/txstats.py --edit` for an automated + suggestion. If there are changes, commit them. + ## (1) Preparation +* Drop the RC variable to 0 in `CMakeLists.txt`, *CALAMARES_VERSION_RC*. +* Edit `CHANGES` and set the date of the release. +* Commit both. This is usually done with commit-message + *Changes: pre-release housekeeping*. + +## (2) Release Preparation + * Make sure all tests pass. ``` make @@ -22,27 +43,16 @@ an additional environment variable to be set for some tests, which will destroy an attached disk. This is not always desirable. There are some sample config-files that are empty and which fail the config-tests. -* Pull latest translations from Transifex. We only push / pull translations - from master, so longer-lived branches (e.g. 3.1.x) don't get translation - updates. This is to keep the translation workflow simple. The script - automatically commits changes to the translations. - ``` - sh ci/txpull.sh - ``` -* Update the list of enabled translation languages in `CMakeLists.txt`. - Check the [translation site][transifex] for the list of languages with - fairly complete translations, or use `ci/txstats.py` for an automated - suggestion. If there are changes, commit them. -* Push the changes. -* Check defaults in `settings.conf` and other configuration files. -* Drop the RC variable to 0 in `CMakeLists.txt`, *CALAMARES_VERSION_RC*. -* Edit `CHANGES` and set the date of the release. -* Commit both. This is usually done with commit-message - *Changes: pre-release housekeeping*. - - -## (2) Release Day - + Note that the release script (see below) also runs the tests and + will bail out if any fail. +* Make sure the translations are up-to-date. There is logic to check + for changes in translations: a movable tag *translations* indicates + when translations were last pushed, and the logic tries to enforce a + week of latency between push-translations and a release, to allow + translators to catch up. Run `ci/txcheck.sh` to confirm this. + Run `ci/txcheck.sh --cleanup` to tidy up afterwards, and possibly pass + `-T` to the release script to skip the translation-age check if you + feel it is warranted. * Run the helper script `ci/RELEASE.sh` or follow steps below. The script checks: - for uncommitted local changes, @@ -119,7 +129,7 @@ ssb rsa3072/0xCFDDC96F12B1915C the Calmares site or as part of a release announcement). - Send the updated key to keyservers with `gpg --send-keys ` - Optional: sanitize the keyring for use in development machines. - Export the current subkeys of the master key and keep **only** those + Export the current subkeys of the primary key and keep **only** those secret keys around. There is documentation [here](https://blog.tinned-software.net/create-gnupg-key-with-sub-keys-to-sign-encrypt-authenticate/) but be careful. From 413e1603685033ff4887f8378540b2ed54535f96 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 23:36:31 +0100 Subject: [PATCH 252/318] Changes: post-release housekeeping --- CHANGES | 12 ++++++++++++ CMakeLists.txt | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 99a59ef19f..6ed633a666 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,18 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. +# 3.2.39 (unreleased) # + +This release contains contributions from (alphabetically by first name): + - No external contributors yet + +## Core ## + - No core changes yet + +## Modules ## + - No module changes yet + + # 3.2.38 (2021-03-14) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index c46be69c86..e7377c2654 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,11 +41,11 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.38 + VERSION 3.2.39 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development ### OPTIONS # From e9908c84c232299b676d33636abbe1f3c4bfd382 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 23:46:11 +0100 Subject: [PATCH 253/318] Changes: document mount/fstab changes --- CHANGES | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 6ed633a666..046136a66a 100644 --- a/CHANGES +++ b/CHANGES @@ -10,13 +10,17 @@ website will have to do for older versions. # 3.2.39 (unreleased) # This release contains contributions from (alphabetically by first name): - - No external contributors yet + - Matti Hyttinen ## Core ## - No core changes yet ## Modules ## - - No module changes yet + - The *mount* module has gained a configurable setup for btrfs volumes. + If your distro has a default-to-btrfs setup, it can skip the hard- + coded setup (which Calamares has had for a long time with @home + and similar) and introduce a custom btrfs configuration through the + `mount.conf` file. # 3.2.38 (2021-03-14) # From 287047fe1ab46cd61ab00302e312e4629ca306cf Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 23:52:12 +0100 Subject: [PATCH 254/318] [users] Tidy up job creation -- leave it to Config --- src/modules/users/UsersViewStep.cpp | 5 ++--- src/modules/users/UsersViewStep.h | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/modules/users/UsersViewStep.cpp b/src/modules/users/UsersViewStep.cpp index df823df067..6836734594 100644 --- a/src/modules/users/UsersViewStep.cpp +++ b/src/modules/users/UsersViewStep.cpp @@ -88,10 +88,10 @@ UsersViewStep::isAtEnd() const } -QList< Calamares::job_ptr > +Calamares::JobList UsersViewStep::jobs() const { - return m_jobs; + return m_config->createJobs(); } @@ -108,7 +108,6 @@ UsersViewStep::onActivate() void UsersViewStep::onLeave() { - m_jobs = m_config->createJobs(); m_config->finalizeGlobalStorage(); } diff --git a/src/modules/users/UsersViewStep.h b/src/modules/users/UsersViewStep.h index abafc1b235..8d5abe48ff 100644 --- a/src/modules/users/UsersViewStep.h +++ b/src/modules/users/UsersViewStep.h @@ -39,7 +39,7 @@ class PLUGINDLLEXPORT UsersViewStep : public Calamares::ViewStep bool isAtBeginning() const override; bool isAtEnd() const override; - QList< Calamares::job_ptr > jobs() const override; + Calamares::JobList jobs() const override; void onActivate() override; void onLeave() override; @@ -48,8 +48,6 @@ class PLUGINDLLEXPORT UsersViewStep : public Calamares::ViewStep private: UsersPage* m_widget; - Calamares::JobList m_jobs; - Config* m_config; }; From 4ffa79d4cff4f0a6e65fbb53b110b0d3ac007b0a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 00:21:26 +0100 Subject: [PATCH 255/318] [users] In code, consistently [aA]utoLogin as name There was a mix of autologin and autoLogin, leading to confusion in the code. QML is sensitive to this, so go to one consistent name. (Although the names of the settings in the `.conf` file are different again) --- src/modules/users/Config.cpp | 22 +++++++++++----------- src/modules/users/Config.h | 16 ++++++++-------- src/modules/users/MiscJobs.cpp | 6 +++--- src/modules/users/Tests.cpp | 8 ++++---- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp index 7aa1cb65cc..be87ad93bc 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp @@ -59,11 +59,11 @@ updateGSAutoLogin( bool doAutoLogin, const QString& login ) if ( doAutoLogin && !login.isEmpty() ) { - gs->insert( "autologinUser", login ); + gs->insert( "autoLoginUser", login ); } else { - gs->remove( "autologinUser" ); + gs->remove( "autoLoginUser" ); } if ( login.isEmpty() ) @@ -142,13 +142,13 @@ insertInGlobalStorage( const QString& key, const QString& group ) } void -Config::setAutologinGroup( const QString& group ) +Config::setAutoLoginGroup( const QString& group ) { - if ( group != m_autologinGroup ) + if ( group != m_autoLoginGroup ) { - m_autologinGroup = group; - insertInGlobalStorage( QStringLiteral( "autologinGroup" ), group ); - emit autologinGroupChanged( group ); + m_autoLoginGroup = group; + insertInGlobalStorage( QStringLiteral( "autoLoginGroup" ), group ); + emit autoLoginGroupChanged( group ); } } @@ -162,9 +162,9 @@ Config::groupsForThisUser() const { l << g.name(); } - if ( doAutoLogin() && !autologinGroup().isEmpty() ) + if ( doAutoLogin() && !autoLoginGroup().isEmpty() ) { - l << autologinGroup(); + l << autoLoginGroup(); } return l; @@ -814,13 +814,13 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) // Now it might be explicitly set to empty, which is ok setUserShell( shell ); - setAutologinGroup( CalamaresUtils::getString( configurationMap, "autologinGroup" ) ); + setAutoLoginGroup( CalamaresUtils::getString( configurationMap, "autoLoginGroup" ) ); setSudoersGroup( CalamaresUtils::getString( configurationMap, "sudoersGroup" ) ); m_hostNameActions = getHostNameActions( configurationMap ); setConfigurationDefaultGroups( configurationMap, m_defaultGroups ); - m_doAutoLogin = CalamaresUtils::getBool( configurationMap, "doAutologin", false ); + m_doAutoLogin = CalamaresUtils::getBool( configurationMap, "doAutoLogin", false ); m_writeRootPassword = CalamaresUtils::getBool( configurationMap, "setRootPassword", true ); Calamares::JobQueue::instance()->globalStorage()->insert( "setRootPassword", m_writeRootPassword ); diff --git a/src/modules/users/Config.h b/src/modules/users/Config.h index 28f0c73d73..d9fce4f601 100644 --- a/src/modules/users/Config.h +++ b/src/modules/users/Config.h @@ -92,7 +92,7 @@ class PLUGINDLLEXPORT Config : public Calamares::ModuleSystem::Config Q_PROPERTY( QString userShell READ userShell WRITE setUserShell NOTIFY userShellChanged ) - Q_PROPERTY( QString autologinGroup READ autologinGroup WRITE setAutologinGroup NOTIFY autologinGroupChanged ) + Q_PROPERTY( QString autoLoginGroup READ autoLoginGroup WRITE setAutoLoginGroup NOTIFY autoLoginGroupChanged ) Q_PROPERTY( QString sudoersGroup READ sudoersGroup WRITE setSudoersGroup NOTIFY sudoersGroupChanged ) Q_PROPERTY( bool doAutoLogin READ doAutoLogin WRITE setAutoLogin NOTIFY autoLoginChanged ) @@ -185,7 +185,7 @@ class PLUGINDLLEXPORT Config : public Calamares::ModuleSystem::Config QString userShell() const { return m_userShell; } /// The group of which auto-login users must be a member - QString autologinGroup() const { return m_autologinGroup; } + QString autoLoginGroup() const { return m_autoLoginGroup; } /// The group of which users who can "sudo" must be a member QString sudoersGroup() const { return m_sudoersGroup; } @@ -217,7 +217,7 @@ class PLUGINDLLEXPORT Config : public Calamares::ModuleSystem::Config const QList< GroupDescription >& defaultGroups() const { return m_defaultGroups; } /** @brief the names of all the groups for the current user * - * Takes into account defaultGroups and autologin behavior. + * Takes into account defaultGroups and autoLogin behavior. */ QStringList groupsForThisUser() const; @@ -253,8 +253,8 @@ public Q_SLOTS: */ void setUserShell( const QString& path ); - /// Sets the autologin group; empty is ignored - void setAutologinGroup( const QString& group ); + /// Sets the autoLogin group; empty is ignored + void setAutoLoginGroup( const QString& group ); /// Sets the sudoer group; empty is ignored void setSudoersGroup( const QString& group ); @@ -266,7 +266,7 @@ public Q_SLOTS: /// Sets the host name (flags it as "custom") void setHostName( const QString& host ); - /// Sets the autologin flag + /// Sets the autoLogin flag void setAutoLogin( bool b ); /// Set to true to use the user password, unchanged, for root too @@ -281,7 +281,7 @@ public Q_SLOTS: signals: void userShellChanged( const QString& ); - void autologinGroupChanged( const QString& ); + void autoLoginGroupChanged( const QString& ); void sudoersGroupChanged( const QString& ); void fullNameChanged( const QString& ); void loginNameChanged( const QString& ); @@ -305,7 +305,7 @@ public Q_SLOTS: QList< GroupDescription > m_defaultGroups; QString m_userShell; - QString m_autologinGroup; + QString m_autoLoginGroup; QString m_sudoersGroup; QString m_fullName; QString m_loginName; diff --git a/src/modules/users/MiscJobs.cpp b/src/modules/users/MiscJobs.cpp index c1c1d5d25b..34fb08863a 100644 --- a/src/modules/users/MiscJobs.cpp +++ b/src/modules/users/MiscJobs.cpp @@ -184,11 +184,11 @@ SetupGroupsJob::exec() tr( "These groups are missing in the target system: %1" ).arg( missingGroups.join( ',' ) ) ); } - if ( m_config->doAutoLogin() && !m_config->autologinGroup().isEmpty() ) + if ( m_config->doAutoLogin() && !m_config->autoLoginGroup().isEmpty() ) { - const QString autologinGroup = m_config->autologinGroup(); + const QString autoLoginGroup = m_config->autoLoginGroup(); (void)ensureGroupsExistInTarget( - QList< GroupDescription >() << GroupDescription( autologinGroup ), availableGroups, missingGroups ); + QList< GroupDescription >() << GroupDescription( autoLoginGroup ), availableGroups, missingGroups ); } return Calamares::JobResult::ok(); diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp index b687a64348..4106cd7855 100644 --- a/src/modules/users/Tests.cpp +++ b/src/modules/users/Tests.cpp @@ -83,13 +83,13 @@ UserTests::testGetSet() } { const QString al( "autolg" ); - QCOMPARE( c.autologinGroup(), QString() ); - c.setAutologinGroup( al ); - QCOMPARE( c.autologinGroup(), al ); + QCOMPARE( c.autoLoginGroup(), QString() ); + c.setAutoLoginGroup( al ); + QCOMPARE( c.autoLoginGroup(), al ); QVERIFY( !c.doAutoLogin() ); c.setAutoLogin( true ); QVERIFY( c.doAutoLogin() ); - QCOMPARE( c.autologinGroup(), al ); + QCOMPARE( c.autoLoginGroup(), al ); } { const QString su( "sudogrp" ); From e60f8bcd06d2e22420ee947680c121cf947b3d01 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 23:58:11 +0100 Subject: [PATCH 256/318] [usersq] Tidy job creation and unnecessary code --- src/modules/usersq/UsersQmlViewStep.cpp | 30 ++++--------------------- src/modules/usersq/UsersQmlViewStep.h | 16 ++++++------- 2 files changed, 11 insertions(+), 35 deletions(-) diff --git a/src/modules/usersq/UsersQmlViewStep.cpp b/src/modules/usersq/UsersQmlViewStep.cpp index b83c66f45d..cc35c0b0fd 100644 --- a/src/modules/usersq/UsersQmlViewStep.cpp +++ b/src/modules/usersq/UsersQmlViewStep.cpp @@ -12,16 +12,12 @@ #include "UsersQmlViewStep.h" -#include "SetHostNameJob.h" -#include "SetPasswordJob.h" - +#include "GlobalStorage.h" +#include "JobQueue.h" #include "utils/Logger.h" #include "utils/NamedEnum.h" #include "utils/Variant.h" -#include "GlobalStorage.h" -#include "JobQueue.h" - CALAMARES_PLUGIN_FACTORY_DEFINITION( UsersQmlViewStepFactory, registerPlugin< UsersQmlViewStep >(); ) UsersQmlViewStep::UsersQmlViewStep( QObject* parent ) @@ -43,59 +39,41 @@ bool UsersQmlViewStep::isNextEnabled() const { return m_config->isReady(); - //return true; } - bool UsersQmlViewStep::isBackEnabled() const { return true; } - bool UsersQmlViewStep::isAtBeginning() const { return true; } - bool UsersQmlViewStep::isAtEnd() const { return true; } - -QList< Calamares::job_ptr > +Calamares::JobList UsersQmlViewStep::jobs() const { - return m_jobs; + return m_config->createJobs(); } - -void -UsersQmlViewStep::onActivate() -{ - //m_config->onActivate(); - //QmlViewStep::onActivate(); -} - - void UsersQmlViewStep::onLeave() { - m_jobs = m_config->createJobs(); m_config->finalizeGlobalStorage(); } - void UsersQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { m_config->setConfigurationMap( configurationMap ); - Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last - setContextProperty( "Users", m_config ); } diff --git a/src/modules/usersq/UsersQmlViewStep.h b/src/modules/usersq/UsersQmlViewStep.h index 33a1f5754b..e98df9d032 100644 --- a/src/modules/usersq/UsersQmlViewStep.h +++ b/src/modules/usersq/UsersQmlViewStep.h @@ -12,14 +12,14 @@ #ifndef USERSQMLVIEWSTEP_H #define USERSQMLVIEWSTEP_H -#include - -#include -#include +// Config from users module +#include "Config.h" -#include +#include "DllMacro.h" +#include "utils/PluginFactory.h" +#include "viewpages/QmlViewStep.h" -#include "Config.h" +#include #include class PLUGINDLLEXPORT UsersQmlViewStep : public Calamares::QmlViewStep @@ -37,9 +37,8 @@ class PLUGINDLLEXPORT UsersQmlViewStep : public Calamares::QmlViewStep bool isAtBeginning() const override; bool isAtEnd() const override; - QList< Calamares::job_ptr > jobs() const override; + Calamares::JobList jobs() const override; - void onActivate() override; void onLeave() override; void setConfigurationMap( const QVariantMap& configurationMap ) override; @@ -48,7 +47,6 @@ class PLUGINDLLEXPORT UsersQmlViewStep : public Calamares::QmlViewStep private: Config* m_config; - Calamares::JobList m_jobs; }; CALAMARES_PLUGIN_FACTORY_DECLARATION( UsersQmlViewStepFactory ) From b96ad4b166b13801d09b0b2ab6b097f76b42dc4c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 00:04:39 +0100 Subject: [PATCH 257/318] [usersq] Hook up QML fields and the Config object For properties, we can bind directly to the Config properties for loginName, fullName, and also to checkbox-style (bool) properties and passwords. --- src/modules/usersq/usersq.qml | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml index 6f1aaa1372..004c8c4c05 100644 --- a/src/modules/usersq/usersq.qml +++ b/src/modules/usersq/usersq.qml @@ -56,10 +56,9 @@ Kirigami.ScrollablePage { id: _userNameField width: parent.width + text: config.fullName placeholderText: qsTr("Your Full Name") - onTextChanged: config.fullNameChanged(text) background: Rectangle { - color: "#FBFBFB" // Kirigami.Theme.backgroundColor radius: 2 opacity: 0.9 @@ -85,8 +84,7 @@ Kirigami.ScrollablePage { id: _userLoginField width: parent.width placeholderText: qsTr("Login Name") - //text: config.userName - onTextEdited: config.loginNameStatusChanged(text) + text: config.loginName background: Rectangle { @@ -167,7 +165,7 @@ Kirigami.ScrollablePage { echoMode: TextInput.Password passwordMaskDelay: 300 inputMethodHints: Qt.ImhNoAutoUppercase - onTextChanged: config.userPasswordStatusChanged(text, _verificationPasswordField.text) + text: config.userPassword background: Rectangle { @@ -186,7 +184,7 @@ Kirigami.ScrollablePage { echoMode: TextInput.Password passwordMaskDelay: 300 inputMethodHints: Qt.ImhNoAutoUppercase - onTextChanged: config.userPasswordSecondaryChanged(_passwordField.text, text) + text: config.userPasswordSecondary background: Rectangle { @@ -211,17 +209,13 @@ Kirigami.ScrollablePage { CheckBox { - visible: config.allowWeakPasswords - //visible: false + visible: config.permitWeakPasswords text: qsTr("Validate passwords quality") - checked: config.allowWeakPasswordsDefault - onToggled: config.allowWeakPasswordsDefault = !config.allowWeakPasswordsDefault + checked: config.requireStrongPasswords } Label { - - visible: config.allowWeakPasswords - //visible: false + visible: config.permitWeakPasswords width: parent.width text: qsTr("When this box is checked, password-strength checking is done and you will not be able to use a weak password.") font.weight: Font.Thin @@ -230,24 +224,18 @@ Kirigami.ScrollablePage { } CheckBox { - text: qsTr("Log in automatically without asking for the password") - checked: config.doAutologin - onToggled: config.doAutologin = !config.doAutologin + checked: config.doAutoLogin } CheckBox { - id: root - visible: config.doReusePassword + visible: config.writeRootPassword text: qsTr("Reuse user password as root password") checked: config.reuseUserPasswordForRoot - //checked: false - onToggled: config.reuseUserPasswordForRoot = !config.reuseUserPasswordForRoot } Label { - visible: root.checked width: parent.width text: qsTr("Use the same password for the administrator account.") @@ -280,7 +268,7 @@ Kirigami.ScrollablePage { echoMode: TextInput.Password passwordMaskDelay: 300 inputMethodHints: Qt.ImhNoAutoUppercase - onTextChanged: config.rootPasswordChanged(text, _verificationRootPasswordField.text) + text: config.rootPassword background: Rectangle { @@ -299,7 +287,7 @@ Kirigami.ScrollablePage { echoMode: TextInput.Password passwordMaskDelay: 300 inputMethodHints: Qt.ImhNoAutoUppercase - onTextChanged: config.rootPasswordSecondaryChanged(_rootPasswordField.text, text) + text: config.rootPasswordSecondary background: Rectangle { From b9ad701a5c1047d5c18c2a3f98a84c7d1865a765 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Mar 2021 15:56:22 +0100 Subject: [PATCH 258/318] [calamares] Change .desktop invocation FIXES #1653 --- calamares.desktop | 3 ++- calamares.desktop.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 calamares.desktop diff --git a/calamares.desktop b/calamares.desktop old mode 100644 new mode 100755 index 834c4a5182..cd8a353c9c --- a/calamares.desktop +++ b/calamares.desktop @@ -1,3 +1,4 @@ +#!/usr/bin/env xdg-open [Desktop Entry] Type=Application Version=1.0 @@ -5,7 +6,7 @@ Name=Install System GenericName=System Installer Keywords=calamares;system;installer; TryExec=calamares -Exec=pkexec /usr/bin/calamares +Exec=sh -c "pkexec calamares" Comment=Calamares — System Installer Icon=calamares Terminal=false diff --git a/calamares.desktop.in b/calamares.desktop.in index 9bfbf8fd9f..ed1d4def86 100644 --- a/calamares.desktop.in +++ b/calamares.desktop.in @@ -5,7 +5,7 @@ Name=Install System GenericName=System Installer Keywords=calamares;system;installer; TryExec=calamares -Exec=pkexec /usr/bin/calamares +Exec=sh -c "pkexec calamares" Comment=Calamares — System Installer Icon=calamares Terminal=false From 1c8a72dcac7266129c94615ec02795e59989775c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 10:28:57 +0100 Subject: [PATCH 259/318] Changes: pre-release housekeeping --- CHANGES | 11 +++++++++++ CMakeLists.txt | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 99a59ef19f..98300be647 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,17 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. +# 3.2.38.1 (2021-03-15) # + +This hotfix release is for this item in the release notes of 3.2.38: + - The .desktop file for Calamares now makes a longer trip, calling + `sh -c "pkexec calamares"`; distributions may still need to adjust. +The change had been lost while updating other files. It has been +restored in `calamares.desktop` and `calamares.desktop.in`. There is +no other difference in this release. (Reported by Erik) + + + # 3.2.38 (2021-03-14) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index c46be69c86..a98eec1e08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.38 + VERSION 3.2.38.1 LANGUAGES C CXX ) From f02cb1a8ea07063705e60c7bd826097324b446ec Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 15 Mar 2021 10:34:25 +0100 Subject: [PATCH 260/318] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_ko.ts | 44 +++++++++++++++++++++++------------------ lang/calamares_uk.ts | 44 +++++++++++++++++++++++------------------ lang/calamares_zh_TW.ts | 44 +++++++++++++++++++++++------------------ 3 files changed, 75 insertions(+), 57 deletions(-) diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts index 3ba7258914..812068eba5 100644 --- a/lang/calamares_ko.ts +++ b/lang/calamares_ko.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + 자동 마운트 설정 관리 @@ -316,7 +316,11 @@ %1 Link copied to clipboard - + 게시한 로그를 설치합니다. + +%1 + +링크가 클립보드에 복사되었습니다. @@ -852,12 +856,12 @@ The installer will quit and all changes will be lost. The setup of %1 did not complete successfully. - + %1 설정이 제대로 완료되지 않았습니다. The installation of %1 did not complete successfully. - + %1 설치가 제대로 완료되지 않았습니다. @@ -971,12 +975,12 @@ The installer will quit and all changes will be lost. Create new %1MiB partition on %3 (%2) with entries %4. - + %4 항목이 있는 %3(%2)에 새 %1MiB 파티션을 만듭니다. Create new %1MiB partition on %3 (%2). - + %3(%2)에 새 %1MiB 파티션을 만듭니다. @@ -986,12 +990,12 @@ The installer will quit and all changes will be lost. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + <em>%4</em> 항목이 있는 <strong>%3</strong>(%2)에 새 <strong>%1MiB</strong> 파티션을 만듭니다. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + <strong>%3</strong>(%2)에 새 <strong>%1MiB</strong> 파티션을 만듭니다. @@ -1339,7 +1343,7 @@ The installer will quit and all changes will be lost. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + <em>%3</em> 기능이 있는 <strong>새</strong> %2 시스템 파티션에 %1을(를) 설치합니다. @@ -1349,27 +1353,27 @@ 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>%1</strong> 및 기능 <em>%3</em>(으)로 <strong>새</strong> %2 파티션을 설정합니다. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + 마운트 지점 <strong>%1</strong>%3(으)로 <strong>새</strong> %2 파티션을 설정합니다. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + <em>%4</em> 기능이 있는 %3 시스템 파티션 <strong>%1</strong>에 %2을(를) 설치합니다. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + 마운트 지점 <strong>%2</strong> 및 기능 <em>%4</em>(으)로 %3 파티션 <strong>%1</strong>을(를) 설정합니다. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + 마운트 지점 <strong>%2</strong>%4으로 %3 파티션 <strong>%1</strong>을(를) 설정합니다. @@ -3950,29 +3954,31 @@ Output: Installation Completed - + 설치 완료 %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1이(가) 컴퓨터에 설치되었습니다.<br/> + 이제 새 시스템으로 다시 시작하거나 라이브 환경을 계속 사용할 수 있습니다. Close Installer - + 설치 관리자 닫기 Restart System - + 시스템 재시작 <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>설치의 전체 로그는 라이브 사용자의 홈 디렉토리에 installation.log로 제공됩니다.<br/> + 이 로그는 대상 시스템의 /var/log/installation.log에 복사됩니다.</p> diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts index 9748c6f25c..db4b54756f 100644 --- a/lang/calamares_uk.ts +++ b/lang/calamares_uk.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Керування параметрами автомонтування @@ -322,7 +322,11 @@ %1 Link copied to clipboard - + Журнал встановлення записано до + +%1 + +Посилання скопійовано до буфера обміну @@ -858,12 +862,12 @@ The installer will quit and all changes will be lost. The setup of %1 did not complete successfully. - + Налаштування %1 не завершено успішно. The installation of %1 did not complete successfully. - + Встановлення %1 не завершено успішно. @@ -977,12 +981,12 @@ The installer will quit and all changes will be lost. Create new %1MiB partition on %3 (%2) with entries %4. - + Створити розділ %1МіБ на %3 (%2) із записами %4. Create new %1MiB partition on %3 (%2). - + Створити розділ %1МіБ на %3 (%2). @@ -992,12 +996,12 @@ The installer will quit and all changes will be lost. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Створити розділ <strong>%1МіБ</strong> на <strong>%3</strong> (%2) із записами <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Створити розділ <strong>%1МіБ</strong> на <strong>%3</strong> (%2). @@ -1345,7 +1349,7 @@ The installer will quit and all changes will be lost. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Встановити %1 на <strong>новий</strong> системний розділ %2 із можливостями <em>%3</em> @@ -1355,27 +1359,27 @@ 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. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Встановити %2 на системний розділ %3 <strong>%1</strong> із можливостями <em>%4</em>. 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>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Налаштувати розділ %3 <strong>%1</strong> із точкою монтування <strong>%2</strong>%4. @@ -3983,29 +3987,31 @@ Output: Installation Completed - + Встановлення завершено %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + На ваш комп'ютер встановлено %1.<br/> + Тепер ви можете перезапустити вашу нову систему або продовжити користуватися середовищем портативної системи. Close Installer - + Закрити засіб встановлення Restart System - + Перезапустити систему <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Повний журнал встановлення записано до файла installation.log у домашньому каталозі користувача портативної системи.<br/> + Цей журнал скопійовано до /var/log/installation.log системи призначення.</p> diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts index 0c0883d180..9753874569 100644 --- a/lang/calamares_zh_TW.ts +++ b/lang/calamares_zh_TW.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + 管理自動掛載設定 @@ -316,7 +316,11 @@ %1 Link copied to clipboard - + 安裝紀錄檔已張貼到： + +%1 + +連結已複製到剪貼簿 @@ -852,12 +856,12 @@ The installer will quit and all changes will be lost. The setup of %1 did not complete successfully. - + %1 的設定並未成功完成。 The installation of %1 did not complete successfully. - + %1 的安裝並未成功完成。 @@ -971,12 +975,12 @@ The installer will quit and all changes will be lost. Create new %1MiB partition on %3 (%2) with entries %4. - + 在 %3 (%2) 上使用項目 %4 建立新的 %1MiB 分割區。 Create new %1MiB partition on %3 (%2). - + 在 %3 (%2) 上建立新的 %1MiB 分割區。 @@ -986,12 +990,12 @@ The installer will quit and all changes will be lost. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + 在 <strong>%3</strong> (%2) 上使用項目 <em>%4</em> 建立新的 <strong>%1MiB</strong> 分割區。 Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + 在 <strong>%3</strong> (%2) 上建立新的 <strong>%1MiB</strong> 分割區。 @@ -1339,7 +1343,7 @@ The installer will quit and all changes will be lost. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + 在有 <em>%3</em> 功能的<strong>新</strong> %2 系統分割區上安裝 %1 @@ -1349,27 +1353,27 @@ 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>%1</strong> 與 <em>%3</em> 的<strong>新</strong> %2 分割區。 Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + 設定有掛載點 <strong>%1</strong> %3 的<strong>新</strong> %2 分割區。 Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + 在有功能 <em>%4</em> 的 %3 系統分割區 <strong>%1</strong> 上安裝 %2。 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>。 Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + 為分割區 %3 <strong>%1</strong> 設定掛載點 <strong>%2</strong> %4。 @@ -3950,29 +3954,31 @@ Output: Installation Completed - + 安裝完成 %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 已安裝到您的電腦上。<br/> + 現在，您可以重新啟動到您的新系統，或繼續使用 Live 環境。 Close Installer - + 關閉安裝程式 Restart System - + 重新啟動系統 <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>完整安裝紀錄檔可在 Live 使用者的家目錄中以 installation.log 的名稱取得。<br/> + 此紀錄檔已複製到目標系統的 /var/log/installation.log。</p> From df67f2bb5969c72c11beb9190be180bcbcf929c6 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 15 Mar 2021 10:34:25 +0100 Subject: [PATCH 261/318] i18n: [desktop] Automatic merge of Transifex translations --- calamares.desktop | 1 - 1 file changed, 1 deletion(-) mode change 100755 => 100644 calamares.desktop diff --git a/calamares.desktop b/calamares.desktop old mode 100755 new mode 100644 index cd8a353c9c..1f25c1f109 --- a/calamares.desktop +++ b/calamares.desktop @@ -1,4 +1,3 @@ -#!/usr/bin/env xdg-open [Desktop Entry] Type=Application Version=1.0 From b17e01edff9acbfa77519e24302d127b2347d810 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 11:45:57 +0100 Subject: [PATCH 262/318] [usersq] Call setters to move values back from QML to the C++ side --- src/modules/usersq/usersq.qml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml index 004c8c4c05..eca114f257 100644 --- a/src/modules/usersq/usersq.qml +++ b/src/modules/usersq/usersq.qml @@ -56,8 +56,10 @@ Kirigami.ScrollablePage { id: _userNameField width: parent.width - text: config.fullName placeholderText: qsTr("Your Full Name") + text: config.fullName + onTextChanged: config.setFullName(text); + background: Rectangle { color: "#FBFBFB" // Kirigami.Theme.backgroundColor radius: 2 @@ -85,6 +87,7 @@ Kirigami.ScrollablePage { width: parent.width placeholderText: qsTr("Login Name") text: config.loginName + onTextChanged: config.setLoginName(text) background: Rectangle { @@ -122,7 +125,8 @@ Kirigami.ScrollablePage { width: parent.width placeholderText: qsTr("Computer Name") text: config.hostName - onTextEdited: config.hostNameStatusChanged(text) + onTextEdited: config.setHostName(text) + background: Rectangle { color: "#FBFBFB" // Kirigami.Theme.backgroundColor @@ -162,10 +166,12 @@ Kirigami.ScrollablePage { id: _passwordField width: parent.width / 2 - 10 placeholderText: qsTr("Password") + text: config.userPassword + onTextChanged: config.setUserPassword(text) + echoMode: TextInput.Password passwordMaskDelay: 300 inputMethodHints: Qt.ImhNoAutoUppercase - text: config.userPassword background: Rectangle { @@ -181,10 +187,12 @@ Kirigami.ScrollablePage { id: _verificationPasswordField width: parent.width / 2 - 10 placeholderText: qsTr("Repeat Password") + text: config.userPasswordSecondary + onTextChanged: config.setUserPasswordSecondary(text) + echoMode: TextInput.Password passwordMaskDelay: 300 inputMethodHints: Qt.ImhNoAutoUppercase - text: config.userPasswordSecondary background: Rectangle { From d2c0c8d638856dbf2a71d2e30e097a02825183f1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 11:53:14 +0100 Subject: [PATCH 263/318] [users] Grab hostname from config on creation --- src/modules/users/UsersPage.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp index be9e634982..0e86931c1c 100644 --- a/src/modules/users/UsersPage.cpp +++ b/src/modules/users/UsersPage.cpp @@ -105,6 +105,7 @@ UsersPage::UsersPage( Config* config, QWidget* parent ) connect( ui->textBoxFullName, &QLineEdit::textEdited, config, &Config::setFullName ); connect( config, &Config::fullNameChanged, this, &UsersPage::onFullNameTextEdited ); + ui->textBoxHostName->setText( config->hostName() ); connect( ui->textBoxHostName, &QLineEdit::textEdited, config, &Config::setHostName ); connect( config, &Config::hostNameChanged, ui->textBoxHostName, &QLineEdit::setText ); connect( config, &Config::hostNameStatusChanged, this, &UsersPage::reportHostNameStatus ); @@ -144,9 +145,12 @@ UsersPage::UsersPage( Config* config, QWidget* parent ) onReuseUserPasswordChanged( m_config->reuseUserPasswordForRoot() ); onFullNameTextEdited( m_config->fullName() ); reportLoginNameStatus( m_config->loginNameStatus() ); + reportHostNameStatus( m_config->hostNameStatus() ); ui->textBoxLoginName->setEnabled( m_config->isEditable( "loginName" ) ); ui->textBoxFullName->setEnabled( m_config->isEditable( "fullName" ) ); + + retranslate(); } UsersPage::~UsersPage() From 202fe46182b458aa85a9756ed2dc044b792a53e3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 12:02:45 +0100 Subject: [PATCH 264/318] Changes: describe other fixes as well --- CHANGES | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 98300be647..de8d180c3c 100644 --- a/CHANGES +++ b/CHANGES @@ -12,10 +12,11 @@ website will have to do for older versions. This hotfix release is for this item in the release notes of 3.2.38: - The .desktop file for Calamares now makes a longer trip, calling `sh -c "pkexec calamares"`; distributions may still need to adjust. -The change had been lost while updating other files. It has been -restored in `calamares.desktop` and `calamares.desktop.in`. There is -no other difference in this release. (Reported by Erik) - +The change had been lost while updating other files. It has been restored +in `calamares.desktop` and `calamares.desktop.in`. (Reported by Erik) +Other minor changes and fixes: + - presets in the *users* module show the hostname, too, + - translations update for Korean, Ukranian and Chinese (zh_TW). # 3.2.38 (2021-03-14) # From 8348bd2bb7303d113d0442c79e1e26b7604c2085 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 12:36:54 +0100 Subject: [PATCH 265/318] [usersq] Call setters for checkboxes --- src/modules/usersq/usersq.qml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml index eca114f257..c94e563000 100644 --- a/src/modules/usersq/usersq.qml +++ b/src/modules/usersq/usersq.qml @@ -125,7 +125,7 @@ Kirigami.ScrollablePage { width: parent.width placeholderText: qsTr("Computer Name") text: config.hostName - onTextEdited: config.setHostName(text) + onTextChanged: config.setHostName(text) background: Rectangle { @@ -220,6 +220,7 @@ Kirigami.ScrollablePage { visible: config.permitWeakPasswords text: qsTr("Validate passwords quality") checked: config.requireStrongPasswords + onCheckedChanged: config.setRequireStrongPasswords(checked) } Label { @@ -234,6 +235,7 @@ Kirigami.ScrollablePage { CheckBox { text: qsTr("Log in automatically without asking for the password") checked: config.doAutoLogin + onCheckedChanged: config.setAutoLogin(checked) } CheckBox { @@ -241,6 +243,7 @@ Kirigami.ScrollablePage { visible: config.writeRootPassword text: qsTr("Reuse user password as root password") checked: config.reuseUserPasswordForRoot + onCheckedChanged: config.setReuseUserPasswordForRoot(checked) } Label { @@ -273,10 +276,12 @@ Kirigami.ScrollablePage { id: _rootPasswordField width: parent.width / 2 -10 placeholderText: qsTr("Root Password") + text: config.rootPassword + onTextChanged: config.setRootPassword(text) + echoMode: TextInput.Password passwordMaskDelay: 300 inputMethodHints: Qt.ImhNoAutoUppercase - text: config.rootPassword background: Rectangle { @@ -292,10 +297,12 @@ Kirigami.ScrollablePage { id: _verificationRootPasswordField width: parent.width / 2 -10 placeholderText: qsTr("Repeat Root Password") + text: config.rootPasswordSecondary + onTextChanged: config.setRootPasswordSecondary(text) + echoMode: TextInput.Password passwordMaskDelay: 300 inputMethodHints: Qt.ImhNoAutoUppercase - text: config.rootPasswordSecondary background: Rectangle { From 416c2c9689348cb05487c64f6aea86dc19bcdfa2 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 12:51:42 +0100 Subject: [PATCH 266/318] [usersq] Reflect editable in the QML - if presets prevent a field from being editable, don't allow the user to edit the field - while here, mention the changes in usersq --- CHANGES | 2 ++ src/modules/usersq/usersq.qml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index 0504cbb3e1..7f4f18ab73 100644 --- a/CHANGES +++ b/CHANGES @@ -21,6 +21,8 @@ This release contains contributions from (alphabetically by first name): coded setup (which Calamares has had for a long time with @home and similar) and introduce a custom btrfs configuration through the `mount.conf` file. + - The *usersq* module now connects to the internal configuration + object and may be usable for regular installations. # 3.2.38.1 (2021-03-15) # diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml index c94e563000..0886bba1ba 100644 --- a/src/modules/usersq/usersq.qml +++ b/src/modules/usersq/usersq.qml @@ -56,6 +56,7 @@ Kirigami.ScrollablePage { id: _userNameField width: parent.width + enabled: config.isEditable("fullName") placeholderText: qsTr("Your Full Name") text: config.fullName onTextChanged: config.setFullName(text); @@ -85,6 +86,7 @@ Kirigami.ScrollablePage { id: _userLoginField width: parent.width + enabled: config.isEditable("loginName") placeholderText: qsTr("Login Name") text: config.loginName onTextChanged: config.setLoginName(text) From f8afb15c4ceaef8745b573c4dbcd44ad1716a516 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 20:47:27 +0100 Subject: [PATCH 267/318] [libcalamaresui] Improve logging for QML modules - mention which instance produces warnings - tag additional debugging from the same method with Logger::SubEntry --- src/libcalamaresui/viewpages/QmlViewStep.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libcalamaresui/viewpages/QmlViewStep.cpp b/src/libcalamaresui/viewpages/QmlViewStep.cpp index 17a1ea79c9..b0392e4041 100644 --- a/src/libcalamaresui/viewpages/QmlViewStep.cpp +++ b/src/libcalamaresui/viewpages/QmlViewStep.cpp @@ -168,7 +168,7 @@ QmlViewStep::loadComplete() } if ( m_qmlComponent->isReady() && !m_qmlObject ) { - cDebug() << "QML component complete" << m_qmlFileName; + cDebug() << Logger::SubEntry << "QML component complete" << m_qmlFileName << "creating object"; // Don't do this again disconnect( m_qmlComponent, &QQmlComponent::statusChanged, this, &QmlViewStep::loadComplete ); @@ -196,7 +196,7 @@ QmlViewStep::showQml() { if ( !m_qmlWidget || !m_qmlObject ) { - cDebug() << "showQml() called but no QML object"; + cWarning() << "showQml() called but no QML object"; return; } if ( m_spinner ) @@ -208,7 +208,7 @@ QmlViewStep::showQml() } else { - cDebug() << "showQml() called twice"; + cWarning() << "showQml() called twice"; } if ( ViewManager::instance()->currentStep() == this ) @@ -228,7 +228,7 @@ QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) = CalamaresUtils::qmlSearchNames().find( CalamaresUtils::getString( configurationMap, "qmlSearch" ), ok ); if ( !ok ) { - cDebug() << "Bad QML search mode."; + cWarning() << "Bad QML search mode set for" << moduleInstanceKey(); } QString qmlFile = CalamaresUtils::getString( configurationMap, "qmlFilename" ); @@ -253,7 +253,7 @@ QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) } else { - cWarning() << "QML configuration set after component has loaded."; + cWarning() << "QML configuration set after component" << moduleInstanceKey() << "has loaded."; } } From 33fec86ef6bc25f2957a62f80a4b1fb5cf1df2cc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 20:53:59 +0100 Subject: [PATCH 268/318] [welcome] Improve logging of requirements-checking - less chatty when 0-results come in - compress the welcome debug to one output chunk --- .../modulesystem/RequirementsChecker.cpp | 2 +- .../welcome/checker/GeneralRequirements.cpp | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/libcalamares/modulesystem/RequirementsChecker.cpp b/src/libcalamares/modulesystem/RequirementsChecker.cpp index a12a4f681b..32c7254dee 100644 --- a/src/libcalamares/modulesystem/RequirementsChecker.cpp +++ b/src/libcalamares/modulesystem/RequirementsChecker.cpp @@ -85,9 +85,9 @@ void RequirementsChecker::addCheckedRequirements( Module* m ) { RequirementsList l = m->checkRequirements(); - cDebug() << "Got" << l.count() << "requirement results from" << m->name(); if ( l.count() > 0 ) { + cDebug() << "Got" << l.count() << "requirement results from" << m->name(); m_model->addRequirementsList( l ); } diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp index a10585af93..07c3529465 100644 --- a/src/modules/welcome/checker/GeneralRequirements.cpp +++ b/src/modules/welcome/checker/GeneralRequirements.cpp @@ -107,14 +107,12 @@ GeneralRequirements::checkRequirements() && ( availableSize.height() >= CalamaresUtils::windowMinimumHeight ); qint64 requiredStorageB = CalamaresUtils::GiBtoBytes( m_requiredStorageGiB ); - cDebug() << "Need at least storage bytes:" << requiredStorageB; if ( m_entriesToCheck.contains( "storage" ) ) { enoughStorage = checkEnoughStorage( requiredStorageB ); } qint64 requiredRamB = CalamaresUtils::GiBtoBytes( m_requiredRamGiB ); - cDebug() << "Need at least ram bytes:" << requiredRamB; if ( m_entriesToCheck.contains( "ram" ) ) { enoughRam = checkEnoughRam( requiredRamB ); @@ -135,10 +133,18 @@ GeneralRequirements::checkRequirements() isRoot = checkIsRoot(); } + using TNum = Logger::DebugRow< const char*, qint64 >; using TR = Logger::DebugRow< const char*, MaybeChecked >; - cDebug() << "GeneralRequirements output:" << TR( "enoughStorage", enoughStorage ) << TR( "enoughRam", enoughRam ) - << TR( "hasPower", hasPower ) << TR( "hasInternet", hasInternet ) << TR( "isRoot", isRoot ); - + // clang-format off + cDebug() << "GeneralRequirements output:" + << TNum( "storage", requiredStorageB ) + << TR( "enoughStorage", enoughStorage ) + << TNum( "RAM", requiredRamB ) + << TR( "enoughRam", enoughRam ) + << TR( "hasPower", hasPower ) + << TR( "hasInternet", hasInternet ) + << TR( "isRoot", isRoot ); + // clang-format on Calamares::RequirementsList checkEntries; foreach ( const QString& entry, m_entriesToCheck ) { From a4c1f07521b9bc3ad4cfa19ae901a3ba1f4b3a72 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 21:11:01 +0100 Subject: [PATCH 269/318] [libcalamares] Reduce indentation-depth in apply() through early-return --- src/libcalamares/modulesystem/Config.cpp | 40 ++++++++++++++---------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/src/libcalamares/modulesystem/Config.cpp b/src/libcalamares/modulesystem/Config.cpp index 71210a9cb0..eece2f185f 100644 --- a/src/libcalamares/modulesystem/Config.cpp +++ b/src/libcalamares/modulesystem/Config.cpp @@ -94,26 +94,34 @@ Config::ApplyPresets::apply( const char* fieldName ) if ( !prop.isValid() ) { cWarning() << "Applying invalid property" << fieldName; + return *this; } - else + + const QString key( fieldName ); + if ( key.isEmpty() ) { - const QString key( fieldName ); - if ( !key.isEmpty() && m_c.d->m_presets->find( key ).isValid() ) - { - cWarning() << "Applying duplicate property" << fieldName; - } - else if ( !key.isEmpty() && m_map.contains( key ) ) - { - QVariantMap m = CalamaresUtils::getSubMap( m_map, key, m_bogus ); - QVariant value = m[ "value" ]; - bool editable = CalamaresUtils::getBool( m, "editable", true ); + cWarning() << "Applying empty field"; + return *this; + } - if ( value.isValid() ) - { - m_c.setProperty( fieldName, value ); - } - m_c.d->m_presets->append( PresetField { key, value, editable } ); + if ( m_c.d->m_presets->find( key ).isValid() ) + { + cWarning() << "Applying duplicate property" << fieldName; + return *this; + } + + if ( m_map.contains( key ) ) + { + // Key has an explicit setting + QVariantMap m = CalamaresUtils::getSubMap( m_map, key, m_bogus ); + QVariant value = m[ "value" ]; + bool editable = CalamaresUtils::getBool( m, "editable", true ); + + if ( value.isValid() ) + { + m_c.setProperty( fieldName, value ); } + m_c.d->m_presets->append( PresetField { key, value, editable } ); } return *this; } From a3a1350dc78a6c87e05c967ca6a1c8107255d919 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 21:18:10 +0100 Subject: [PATCH 270/318] [libcalamares] Don't complain if there isn't a preset - If the module knows about a preset, then it should be registered even if there is not a value set for it specifically; this avoids complaints from isEditable() for fields that are known, but do not have a preset. (Reported by Anke) --- src/libcalamares/modulesystem/Config.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/libcalamares/modulesystem/Config.cpp b/src/libcalamares/modulesystem/Config.cpp index eece2f185f..68d7b6514c 100644 --- a/src/libcalamares/modulesystem/Config.cpp +++ b/src/libcalamares/modulesystem/Config.cpp @@ -123,6 +123,13 @@ Config::ApplyPresets::apply( const char* fieldName ) } m_c.d->m_presets->append( PresetField { key, value, editable } ); } + else + { + // There is no setting, but since we apply() this field, + // we do know about it; put in a preset so that looking + // it up won't complani. + m_c.d->m_presets->append( PresetField { key, QVariant(), true } ); + } return *this; } From 8fe2e1f68a59ceaf6e6740ba92a4ade4da12455f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 21:22:20 +0100 Subject: [PATCH 271/318] [finished] Make the debug-log less cryptic --- src/modules/finished/Config.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp index 5d824a8f39..d6d602db09 100644 --- a/src/modules/finished/Config.cpp +++ b/src/modules/finished/Config.cpp @@ -111,8 +111,8 @@ Config::onInstallationFailed( const QString& message, const QString& details ) void Config::doRestart( bool restartAnyway ) { - cDebug() << "mode=" << restartModes().find( restartNowMode() ) << " user?" << restartNowWanted() << "arg?" - << restartAnyway; + cDebug() << "mode=" << restartModes().find( restartNowMode() ) << " user wants restart?" << restartNowWanted() + << "force restart?" << restartAnyway; if ( restartNowMode() != RestartMode::Never && restartAnyway ) { cDebug() << Logger::SubEntry << "Running restart command" << m_restartNowCommand; @@ -124,9 +124,11 @@ Config::doRestart( bool restartAnyway ) void Config::doNotify( bool hasFailed, bool sendAnyway ) { + const char* const failName = hasFailed ? "failed" : "succeeded"; + if ( !sendAnyway ) { - cDebug() << "Notification failed?" << hasFailed << "not sent."; + cDebug() << "Notification not sent; completion:" << failName; return; } @@ -134,7 +136,7 @@ Config::doNotify( bool hasFailed, bool sendAnyway ) "org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications" ); if ( notify.isValid() ) { - cDebug() << "Sending notification of completion. Failed?" << hasFailed; + cDebug() << "Sending notification of completion:" << failName; QString title; QString message; From 72f67286a487f57932821424a93edcad6944bae0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 21:41:27 +0100 Subject: [PATCH 272/318] [libcalamares] Preserve type CDebug() if possible. --- src/libcalamares/utils/Logger.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h index f318c78a6a..79b2e8e386 100644 --- a/src/libcalamares/utils/Logger.h +++ b/src/libcalamares/utils/Logger.h @@ -57,7 +57,7 @@ class DLLEXPORT CDebug : public QDebug explicit CDebug( unsigned int debugLevel = LOGDEBUG, const char* func = nullptr ); virtual ~CDebug(); - friend QDebug& operator<<( CDebug&&, const FuncSuppressor& ); + friend CDebug& operator<<( CDebug&&, const FuncSuppressor& ); private: QString m_msg; @@ -65,11 +65,12 @@ class DLLEXPORT CDebug : public QDebug const char* m_funcinfo = nullptr; }; -inline QDebug& +inline CDebug& operator<<( CDebug&& s, const FuncSuppressor& f ) { s.m_funcinfo = nullptr; - return s << f.m_s; + s << f.m_s; + return s; } inline QDebug& From a90f510b85ef0493d473ba6a0ce256607f126a35 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Mar 2021 22:45:29 +0100 Subject: [PATCH 273/318] [libcalamares] Convenience for logging subentries For methods that log a bunch of things, and which want to consistently use SubEntry, but don't know when the **first** log entry is within the method, Logger::Once can be used to log one regular message (with function info) and the rest are subentries. --- src/libcalamares/utils/Logger.h | 30 +++++++++++++++++++ .../modulesystem/ModuleManager.cpp | 10 +++---- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h index 79b2e8e386..7b17754e8f 100644 --- a/src/libcalamares/utils/Logger.h +++ b/src/libcalamares/utils/Logger.h @@ -22,6 +22,8 @@ namespace Logger { +class Once; + struct FuncSuppressor { explicit constexpr FuncSuppressor( const char[] ); @@ -58,6 +60,7 @@ class DLLEXPORT CDebug : public QDebug virtual ~CDebug(); friend CDebug& operator<<( CDebug&&, const FuncSuppressor& ); + friend CDebug& operator<<( CDebug&&, Once& ); private: QString m_msg; @@ -286,6 +289,33 @@ operator<<( QDebug& s, const Pointer& p ) s << '@' << p.ptr << Quote; return s; } + +class Once +{ +public: + Once() + : m( true ) + { + } + friend CDebug& operator<<( CDebug&&, Once& ); + +private: + bool m = false; +}; + +inline CDebug& +operator<<( CDebug&& s, Once& o ) +{ + if ( o.m ) + { + o.m = false; + return s; + } + s.m_funcinfo = nullptr; + s << SubEntry; + return s; +} + } // namespace Logger #define cDebug() Logger::CDebug( Logger::LOGDEBUG, Q_FUNC_INFO ) diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp index 5a971d6618..054f4d5d5a 100644 --- a/src/libcalamaresui/modulesystem/ModuleManager.cpp +++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp @@ -61,7 +61,6 @@ ModuleManager::init() QTimer::singleShot( 0, this, &ModuleManager::doInit ); } - void ModuleManager::doInit() { @@ -72,6 +71,7 @@ ModuleManager::doInit() // the module name, and must contain a settings file named module.desc. // If at any time the module loading procedure finds something unexpected, it // silently skips to the next module or search path. --Teo 6/2014 + Logger::Once deb; for ( const QString& path : m_paths ) { QDir currentDir( path ); @@ -88,12 +88,12 @@ ModuleManager::doInit() QFileInfo descriptorFileInfo( currentDir.absoluteFilePath( QLatin1String( "module.desc" ) ) ); if ( !descriptorFileInfo.exists() ) { - cDebug() << bad_descriptor << descriptorFileInfo.absoluteFilePath() << "(missing)"; + cDebug() << deb << bad_descriptor << descriptorFileInfo.absoluteFilePath() << "(missing)"; continue; } if ( !descriptorFileInfo.isReadable() ) { - cDebug() << bad_descriptor << descriptorFileInfo.absoluteFilePath() << "(unreadable)"; + cDebug() << deb << bad_descriptor << descriptorFileInfo.absoluteFilePath() << "(unreadable)"; continue; } @@ -118,12 +118,12 @@ ModuleManager::doInit() } else { - cDebug() << "ModuleManager module search path does not exist:" << path; + cDebug() << deb << "ModuleManager module search path does not exist:" << path; } } // At this point m_availableDescriptorsByModuleName is filled with // the modules that were found in the search paths. - cDebug() << "Found" << m_availableDescriptorsByModuleName.count() << "modules"; + cDebug() << deb << "Found" << m_availableDescriptorsByModuleName.count() << "modules"; QTimer::singleShot( 10, this, &ModuleManager::initDone ); } From 8e8525a941ecf660f038c582138c0bdf509f35d0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 13:10:09 +0100 Subject: [PATCH 274/318] [netinstall] Simplify slots in the UI page --- src/modules/netinstall/NetInstallPage.cpp | 28 +++++------------------ src/modules/netinstall/NetInstallPage.h | 4 ---- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/src/modules/netinstall/NetInstallPage.cpp b/src/modules/netinstall/NetInstallPage.cpp index 0dfb810b5a..31c9d15ace 100644 --- a/src/modules/netinstall/NetInstallPage.cpp +++ b/src/modules/netinstall/NetInstallPage.cpp @@ -33,8 +33,12 @@ NetInstallPage::NetInstallPage( Config* c, QWidget* parent ) ui->setupUi( this ); ui->groupswidget->header()->setSectionResizeMode( QHeaderView::ResizeToContents ); ui->groupswidget->setModel( c->model() ); - connect( c, &Config::statusChanged, this, &NetInstallPage::setStatus ); - connect( c, &Config::titleLabelChanged, this, &NetInstallPage::setTitle ); + connect( c, &Config::statusChanged, ui->netinst_status, &QLabel::setText ); + connect( c, &Config::titleLabelChanged, [ui = this->ui]( const QString title ) { + ui->label->setVisible( !title.isEmpty() ); + ui->label->setText( title ); + } ); + connect( c, &Config::statusReady, this, &NetInstallPage::expandGroups ); } @@ -55,26 +59,6 @@ NetInstallPage::expandGroups() } } -void -NetInstallPage::setStatus( QString s ) -{ - ui->netinst_status->setText( s ); -} - -void -NetInstallPage::setTitle( QString title ) -{ - if ( title.isEmpty() ) - { - ui->label->hide(); - } - else - { - ui->label->setText( title ); // That's get() on the TranslatedString - ui->label->show(); - } -} - void NetInstallPage::onActivate() { diff --git a/src/modules/netinstall/NetInstallPage.h b/src/modules/netinstall/NetInstallPage.h index e58a7dd8c3..72375d0f0a 100644 --- a/src/modules/netinstall/NetInstallPage.h +++ b/src/modules/netinstall/NetInstallPage.h @@ -39,10 +39,6 @@ class NetInstallPage : public QWidget void onActivate(); -public slots: - void setStatus( QString s ); - void setTitle( QString title ); - /** @brief Expand entries that should be pre-expanded. * * Follows the *expanded* key / the startExpanded field in the From 79b4f918fcc67bc1f2d154ee290a4c8548c31ddd Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 13:10:35 +0100 Subject: [PATCH 275/318] [netinstall] Apply coding style --- src/modules/netinstall/Config.cpp | 7 ++++--- src/modules/netinstall/Config.h | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 6b1daaa074..233bc65dd2 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -170,15 +170,16 @@ Config::receivedGroupData() } } -Config::SourceItem Config::SourceItem::makeSourceItem(const QVariantMap& configurationMap, const QString& groupsUrl) +Config::SourceItem +Config::SourceItem::makeSourceItem( const QVariantMap& configurationMap, const QString& groupsUrl ) { if ( groupsUrl == QStringLiteral( "local" ) ) { - return SourceItem{ QUrl(), configurationMap.value( "groups" ).toList() }; + return SourceItem { QUrl(), configurationMap.value( "groups" ).toList() }; } else { - return SourceItem{ QUrl{ groupsUrl }, QVariantList() }; + return SourceItem { QUrl { groupsUrl }, QVariantList() }; } } diff --git a/src/modules/netinstall/Config.h b/src/modules/netinstall/Config.h index 554b4ce7dd..84ab027cd6 100644 --- a/src/modules/netinstall/Config.h +++ b/src/modules/netinstall/Config.h @@ -17,8 +17,8 @@ #include "locale/TranslatableConfiguration.h" #include -#include #include +#include #include class QNetworkReply; @@ -99,7 +99,7 @@ private slots: bool isUrl() const { return url.isValid(); } bool isLocal() const { return !data.isEmpty(); } bool isValid() const { return isUrl() || isLocal(); } - static SourceItem makeSourceItem( const QVariantMap& configurationMap, const QString& groupsUrl); + static SourceItem makeSourceItem( const QVariantMap& configurationMap, const QString& groupsUrl ); }; QQueue< SourceItem > m_urls; From 6662cb5f2d8b2d96b034f651972fc4aad1407836 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 13:17:33 +0100 Subject: [PATCH 276/318] [netinstall] Swap parameters to makeSourceItem and document it --- src/modules/netinstall/Config.cpp | 6 +++--- src/modules/netinstall/Config.h | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 233bc65dd2..017164c867 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -171,7 +171,7 @@ Config::receivedGroupData() } Config::SourceItem -Config::SourceItem::makeSourceItem( const QVariantMap& configurationMap, const QString& groupsUrl ) +Config::SourceItem::makeSourceItem( const QString& groupsUrl, const QVariantMap& configurationMap ) { if ( groupsUrl == QStringLiteral( "local" ) ) { @@ -211,13 +211,13 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) const auto& groupsUrlVariant = configurationMap.value( key ); if ( groupsUrlVariant.type() == QVariant::String ) { - m_urls.append( SourceItem::makeSourceItem( configurationMap, groupsUrlVariant.toString() ) ); + m_urls.append( SourceItem::makeSourceItem( groupsUrlVariant.toString(), configurationMap ) ); } else if ( groupsUrlVariant.type() == QVariant::StringList ) { for ( const auto& s : groupsUrlVariant.toStringList() ) { - m_urls.append( SourceItem::makeSourceItem( configurationMap, s ) ); + m_urls.append( SourceItem::makeSourceItem( s, configurationMap ) ); } } diff --git a/src/modules/netinstall/Config.h b/src/modules/netinstall/Config.h index 84ab027cd6..de96ccee42 100644 --- a/src/modules/netinstall/Config.h +++ b/src/modules/netinstall/Config.h @@ -99,7 +99,13 @@ private slots: bool isUrl() const { return url.isValid(); } bool isLocal() const { return !data.isEmpty(); } bool isValid() const { return isUrl() || isLocal(); } - static SourceItem makeSourceItem( const QVariantMap& configurationMap, const QString& groupsUrl ); + /** @brief Create a SourceItem + * + * If the @p groupsUrl is @c "local" then the *groups* key in + * the @p configurationMap is used as the source; otherwise the + * string is used as an actual URL. + */ + static SourceItem makeSourceItem( const QString& groupsUrl, const QVariantMap& configurationMap ); }; QQueue< SourceItem > m_urls; From b8688943714d1fcf583cade3557f4fa47e9d74db Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 13:50:15 +0100 Subject: [PATCH 277/318] [libcalamares] Start a packages service for netinstall and others --- src/libcalamares/CMakeLists.txt | 9 ++++ src/libcalamares/packages/Globals.cpp | 69 +++++++++++++++++++++++++++ src/libcalamares/packages/Globals.h | 32 +++++++++++++ src/libcalamares/packages/Tests.cpp | 44 +++++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 src/libcalamares/packages/Globals.cpp create mode 100644 src/libcalamares/packages/Globals.h create mode 100644 src/libcalamares/packages/Tests.cpp diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 826f0bc413..95dad05300 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -59,6 +59,9 @@ set( libSources # Network service network/Manager.cpp + # Packages service + packages/Globals.cpp + # Partition service partition/Mount.cpp partition/PartitionSize.cpp @@ -228,6 +231,12 @@ calamares_add_test( network/Tests.cpp ) +calamares_add_test( + libcalamarespackagestest + SOURCES + packages/Tests.cpp +) + calamares_add_test( libcalamarespartitiontest SOURCES diff --git a/src/libcalamares/packages/Globals.cpp b/src/libcalamares/packages/Globals.cpp new file mode 100644 index 0000000000..a488e704b1 --- /dev/null +++ b/src/libcalamares/packages/Globals.cpp @@ -0,0 +1,69 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "Globals.h" + +#include "GlobalStorage.h" +#include "JobQueue.h" +#include "utils/Logger.h" + +bool +CalamaresUtils::Packages::setGSPackageAdditions( const Calamares::ModuleSystem::InstanceKey& module, + const QVariantList& installPackages, + const QVariantList& tryInstallPackages ) +{ + static const char PACKAGEOP[] = "packageOperations"; + + // Check if there's already a PACAKGEOP entry in GS, and if so we'll + // extend that one (overwriting the value in GS at the end of this method) + Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); + QVariantList packageOperations = gs->contains( PACKAGEOP ) ? gs->value( PACKAGEOP ).toList() : QVariantList(); + cDebug() << "Existing package operations length" << packageOperations.length(); + + const QString key = module.toString() + QStringLiteral( ";add" ); + + // Clear out existing operations for this module, going backwards: + // Sometimes we remove an item, and we don't want the index to + // fall off the end of the list. + bool somethingRemoved = false; + for ( int index = packageOperations.length() - 1; 0 <= index; index-- ) + { + const QVariantMap op = packageOperations.at( index ).toMap(); + if ( op.contains( "source" ) && op.value( "source" ).toString() == key ) + { + cDebug() << Logger::SubEntry << "Removing existing operations for" << key; + packageOperations.removeAt( index ); + somethingRemoved = true; + } + } + + if ( !installPackages.empty() ) + { + QVariantMap op; + op.insert( "install", QVariant( installPackages ) ); + op.insert( "source", key ); + packageOperations.append( op ); + cDebug() << Logger::SubEntry << installPackages.length() << "critical packages."; + } + if ( !tryInstallPackages.empty() ) + { + QVariantMap op; + op.insert( "try_install", QVariant( tryInstallPackages ) ); + op.insert( "source", key ); + packageOperations.append( op ); + cDebug() << Logger::SubEntry << tryInstallPackages.length() << "non-critical packages."; + } + + if ( somethingRemoved || !packageOperations.isEmpty() ) + { + gs->insert( PACKAGEOP, packageOperations ); + return true; + } + return false; +} diff --git a/src/libcalamares/packages/Globals.h b/src/libcalamares/packages/Globals.h new file mode 100644 index 0000000000..ef9fa3801a --- /dev/null +++ b/src/libcalamares/packages/Globals.h @@ -0,0 +1,32 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef LIBCALAMARES_PACKAGES_GLOBALS_H +#define LIBCALAMARES_PACKAGES_GLOBALS_H + +#include "modulesystem/InstanceKey.h" + +namespace CalamaresUtils +{ +namespace Packages +{ +/** @brief Sets the install-packages GS keys for the given module + * + * This replaces previously-set install-packages lists for the + * given module by the two new lists. + */ +bool setGSPackageAdditions( const Calamares::ModuleSystem::InstanceKey& module, + const QVariantList& installPackages, + const QVariantList& tryInstallPackages ); +// void setGSPackageRemovals( const Calamares::ModuleSystem::InstanceKey& key, const QVariantList& removePackages ); +} // namespace Packages +} // namespace CalamaresUtils + + +#endif diff --git a/src/libcalamares/packages/Tests.cpp b/src/libcalamares/packages/Tests.cpp new file mode 100644 index 0000000000..307fb3c411 --- /dev/null +++ b/src/libcalamares/packages/Tests.cpp @@ -0,0 +1,44 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "utils/Logger.h" + +#include "GlobalStorage.h" + +#include + +class PackagesTests : public QObject +{ + Q_OBJECT +public: + PackagesTests() {} + ~PackagesTests() override {} +private Q_SLOTS: + void initTestCase(); + + void testEmpty(); +}; + +void +PackagesTests::initTestCase() +{ + Logger::setupLogLevel( Logger::LOGDEBUG ); +} + +void +PackagesTests::testEmpty() +{ +} + + +QTEST_GUILESS_MAIN( PackagesTests ) + +#include "utils/moc-warnings.h" + +#include "Tests.moc" From 5b609565e2d7b3adefeede2688f2e44cb8495d2d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 14:14:02 +0100 Subject: [PATCH 278/318] [libcalamares] Make Packages API more flexible - pass in the GS object; this makes mostly **testing** much easier --- src/libcalamares/packages/Globals.cpp | 5 ++--- src/libcalamares/packages/Globals.h | 6 +++++- src/libcalamares/packages/Tests.cpp | 13 ++++++++++++- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/libcalamares/packages/Globals.cpp b/src/libcalamares/packages/Globals.cpp index a488e704b1..6cd07bc4a3 100644 --- a/src/libcalamares/packages/Globals.cpp +++ b/src/libcalamares/packages/Globals.cpp @@ -10,11 +10,11 @@ #include "Globals.h" #include "GlobalStorage.h" -#include "JobQueue.h" #include "utils/Logger.h" bool -CalamaresUtils::Packages::setGSPackageAdditions( const Calamares::ModuleSystem::InstanceKey& module, +CalamaresUtils::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, + const Calamares::ModuleSystem::InstanceKey& module, const QVariantList& installPackages, const QVariantList& tryInstallPackages ) { @@ -22,7 +22,6 @@ CalamaresUtils::Packages::setGSPackageAdditions( const Calamares::ModuleSystem:: // Check if there's already a PACAKGEOP entry in GS, and if so we'll // extend that one (overwriting the value in GS at the end of this method) - Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); QVariantList packageOperations = gs->contains( PACKAGEOP ) ? gs->value( PACKAGEOP ).toList() : QVariantList(); cDebug() << "Existing package operations length" << packageOperations.length(); diff --git a/src/libcalamares/packages/Globals.h b/src/libcalamares/packages/Globals.h index ef9fa3801a..a47cf5ae17 100644 --- a/src/libcalamares/packages/Globals.h +++ b/src/libcalamares/packages/Globals.h @@ -10,6 +10,7 @@ #ifndef LIBCALAMARES_PACKAGES_GLOBALS_H #define LIBCALAMARES_PACKAGES_GLOBALS_H +#include "GlobalStorage.h" #include "modulesystem/InstanceKey.h" namespace CalamaresUtils @@ -20,8 +21,11 @@ namespace Packages * * This replaces previously-set install-packages lists for the * given module by the two new lists. + * + * Returns @c true if anything was changed, @c false otherwise. */ -bool setGSPackageAdditions( const Calamares::ModuleSystem::InstanceKey& module, +bool setGSPackageAdditions( Calamares::GlobalStorage* gs, + const Calamares::ModuleSystem::InstanceKey& module, const QVariantList& installPackages, const QVariantList& tryInstallPackages ); // void setGSPackageRemovals( const Calamares::ModuleSystem::InstanceKey& key, const QVariantList& removePackages ); diff --git a/src/libcalamares/packages/Tests.cpp b/src/libcalamares/packages/Tests.cpp index 307fb3c411..aaff227a95 100644 --- a/src/libcalamares/packages/Tests.cpp +++ b/src/libcalamares/packages/Tests.cpp @@ -7,9 +7,10 @@ * */ -#include "utils/Logger.h" +#include "Globals.h" #include "GlobalStorage.h" +#include "utils/Logger.h" #include @@ -34,6 +35,16 @@ PackagesTests::initTestCase() void PackagesTests::testEmpty() { + Calamares::GlobalStorage gs; + const QString topKey( "packageOperations" ); + Calamares::ModuleSystem::InstanceKey k( "this", "that" ); + + QVERIFY( !gs.contains( topKey ) ); + QCOMPARE( k.toString(), "this@that" ); + + // Adding nothing at all does nothing + QVERIFY( !CalamaresUtils::Packages::setGSPackageAdditions( &gs, k, QVariantList(), QVariantList() ) ); + QVERIFY( !gs.contains( topKey ) ); } From f1446736f817a482ff26562aa968cb370a1e85b9 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 14:37:13 +0100 Subject: [PATCH 279/318] [libcalamares] Expand tests a little - do some additions and check they work - drop the ";add" annotation on the source, this is not needed in the current situation with only adds available. --- src/libcalamares/packages/Globals.cpp | 2 +- src/libcalamares/packages/Tests.cpp | 33 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/libcalamares/packages/Globals.cpp b/src/libcalamares/packages/Globals.cpp index 6cd07bc4a3..c5e882436b 100644 --- a/src/libcalamares/packages/Globals.cpp +++ b/src/libcalamares/packages/Globals.cpp @@ -25,7 +25,7 @@ CalamaresUtils::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, QVariantList packageOperations = gs->contains( PACKAGEOP ) ? gs->value( PACKAGEOP ).toList() : QVariantList(); cDebug() << "Existing package operations length" << packageOperations.length(); - const QString key = module.toString() + QStringLiteral( ";add" ); + const QString key = module.toString(); // Clear out existing operations for this module, going backwards: // Sometimes we remove an item, and we don't want the index to diff --git a/src/libcalamares/packages/Tests.cpp b/src/libcalamares/packages/Tests.cpp index aaff227a95..0a9be3a205 100644 --- a/src/libcalamares/packages/Tests.cpp +++ b/src/libcalamares/packages/Tests.cpp @@ -24,6 +24,7 @@ private Q_SLOTS: void initTestCase(); void testEmpty(); + void testAdd(); }; void @@ -47,6 +48,38 @@ PackagesTests::testEmpty() QVERIFY( !gs.contains( topKey ) ); } +void +PackagesTests::testAdd() +{ + Calamares::GlobalStorage gs; + const QString topKey( "packageOperations" ); + Calamares::ModuleSystem::InstanceKey k( "this", "that" ); + + QVERIFY( !gs.contains( topKey ) ); + QVERIFY( + CalamaresUtils::Packages::setGSPackageAdditions( &gs, k, QVariantList { QString( "vim" ) }, QVariantList() ) ); + QVERIFY( gs.contains( topKey ) ); + auto actionList = gs.value( topKey ).toList(); + QCOMPARE( actionList.length(), 1 ); + auto action = actionList[ 0 ].toMap(); + QVERIFY( action.contains( "install" ) ); + auto op = action[ "install" ].toList(); + QCOMPARE( op.length(), 1 ); + cDebug() << op; + + QVERIFY( CalamaresUtils::Packages::setGSPackageAdditions( + &gs, k, QVariantList { QString( "vim" ), QString( "emacs" ) }, QVariantList() ) ); + QVERIFY( gs.contains( topKey ) ); + actionList = gs.value( topKey ).toList(); + QCOMPARE( actionList.length(), 1 ); + action = actionList[ 0 ].toMap(); + QVERIFY( action.contains( "install" ) ); + op = action[ "install" ].toList(); + QCOMPARE( op.length(), 2 ); + QCOMPARE( action[ "source" ].toString(), k.toString() ); + cDebug() << op; +} + QTEST_GUILESS_MAIN( PackagesTests ) From 9acd2fe458407f2259daa68ab64ac690cc78fcf5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 14:38:52 +0100 Subject: [PATCH 280/318] [netinstall] Use the packages service --- src/modules/netinstall/NetInstallViewStep.cpp | 50 ++----------------- 1 file changed, 3 insertions(+), 47 deletions(-) diff --git a/src/modules/netinstall/NetInstallViewStep.cpp b/src/modules/netinstall/NetInstallViewStep.cpp index a8ce1e3114..ae8d2f95f8 100644 --- a/src/modules/netinstall/NetInstallViewStep.cpp +++ b/src/modules/netinstall/NetInstallViewStep.cpp @@ -11,9 +11,8 @@ #include "NetInstallViewStep.h" -#include "GlobalStorage.h" #include "JobQueue.h" - +#include "packages/Globals.h" #include "utils/Logger.h" #include "utils/Variant.h" @@ -127,30 +126,6 @@ void NetInstallViewStep::onLeave() { auto packages = m_config.model()->getPackages(); - cDebug() << "Netinstall: Processing" << packages.length() << "packages."; - - static const char PACKAGEOP[] = "packageOperations"; - - // Check if there's already a PACAKGEOP entry in GS, and if so we'll - // extend that one (overwriting the value in GS at the end of this method) - Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); - QVariantList packageOperations = gs->contains( PACKAGEOP ) ? gs->value( PACKAGEOP ).toList() : QVariantList(); - cDebug() << Logger::SubEntry << "Existing package operations length" << packageOperations.length(); - - // Clear out existing operations for this module, going backwards: - // Sometimes we remove an item, and we don't want the index to - // fall off the end of the list. - bool somethingRemoved = false; - for ( int index = packageOperations.length() - 1; 0 <= index; index-- ) - { - const QVariantMap op = packageOperations.at( index ).toMap(); - if ( op.contains( "source" ) && op.value( "source" ).toString() == moduleInstanceKey().toString() ) - { - cDebug() << Logger::SubEntry << "Removing existing operations for" << moduleInstanceKey(); - packageOperations.removeAt( index ); - somethingRemoved = true; - } - } // This netinstall module may add two sub-steps to the packageOperations, // one for installing and one for try-installing. @@ -169,27 +144,8 @@ NetInstallViewStep::onLeave() } } - if ( !installPackages.empty() ) - { - QVariantMap op; - op.insert( "install", QVariant( installPackages ) ); - op.insert( "source", moduleInstanceKey().toString() ); - packageOperations.append( op ); - cDebug() << Logger::SubEntry << installPackages.length() << "critical packages."; - } - if ( !tryInstallPackages.empty() ) - { - QVariantMap op; - op.insert( "try_install", QVariant( tryInstallPackages ) ); - op.insert( "source", moduleInstanceKey().toString() ); - packageOperations.append( op ); - cDebug() << Logger::SubEntry << tryInstallPackages.length() << "non-critical packages."; - } - - if ( somethingRemoved || !packageOperations.isEmpty() ) - { - gs->insert( PACKAGEOP, packageOperations ); - } + CalamaresUtils::Packages::setGSPackageAdditions( + Calamares::JobQueue::instance()->globalStorage(), moduleInstanceKey(), installPackages, tryInstallPackages ); } void From 603a7106b3db9c78f7b0e7da79a606b4ecc4160b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 14:47:12 +0100 Subject: [PATCH 281/318] [netinstall] Move package-listing wrangling to the Config object Now all the business logic is in Config, the door is open to building a QML-ified netinstall module. I'm not sure that would be worth it: packagechooser offers more space for a nice UI and should be QML'ed first. --- src/modules/netinstall/Config.cpp | 34 +++++++++++++++++-- src/modules/netinstall/Config.h | 7 ++++ src/modules/netinstall/NetInstallViewStep.cpp | 27 +-------------- 3 files changed, 39 insertions(+), 29 deletions(-) diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 017164c867..927eb8330f 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -15,6 +15,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "network/Manager.h" +#include "packages/Globals.h" #include "utils/Logger.h" #include "utils/RAII.h" #include "utils/Retranslator.h" @@ -25,12 +26,13 @@ Config::Config( QObject* parent ) : QObject( parent ) - , m_model( new PackageModel( this ) ) { CALAMARES_RETRANSLATE_SLOT( &Config::retranslate ) } - - Config::~Config() + , m_model( new PackageModel( this ) ) { + CALAMARES_RETRANSLATE_SLOT( &Config::retranslate ); } +Config::~Config() {} + void Config::retranslate() { @@ -238,3 +240,29 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) } } } + +void +Config::finalizeGlobalStorage( const Calamares::ModuleSystem::InstanceKey& key ) +{ + auto packages = model()->getPackages(); + + // This netinstall module may add two sub-steps to the packageOperations, + // one for installing and one for try-installing. + QVariantList installPackages; + QVariantList tryInstallPackages; + + for ( const auto& package : packages ) + { + if ( package->isCritical() ) + { + installPackages.append( package->toOperation() ); + } + else + { + tryInstallPackages.append( package->toOperation() ); + } + } + + CalamaresUtils::Packages::setGSPackageAdditions( + Calamares::JobQueue::instance()->globalStorage(), key, installPackages, tryInstallPackages ); +} diff --git a/src/modules/netinstall/Config.h b/src/modules/netinstall/Config.h index de96ccee42..e748449a30 100644 --- a/src/modules/netinstall/Config.h +++ b/src/modules/netinstall/Config.h @@ -15,6 +15,7 @@ #include "PackageModel.h" #include "locale/TranslatableConfiguration.h" +#include "modulesystem/InstanceKey.h" #include #include @@ -74,6 +75,12 @@ class Config : public QObject */ void loadGroupList( const QVariantList& groupData ); + /** @brief Write the selected package lists to global storage + * + * Since the config doesn't know what module it is for, + * pass in an instance key. + */ + void finalizeGlobalStorage( const Calamares::ModuleSystem::InstanceKey& key ); signals: void statusChanged( QString status ); ///< Something changed diff --git a/src/modules/netinstall/NetInstallViewStep.cpp b/src/modules/netinstall/NetInstallViewStep.cpp index ae8d2f95f8..2ac0e73c95 100644 --- a/src/modules/netinstall/NetInstallViewStep.cpp +++ b/src/modules/netinstall/NetInstallViewStep.cpp @@ -11,11 +11,6 @@ #include "NetInstallViewStep.h" -#include "JobQueue.h" -#include "packages/Globals.h" -#include "utils/Logger.h" -#include "utils/Variant.h" - #include "NetInstallPage.h" CALAMARES_PLUGIN_FACTORY_DEFINITION( NetInstallViewStepFactory, registerPlugin< NetInstallViewStep >(); ) @@ -125,27 +120,7 @@ NetInstallViewStep::onActivate() void NetInstallViewStep::onLeave() { - auto packages = m_config.model()->getPackages(); - - // This netinstall module may add two sub-steps to the packageOperations, - // one for installing and one for try-installing. - QVariantList installPackages; - QVariantList tryInstallPackages; - - for ( const auto& package : packages ) - { - if ( package->isCritical() ) - { - installPackages.append( package->toOperation() ); - } - else - { - tryInstallPackages.append( package->toOperation() ); - } - } - - CalamaresUtils::Packages::setGSPackageAdditions( - Calamares::JobQueue::instance()->globalStorage(), moduleInstanceKey(), installPackages, tryInstallPackages ); + m_config.finalizeGlobalStorage( moduleInstanceKey() ); } void From 9341a848201dd11559bc126699ab292bff227acf Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 14:55:26 +0100 Subject: [PATCH 282/318] [libcalamares] Make the RETRANSLATE macros more statement-line Require a ; after RETRANSLATE macros. They are statement-like; this makes it easier for some of them to be recognized by clang-format and resolves some existing weird formatting. --- src/calamares/CalamaresWindow.cpp | 9 +++--- src/calamares/DebugWindow.cpp | 2 +- src/libcalamares/utils/Retranslator.h | 7 +++-- src/libcalamaresui/ViewManager.cpp | 2 +- src/libcalamaresui/viewpages/Slideshow.cpp | 6 ++-- .../InteractiveTerminalPage.cpp | 3 +- src/modules/keyboard/KeyboardPage.cpp | 28 +++++++++---------- src/modules/license/LicensePage.cpp | 2 +- src/modules/locale/LocalePage.cpp | 2 +- src/modules/netinstall/NetInstallPage.cpp | 2 +- src/modules/oemid/OEMViewStep.cpp | 2 +- .../packagechooser/PackageChooserPage.cpp | 2 +- src/modules/plasmalnf/PlasmaLnfPage.cpp | 2 +- src/modules/summary/SummaryPage.cpp | 2 +- src/modules/tracking/TrackingPage.cpp | 2 +- src/modules/users/UsersPage.cpp | 2 +- src/modules/welcome/Config.cpp | 2 +- src/modules/welcome/WelcomePage.cpp | 2 +- .../welcome/checker/CheckerContainer.cpp | 3 +- .../welcome/checker/ResultsListWidget.cpp | 4 +-- 20 files changed, 44 insertions(+), 42 deletions(-) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index c37ad97d72..d85d0de747 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -134,9 +134,10 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug, { QPushButton* debugWindowBtn = new QPushButton; debugWindowBtn->setObjectName( "debugButton" ); - CALAMARES_RETRANSLATE_WIDGET( debugWindowBtn, - debugWindowBtn->setText( QCoreApplication::translate( - CalamaresWindow::staticMetaObject.className(), "Show debug information" ) ); ) + CALAMARES_RETRANSLATE_WIDGET( + debugWindowBtn, + debugWindowBtn->setText( QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), + "Show debug information" ) ); ); sideLayout->addWidget( debugWindowBtn ); debugWindowBtn->setFlat( true ); debugWindowBtn->setCheckable( true ); @@ -365,7 +366,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) CALAMARES_RETRANSLATE( const auto* branding = Calamares::Branding::instance(); setWindowTitle( Calamares::Settings::instance()->isSetupMode() ? tr( "%1 Setup Program" ).arg( branding->productName() ) - : tr( "%1 Installer" ).arg( branding->productName() ) ); ) + : tr( "%1 Installer" ).arg( branding->productName() ) ); ); const Calamares::Branding* const branding = Calamares::Branding::instance(); using ImageEntry = Calamares::Branding::ImageEntry; diff --git a/src/calamares/DebugWindow.cpp b/src/calamares/DebugWindow.cpp index ba51714372..45e28878c0 100644 --- a/src/calamares/DebugWindow.cpp +++ b/src/calamares/DebugWindow.cpp @@ -213,7 +213,7 @@ DebugWindow::DebugWindow() } } ); - CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); setWindowTitle( tr( "Debug information" ) ); ) + CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); setWindowTitle( tr( "Debug information" ) ); ); } diff --git a/src/libcalamares/utils/Retranslator.h b/src/libcalamares/utils/Retranslator.h index df38fa4d87..f6169e9aa2 100644 --- a/src/libcalamares/utils/Retranslator.h +++ b/src/libcalamares/utils/Retranslator.h @@ -91,15 +91,16 @@ class Retranslator : public QObject } // namespace CalamaresUtils -#define CALAMARES_RETRANSLATE( body ) CalamaresUtils::Retranslator::attachRetranslator( this, [=] { body } ); +#define CALAMARES_RETRANSLATE( body ) CalamaresUtils::Retranslator::attachRetranslator( this, [=] { body } ) #define CALAMARES_RETRANSLATE_WIDGET( widget, body ) \ - CalamaresUtils::Retranslator::attachRetranslator( widget, [=] { body } ); + CalamaresUtils::Retranslator::attachRetranslator( widget, [=] { body } ) #define CALAMARES_RETRANSLATE_SLOT( slotfunc ) \ + do \ { \ this->connect( CalamaresUtils::Retranslator::retranslatorFor( this ), \ &CalamaresUtils::Retranslator::languageChange, \ this, \ slotfunc ); \ - } + } while ( 0 ) #endif diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index b22d34c88f..566a77f937 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -81,7 +81,7 @@ ViewManager::ViewManager( QObject* parent ) connect( JobQueue::instance(), &JobQueue::failed, this, &ViewManager::onInstallationFailed ); connect( JobQueue::instance(), &JobQueue::finished, this, &ViewManager::next ); - CALAMARES_RETRANSLATE_SLOT( &ViewManager::updateButtonLabels ) + CALAMARES_RETRANSLATE_SLOT( &ViewManager::updateButtonLabels ); } diff --git a/src/libcalamaresui/viewpages/Slideshow.cpp b/src/libcalamaresui/viewpages/Slideshow.cpp index f6df1cae42..6ae5618dbb 100644 --- a/src/libcalamaresui/viewpages/Slideshow.cpp +++ b/src/libcalamaresui/viewpages/Slideshow.cpp @@ -43,7 +43,7 @@ SlideshowQML::SlideshowQML( QWidget* parent ) , m_qmlComponent( nullptr ) , m_qmlObject( nullptr ) { - m_qmlShow->setObjectName("qml"); + m_qmlShow->setObjectName( "qml" ); CalamaresUtils::registerQmlModels(); @@ -53,7 +53,7 @@ SlideshowQML::SlideshowQML( QWidget* parent ) cDebug() << "QML import paths:" << Logger::DebugList( m_qmlShow->engine()->importPathList() ); #if QT_VERSION >= QT_VERSION_CHECK( 5, 10, 0 ) - CALAMARES_RETRANSLATE( if ( m_qmlShow ) { m_qmlShow->engine()->retranslate(); } ) + CALAMARES_RETRANSLATE( if ( m_qmlShow ) { m_qmlShow->engine()->retranslate(); } ); #endif if ( Branding::instance()->slideshowAPI() == 2 ) @@ -205,7 +205,7 @@ SlideshowPictures::SlideshowPictures( QWidget* parent ) , m_imageIndex( 0 ) , m_images( Branding::instance()->slideshowImages() ) { - m_label->setObjectName("image"); + m_label->setObjectName( "image" ); m_label->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); m_label->setAlignment( Qt::AlignCenter ); diff --git a/src/modules/interactiveterminal/InteractiveTerminalPage.cpp b/src/modules/interactiveterminal/InteractiveTerminalPage.cpp index ea4e3b42ef..65818aa030 100644 --- a/src/modules/interactiveterminal/InteractiveTerminalPage.cpp +++ b/src/modules/interactiveterminal/InteractiveTerminalPage.cpp @@ -99,5 +99,6 @@ void InteractiveTerminalPage::setCommand( const QString& command ) { m_command = command; - CALAMARES_RETRANSLATE( m_headerLabel->setText( tr( "Executing script:  %1" ).arg( m_command ) ); ) + CALAMARES_RETRANSLATE( + m_headerLabel->setText( tr( "Executing script:  %1" ).arg( m_command ) ); ); } diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp index 5044d9bb69..902f65f9ef 100644 --- a/src/modules/keyboard/KeyboardPage.cpp +++ b/src/modules/keyboard/KeyboardPage.cpp @@ -70,9 +70,8 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent ) cDebug() << "Variants now" << model->rowCount() << model->currentIndex(); } - connect( ui->buttonRestore, &QPushButton::clicked, [ config = config ] { - config->keyboardModels()->setCurrentIndex(); - } ); + connect( + ui->buttonRestore, &QPushButton::clicked, [config = config] { config->keyboardModels()->setCurrentIndex(); } ); connect( ui->physicalModelSelector, QOverload< int >::of( &QComboBox::currentIndexChanged ), @@ -83,25 +82,24 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent ) ui->physicalModelSelector, &QComboBox::setCurrentIndex ); - connect( - ui->layoutSelector->selectionModel(), - &QItemSelectionModel::currentChanged, - [ this ]( const QModelIndex& current ) { m_config->keyboardLayouts()->setCurrentIndex( current.row() ); } ); - connect( config->keyboardLayouts(), &KeyboardLayoutModel::currentIndexChanged, [ this ]( int index ) { + connect( ui->layoutSelector->selectionModel(), + &QItemSelectionModel::currentChanged, + [this]( const QModelIndex& current ) { m_config->keyboardLayouts()->setCurrentIndex( current.row() ); } ); + connect( config->keyboardLayouts(), &KeyboardLayoutModel::currentIndexChanged, [this]( int index ) { ui->layoutSelector->setCurrentIndex( m_config->keyboardLayouts()->index( index ) ); m_keyboardPreview->setLayout( m_config->keyboardLayouts()->key( index ) ); - m_keyboardPreview->setVariant( m_config->keyboardVariants()->key( m_config->keyboardVariants()->currentIndex() ) ); + m_keyboardPreview->setVariant( + m_config->keyboardVariants()->key( m_config->keyboardVariants()->currentIndex() ) ); } ); - connect( - ui->variantSelector->selectionModel(), - &QItemSelectionModel::currentChanged, - [ this ]( const QModelIndex& current ) { m_config->keyboardVariants()->setCurrentIndex( current.row() ); } ); - connect( config->keyboardVariants(), &KeyboardVariantsModel::currentIndexChanged, [ this ]( int index ) { + connect( ui->variantSelector->selectionModel(), + &QItemSelectionModel::currentChanged, + [this]( const QModelIndex& current ) { m_config->keyboardVariants()->setCurrentIndex( current.row() ); } ); + connect( config->keyboardVariants(), &KeyboardVariantsModel::currentIndexChanged, [this]( int index ) { ui->variantSelector->setCurrentIndex( m_config->keyboardVariants()->index( index ) ); m_keyboardPreview->setVariant( m_config->keyboardVariants()->key( index ) ); } ); - CALAMARES_RETRANSLATE_SLOT( &KeyboardPage::retranslate ) + CALAMARES_RETRANSLATE_SLOT( &KeyboardPage::retranslate ); } KeyboardPage::~KeyboardPage() diff --git a/src/modules/license/LicensePage.cpp b/src/modules/license/LicensePage.cpp index 1a92e9ac1c..cb5481a1ee 100644 --- a/src/modules/license/LicensePage.cpp +++ b/src/modules/license/LicensePage.cpp @@ -105,7 +105,7 @@ LicensePage::LicensePage( QWidget* parent ) connect( ui->acceptCheckBox, &QCheckBox::toggled, this, &LicensePage::checkAcceptance ); - CALAMARES_RETRANSLATE_SLOT( &LicensePage::retranslate ) + CALAMARES_RETRANSLATE_SLOT( &LicensePage::retranslate ); } void diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp index e296b790be..f63aed10d5 100644 --- a/src/modules/locale/LocalePage.cpp +++ b/src/modules/locale/LocalePage.cpp @@ -117,7 +117,7 @@ LocalePage::LocalePage( Config* config, QWidget* parent ) connect( m_localeChangeButton, &QPushButton::clicked, this, &LocalePage::changeLocale ); connect( m_formatsChangeButton, &QPushButton::clicked, this, &LocalePage::changeFormats ); - CALAMARES_RETRANSLATE_SLOT( &LocalePage::updateLocaleLabels ) + CALAMARES_RETRANSLATE_SLOT( &LocalePage::updateLocaleLabels ); } diff --git a/src/modules/netinstall/NetInstallPage.cpp b/src/modules/netinstall/NetInstallPage.cpp index 75175a9412..3addf86b30 100644 --- a/src/modules/netinstall/NetInstallPage.cpp +++ b/src/modules/netinstall/NetInstallPage.cpp @@ -37,7 +37,7 @@ NetInstallPage::NetInstallPage( Config* c, QWidget* parent ) connect( c, &Config::statusReady, this, &NetInstallPage::expandGroups ); setPageTitle( nullptr ); - CALAMARES_RETRANSLATE_SLOT( &NetInstallPage::retranslate ) + CALAMARES_RETRANSLATE_SLOT( &NetInstallPage::retranslate ); } NetInstallPage::~NetInstallPage() {} diff --git a/src/modules/oemid/OEMViewStep.cpp b/src/modules/oemid/OEMViewStep.cpp index f996d4ff32..0c1bdd1d8f 100644 --- a/src/modules/oemid/OEMViewStep.cpp +++ b/src/modules/oemid/OEMViewStep.cpp @@ -29,7 +29,7 @@ class OEMPage : public QWidget { m_ui->setupUi( this ); - CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); ) + CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); ); } ~OEMPage() override; diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp index e46809fdda..020365a7fa 100644 --- a/src/modules/packagechooser/PackageChooserPage.cpp +++ b/src/modules/packagechooser/PackageChooserPage.cpp @@ -28,7 +28,7 @@ PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent m_introduction.screenshot = QPixmap( QStringLiteral( ":/images/no-selection.png" ) ); ui->setupUi( this ); - CALAMARES_RETRANSLATE( updateLabels(); ) + CALAMARES_RETRANSLATE( updateLabels(); ); switch ( mode ) { diff --git a/src/modules/plasmalnf/PlasmaLnfPage.cpp b/src/modules/plasmalnf/PlasmaLnfPage.cpp index 0e7f05e432..a4de6cc473 100644 --- a/src/modules/plasmalnf/PlasmaLnfPage.cpp +++ b/src/modules/plasmalnf/PlasmaLnfPage.cpp @@ -85,7 +85,7 @@ PlasmaLnfPage::PlasmaLnfPage( Config* config, QWidget* parent ) "You can also skip this step and configure the look-and-feel " "once the system is installed. Clicking on a look-and-feel " "selection will give you a live preview of that look-and-feel." ) ); - } ) + } ); auto* view = new QListView( this ); view->setModel( m_config->themeModel() ); diff --git a/src/modules/summary/SummaryPage.cpp b/src/modules/summary/SummaryPage.cpp index 96781c25ef..3dd797be01 100644 --- a/src/modules/summary/SummaryPage.cpp +++ b/src/modules/summary/SummaryPage.cpp @@ -48,7 +48,7 @@ SummaryPage::SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent ) headerLabel->setText( tr( "This is an overview of what will happen once you start " "the setup procedure." ) ); else headerLabel->setText( tr( "This is an overview of what will happen once you start " - "the install procedure." ) ); ) + "the install procedure." ) ); ); layout->addWidget( headerLabel ); layout->addWidget( m_scrollArea ); m_scrollArea->setWidgetResizable( true ); diff --git a/src/modules/tracking/TrackingPage.cpp b/src/modules/tracking/TrackingPage.cpp index ffdb8be663..727efebbd0 100644 --- a/src/modules/tracking/TrackingPage.cpp +++ b/src/modules/tracking/TrackingPage.cpp @@ -28,7 +28,7 @@ TrackingPage::TrackingPage( Config* config, QWidget* parent ) , ui( new Ui::TrackingPage ) { ui->setupUi( this ); - CALAMARES_RETRANSLATE_SLOT( &TrackingPage::retranslate ) + CALAMARES_RETRANSLATE_SLOT( &TrackingPage::retranslate ); ui->noneCheckBox->setChecked( true ); ui->noneCheckBox->setEnabled( false ); diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp index 0e86931c1c..04554454c5 100644 --- a/src/modules/users/UsersPage.cpp +++ b/src/modules/users/UsersPage.cpp @@ -140,7 +140,7 @@ UsersPage::UsersPage( Config* config, QWidget* parent ) config, &Config::requireStrongPasswordsChanged, ui->checkBoxRequireStrongPassword, &QCheckBox::setChecked ); } - CALAMARES_RETRANSLATE_SLOT( &UsersPage::retranslate ) + CALAMARES_RETRANSLATE_SLOT( &UsersPage::retranslate ); onReuseUserPasswordChanged( m_config->reuseUserPasswordForRoot() ); onFullNameTextEdited( m_config->fullName() ); diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp index 72e1cfc3b7..097126ea60 100644 --- a/src/modules/welcome/Config.cpp +++ b/src/modules/welcome/Config.cpp @@ -30,7 +30,7 @@ Config::Config( QObject* parent ) { initLanguages(); - CALAMARES_RETRANSLATE_SLOT( &Config::retranslate ) + CALAMARES_RETRANSLATE_SLOT( &Config::retranslate ); } void diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp index aa9e9d7bba..616c91bff6 100644 --- a/src/modules/welcome/WelcomePage.cpp +++ b/src/modules/welcome/WelcomePage.cpp @@ -75,7 +75,7 @@ WelcomePage::WelcomePage( Config* conf, QWidget* parent ) initLanguages(); - CALAMARES_RETRANSLATE_SLOT( &WelcomePage::retranslate ) + CALAMARES_RETRANSLATE_SLOT( &WelcomePage::retranslate ); connect( ui->aboutButton, &QPushButton::clicked, this, &WelcomePage::showAboutBox ); connect( Calamares::ModuleManager::instance(), diff --git a/src/modules/welcome/checker/CheckerContainer.cpp b/src/modules/welcome/checker/CheckerContainer.cpp index 0dcd820a3e..eb3416ce50 100644 --- a/src/modules/welcome/checker/CheckerContainer.cpp +++ b/src/modules/welcome/checker/CheckerContainer.cpp @@ -34,7 +34,8 @@ CheckerContainer::CheckerContainer( const Calamares::RequirementsModel& model, Q CalamaresUtils::unmarginLayout( mainLayout ); mainLayout->addWidget( m_waitingWidget ); - CALAMARES_RETRANSLATE( if ( m_waitingWidget ) m_waitingWidget->setText( tr( "Gathering system information..." ) ); ) + CALAMARES_RETRANSLATE( if ( m_waitingWidget ) + m_waitingWidget->setText( tr( "Gathering system information..." ) ); ); } CheckerContainer::~CheckerContainer() diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp index b0e8a175e2..c04d2a48b9 100644 --- a/src/modules/welcome/checker/ResultsListWidget.cpp +++ b/src/modules/welcome/checker/ResultsListWidget.cpp @@ -121,7 +121,7 @@ ResultsListDialog::ResultsListDialog( const Calamares::RequirementsModel& model, connect( buttonBox, &QDialogButtonBox::clicked, this, &QDialog::close ); - CALAMARES_RETRANSLATE_SLOT( &ResultsListDialog::retranslate ) + CALAMARES_RETRANSLATE_SLOT( &ResultsListDialog::retranslate ); retranslate(); // Do it now to fill in the texts } @@ -216,7 +216,7 @@ ResultsListWidget::ResultsListWidget( const Calamares::RequirementsModel& model, m_explanation->setAlignment( Qt::AlignCenter ); } - CALAMARES_RETRANSLATE_SLOT( &ResultsListWidget::retranslate ) + CALAMARES_RETRANSLATE_SLOT( &ResultsListWidget::retranslate ); retranslate(); } From bb426ebac4e7fc546136cb8c884a038aad2a163f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 16:01:25 +0100 Subject: [PATCH 283/318] [partition] Add missing ; (and apply coding style) --- src/modules/partition/gui/BootInfoWidget.cpp | 2 +- src/modules/partition/gui/ChoicePage.cpp | 113 +++++++++---------- 2 files changed, 55 insertions(+), 60 deletions(-) diff --git a/src/modules/partition/gui/BootInfoWidget.cpp b/src/modules/partition/gui/BootInfoWidget.cpp index 0b9d08c470..4bfa6f8f4b 100644 --- a/src/modules/partition/gui/BootInfoWidget.cpp +++ b/src/modules/partition/gui/BootInfoWidget.cpp @@ -53,7 +53,7 @@ BootInfoWidget::BootInfoWidget( QWidget* parent ) m_bootIcon->setPalette( palette ); m_bootLabel->setPalette( palette ); - CALAMARES_RETRANSLATE( retranslateUi(); ) + CALAMARES_RETRANSLATE( retranslateUi(); ); } void diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 09a32b1a28..00b6b7d635 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -119,7 +119,7 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent ) // Drive selector + preview CALAMARES_RETRANSLATE( retranslateUi( this ); m_drivesLabel->setText( tr( "Select storage de&vice:" ) ); m_previewBeforeLabel->setText( tr( "Current:" ) ); - m_previewAfterLabel->setText( tr( "After:" ) ); ) + m_previewAfterLabel->setText( tr( "After:" ) ); ); m_previewBeforeFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding ); m_previewAfterFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding ); @@ -298,7 +298,7 @@ ChoicePage::setupChoices() CALAMARES_RETRANSLATE( m_somethingElseButton->setText( tr( "Manual partitioning
" "You can create or resize partitions yourself." ) ); - updateSwapChoicesTr( m_eraseSwapChoiceComboBox ); ) + updateSwapChoicesTr( m_eraseSwapChoiceComboBox ); ); } @@ -360,13 +360,12 @@ ChoicePage::applyDeviceChoice() if ( m_core->isDirty() ) { - ScanningDialog::run( - QtConcurrent::run( [=] { - QMutexLocker locker( &m_coreMutex ); - m_core->revertAllDevices(); - } ), - [this] { continueApplyDeviceChoice(); }, - this ); + ScanningDialog::run( QtConcurrent::run( [=] { + QMutexLocker locker( &m_coreMutex ); + m_core->revertAllDevices(); + } ), + [this] { continueApplyDeviceChoice(); }, + this ); } else { @@ -453,16 +452,15 @@ ChoicePage::applyActionChoice( InstallChoice choice ) if ( m_core->isDirty() ) { - ScanningDialog::run( - QtConcurrent::run( [=] { - QMutexLocker locker( &m_coreMutex ); - m_core->revertDevice( selectedDevice() ); - } ), - [=] { - PartitionActions::doAutopartition( m_core, selectedDevice(), options ); - emit deviceChosen(); - }, - this ); + ScanningDialog::run( QtConcurrent::run( [=] { + QMutexLocker locker( &m_coreMutex ); + m_core->revertDevice( selectedDevice() ); + } ), + [=] { + PartitionActions::doAutopartition( m_core, selectedDevice(), options ); + emit deviceChosen(); + }, + this ); } else { @@ -474,13 +472,12 @@ ChoicePage::applyActionChoice( InstallChoice choice ) case InstallChoice::Replace: if ( m_core->isDirty() ) { - ScanningDialog::run( - QtConcurrent::run( [=] { - QMutexLocker locker( &m_coreMutex ); - m_core->revertDevice( selectedDevice() ); - } ), - [] {}, - this ); + ScanningDialog::run( QtConcurrent::run( [=] { + QMutexLocker locker( &m_coreMutex ); + m_core->revertDevice( selectedDevice() ); + } ), + [] {}, + this ); } updateNextEnabled(); @@ -494,18 +491,17 @@ ChoicePage::applyActionChoice( InstallChoice choice ) case InstallChoice::Alongside: if ( m_core->isDirty() ) { - ScanningDialog::run( - QtConcurrent::run( [=] { - QMutexLocker locker( &m_coreMutex ); - m_core->revertDevice( selectedDevice() ); - } ), - [this] { - // We need to reupdate after reverting because the splitter widget is - // not a true view. - updateActionChoicePreview( m_config->installChoice() ); - updateNextEnabled(); - }, - this ); + ScanningDialog::run( QtConcurrent::run( [=] { + QMutexLocker locker( &m_coreMutex ); + m_core->revertDevice( selectedDevice() ); + } ), + [this] { + // We need to reupdate after reverting because the splitter widget is + // not a true view. + updateActionChoicePreview( m_config->installChoice() ); + updateNextEnabled(); + }, + this ); } updateNextEnabled(); @@ -1037,23 +1033,22 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice ) Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() ); } } ); - connect( - m_core, - &PartitionCoreModule::deviceReverted, - this, - [this]( Device* dev ) { - Q_UNUSED( dev ) - if ( !m_bootloaderComboBox.isNull() ) - { - if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() ) - { - m_bootloaderComboBox->setModel( m_core->bootLoaderModel() ); - } - - m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex ); - } - }, - Qt::QueuedConnection ); + connect( m_core, + &PartitionCoreModule::deviceReverted, + this, + [this]( Device* dev ) { + Q_UNUSED( dev ) + if ( !m_bootloaderComboBox.isNull() ) + { + if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() ) + { + m_bootloaderComboBox->setModel( m_core->bootLoaderModel() ); + } + + m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex ); + } + }, + Qt::QueuedConnection ); // ^ Must be Queued so it's sure to run when the widget is already visible. eraseLayout->addWidget( m_bootloaderComboBox ); @@ -1303,7 +1298,7 @@ ChoicePage::setupActions() m_replaceButton->setText( tr( "Replace a partition
" "Replaces a partition with %1." ) - .arg( Calamares::Branding::instance()->shortVersionedName() ) ); ) + .arg( Calamares::Branding::instance()->shortVersionedName() ) ); ); m_replaceButton->hide(); m_alongsideButton->hide(); @@ -1337,7 +1332,7 @@ ChoicePage::setupActions() m_replaceButton->setText( tr( "Replace a partition
" "Replaces a partition with %1." ) - .arg( Calamares::Branding::instance()->shortVersionedName() ) ); ) + .arg( Calamares::Branding::instance()->shortVersionedName() ) ); ); } else { @@ -1358,7 +1353,7 @@ ChoicePage::setupActions() m_replaceButton->setText( tr( "Replace a partition
" "Replaces a partition with %1." ) - .arg( Calamares::Branding::instance()->shortVersionedName() ) ); ) + .arg( Calamares::Branding::instance()->shortVersionedName() ) ); ); } } else @@ -1383,7 +1378,7 @@ ChoicePage::setupActions() m_replaceButton->setText( tr( "Replace a partition
" "Replaces a partition with %1." ) - .arg( Calamares::Branding::instance()->shortVersionedName() ) ); ) + .arg( Calamares::Branding::instance()->shortVersionedName() ) ); ); } #ifdef DEBUG_PARTITION_UNSAFE From 3b9c0bdf91638db41bf48423b2f04231913ed066 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 16:06:46 +0100 Subject: [PATCH 284/318] CI: don't allow clang-format 7 any more --- ci/calamaresstyle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/calamaresstyle b/ci/calamaresstyle index 42adc33cc3..81ec71c39c 100755 --- a/ci/calamaresstyle +++ b/ci/calamaresstyle @@ -36,7 +36,12 @@ test -x "$AS" || { echo "! $AS is not executable."; exit 1 ; } test -x "$CF" || { echo "! $CF is not executable."; exit 1 ; } unmangle_clang_format="" -if expr `"$CF" --version | tr -dc '[^.0-9]' | cut -d . -f 1` '<' 10 > /dev/null ; then +format_version=`"$CF" --version | tr -dc '[^.0-9]' | cut -d . -f 1` +if expr "$format_version" '<' 8 > /dev/null ; then + echo "! Clang-format version 8+ required" + exit 1 +fi +if expr "$format_version" '<' 10 > /dev/null ; then : else unmangle_clang_format=$( dirname $0 )/../.clang-format From 2b4bc7adf47f7b5458f698496c2ad80c9cc4d3fe Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 16:08:13 +0100 Subject: [PATCH 285/318] [partition] Apply newer formatting tool --- src/modules/partition/gui/ChoicePage.cpp | 101 ++++++++++++----------- 1 file changed, 53 insertions(+), 48 deletions(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 00b6b7d635..ba7552c764 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -360,12 +360,13 @@ ChoicePage::applyDeviceChoice() if ( m_core->isDirty() ) { - ScanningDialog::run( QtConcurrent::run( [=] { - QMutexLocker locker( &m_coreMutex ); - m_core->revertAllDevices(); - } ), - [this] { continueApplyDeviceChoice(); }, - this ); + ScanningDialog::run( + QtConcurrent::run( [=] { + QMutexLocker locker( &m_coreMutex ); + m_core->revertAllDevices(); + } ), + [this] { continueApplyDeviceChoice(); }, + this ); } else { @@ -452,15 +453,16 @@ ChoicePage::applyActionChoice( InstallChoice choice ) if ( m_core->isDirty() ) { - ScanningDialog::run( QtConcurrent::run( [=] { - QMutexLocker locker( &m_coreMutex ); - m_core->revertDevice( selectedDevice() ); - } ), - [=] { - PartitionActions::doAutopartition( m_core, selectedDevice(), options ); - emit deviceChosen(); - }, - this ); + ScanningDialog::run( + QtConcurrent::run( [=] { + QMutexLocker locker( &m_coreMutex ); + m_core->revertDevice( selectedDevice() ); + } ), + [=] { + PartitionActions::doAutopartition( m_core, selectedDevice(), options ); + emit deviceChosen(); + }, + this ); } else { @@ -472,12 +474,13 @@ ChoicePage::applyActionChoice( InstallChoice choice ) case InstallChoice::Replace: if ( m_core->isDirty() ) { - ScanningDialog::run( QtConcurrent::run( [=] { - QMutexLocker locker( &m_coreMutex ); - m_core->revertDevice( selectedDevice() ); - } ), - [] {}, - this ); + ScanningDialog::run( + QtConcurrent::run( [=] { + QMutexLocker locker( &m_coreMutex ); + m_core->revertDevice( selectedDevice() ); + } ), + [] {}, + this ); } updateNextEnabled(); @@ -491,17 +494,18 @@ ChoicePage::applyActionChoice( InstallChoice choice ) case InstallChoice::Alongside: if ( m_core->isDirty() ) { - ScanningDialog::run( QtConcurrent::run( [=] { - QMutexLocker locker( &m_coreMutex ); - m_core->revertDevice( selectedDevice() ); - } ), - [this] { - // We need to reupdate after reverting because the splitter widget is - // not a true view. - updateActionChoicePreview( m_config->installChoice() ); - updateNextEnabled(); - }, - this ); + ScanningDialog::run( + QtConcurrent::run( [=] { + QMutexLocker locker( &m_coreMutex ); + m_core->revertDevice( selectedDevice() ); + } ), + [this] { + // We need to reupdate after reverting because the splitter widget is + // not a true view. + updateActionChoicePreview( m_config->installChoice() ); + updateNextEnabled(); + }, + this ); } updateNextEnabled(); @@ -1033,22 +1037,23 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice ) Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() ); } } ); - connect( m_core, - &PartitionCoreModule::deviceReverted, - this, - [this]( Device* dev ) { - Q_UNUSED( dev ) - if ( !m_bootloaderComboBox.isNull() ) - { - if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() ) - { - m_bootloaderComboBox->setModel( m_core->bootLoaderModel() ); - } - - m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex ); - } - }, - Qt::QueuedConnection ); + connect( + m_core, + &PartitionCoreModule::deviceReverted, + this, + [this]( Device* dev ) { + Q_UNUSED( dev ) + if ( !m_bootloaderComboBox.isNull() ) + { + if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() ) + { + m_bootloaderComboBox->setModel( m_core->bootLoaderModel() ); + } + + m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex ); + } + }, + Qt::QueuedConnection ); // ^ Must be Queued so it's sure to run when the widget is already visible. eraseLayout->addWidget( m_bootloaderComboBox ); From 186d32ebeebf1a11f0553b47d3386e85187478a9 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 16:11:02 +0100 Subject: [PATCH 286/318] [partition] More missing ; --- src/modules/partition/gui/DeviceInfoWidget.cpp | 2 +- src/modules/partition/gui/EncryptWidget.cpp | 2 +- src/modules/partition/gui/PartitionPage.cpp | 2 +- src/modules/partition/gui/PartitionViewStep.cpp | 2 +- src/modules/partition/gui/ReplaceWidget.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/partition/gui/DeviceInfoWidget.cpp b/src/modules/partition/gui/DeviceInfoWidget.cpp index 708982101f..bbc8ce74ce 100644 --- a/src/modules/partition/gui/DeviceInfoWidget.cpp +++ b/src/modules/partition/gui/DeviceInfoWidget.cpp @@ -54,7 +54,7 @@ DeviceInfoWidget::DeviceInfoWidget( QWidget* parent ) m_ptIcon->setPalette( palette ); m_ptLabel->setPalette( palette ); - CALAMARES_RETRANSLATE_SLOT( &DeviceInfoWidget::retranslateUi ) + CALAMARES_RETRANSLATE_SLOT( &DeviceInfoWidget::retranslateUi ); } diff --git a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp index 3ac56575bc..7f648491a7 100644 --- a/src/modules/partition/gui/EncryptWidget.cpp +++ b/src/modules/partition/gui/EncryptWidget.cpp @@ -35,7 +35,7 @@ EncryptWidget::EncryptWidget( QWidget* parent ) setFixedHeight( m_ui->m_passphraseLineEdit->height() ); // Avoid jumping up and down updateState(); - CALAMARES_RETRANSLATE_SLOT( &EncryptWidget::retranslate ) + CALAMARES_RETRANSLATE_SLOT( &EncryptWidget::retranslate ); } diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp index b9930504f2..f5a3b0f433 100644 --- a/src/modules/partition/gui/PartitionPage.cpp +++ b/src/modules/partition/gui/PartitionPage.cpp @@ -117,7 +117,7 @@ PartitionPage::PartitionPage( PartitionCoreModule* core, QWidget* parent ) m_ui->label_3->hide(); } - CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); ) + CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); ); } PartitionPage::~PartitionPage() {} diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 561fdaba72..6755b64c6a 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -67,7 +67,7 @@ PartitionViewStep::PartitionViewStep( QObject* parent ) m_waitingWidget = new WaitingWidget( QString() ); m_widget->addWidget( m_waitingWidget ); - CALAMARES_RETRANSLATE( m_waitingWidget->setText( tr( "Gathering system information..." ) ); ) + CALAMARES_RETRANSLATE( m_waitingWidget->setText( tr( "Gathering system information..." ) ); ); m_core = new PartitionCoreModule( this ); // Unusable before init is complete! // We're not done loading, but we need the configuration map first. diff --git a/src/modules/partition/gui/ReplaceWidget.cpp b/src/modules/partition/gui/ReplaceWidget.cpp index a8ab40570e..078eb4de7e 100644 --- a/src/modules/partition/gui/ReplaceWidget.cpp +++ b/src/modules/partition/gui/ReplaceWidget.cpp @@ -50,7 +50,7 @@ ReplaceWidget::ReplaceWidget( PartitionCoreModule* core, QComboBox* devicesCombo updateFromCurrentDevice( devicesComboBox ); } ); - CALAMARES_RETRANSLATE( onPartitionSelected(); ) + CALAMARES_RETRANSLATE( onPartitionSelected(); ); } From 404a9ef98ace44ace1e3cc3bf6ee04143a4a5559 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 17 Mar 2021 00:09:15 +0100 Subject: [PATCH 287/318] [netinstall] Split off requesting netinstall data into a queue-manager This is the actual "meat" of the branch, which makes the netinstall module request one URL at a time until one succeeds. --- src/modules/netinstall/CMakeLists.txt | 1 + src/modules/netinstall/Config.cpp | 130 +++--------------- src/modules/netinstall/Config.h | 43 +----- src/modules/netinstall/LoaderQueue.cpp | 174 +++++++++++++++++++++++++ src/modules/netinstall/LoaderQueue.h | 67 ++++++++++ 5 files changed, 263 insertions(+), 152 deletions(-) create mode 100644 src/modules/netinstall/LoaderQueue.cpp create mode 100644 src/modules/netinstall/LoaderQueue.h diff --git a/src/modules/netinstall/CMakeLists.txt b/src/modules/netinstall/CMakeLists.txt index 4500a314f8..ec926c9d31 100644 --- a/src/modules/netinstall/CMakeLists.txt +++ b/src/modules/netinstall/CMakeLists.txt @@ -8,6 +8,7 @@ calamares_add_plugin( netinstall EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES Config.cpp + LoaderQueue.cpp NetInstallViewStep.cpp NetInstallPage.cpp PackageTreeItem.cpp diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 927eb8330f..4914436542 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -12,15 +12,15 @@ #include "Config.h" +#include "LoaderQueue.h" + #include "GlobalStorage.h" #include "JobQueue.h" #include "network/Manager.h" #include "packages/Globals.h" #include "utils/Logger.h" -#include "utils/RAII.h" #include "utils/Retranslator.h" #include "utils/Variant.h" -#include "utils/Yaml.h" #include @@ -86,106 +86,13 @@ void Config::loadGroupList( const QVariantList& groupData ) { m_model->setupModelData( groupData ); - emit statusReady(); -} - -void -Config::loadGroupList( const QUrl& url ) -{ - if ( !url.isValid() ) - { - setStatus( Status::FailedBadConfiguration ); - } - - using namespace CalamaresUtils::Network; - - cDebug() << "NetInstall loading groups from" << url; - QNetworkReply* reply = Manager::instance().asynchronousGet( - url, - RequestOptions( RequestOptions::FakeUserAgent | RequestOptions::FollowRedirect, std::chrono::seconds( 30 ) ) ); - - if ( !reply ) - { - cDebug() << Logger::Continuation << "request failed immediately."; - setStatus( Status::FailedBadConfiguration ); - } - else - { - m_reply = reply; - connect( reply, &QNetworkReply::finished, this, &Config::receivedGroupData ); - } -} - -void -Config::receivedGroupData() -{ - if ( !m_reply || !m_reply->isFinished() ) - { - cWarning() << "NetInstall data called too early."; - setStatus( Status::FailedInternalError ); - return; - } - - cDebug() << "NetInstall group data received" << m_reply->size() << "bytes from" << m_reply->url(); - - cqDeleter< QNetworkReply > d { m_reply }; - - // If m_required is *false* then we still say we're ready - // even if the reply is corrupt or missing. - if ( m_reply->error() != QNetworkReply::NoError ) - { - cWarning() << "unable to fetch netinstall package lists."; - cDebug() << Logger::SubEntry << "Netinstall reply error: " << m_reply->error(); - cDebug() << Logger::SubEntry << "Request for url: " << m_reply->url().toString() - << " failed with: " << m_reply->errorString(); - setStatus( Status::FailedNetworkError ); - return; - } - - QByteArray yamlData = m_reply->readAll(); - try + if ( m_model->rowCount() < 1 ) { - YAML::Node groups = YAML::Load( yamlData.constData() ); - - if ( groups.IsSequence() ) - { - loadGroupList( CalamaresUtils::yamlSequenceToVariant( groups ) ); - } - else if ( groups.IsMap() ) - { - auto map = CalamaresUtils::yamlMapToVariant( groups ); - loadGroupList( map.value( "groups" ).toList() ); - } - else - { - cWarning() << "NetInstall groups data does not form a sequence."; - } - if ( m_model->rowCount() < 1 ) - { - cWarning() << "NetInstall groups data was empty."; - } - } - catch ( YAML::Exception& e ) - { - CalamaresUtils::explainYamlException( e, yamlData, "netinstall groups data" ); - setStatus( Status::FailedBadData ); - } -} - -Config::SourceItem -Config::SourceItem::makeSourceItem( const QString& groupsUrl, const QVariantMap& configurationMap ) -{ - if ( groupsUrl == QStringLiteral( "local" ) ) - { - return SourceItem { QUrl(), configurationMap.value( "groups" ).toList() }; - } - else - { - return SourceItem { QUrl { groupsUrl }, QVariantList() }; + cWarning() << "NetInstall groups data was empty."; } + emit statusReady(); } - void Config::setConfigurationMap( const QVariantMap& configurationMap ) { @@ -213,31 +120,24 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) const auto& groupsUrlVariant = configurationMap.value( key ); if ( groupsUrlVariant.type() == QVariant::String ) { - m_urls.append( SourceItem::makeSourceItem( groupsUrlVariant.toString(), configurationMap ) ); + m_queue = new LoaderQueue( this ); + m_queue->append( SourceItem::makeSourceItem( groupsUrlVariant.toString(), configurationMap ) ); } else if ( groupsUrlVariant.type() == QVariant::StringList ) { + m_queue = new LoaderQueue( this ); for ( const auto& s : groupsUrlVariant.toStringList() ) { - m_urls.append( SourceItem::makeSourceItem( s, configurationMap ) ); + m_queue->append( SourceItem::makeSourceItem( s, configurationMap ) ); } } - - QString groupsUrl = CalamaresUtils::getString( configurationMap, "groupsUrl" ); - if ( !groupsUrl.isEmpty() ) + if ( m_queue ) { - // Keep putting groupsUrl into the global storage, - // even though it's no longer used for in-module data-passing. - Calamares::JobQueue::instance()->globalStorage()->insert( "groupsUrl", groupsUrl ); - if ( groupsUrl == QStringLiteral( "local" ) ) - { - QVariantList l = configurationMap.value( "groups" ).toList(); - loadGroupList( l ); - } - else - { - loadGroupList( groupsUrl ); - } + connect( m_queue, &LoaderQueue::done, [this]() { + m_queue->deleteLater(); + m_queue = nullptr; + } ); + m_queue->fetchNext(); } } diff --git a/src/modules/netinstall/Config.h b/src/modules/netinstall/Config.h index e748449a30..b8e258eff7 100644 --- a/src/modules/netinstall/Config.h +++ b/src/modules/netinstall/Config.h @@ -18,11 +18,11 @@ #include "modulesystem/InstanceKey.h" #include -#include -#include #include -class QNetworkReply; +#include + +class LoaderQueue; class Config : public QObject { @@ -61,13 +61,6 @@ class Config : public QObject QString sidebarLabel() const; QString titleLabel() const; - /** @brief Retrieves the groups, with name, description and packages - * - * Loads data from the given URL. Once done, the data is parsed - * and passed on to the other loadGroupList() method. - */ - void loadGroupList( const QUrl& url ); - /** @brief Fill model from parsed data. * * Fills the model with a list of groups -- which can contain @@ -82,44 +75,20 @@ class Config : public QObject */ void finalizeGlobalStorage( const Calamares::ModuleSystem::InstanceKey& key ); -signals: +Q_SIGNALS: void statusChanged( QString status ); ///< Something changed void sidebarLabelChanged( QString label ); void titleLabelChanged( QString label ); void statusReady(); ///< Loading groups is complete -private slots: - void receivedGroupData(); ///< From async-loading group data +private Q_SLOTS: void retranslate(); private: - /** @brief Data about an entry in *groupsUrl* - * - * This can be a specific URL, or "local" which uses data stored - * in the configuration file itself. - */ - struct SourceItem - { - QUrl url; - QVariantList data; - - bool isUrl() const { return url.isValid(); } - bool isLocal() const { return !data.isEmpty(); } - bool isValid() const { return isUrl() || isLocal(); } - /** @brief Create a SourceItem - * - * If the @p groupsUrl is @c "local" then the *groups* key in - * the @p configurationMap is used as the source; otherwise the - * string is used as an actual URL. - */ - static SourceItem makeSourceItem( const QString& groupsUrl, const QVariantMap& configurationMap ); - }; - - QQueue< SourceItem > m_urls; CalamaresUtils::Locale::TranslatedString* m_sidebarLabel = nullptr; // As it appears in the sidebar CalamaresUtils::Locale::TranslatedString* m_titleLabel = nullptr; PackageModel* m_model = nullptr; - QNetworkReply* m_reply = nullptr; // For fetching data + LoaderQueue* m_queue; Status m_status = Status::Ok; bool m_required = false; }; diff --git a/src/modules/netinstall/LoaderQueue.cpp b/src/modules/netinstall/LoaderQueue.cpp new file mode 100644 index 0000000000..7236b4096a --- /dev/null +++ b/src/modules/netinstall/LoaderQueue.cpp @@ -0,0 +1,174 @@ +/* + * SPDX-FileCopyrightText: 2016 Luca Giambonini + * SPDX-FileCopyrightText: 2016 Lisa Vitolo + * SPDX-FileCopyrightText: 2017 Kyle Robbertze + * SPDX-FileCopyrightText: 2017-2018 2020, Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "LoaderQueue.h" + +#include "Config.h" +#include "network/Manager.h" +#include "utils/Logger.h" +#include "utils/RAII.h" +#include "utils/Yaml.h" + +#include +#include + +SourceItem +SourceItem::makeSourceItem( const QString& groupsUrl, const QVariantMap& configurationMap ) +{ + if ( groupsUrl == QStringLiteral( "local" ) ) + { + return SourceItem { QUrl(), configurationMap.value( "groups" ).toList() }; + } + else + { + return SourceItem { QUrl { groupsUrl }, QVariantList() }; + } +} + +LoaderQueue::LoaderQueue( Config* parent ) + : QObject( parent ) + , m_config( parent ) +{ +} + +void +LoaderQueue::append( SourceItem&& i ) +{ + m_queue.append( std::move( i ) ); +} + +void +LoaderQueue::fetchNext() +{ + if ( m_queue.isEmpty() ) + { + m_config->setStatus( Config::Status::FailedBadData ); + emit done(); + return; + } + + auto source = m_queue.takeFirst(); + if ( source.isLocal() ) + { + m_config->loadGroupList( source.data ); + emit done(); + } + else + { + fetch( source.url ); + } +} + + +void +LoaderQueue::fetch( const QUrl& url ) +{ + if ( !url.isValid() ) + { + m_config->setStatus( Config::Status::FailedBadConfiguration ); + } + + using namespace CalamaresUtils::Network; + + cDebug() << "NetInstall loading groups from" << url; + QNetworkReply* reply = Manager::instance().asynchronousGet( + url, + RequestOptions( RequestOptions::FakeUserAgent | RequestOptions::FollowRedirect, std::chrono::seconds( 30 ) ) ); + + if ( !reply ) + { + cDebug() << Logger::Continuation << "request failed immediately."; + m_config->setStatus( Config::Status::FailedBadConfiguration ); + } + else + { + m_reply = reply; + connect( reply, &QNetworkReply::finished, this, &LoaderQueue::dataArrived ); + } +} + +class FetchNextUnless +{ +public: + FetchNextUnless( LoaderQueue* q ) + : m_q( q ) + { + } + ~FetchNextUnless() + { + if ( m_q ) + { + QMetaObject::invokeMethod( m_q, "fetchNext", Qt::QueuedConnection ); + } + } + void release() { m_q = nullptr; } + +private: + LoaderQueue* m_q = nullptr; +}; + +void +LoaderQueue::dataArrived() +{ + FetchNextUnless finished( this ); + + if ( !m_reply || !m_reply->isFinished() ) + { + cWarning() << "NetInstall data called too early."; + m_config->setStatus( Config::Status::FailedInternalError ); + return; + } + + cDebug() << "NetInstall group data received" << m_reply->size() << "bytes from" << m_reply->url(); + + cqDeleter< QNetworkReply > d { m_reply }; + + // If m_required is *false* then we still say we're ready + // even if the reply is corrupt or missing. + if ( m_reply->error() != QNetworkReply::NoError ) + { + cWarning() << "unable to fetch netinstall package lists."; + cDebug() << Logger::SubEntry << "Netinstall reply error: " << m_reply->error(); + cDebug() << Logger::SubEntry << "Request for url: " << m_reply->url().toString() + << " failed with: " << m_reply->errorString(); + m_config->setStatus( Config::Status::FailedNetworkError ); + return; + } + + QByteArray yamlData = m_reply->readAll(); + try + { + YAML::Node groups = YAML::Load( yamlData.constData() ); + + if ( groups.IsSequence() ) + { + finished.release(); + m_config->loadGroupList( CalamaresUtils::yamlSequenceToVariant( groups ) ); + emit done(); + } + else if ( groups.IsMap() ) + { + finished.release(); + auto map = CalamaresUtils::yamlMapToVariant( groups ); + m_config->loadGroupList( map.value( "groups" ).toList() ); + emit done(); + } + else + { + cWarning() << "NetInstall groups data does not form a sequence."; + } + } + catch ( YAML::Exception& e ) + { + CalamaresUtils::explainYamlException( e, yamlData, "netinstall groups data" ); + m_config->setStatus( Config::Status::FailedBadData ); + } +} diff --git a/src/modules/netinstall/LoaderQueue.h b/src/modules/netinstall/LoaderQueue.h new file mode 100644 index 0000000000..de6c7276f7 --- /dev/null +++ b/src/modules/netinstall/LoaderQueue.h @@ -0,0 +1,67 @@ +/* + * SPDX-FileCopyrightText: 2016 Luca Giambonini + * SPDX-FileCopyrightText: 2016 Lisa Vitolo + * SPDX-FileCopyrightText: 2017 Kyle Robbertze + * SPDX-FileCopyrightText: 2017-2018 2020, Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef NETINSTALL_LOADERQUEUE_H +#define NETINSTALL_LOADERQUEUE_H + +#include +#include +#include + +class Config; +class QNetworkReply; + +/** @brief Data about an entry in *groupsUrl* + * + * This can be a specific URL, or "local" which uses data stored + * in the configuration file itself. + */ +struct SourceItem +{ + QUrl url; + QVariantList data; + + bool isUrl() const { return url.isValid(); } + bool isLocal() const { return !data.isEmpty(); } + bool isValid() const { return isUrl() || isLocal(); } + /** @brief Create a SourceItem + * + * If the @p groupsUrl is @c "local" then the *groups* key in + * the @p configurationMap is used as the source; otherwise the + * string is used as an actual URL. + */ + static SourceItem makeSourceItem( const QString& groupsUrl, const QVariantMap& configurationMap ); +}; + + +class LoaderQueue : public QObject +{ + Q_OBJECT +public: + LoaderQueue( Config* parent ); + + void append( SourceItem&& i ); + void fetchNext(); + +public Q_SLOTS: + void fetch( const QUrl& url ); + void dataArrived(); + +Q_SIGNALS: + void done(); + +private: + QQueue< SourceItem > m_queue; + Config* m_config = nullptr; + QNetworkReply* m_reply = nullptr; +}; + +#endif From 03d086a2333ea8a2858662debcc4cee9d89b3d24 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 19 Mar 2021 11:41:47 +0100 Subject: [PATCH 288/318] [netinstall] Missing initialisations, split out slot - m_queue was not initialized to nullptr, crashes - split queue-is-done to a separate slot rather than a lambda - prefer queueing calls to fetchNext(), for responsiveness --- src/modules/netinstall/Config.cpp | 18 +++++++++++++----- src/modules/netinstall/Config.h | 3 ++- src/modules/netinstall/LoaderQueue.cpp | 6 ++++++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 4914436542..5f703f8d4a 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -93,6 +93,17 @@ Config::loadGroupList( const QVariantList& groupData ) emit statusReady(); } +void +Config::loadingDone() +{ + if ( m_queue ) + { + m_queue->deleteLater(); + m_queue = nullptr; + } +} + + void Config::setConfigurationMap( const QVariantMap& configurationMap ) { @@ -133,11 +144,8 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) } if ( m_queue ) { - connect( m_queue, &LoaderQueue::done, [this]() { - m_queue->deleteLater(); - m_queue = nullptr; - } ); - m_queue->fetchNext(); + connect( m_queue, &LoaderQueue::done, this, &Config::loadingDone ); + QMetaObject::invokeMethod( m_queue, "fetchNext", Qt::QueuedConnection ); } } diff --git a/src/modules/netinstall/Config.h b/src/modules/netinstall/Config.h index b8e258eff7..d4c3c6f19a 100644 --- a/src/modules/netinstall/Config.h +++ b/src/modules/netinstall/Config.h @@ -83,12 +83,13 @@ class Config : public QObject private Q_SLOTS: void retranslate(); + void loadingDone(); private: CalamaresUtils::Locale::TranslatedString* m_sidebarLabel = nullptr; // As it appears in the sidebar CalamaresUtils::Locale::TranslatedString* m_titleLabel = nullptr; PackageModel* m_model = nullptr; - LoaderQueue* m_queue; + LoaderQueue* m_queue = nullptr; Status m_status = Status::Ok; bool m_required = false; }; diff --git a/src/modules/netinstall/LoaderQueue.cpp b/src/modules/netinstall/LoaderQueue.cpp index 7236b4096a..98245deadf 100644 --- a/src/modules/netinstall/LoaderQueue.cpp +++ b/src/modules/netinstall/LoaderQueue.cpp @@ -95,6 +95,12 @@ LoaderQueue::fetch( const QUrl& url ) } } +/** @brief Call fetchNext() on the queue if it can + * + * On destruction, a new call to fetchNext() is queued, so that + * the queue continues loading. Calling release() before the + * destructor skips the fetchNext(), ending the queue-loading. + */ class FetchNextUnless { public: From fdfe52efe29df1b0f26841feaf920beaa3f24765 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 19 Mar 2021 12:30:09 +0100 Subject: [PATCH 289/318] [netinstall] Improve loader queue API a bit - use load() to start loading - the FetchNextUnless class is useful in more spots in the loading process - set status explicitly on success (otherwise, a failure in a previous URL would leave a failure message lying around even when the module shows something useful) --- src/modules/netinstall/Config.cpp | 16 ++++-- src/modules/netinstall/Config.h | 4 +- src/modules/netinstall/LoaderQueue.cpp | 70 +++++++++++++++----------- src/modules/netinstall/LoaderQueue.h | 14 +++++- 4 files changed, 69 insertions(+), 35 deletions(-) diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 5f703f8d4a..2d663829cd 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -54,9 +54,11 @@ Config::status() const case Status::FailedBadData: return tr( "Network Installation. (Disabled: Received invalid groups data)" ); case Status::FailedInternalError: - return tr( "Network Installation. (Disabled: internal error)" ); + return tr( "Network Installation. (Disabled: Internal error)" ); case Status::FailedNetworkError: return tr( "Network Installation. (Disabled: Unable to fetch package lists, check your network connection)" ); + case Status::FailedNoData: + return tr( "Network Installation. (Disabled: No package list)" ); } __builtin_unreachable(); } @@ -89,6 +91,11 @@ Config::loadGroupList( const QVariantList& groupData ) if ( m_model->rowCount() < 1 ) { cWarning() << "NetInstall groups data was empty."; + setStatus( Status::FailedNoData ); + } + else + { + setStatus( Status::Ok ); } emit statusReady(); } @@ -134,7 +141,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) m_queue = new LoaderQueue( this ); m_queue->append( SourceItem::makeSourceItem( groupsUrlVariant.toString(), configurationMap ) ); } - else if ( groupsUrlVariant.type() == QVariant::StringList ) + else if ( groupsUrlVariant.type() == QVariant::List ) { m_queue = new LoaderQueue( this ); for ( const auto& s : groupsUrlVariant.toStringList() ) @@ -142,10 +149,11 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) m_queue->append( SourceItem::makeSourceItem( s, configurationMap ) ); } } - if ( m_queue ) + if ( m_queue && m_queue->count() > 0 ) { + cDebug() << "Loading netinstall from" << m_queue->count() << "alternate sources."; connect( m_queue, &LoaderQueue::done, this, &Config::loadingDone ); - QMetaObject::invokeMethod( m_queue, "fetchNext", Qt::QueuedConnection ); + m_queue->load(); } } diff --git a/src/modules/netinstall/Config.h b/src/modules/netinstall/Config.h index d4c3c6f19a..b676a7d398 100644 --- a/src/modules/netinstall/Config.h +++ b/src/modules/netinstall/Config.h @@ -47,7 +47,9 @@ class Config : public QObject FailedBadConfiguration, FailedInternalError, FailedNetworkError, - FailedBadData + FailedBadData, + FailedNoData + }; QString status() const; diff --git a/src/modules/netinstall/LoaderQueue.cpp b/src/modules/netinstall/LoaderQueue.cpp index 98245deadf..f8ba17cffb 100644 --- a/src/modules/netinstall/LoaderQueue.cpp +++ b/src/modules/netinstall/LoaderQueue.cpp @@ -20,6 +20,32 @@ #include #include +/** @brief Call fetchNext() on the queue if it can + * + * On destruction, a new call to fetchNext() is queued, so that + * the queue continues loading. Calling release() before the + * destructor skips the fetchNext(), ending the queue-loading. + */ +class FetchNextUnless +{ +public: + FetchNextUnless( LoaderQueue* q ) + : m_q( q ) + { + } + ~FetchNextUnless() + { + if ( m_q ) + { + QMetaObject::invokeMethod( m_q, "fetchNext", Qt::QueuedConnection ); + } + } + void release() { m_q = nullptr; } + +private: + LoaderQueue* m_q = nullptr; +}; + SourceItem SourceItem::makeSourceItem( const QString& groupsUrl, const QVariantMap& configurationMap ) { @@ -45,6 +71,13 @@ LoaderQueue::append( SourceItem&& i ) m_queue.append( std::move( i ) ); } +void +LoaderQueue::load() +{ + QMetaObject::invokeMethod( this, "fetchNext", Qt::QueuedConnection ); +} + + void LoaderQueue::fetchNext() { @@ -67,13 +100,16 @@ LoaderQueue::fetchNext() } } - void LoaderQueue::fetch( const QUrl& url ) { + FetchNextUnless next( this ); + if ( !url.isValid() ) { m_config->setStatus( Config::Status::FailedBadConfiguration ); + cDebug() << "Invalid URL" << url; + return; } using namespace CalamaresUtils::Network; @@ -85,42 +121,20 @@ LoaderQueue::fetch( const QUrl& url ) if ( !reply ) { - cDebug() << Logger::Continuation << "request failed immediately."; + cDebug() << Logger::SubEntry << "Request failed immediately."; + // If nobody sets a different status, this will remain m_config->setStatus( Config::Status::FailedBadConfiguration ); } else { + // When the network request is done, **then** we might + // do the next item from the queue, so don't call fetchNext() now. + next.release(); m_reply = reply; connect( reply, &QNetworkReply::finished, this, &LoaderQueue::dataArrived ); } } -/** @brief Call fetchNext() on the queue if it can - * - * On destruction, a new call to fetchNext() is queued, so that - * the queue continues loading. Calling release() before the - * destructor skips the fetchNext(), ending the queue-loading. - */ -class FetchNextUnless -{ -public: - FetchNextUnless( LoaderQueue* q ) - : m_q( q ) - { - } - ~FetchNextUnless() - { - if ( m_q ) - { - QMetaObject::invokeMethod( m_q, "fetchNext", Qt::QueuedConnection ); - } - } - void release() { m_q = nullptr; } - -private: - LoaderQueue* m_q = nullptr; -}; - void LoaderQueue::dataArrived() { diff --git a/src/modules/netinstall/LoaderQueue.h b/src/modules/netinstall/LoaderQueue.h index de6c7276f7..d7baf58d46 100644 --- a/src/modules/netinstall/LoaderQueue.h +++ b/src/modules/netinstall/LoaderQueue.h @@ -41,7 +41,14 @@ struct SourceItem static SourceItem makeSourceItem( const QString& groupsUrl, const QVariantMap& configurationMap ); }; - +/** @brief Queue of source items to load + * + * Queue things up by calling append() and then kick things off + * by calling load(). This will try to load the items, in order; + * the first one that succeeds will end the loading process. + * + * Signal done() is emitted when done (also when all of the items fail). + */ class LoaderQueue : public QObject { Q_OBJECT @@ -49,9 +56,12 @@ class LoaderQueue : public QObject LoaderQueue( Config* parent ); void append( SourceItem&& i ); - void fetchNext(); + int count() const { return m_queue.count(); } public Q_SLOTS: + void load(); + + void fetchNext(); void fetch( const QUrl& url ); void dataArrived(); From 3588f06767c664ec740b4c6c71e1245e8d1158e1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 19 Mar 2021 12:49:37 +0100 Subject: [PATCH 290/318] [netinstall] Document groupsUrl with multiple entries --- src/modules/netinstall/netinstall.conf | 48 +++++++++++++++++--------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/src/modules/netinstall/netinstall.conf b/src/modules/netinstall/netinstall.conf index c377b526e3..d38c0b0409 100644 --- a/src/modules/netinstall/netinstall.conf +++ b/src/modules/netinstall/netinstall.conf @@ -32,20 +32,21 @@ # This module supports multiple instances through the *label* key, # which allows you to distinguish them in the UI. --- -# This is the URL that is retrieved to get the netinstall groups-and-packages -# data (which should be in the format described in netinstall.yaml), e.g.: -# ``` -# groupsUrl: http://example.org/netinstall.php -# ``` -# or it can be a locally installed file: -# ``` -# groupsUrl: file:///usr/share/calamares/netinstall.yaml -# ``` -# or it can be the special-case literal string "local": -# ``` -# groupsUrl: local -# ``` +# The *groupsUrl* determines where the data for the netinstall groups-and- +# packages comes from. The value of the key may be: # +# - a single string (this is treated as a list with just that string in it) +# - a list of strings +# +# Each string is treated as a URL (see below for special cases. The +# list is examined **in order** and each URL is tried in turn. The +# first URL to load successfully -- even if it yields 0 packages -- +# ends the process. This allows using a network URL and a (fallback) +# local URL for package lists, or for using multiple mirrors of +# netinstall data. +# +# The URL must point to a YAML file that follows the format described +# below at the key *groups* -- except for the special case URL "local". # Note that the contents of the groups file is the **important** # part of the configuration of this module. It specifies what # groups and packages the user may select (and so what commands are to @@ -59,12 +60,27 @@ # must have a list-of-groups as value; if the file does not have # a top-level key *groups*, then the file must contain only a list of groups. # -# As a special case, setting *groupsUrl* to the literal string -# `local` means that the data is obtained from **this** config -# file, under the key *groups*. +# Each item in the list *groupsUrl* may be: +# - A remote URL like `http://example.org/netinstall.php` +# - A local file URL like `file:///usr/share/calamares/netinstall.yaml` +# - The special-case literal string `local` +# +# Non-special case URLs are loaded as YAML; if the load succeeds, then +# they are interpreted like the *groups* key below. The special case +# `local` loads the data directly from **this** file. # groupsUrl: local +# Alternate form: +# groupsUrl: [ local ] + +# Net-based package list, with fallback to local file +# groupsUrl: +# - http://example.com/calamares/netinstall.yaml +# - file:///etc/calamares/modules/netinstall.yaml + + + # If the installation can proceed without netinstall (e.g. the Live CD # can create a working installed system, but netinstall is preferred # to bring it up-to-date or extend functionality) leave this set to From 63e61e99245a621611669617850eabeee2abb1a6 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 19 Mar 2021 13:25:45 +0100 Subject: [PATCH 291/318] Changes: pre-release housekeeping --- CHANGES | 5 +++-- CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 10647218d0..cd243ec431 100644 --- a/CHANGES +++ b/CHANGES @@ -7,7 +7,7 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. -# 3.2.39 (unreleased) # +# 3.2.39 (2021-03-19) # This release contains contributions from (alphabetically by first name): - Matti Hyttinen @@ -20,7 +20,8 @@ This release contains contributions from (alphabetically by first name): If your distro has a default-to-btrfs setup, it can skip the hard- coded setup (which Calamares has had for a long time with @home and similar) and introduce a custom btrfs configuration through the - `mount.conf` file. + `mount.conf` file. See issues #1659 and #1661 for warnings about + using this in production. - *netinstall* now supports fallbacks for the groups data. Instead of a single URL, multiple URLs may be specified in a list and Calamares goes through them until one is successfully diff --git a/CMakeLists.txt b/CMakeLists.txt index e7377c2654..0d1a006151 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ project( CALAMARES LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development ### OPTIONS # From 668921543af3d8b58467f8f98bfb5f2d78d072c1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 19 Mar 2021 13:36:40 +0100 Subject: [PATCH 292/318] [libcalamaresui] Convenience method to check if paste would do anything --- src/libcalamaresui/utils/Paste.cpp | 7 +++++++ src/libcalamaresui/utils/Paste.h | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 2f0cfa1434..a61b80b4e2 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -126,3 +126,10 @@ CalamaresUtils::Paste::doLogUpload( QObject* parent ) } return QString(); } + +bool +CalamaresUtils::Paste::isEnabled() +{ + auto [ type, serverUrl ] = Calamares::Branding::instance()->uploadServer(); + return type != Calamares::Branding::UploadServerType::None; +} diff --git a/src/libcalamaresui/utils/Paste.h b/src/libcalamaresui/utils/Paste.h index 6258e57a09..c6b0adba80 100644 --- a/src/libcalamaresui/utils/Paste.h +++ b/src/libcalamaresui/utils/Paste.h @@ -18,12 +18,17 @@ namespace CalamaresUtils { namespace Paste { - /** @brief Send the current log file to a pastebin * * Returns the (string) URL that the pastebin gives us. */ QString doLogUpload( QObject* parent ); + +/** @brief Is paste enabled? + * + * Checks the branding instance if paste can be done. + */ +bool isEnabled(); } // namespace Paste } // namespace CalamaresUtils From c54e417ff358da5ef81f0d8ec9dbe9ca654de0f4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 19 Mar 2021 13:38:06 +0100 Subject: [PATCH 293/318] [calamares] Add a 'send log' button to the debug window FIXES #1660 --- src/calamares/DebugWindow.cpp | 5 +++++ src/calamares/DebugWindow.ui | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/calamares/DebugWindow.cpp b/src/calamares/DebugWindow.cpp index 45e28878c0..fa8a31647a 100644 --- a/src/calamares/DebugWindow.cpp +++ b/src/calamares/DebugWindow.cpp @@ -20,6 +20,7 @@ #include "modulesystem/Module.h" #include "modulesystem/ModuleManager.h" #include "utils/Logger.h" +#include "utils/Paste.h" #include "utils/Retranslator.h" #ifdef WITH_PYTHONQT @@ -213,6 +214,10 @@ 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::doLogUpload( this ); } ); + CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); setWindowTitle( tr( "Debug information" ) ); ); } diff --git a/src/calamares/DebugWindow.ui b/src/calamares/DebugWindow.ui index 014d4837e9..ad9234c0f2 100644 --- a/src/calamares/DebugWindow.ui +++ b/src/calamares/DebugWindow.ui @@ -21,7 +21,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - 2 + 3 @@ -118,6 +118,13 @@ SPDX-License-Identifier: GPL-3.0-or-later + + + + Send Session Log + + + From 981e96ea7f12d1074b773c081b9e80a9beb9d90f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 19 Mar 2021 13:51:30 +0100 Subject: [PATCH 294/318] [calamares] Redo debug window tools - make the tools tab buttons along the bottom row - show the global storage tab by default This costs little screen real-estate, makes the tools much more visible and useful. --- src/calamares/DebugWindow.ui | 106 +++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 49 deletions(-) diff --git a/src/calamares/DebugWindow.ui b/src/calamares/DebugWindow.ui index ad9234c0f2..1b163d49d4 100644 --- a/src/calamares/DebugWindow.ui +++ b/src/calamares/DebugWindow.ui @@ -21,7 +21,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - 3 + 0 @@ -92,56 +92,64 @@ SPDX-License-Identifier: GPL-3.0-or-later - - - Tools - - - - - - Crash now - - - - - - - Reload Stylesheet - - - - - - - Widget Tree - - - - - - - Send Session Log - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - + + + + + + Crashes Calamares, so that Dr. Konqui can look at it. + + + Crash now + + + + + + + + + + Reloads the stylesheet from the branding directory. + + + Reload Stylesheet + + + + + + + + + + Displays the tree of widget names in the log (for stylesheet debugging). + + + Widget Tree + + + + + + + + + + Uploads the session log to the configured pastebin. + + + Send Session Log + + + + + + + + From 779e5ecf8f8b5727837d1a5679c0dd46bc019f5b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 19 Mar 2021 14:17:34 +0100 Subject: [PATCH 295/318] [libcalamaresui] Factor out the pastebin UI - offer a convenience method for showing a popup and URL information and copying the URL to the clipboard - use that from ViewManager (on failure) and DebugWindow (on demand) --- src/calamares/DebugWindow.cpp | 2 +- src/libcalamaresui/ViewManager.cpp | 21 +----------------- src/libcalamaresui/utils/Paste.cpp | 35 ++++++++++++++++++++++++++++++ src/libcalamaresui/utils/Paste.h | 8 +++++++ 4 files changed, 45 insertions(+), 21 deletions(-) diff --git a/src/calamares/DebugWindow.cpp b/src/calamares/DebugWindow.cpp index fa8a31647a..b5fd899d46 100644 --- a/src/calamares/DebugWindow.cpp +++ b/src/calamares/DebugWindow.cpp @@ -216,7 +216,7 @@ 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::doLogUpload( this ); } ); + connect( m_ui->sendLogButton, &QPushButton::clicked, [this]() { CalamaresUtils::Paste::doLogUploadUI( this ); } ); CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); setWindowTitle( tr( "Debug information" ) ); ); } diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 566a77f937..704655c8b5 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -190,26 +190,7 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail connect( msgBox, &QMessageBox::buttonClicked, [msgBox]( QAbstractButton* button ) { if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole ) { - QString pasteUrl = CalamaresUtils::Paste::doLogUpload( msgBox ); - QString pasteUrlMessage; - if ( pasteUrl.isEmpty() ) - { - pasteUrlMessage = tr( "The upload was unsuccessful. No web-paste was done." ); - } - else - { - QClipboard* clipboard = QApplication::clipboard(); - clipboard->setText( pasteUrl, QClipboard::Clipboard ); - - if ( clipboard->supportsSelection() ) - { - clipboard->setText( pasteUrl, QClipboard::Selection ); - } - QString pasteUrlFmt = tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); - pasteUrlMessage = pasteUrlFmt.arg( pasteUrl ); - } - - QMessageBox::critical( nullptr, tr( "Install Log Paste URL" ), pasteUrlMessage ); + CalamaresUtils::Paste::doLogUploadUI( msgBox ); } QApplication::quit(); } ); diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index a61b80b4e2..40e3141083 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -14,10 +14,14 @@ #include "utils/Logger.h" #include "utils/Units.h" +#include +#include #include #include +#include #include #include +#include using namespace CalamaresUtils::Units; @@ -127,6 +131,37 @@ CalamaresUtils::Paste::doLogUpload( QObject* parent ) return QString(); } +QString +CalamaresUtils::Paste::doLogUploadUI( QWidget* parent ) +{ + // These strings originated in the ViewManager class + QString pasteUrl = CalamaresUtils::Paste::doLogUpload( parent ); + QString pasteUrlMessage; + if ( pasteUrl.isEmpty() ) + { + pasteUrlMessage = QCoreApplication::translate( "Calamares::ViewManager", + "The upload was unsuccessful. No web-paste was done." ); + } + else + { + QClipboard* clipboard = QApplication::clipboard(); + clipboard->setText( pasteUrl, QClipboard::Clipboard ); + + if ( clipboard->supportsSelection() ) + { + clipboard->setText( pasteUrl, QClipboard::Selection ); + } + QString pasteUrlFmt = QCoreApplication::translate( "Calamares::ViewManager", + "Install log posted to\n\n%1\n\nLink copied to clipboard" ); + pasteUrlMessage = pasteUrlFmt.arg( pasteUrl ); + } + + QMessageBox::critical( + nullptr, QCoreApplication::translate( "Calamares::ViewManager", "Install Log Paste URL" ), pasteUrlMessage ); + return pasteUrl; +} + + bool CalamaresUtils::Paste::isEnabled() { diff --git a/src/libcalamaresui/utils/Paste.h b/src/libcalamaresui/utils/Paste.h index c6b0adba80..c776254156 100644 --- a/src/libcalamaresui/utils/Paste.h +++ b/src/libcalamaresui/utils/Paste.h @@ -13,6 +13,7 @@ #include class QObject; +class QWidget; namespace CalamaresUtils { @@ -24,6 +25,13 @@ namespace Paste */ QString doLogUpload( QObject* parent ); +/** @brief Send the current log file to a pastebin + * + * As doLogUpload(), but also sets the clipboard and displays + * a message saying it's been done. + */ +QString doLogUploadUI( QWidget* parent ); + /** @brief Is paste enabled? * * Checks the branding instance if paste can be done. From 64f9a2df26b1b3c5534184df78ba1c8e39e74939 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Fri, 19 Mar 2021 14:23:07 +0100 Subject: [PATCH 296/318] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_ca.ts | 44 +++++++++++++++++++++++------------------ lang/calamares_eo.ts | 10 +++++++--- lang/calamares_fi_FI.ts | 44 +++++++++++++++++++++++------------------ lang/calamares_lt.ts | 44 +++++++++++++++++++++++------------------ lang/calamares_pt_PT.ts | 44 +++++++++++++++++++++++------------------ lang/calamares_si.ts | 4 ++-- lang/calamares_sv.ts | 44 +++++++++++++++++++++++------------------ 7 files changed, 134 insertions(+), 100 deletions(-) diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index b1375ea2f3..b2594aff10 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Gestió dels paràmetres dels muntatges automàtics @@ -318,7 +318,11 @@ %1 Link copied to clipboard - + El registre d'instal·lació s'ha penjat a + +%1 + +L'enllaç s'ha copiat al porta-retalls. @@ -854,12 +858,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. The setup of %1 did not complete successfully. - + La configuració de %1 no s'ha completat correctament. The installation of %1 did not complete successfully. - + La instal·lació de %1 no s'ha completat correctament. @@ -973,12 +977,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. Create new %1MiB partition on %3 (%2) with entries %4. - + Crea una partició nova de %1 MiB a %3 (%2) amb entrades %4. Create new %1MiB partition on %3 (%2). - + Crea una partició nova de %1 MiB a %3 (%2). @@ -988,12 +992,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Crea una partició nova de <strong>%1 MiB</strong> a <strong>%3</strong> (%2) amb entrades <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Crea una partició nova de <strong>%1 MiB</strong> a <strong>%3</strong> (%2). @@ -1341,7 +1345,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Instal·la %1 a la partició de sistema <strong>nova</strong> %2 amb funcions <em>%3</em>. @@ -1351,27 +1355,27 @@ L'instal·lador es tancarà i tots els canvis es perdran. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Estableix la partició <strong>nova</strong> %2 amb el punt de muntatge <strong>%1</strong> i funcions <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Estableix la partició <strong>nova</strong> %2 amb el punt de muntatge <strong>%1</strong> %3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Instal·la %2 a la partició de sistema %3 <strong>%1</strong> amb funcions <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Estableix la partició %3 <strong>%1</strong> amb el punt de muntatge <strong>%2</strong> i funcions <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Estableix la partició %3 <strong>%1</strong> amb el punt de muntatge <strong>%2</strong> %4. @@ -3961,29 +3965,31 @@ La configuració pot continuar, però algunes característiques podrien estar in Installation Completed - + Instal·lació acabada %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 s'ha instal·lat a l'ordinador. <br/> + Ara podeu reiniciar-lo per tal d'accedir al sistema operatiu nou o bé continuar usant l'entorn autònom. Close Installer - + Tanca l'instal·lador Restart System - + Reinicia el sistema <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Hi ha disponible un registre complet de la instal·lació com a installation.log al directori de l’usuari autònom.<br/> + Aquest registre es copia a /var/log/installation.log del sistema de destinació.</p> diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts index a4483e7fba..ab4efbc437 100644 --- a/lang/calamares_eo.ts +++ b/lang/calamares_eo.ts @@ -304,12 +304,12 @@ Install Log Paste URL - + Retadreso de la alglua servilo The upload was unsuccessful. No web-paste was done. - + Alŝuto malsukcesinta. Neniu transpoŝigis al la reto. @@ -318,7 +318,11 @@ %1 Link copied to clipboard - + La protokolo de instalado estis enpoŝtita al: + +%1 + +La retadreso estis copiita al vian tondujon. diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index 5b0eb435b9..16ec5d3ece 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Hallitse 'auto-mount' asetuksia @@ -318,7 +318,11 @@ %1 Link copied to clipboard - + Asennuksen loki on lähetetty + +%1 + +Linkki kopioitu leikepöydälle @@ -855,12 +859,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. The setup of %1 did not complete successfully. - + Määrityksen %1 asennus ei onnistunut. The installation of %1 did not complete successfully. - + Asennus %1 ei onnistunut. @@ -974,12 +978,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Create new %1MiB partition on %3 (%2) with entries %4. - + Luo uusi %1MiB osio kohteeseen %3 (%2), jossa on %4. Create new %1MiB partition on %3 (%2). - + Luo uusi %1MiB osio kohteeseen %3 (%2). @@ -989,12 +993,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Luo uusi <strong>%1MiB</strong> osio kohteeseen <strong>%3</strong> (%2) jossa on <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Luo uusi <strong>%1MiB</strong> osio kohteeseen <strong>%3</strong> (%2). @@ -1342,7 +1346,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Asenna %1 <strong>uusi</strong> %2 järjestelmäosio ominaisuuksilla <em>%3</em> @@ -1352,27 +1356,27 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Määritä <strong>uusi</strong> %2 osio liitospisteellä <strong>%1</strong> ja ominaisuuksilla <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Määritä <strong>uusi</strong> %2 osio liitospisteellä <strong>%1</strong>%3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Asenna %2 - %3 järjestelmäosio <strong>%1</strong> ominaisuuksilla <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Määritä %3 osio <strong>%1</strong> liitospisteellä <strong>%2</strong> ja ominaisuuksilla <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Määritä %3 osio <strong>%1</strong> liitospisteellä <strong>%2</strong>%4. @@ -3963,29 +3967,31 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Installation Completed - + Asennus suoritettu %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 on asennettu tietokoneellesi.<br/> + Voit käynnistää nyt uuden järjestelmän tai jatkaa Live-ympäristön käyttöä. Close Installer - + Sulje asennusohjelma Restart System - + Käynnistä järjestelmä <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Täydellinen loki asennuksesta on saatavana nimellä install.log Live-käyttäjän kotihakemistossa.<br/> + Tämä loki on kopioitu /var/log/installation.log tiedostoon.</p> diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index 0bf3751c7f..7e4fec5217 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Tvarkyti automatinio prijungimo nustatymus @@ -322,7 +322,11 @@ %1 Link copied to clipboard - + Diegimo žurnalas paskelbtas į + +%1 + +Nuoroda nukopijuota į iškarpinę @@ -858,12 +862,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. The setup of %1 did not complete successfully. - + %1 sąranka nebuvo užbaigta sėkmingai. The installation of %1 did not complete successfully. - + %1 nebuvo užbaigtas sėkmingai. @@ -977,12 +981,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Create new %1MiB partition on %3 (%2) with entries %4. - + Sukurti naują %1MiB skaidinį ties %3 (%2) su įrašais %4. Create new %1MiB partition on %3 (%2). - + Sukurti naują %1MiB skaidinį ties %3 (%2). @@ -992,12 +996,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Sukurti naują <strong>%1MiB</strong> skaidinį ties <strong>%3</strong> (%2) su įrašais <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Sukurti naują <strong>%1MiB</strong> skaidinį ties <strong>%3</strong> (%2). @@ -1345,7 +1349,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Įdiegti %1 <strong>naujame</strong> %2 sistemos skaidinyje su ypatybėmis <em>%3</em> @@ -1355,27 +1359,27 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Nustatyti <strong>naują</strong> %2 skaidinį su prijungimo tašku <strong>%1</strong> ir ypatybėmis <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Nustatyti <strong>naują</strong> %2 skaidinį su prijungimo tašku <strong>%1</strong>%3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Įdiegti %2 sistemą %3 sistemos skaidinyje <strong>%1</strong> su ypatybėmis <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Nustatyti %3 skaidinį <strong>%1</strong> su prijungimo tašku <strong>%2</strong> ir ypatybėmis <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Nustatyti %3 skaidinį <strong>%1</strong> su prijungimo tašku <strong>%2</strong>%4. @@ -3983,29 +3987,31 @@ Išvestis: Installation Completed - + Diegimas užbaigtas %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 įdiegta jūsų kompiuteryje.<br/> + Galite iš naujo paleisti kompiuterį dabar ir naudotis savo naująja sistema; arba galite ir toliau naudotis demonstracine aplinka. Close Installer - + Užverti diegimo programą Restart System - + Paleisti sistemą iš naujo <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Pilnas diegimo žurnalas yra prieinamas kaip installation.log failas, esantis demonstracinio naudotojo namų kataloge.<br/> + Šis žurnalas yra nukopijuotas paskirties sistemoje į failą /var/log/installation.log.</p> diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index ecd1f3c641..c3ec77d14a 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Gerir definições de montagem automática @@ -318,7 +318,11 @@ %1 Link copied to clipboard - + Registo de instalação publicado em + +%1 + +Ligação copiada para a área de transferência @@ -854,12 +858,12 @@ O instalador será encerrado e todas as alterações serão perdidas. The setup of %1 did not complete successfully. - + A configuração de %1 não foi concluída com sucesso. The installation of %1 did not complete successfully. - + A instalação de %1 não foi concluída com sucesso. @@ -973,12 +977,12 @@ O instalador será encerrado e todas as alterações serão perdidas. Create new %1MiB partition on %3 (%2) with entries %4. - + Criar nova partição de %1MiB em %3 (%2) com entradas %4. Create new %1MiB partition on %3 (%2). - + Criar nova partição de %1MiB em %3 (%2). @@ -988,12 +992,12 @@ O instalador será encerrado e todas as alterações serão perdidas. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Criar nova partição de <strong>%1MiB</strong> em <strong>%3</strong> (%2) com entradas <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Criar nova partição de <strong>%1MiB</strong> em <strong>%3</strong> (%2). @@ -1341,7 +1345,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Instalar %1 na <strong>nova</strong> partição do sistema %2 com funcionalidades <em>%3</em> @@ -1351,27 +1355,27 @@ O instalador será encerrado e todas as alterações serão perdidas. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Configurar <strong>nova</strong> partição %2 com ponto de montagem <strong>%1</strong> e funcionalidades <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Configurar <strong>nova</strong> partição %2 com ponto de montagem <strong>%1</strong>%3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Instalar %2 em %3 partição do sistema <strong>%1</strong> com funcionalidades <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Configurar %3 partição <strong>%1</strong> com ponto de montagem <strong>%2</strong> e funcionalidades <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Configurar %3 partição <strong>%1</strong> com ponto de montagem <strong>%2</strong>%4. @@ -3961,29 +3965,31 @@ Saída de Dados: Installation Completed - + Instalação Concluída %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 foi instalado no seu computador.<br/> + Pode agora reiniciar no seu novo sistema, ou continuar a utilizar o ambiente Live. Close Installer - + Fechar Instalador Restart System - + Reiniciar Sistema <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Um registo completo da instalação está disponível como installation.log no diretório home do utilizador Live.<br/> + Este registo é copiado para /var/log/installation.log do sistema de destino.</p> diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts index 085f79c070..ca2abdc584 100644 --- a/lang/calamares_si.ts +++ b/lang/calamares_si.ts @@ -52,7 +52,7 @@ %1 (%2) - + %1 (%2) @@ -2888,7 +2888,7 @@ Output: %1 (%2) - + %1 (%2) diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index 907373b3f2..e30f2463c8 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Hantera inställningar för automatisk montering @@ -318,7 +318,11 @@ %1 Link copied to clipboard - + Installationslogg postad till + +%1 + +Länken kopierades till urklipp @@ -853,12 +857,12 @@ Alla ändringar kommer att gå förlorade. The setup of %1 did not complete successfully. - + Installationen av %1 slutfördes inte korrekt. The installation of %1 did not complete successfully. - + Installationen av %1 slutfördes inte korrekt. @@ -972,12 +976,12 @@ Alla ändringar kommer att gå förlorade. Create new %1MiB partition on %3 (%2) with entries %4. - + Skapa ny %1MiB partition på %3 (%2) med poster %4. Create new %1MiB partition on %3 (%2). - + Skapa ny %1MiB partition på %3 (%2). @@ -987,12 +991,12 @@ Alla ändringar kommer att gå förlorade. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Skapa ny <strong>%1MiB</strong> partition på <strong>%3</strong> (%2) med poster <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Skapa ny <strong>%1MiB</strong> partition på <strong>%3</strong> (%2). @@ -1340,7 +1344,7 @@ Alla ändringar kommer att gå förlorade. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Installera %1 på <strong>ny</strong> %2 system partition med funktioner <em>%3</em> @@ -1350,27 +1354,27 @@ Alla ändringar kommer att gå förlorade. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Skapa <strong>ny</strong>%2 partition med monteringspunkt <strong>%1</strong> och funktioner <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Skapa <strong>ny</strong> %2 partition med monteringspunkt <strong>%1</strong>%3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Installera %2 på %3 system partition <strong>%1</strong> med funktioner <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Skapa %3 partition <strong>%1</strong>med monteringspunkt <strong>%2</strong>och funktioner <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Skapa %3 partition <strong>%1</strong> med monteringspunkt <strong>%2</strong> %4. @@ -3961,29 +3965,31 @@ Installationen kan inte fortsätta.</p> Installation Completed - + Installationen är klar %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 har installerats på din dator. <br/> + Du kan nu starta om i ditt nya system eller fortsätta använda Live-miljön. Close Installer - + Stäng installationsprogrammet Restart System - + Starta om System <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>En fullständig logg över installationen är tillgänglig som installation.log i hemkatalogen av Live användaren.<br/> + Denna logg är kopierad till /var/log/installation.log på målsystemet.</p> From 4243d5f41a6145ad7b180c3a964b7a107ffc2446 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Fri, 19 Mar 2021 14:23:08 +0100 Subject: [PATCH 297/318] i18n: [python] Automatic merge of Transifex translations --- lang/python/az/LC_MESSAGES/python.po | 4 ++-- lang/python/az_AZ/LC_MESSAGES/python.po | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po index 008666012b..9e51b86ace 100644 --- a/lang/python/az/LC_MESSAGES/python.po +++ b/lang/python/az/LC_MESSAGES/python.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# xxmn77 , 2020 +# Xəyyam Qocayev , 2020 # #, fuzzy msgid "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: xxmn77 , 2020\n" +"Last-Translator: Xəyyam Qocayev , 2020\n" "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po index 6c5d277e1f..e261162ead 100644 --- a/lang/python/az_AZ/LC_MESSAGES/python.po +++ b/lang/python/az_AZ/LC_MESSAGES/python.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# xxmn77 , 2020 +# Xəyyam Qocayev , 2020 # #, fuzzy msgid "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-14 16:14+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: xxmn77 , 2020\n" +"Last-Translator: Xəyyam Qocayev , 2020\n" "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From ba89f03d8edaa473ca13d96a721510123963eb48 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 19 Mar 2021 14:37:38 +0100 Subject: [PATCH 298/318] Changes: post-release housekeeping - mention the *packages* service in CHANGES for the previous release --- CHANGES | 16 +++++++++++++++- CMakeLists.txt | 4 ++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index cd243ec431..0c96bc47c8 100644 --- a/CHANGES +++ b/CHANGES @@ -7,13 +7,27 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. +# 3.2.40 (unreleased) # + +This release contains contributions from (alphabetically by first name): + - No external contributors yet + +## Core ## + - No core changes yet + +## Modules ## + - No module changes yet + + # 3.2.39 (2021-03-19) # This release contains contributions from (alphabetically by first name): - Matti Hyttinen ## Core ## - - No core changes yet + - A *packages* service has been added to the core, for use by + *netinstall* module and any others that need to set up + package information for the *packages* module. ## Modules ## - The *mount* module has gained a configurable setup for btrfs volumes. diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d1a006151..7ad919c4fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,11 +41,11 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.39 + VERSION 3.2.40 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development ### OPTIONS # From f8494f27d58ed7430fcb2bd10c2d4853502c9c89 Mon Sep 17 00:00:00 2001 From: Erik Dubois Date: Wed, 17 Mar 2021 14:58:50 +0100 Subject: [PATCH 299/318] displaymanager from arcolinux --- src/modules/displaymanager/main.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index c75897efc6..8c75baf292 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -175,7 +175,6 @@ def update_from_desktop_file(self, root_mount_point): '/usr/bin/budgie-session', 'budgie-desktop' # Budgie v8 ), DesktopEnvironment('/usr/bin/gnome-session', 'gnome'), - DesktopEnvironment('/usr/bin/startxfce4', 'xfce'), DesktopEnvironment('/usr/bin/cinnamon-session-cinnamon', 'cinnamon'), DesktopEnvironment('/usr/bin/mate-session', 'mate'), DesktopEnvironment('/usr/bin/enlightenment_start', 'enlightenment'), @@ -184,9 +183,18 @@ def update_from_desktop_file(self, root_mount_point): DesktopEnvironment('/usr/bin/lxqt-session', 'lxqt'), DesktopEnvironment('/usr/bin/pekwm', 'pekwm'), DesktopEnvironment('/usr/bin/pantheon-session', 'pantheon'), - DesktopEnvironment('/usr/bin/i3', 'i3'), DesktopEnvironment('/usr/bin/startdde', 'deepin'), - DesktopEnvironment('/usr/bin/openbox-session', 'openbox') + DesktopEnvironment('/usr/bin/startxfce4', 'xfce'), + DesktopEnvironment('/usr/bin/openbox-session', 'openbox'), + DesktopEnvironment('/usr/bin/i3', 'i3'), + DesktopEnvironment('/usr/bin/awesome', 'awesome'), + DesktopEnvironment('/usr/bin/bspwm', 'bspwm'), + DesktopEnvironment('/usr/bin/herbstluftwm', 'herbstluftwm'), + DesktopEnvironment('/usr/bin/qtile', 'qtile'), + DesktopEnvironment('/usr/bin/xmonad', 'xmonad'), + DesktopEnvironment('/usr/bin/dwm', 'dmw'), + DesktopEnvironment('/usr/bin/jwm', 'jwm'), + DesktopEnvironment('/usr/bin/icewm-session', 'icewm-session'), ] From d19c3b5458de38afcef426aaba550e3889053328 Mon Sep 17 00:00:00 2001 From: Erik Dubois Date: Sun, 28 Mar 2021 17:07:09 +0200 Subject: [PATCH 300/318] Update main.py Typo --- src/modules/displaymanager/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 8c75baf292..2b125cb68d 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -192,7 +192,7 @@ def update_from_desktop_file(self, root_mount_point): DesktopEnvironment('/usr/bin/herbstluftwm', 'herbstluftwm'), DesktopEnvironment('/usr/bin/qtile', 'qtile'), DesktopEnvironment('/usr/bin/xmonad', 'xmonad'), - DesktopEnvironment('/usr/bin/dwm', 'dmw'), + DesktopEnvironment('/usr/bin/dwm', 'dwm'), DesktopEnvironment('/usr/bin/jwm', 'jwm'), DesktopEnvironment('/usr/bin/icewm-session', 'icewm-session'), ] From 9d4c2bf1c78c1c68cab6ddf86e1fdbd3a9ed28e3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 10:30:56 +0200 Subject: [PATCH 301/318] [displaymanager] Fix mismatch in spelling of "autologinUser" In 4ffa79d4cff4f0a6e65fbb53b110b0d3ac007b0a, the spelling was changed to consistently be "autoLoginUser" in the *users* module, but that changed the Global Storage key as well, and the *displaymanager* module wasn't changed to follow. --- src/modules/displaymanager/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 2b125cb68d..fad03eede9 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -954,7 +954,7 @@ def run(): else: enable_basic_setup = False - username = libcalamares.globalstorage.value("autologinUser") + username = libcalamares.globalstorage.value("autoLoginUser") if username is not None: do_autologin = True libcalamares.utils.debug("Setting up autologin for user {!s}.".format(username)) From 1184229c4afd021851ab2e085e7ca933e958d8e7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 30 Mar 2021 11:29:38 +0200 Subject: [PATCH 302/318] Changes: pre-release housekeeping --- CHANGES | 8 ++++++++ CMakeLists.txt | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 0c96bc47c8..a62ff0f196 100644 --- a/CHANGES +++ b/CHANGES @@ -19,6 +19,14 @@ This release contains contributions from (alphabetically by first name): - No module changes yet +# 3.2.39.1 (2021-03-30) # + +This hotfix release corrects a regression in the *displaymanager* +module caused by changes in the *users* module; autologin was +internally renamed and no longer recognized by the *displaymanager* +module. (Reported by Erik Dubois, #1665) + + # 3.2.39 (2021-03-19) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ad919c4fc..db098644d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,11 +41,11 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.40 + VERSION 3.2.39.1 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development ### OPTIONS # From 8949b079e1d88ecfeddc420a17b63140ae2ba01a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 2 Apr 2021 13:11:16 +0200 Subject: [PATCH 303/318] [users] Fix autologin-setting from config file SEE #1668 --- src/modules/users/Config.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp index be87ad93bc..2954b03813 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp @@ -820,7 +820,19 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) m_hostNameActions = getHostNameActions( configurationMap ); setConfigurationDefaultGroups( configurationMap, m_defaultGroups ); - m_doAutoLogin = CalamaresUtils::getBool( configurationMap, "doAutoLogin", false ); + + // Renaming of Autologin -> AutoLogin in 4ffa79d4cf also affected + // configuration keys, which was not intended. Accept both. + const auto oldKey = QStringLiteral( "doAutologin" ); + const auto newKey = QStringLiteral( "doAutoLogin" ); + if ( configurationMap.contains( oldKey ) ) + { + m_doAutoLogin = CalamaresUtils::getBool( configurationMap, oldKey, false ); + } + else + { + m_doAutoLogin = CalamaresUtils::getBool( configurationMap, newKey, false ); + } m_writeRootPassword = CalamaresUtils::getBool( configurationMap, "setRootPassword", true ); Calamares::JobQueue::instance()->globalStorage()->insert( "setRootPassword", m_writeRootPassword ); From e7b39303e4880408e8ae9f219023d5bc9be9378f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 2 Apr 2021 13:13:36 +0200 Subject: [PATCH 304/318] Changes: pre-release housekeeping --- CHANGES | 7 +++++++ CMakeLists.txt | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index a62ff0f196..50eb23f8e7 100644 --- a/CHANGES +++ b/CHANGES @@ -19,6 +19,13 @@ This release contains contributions from (alphabetically by first name): - No module changes yet +# 3.2.39.2 (2021-04-02) # + +This is **another** hotfix release for issues around autologin .. +autoLogin, really, since the whole problem is that internal capitalization +changed. (Reported by pcrepix, #1668) + + # 3.2.39.1 (2021-03-30) # This hotfix release corrects a regression in the *displaymanager* diff --git a/CMakeLists.txt b/CMakeLists.txt index db098644d5..92ea86845a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.39.1 + VERSION 3.2.39.2 LANGUAGES C CXX ) From b191f39bdf6085a83896d132d6a6af5ca0f386d2 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 2 Apr 2021 15:38:41 +0200 Subject: [PATCH 305/318] [keyboard] Simplify config-loading The machinery in `setConfigurationMap()` was just duplicating checks already in place in the `getString()` and `getBool()` methods, and there's no special need for efficiency here, so prefer the more readable and short code. ("efficiency" here means "we're saving one method call in case the configuration is not set") --- src/modules/keyboard/Config.cpp | 35 ++++++--------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp index a2f200a522..5140021ef5 100644 --- a/src/modules/keyboard/Config.cpp +++ b/src/modules/keyboard/Config.cpp @@ -528,37 +528,14 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) { using namespace CalamaresUtils; - if ( configurationMap.contains( "xOrgConfFileName" ) - && configurationMap.value( "xOrgConfFileName" ).type() == QVariant::String - && !getString( configurationMap, "xOrgConfFileName" ).isEmpty() ) + const auto xorgConfDefault = QStringLiteral( "00-keyboard.conf" ); + m_xOrgConfFileName = getString( configurationMap, "xOrgConfFileName", xorgConfDefault ); + if ( m_xOrgConfFileName.isEmpty() ) { - m_xOrgConfFileName = getString( configurationMap, "xOrgConfFileName" ); - } - else - { - m_xOrgConfFileName = "00-keyboard.conf"; - } - - if ( configurationMap.contains( "convertedKeymapPath" ) - && configurationMap.value( "convertedKeymapPath" ).type() == QVariant::String - && !getString( configurationMap, "convertedKeymapPath" ).isEmpty() ) - { - m_convertedKeymapPath = getString( configurationMap, "convertedKeymapPath" ); - } - else - { - m_convertedKeymapPath = QString(); - } - - if ( configurationMap.contains( "writeEtcDefaultKeyboard" ) - && configurationMap.value( "writeEtcDefaultKeyboard" ).type() == QVariant::Bool ) - { - m_writeEtcDefaultKeyboard = getBool( configurationMap, "writeEtcDefaultKeyboard", true ); - } - else - { - m_writeEtcDefaultKeyboard = true; + m_xOrgConfFileName = xorgConfDefault; } + m_convertedKeymapPath = getString( configurationMap, "convertedKeymapPath" ); + m_writeEtcDefaultKeyboard = getBool( configurationMap, "writeEtcDefaultKeyboard", true ); } void From 18b805d43f4bd1a48a22bc6d87a932035b0e3343 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 2 Apr 2021 15:51:24 +0200 Subject: [PATCH 306/318] [keyboard] Set initial values for model, layout, variant When loading the lists, no initial string-value was being set for the model, layout and variant; the configuration could pass right through and pick up empty strings instead. If the user does not change the model, the UI would show "pc105" but the internal setting would still be empty. FIXES #1668 --- src/modules/keyboard/Config.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp index 5140021ef5..d286e26fdc 100644 --- a/src/modules/keyboard/Config.cpp +++ b/src/modules/keyboard/Config.cpp @@ -210,6 +210,10 @@ Config::Config( QObject* parent ) m_setxkbmapTimer.start( QApplication::keyboardInputInterval() ); emit prettyStatusChanged(); } ); + + m_selectedModel = m_keyboardModelsModel->key( m_keyboardModelsModel->currentIndex() ); + m_selectedLayout = m_keyboardLayoutsModel->item( m_keyboardLayoutsModel->currentIndex() ).first; + m_selectedVariant = m_keyboardVariantsModel->key( m_keyboardVariantsModel->currentIndex() ); } KeyboardModelsModel* From 21f52f9dc19a9df5f8ff6805231d71373e8266b4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 2 Apr 2021 15:56:42 +0200 Subject: [PATCH 307/318] [calamares] Remove overly-spaced debug (SubEntry does the right thing) --- src/calamares/CalamaresApplication.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp index 164b3ed5c7..88d2e9a85d 100644 --- a/src/calamares/CalamaresApplication.cpp +++ b/src/calamares/CalamaresApplication.cpp @@ -68,7 +68,7 @@ CalamaresApplication::init() Logger::setupLogfile(); cDebug() << "Calamares version:" << CALAMARES_VERSION; cDebug() << Logger::SubEntry - << " languages:" << QString( CALAMARES_TRANSLATION_LANGUAGES ).replace( ";", ", " ); + << "languages:" << QString( CALAMARES_TRANSLATION_LANGUAGES ).replace( ";", ", " ); if ( !Calamares::Settings::instance() ) { From 5c5c7f28dcf438e8396dc8979c9c52c56534e10f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 2 Apr 2021 16:30:15 +0200 Subject: [PATCH 308/318] Changes: cut down changelog to just this release --- CHANGES | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index 50eb23f8e7..fb9f13d6bb 100644 --- a/CHANGES +++ b/CHANGES @@ -7,23 +7,12 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. -# 3.2.40 (unreleased) # - -This release contains contributions from (alphabetically by first name): - - No external contributors yet - -## Core ## - - No core changes yet - -## Modules ## - - No module changes yet - - # 3.2.39.2 (2021-04-02) # This is **another** hotfix release for issues around autologin .. autoLogin, really, since the whole problem is that internal capitalization -changed. (Reported by pcrepix, #1668) +changed. An unrelated bug in writing /etc/default/keyboard was +also fixed. (Reported by pcrepix, #1668) # 3.2.39.1 (2021-03-30) # From 6bcf4995c9f72e25299091a849d713857a79379e Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Fri, 2 Apr 2021 16:32:14 +0200 Subject: [PATCH 309/318] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_ar.ts | 247 +++++++++++---------- lang/calamares_as.ts | 249 ++++++++++++---------- lang/calamares_ast.ts | 247 +++++++++++---------- lang/calamares_az.ts | 297 ++++++++++++++------------ lang/calamares_az_AZ.ts | 301 ++++++++++++++------------ lang/calamares_be.ts | 249 ++++++++++++---------- lang/calamares_bg.ts | 247 +++++++++++---------- lang/calamares_bn.ts | 245 +++++++++++---------- lang/calamares_ca.ts | 249 ++++++++++++---------- lang/calamares_ca@valencia.ts | 249 ++++++++++++---------- lang/calamares_cs_CZ.ts | 249 ++++++++++++---------- lang/calamares_da.ts | 249 ++++++++++++---------- lang/calamares_de.ts | 303 ++++++++++++++------------ lang/calamares_el.ts | 247 +++++++++++---------- lang/calamares_en.ts | 249 ++++++++++++---------- lang/calamares_en_GB.ts | 247 +++++++++++---------- lang/calamares_eo.ts | 247 +++++++++++---------- lang/calamares_es.ts | 247 +++++++++++---------- lang/calamares_es_MX.ts | 247 +++++++++++---------- lang/calamares_es_PR.ts | 245 +++++++++++---------- lang/calamares_et.ts | 247 +++++++++++---------- lang/calamares_eu.ts | 247 +++++++++++---------- lang/calamares_fa.ts | 249 ++++++++++++---------- lang/calamares_fi_FI.ts | 307 ++++++++++++++------------ lang/calamares_fr.ts | 249 ++++++++++++---------- lang/calamares_fr_CH.ts | 245 +++++++++++---------- lang/calamares_fur.ts | 249 ++++++++++++---------- lang/calamares_gl.ts | 247 +++++++++++---------- lang/calamares_gu.ts | 245 +++++++++++---------- lang/calamares_he.ts | 281 +++++++++++++----------- lang/calamares_hi.ts | 305 ++++++++++++++------------ lang/calamares_hr.ts | 293 ++++++++++++++----------- lang/calamares_hu.ts | 247 +++++++++++---------- lang/calamares_id.ts | 249 ++++++++++++---------- lang/calamares_id_ID.ts | 245 +++++++++++---------- lang/calamares_ie.ts | 247 +++++++++++---------- lang/calamares_is.ts | 247 +++++++++++---------- lang/calamares_it_IT.ts | 249 ++++++++++++---------- lang/calamares_ja.ts | 391 ++++++++++++++++++---------------- lang/calamares_kk.ts | 247 +++++++++++---------- lang/calamares_kn.ts | 247 +++++++++++---------- lang/calamares_ko.ts | 247 +++++++++++---------- lang/calamares_lo.ts | 245 +++++++++++---------- lang/calamares_lt.ts | 249 ++++++++++++---------- lang/calamares_lv.ts | 245 +++++++++++---------- lang/calamares_mk.ts | 247 +++++++++++---------- lang/calamares_ml.ts | 247 +++++++++++---------- lang/calamares_mr.ts | 247 +++++++++++---------- lang/calamares_nb.ts | 247 +++++++++++---------- lang/calamares_ne.ts | 245 +++++++++++---------- lang/calamares_ne_NP.ts | 247 +++++++++++---------- lang/calamares_nl.ts | 249 ++++++++++++---------- lang/calamares_pl.ts | 247 +++++++++++---------- lang/calamares_pt_BR.ts | 293 ++++++++++++++----------- lang/calamares_pt_PT.ts | 249 ++++++++++++---------- lang/calamares_ro.ts | 247 +++++++++++---------- lang/calamares_ru.ts | 289 ++++++++++++++----------- lang/calamares_si.ts | 245 +++++++++++---------- lang/calamares_sk.ts | 249 ++++++++++++---------- lang/calamares_sl.ts | 245 +++++++++++---------- lang/calamares_sq.ts | 249 ++++++++++++---------- lang/calamares_sr.ts | 247 +++++++++++---------- lang/calamares_sr@latin.ts | 245 +++++++++++---------- lang/calamares_sv.ts | 247 +++++++++++---------- lang/calamares_te.ts | 247 +++++++++++---------- lang/calamares_tg.ts | 249 ++++++++++++---------- lang/calamares_th.ts | 245 +++++++++++---------- lang/calamares_tr_TR.ts | 293 ++++++++++++++----------- lang/calamares_uk.ts | 247 +++++++++++---------- lang/calamares_ur.ts | 245 +++++++++++---------- lang/calamares_uz.ts | 245 +++++++++++---------- lang/calamares_vi.ts | 249 ++++++++++++---------- lang/calamares_zh.ts | 245 +++++++++++---------- lang/calamares_zh_CN.ts | 249 ++++++++++++---------- lang/calamares_zh_TW.ts | 249 ++++++++++++---------- 75 files changed, 10698 insertions(+), 8475 deletions(-) diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts index e9946899d7..8b8a094191 100644 --- a/lang/calamares_ar.ts +++ b/lang/calamares_ar.ts @@ -102,22 +102,42 @@ الواجهة: - - Tools - الأدوات + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet إعادة تحميل ورقة الأنماط - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information معلومات التّنقيح @@ -294,13 +314,13 @@ - + &Yes &نعم - + &No &لا @@ -310,17 +330,17 @@ &اغلاق - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -329,124 +349,124 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? الإستمرار في التثبيت؟ - + 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 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 على وشك بإجراء تعديلات على قرصك لتثبيت %2.<br/><strong>لن تستطيع التّراجع عن هذا.</strong> - + &Set up now - + &Install now &ثبت الأن - + Go &back &إرجع - + &Set up - + &Install &ثبت - + Setup is complete. Close the setup program. اكتمل الإعداد. أغلق برنامج الإعداد. - + The installation is complete. Close the installer. اكتمل التثبيت , اغلق المثبِت - + Cancel setup without changing the system. - + Cancel installation without changing the system. الغاء الـ تثبيت من دون احداث تغيير في النظام - + &Next &التالي - + &Back &رجوع - + &Done - + &Cancel &إلغاء - + Cancel setup? إلغاء الإعداد؟ - + 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 install process? The installer will quit and all changes will be lost. أتريد إلغاء عمليّة التّثبيت الحاليّة؟ @@ -479,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 المثبت @@ -492,7 +512,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... يجمع معلومات النّظام... @@ -740,22 +760,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -850,42 +880,42 @@ The installer will quit and all changes will be lost. لا يوجد تطابق في كلمات السر! - + Setup Failed - + Installation Failed فشل التثبيت - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1482,72 +1512,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source موصول بمصدر للطّاقة - + The system is not plugged in to a power source. النّظام ليس متّصلًا بمصدر للطّاقة. - + is connected to the Internet موصول بالإنترنت - + The system is not connected to the Internet. النّظام ليس موصولًا بالإنترنت - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. المثبّت لا يعمل بصلاحيّات المدير. - + 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 installer. @@ -1615,7 +1645,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> ينفّذ السّكربت: &nbsp;<code>%1</code> @@ -1885,98 +1915,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3740,12 +3769,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 installation.</small> @@ -3753,7 +3782,7 @@ Output: UsersQmlViewStep - + Users المستخدمين @@ -4137,102 +4166,102 @@ Output: ما اسمك؟ - + Your Full Name - + What name do you want to use to log in? ما الاسم الذي تريده لتلج به؟ - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? ما اسم هذا الحاسوب؟ - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. اختر كلمة مرور لإبقاء حسابك آمنًا. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. استخدم نفس كلمة المرور لحساب المدير. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_as.ts b/lang/calamares_as.ts index af7ee1a037..721d21d2ed 100644 --- a/lang/calamares_as.ts +++ b/lang/calamares_as.ts @@ -102,22 +102,42 @@ ইন্টাৰফেচ: - - Tools - সঁজুলি + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + - + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet স্টাইলছীট পুনৰ লোড্ কৰক - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree ৱিজেত্ ত্ৰি - + Debug information ডিবাগ তথ্য @@ -286,13 +306,13 @@ - + &Yes হয় (&Y) - + &No নহয় (&N) @@ -302,17 +322,17 @@ বন্ধ (&C) - + Install Log Paste URL ইনস্তল​ ল'গ পেস্ট URL - + The upload was unsuccessful. No web-paste was done. আপলোড বিফল হৈছিল। কোনো ৱেব-পেস্ট কৰা হোৱা নাছিল। - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + 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 ইনস্তল কৰিব পৰা নগ'ল। কেলামাৰেচে সকলোবোৰ সংৰূপ দিয়া মডিউল লোড্ কৰাত সফল নহ'ল। এইটো এটা আপোনাৰ ডিষ্ট্ৰিবিউচনে কি ধৰণে কেলামাৰেচ ব্যৱহাৰ কৰিছে, সেই সম্বন্ধীয় সমস্যা। - + <br/>The following modules could not be loaded: <br/>নিম্নোক্ত মডিউলবোৰ লোড্ কৰিৱ পৰা নগ'ল: - + Continue with setup? চেত্ আপ অব্যাহত ৰাখিব? - + 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> %1 চেত্ আপ প্ৰগ্ৰেমটোৱে %2 চেত্ আপ কৰিবলৈ আপোনাৰ ডিস্কত সালসলনি কৰিব।<br/><strong>আপুনি এইবোৰ পিছত পূৰ্বলৈ সলনি কৰিব নোৱাৰিব।</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 ইনস্তলাৰটোৱে %2 ইনস্তল কৰিবলৈ আপোনাৰ ডিস্কত সালসলনি কৰিব।<br/><strong>আপুনি এইবোৰ পিছত পূৰ্বলৈ সলনি কৰিব নোৱাৰিব।</strong> - + &Set up now এতিয়া চেত্ আপ কৰক (&S) - + &Install now এতিয়া ইনস্তল কৰক (&I) - + Go &back উভতি যাওক (&b) - + &Set up চেত্ আপ কৰক (&S) - + &Install ইনস্তল (&I) - + Setup is complete. Close the setup program. চেত্ আপ সম্পূৰ্ণ হ'ল। প্ৰোগ্ৰেম বন্ধ কৰক। - + The installation is complete. Close the installer. ইনস্তলেচন সম্পূৰ্ণ হ'ল। ইন্স্তলাৰ বন্ধ কৰক। - + Cancel setup without changing the system. চিছ্তেম সলনি নকৰাকৈ চেত্ আপ বাতিল কৰক। - + Cancel installation without changing the system. চিছ্তেম সলনি নকৰাকৈ ইনস্তলেচন বাতিল কৰক। - + &Next পৰবর্তী (&N) - + &Back পাছলৈ (&B) - + &Done হৈ গ'ল (&D) - + &Cancel বাতিল কৰক (&C) - + Cancel setup? চেত্ আপ বাতিল কৰিব? - + 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 install process? The installer will quit and all changes will be lost. সচাকৈয়ে চলিত ইনস্তল প্ৰক্ৰিয়া বাতিল কৰিব বিচাৰে নেকি? @@ -471,12 +491,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 চেত্ আপ প্ৰোগ্ৰেম - + %1 Installer %1 ইনস্তলাৰ @@ -484,7 +504,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... চিছ্তেম তথ্য সংগ্ৰহ কৰা হৈ আছে... @@ -732,22 +752,32 @@ The installer will quit and all changes will be lost. সংখ্যা আৰু তাৰিখ স্থানীয় %1লৈ সলনি কৰা হ'ব। - + Network Installation. (Disabled: Incorrect configuration) নেটৱৰ্ক ইনস্তলেচন। (নিস্ক্ৰিয়: ভুল কনফিগাৰেচন) - + Network Installation. (Disabled: Received invalid groups data) নেটৱৰ্ক্ ইনস্তলেচন। (নিস্ক্ৰিয়: অকার্যকৰ গোটৰ তথ্য পোৱা গ'ল) - - Network Installation. (Disabled: internal error) - নেটৱৰ্ক ইনস্তলেচন। (নিস্ক্ৰিয়: ভিতৰুৱা দোষ) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + পেকেজ বাচনি - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) নেটৱৰ্ক্ ইনস্তলেচন। (নিস্ক্ৰিয়: পেকেজ সুচী বিচাৰি পোৱা নগ'ল, আপোনাৰ নেটৱৰ্ক্ সংযোগ পৰীক্ষা কৰক) @@ -842,42 +872,42 @@ The installer will quit and all changes will be lost. আপোনাৰ পাছৱৰ্ডকেইটাৰ মিল নাই! - + Setup Failed চেত্ আপ বিফল হ'ল - + Installation Failed ইনস্তলেচন বিফল হ'ল - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete চেত্ আপ সম্পুৰ্ণ হৈছে - + Installation Complete ইনস্তলচেন সম্পুৰ্ণ হ'ল - + The setup of %1 is complete. %1ৰ চেত্ আপ সম্পুৰ্ণ হৈছে। - + The installation of %1 is complete. %1ৰ ইনস্তলচেন সম্পুৰ্ণ হ'ল। @@ -1474,72 +1504,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space অতি কমেও %1 GiB খালী ঠাই ড্ৰাইভত উপলব্ধ আছে - + There is not enough drive space. At least %1 GiB is required. ড্ৰাইভত পৰ্য্যাপ্ত খালী ঠাই নাই। অতি কমেও %1 GiB আৱশ্যক। - + has at least %1 GiB working memory অতি কমেও %1 GiB কাৰ্য্যকৰি মেম'ৰি আছে - + The system does not have enough working memory. At least %1 GiB is required. চিছটেমত পৰ্য্যাপ্ত কাৰ্য্যকৰি মেম'ৰী নাই। অতি কমেও %1 GiB আৱশ্যক। - + is plugged in to a power source পাৱাৰৰ উৎসৰ লগত সংযোগ হৈ আছে। - + The system is not plugged in to a power source. চিছটেম পাৱাৰৰ উৎসৰ লগত সংযোগ হৈ থকা নাই। - + is connected to the Internet ইন্টাৰনেটৰ সৈতে সংযোগ হৈছে - + The system is not connected to the Internet. চিছটেমটো ইন্টাৰনেটৰ সৈতে সংযোগ হৈ থকা নাই। - + is running the installer as an administrator (root) ইনস্তলাৰটো প্ৰসাশনক (ৰুট) হিছাবে চলি আছে নেকি - + The setup program is not running with administrator rights. চেত্ আপ প্ৰগ্ৰেমটো প্ৰসাশনীয় অধিকাৰৰ সৈতে চলি থকা নাই। - + The installer is not running with administrator rights. ইনস্তলাৰটো প্ৰসাশনীয় অধিকাৰৰ সৈতে চলি থকা নাই। - + 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 installer. ইনস্তলাৰটো প্ৰদৰ্শন কৰিবলৈ স্ক্ৰিনখনৰ আয়তন যথেস্ট সৰু। @@ -1607,7 +1637,7 @@ The installer will quit and all changes will be lost. অনুগ্ৰহ কৰি কেডিই কনচোল্ ইন্সটল কৰক আৰু পুনৰ চেষ্টা কৰক! - + Executing script: &nbsp;<code>%1</code> নিস্পাদিত লিপি: &nbsp; <code>%1</code> @@ -1879,98 +1909,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection পেকেজ বাচনি - + Office software কাৰ্যালয়ৰ ছফটৱেৰ - + Office package কাৰ্যালয়ৰ পেকেজ - + Browser software ব্ৰাউজাৰৰ ছফটৱেৰ - + Browser package ব্ৰাউজাৰৰ পেকেজ - + Web browser ৱেব ব্ৰাউজাৰ - + Kernel কাৰ্ণেল - + Services সেৰ্ৱিচেস - + Login পৰীক্ষণ কৰক - + Desktop দেস্কেতোপ - + Applications এপ্লীকেছ্নচ - + Communication যোগাযোগ - + Development প্রবৃদ্ধি - + Office কাৰ্যালয় - + Multimedia মাল্টিমিডিয়া - + Internet ইণ্টাৰনেট - + Theming থিমীং - + Gaming খেলা - + Utilities সঁজুলি @@ -3702,12 +3731,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>যদি এটাতকৈ বেছি ব্যক্তিয়ে এইটো কম্পিউটাৰ ব্যৱহাৰ কৰে, আপুনি চেত্ আপৰ পিছত বহুতো একাউন্ট বনাব পাৰে।</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>যদি এটাতকৈ বেছি ব্যক্তিয়ে এইটো কম্পিউটাৰ ব্যৱহাৰ কৰে, আপুনি ইনস্তলচেন​ৰ পিছত বহুতো একাউন্ট বনাব পাৰে।</small> @@ -3715,7 +3744,7 @@ Output: UsersQmlViewStep - + Users ব্যৱহাৰকাৰীসকল @@ -4102,102 +4131,102 @@ Output: আপোনাৰ নাম কি? - + Your Full Name আপোনাৰ সম্পূৰ্ণ নাম - + What name do you want to use to log in? লগইনত আপোনি কি নাম ব্যৱহাৰ কৰিব বিচাৰে? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? এইটো কম্পিউটাৰৰ নাম কি? - + Computer Name কম্পিউটাৰৰ নাম - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. আপোনাৰ একাউণ্ট সুৰক্ষিত ৰাখিবলৈ পাছৱৰ্ড এটা বাছনি কৰক। - + Password পাছৱৰ্ড - + Repeat Password পাছৱৰ্ড পুনৰ লিখক। - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. এই বাকচটো চিহ্নিত কৰিলে পাছ্ৱৰ্ডৰ প্ৰৱলতা কৰা হ'ব আৰু আপুনি দুৰ্বল পাছৱৰ্ড ব্যৱহাৰ কৰিব নোৱাৰিব। - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. প্ৰশাসনীয় একাউন্টৰ বাবে একে পাছৱৰ্ড্ ব্যৱহাৰ কৰক। - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts index 7f593e9f51..a005105ab2 100644 --- a/lang/calamares_ast.ts +++ b/lang/calamares_ast.ts @@ -102,22 +102,42 @@ Interfaz: - - Tools - Ferramientes + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Información de la depuración @@ -286,13 +306,13 @@ - + &Yes &Sí - + &No &Non @@ -302,17 +322,17 @@ &Zarrar - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed Falló l'aniciu de Calamares - + %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 nun pue instalase. Calamares nun foi a cargar tolos módulos configuraos. Esto ye un problema col mou nel que la distribución usa Calamares. - + <br/>The following modules could not be loaded: <br/>Nun pudieron cargase los módulos de darréu: - + Continue with setup? ¿Siguir cola instalación? - + Continue with installation? ¿Siguir cola instalación? - + 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> El programa d'instalación de %1 ta a piques de facer cambeos nel discu pa configurar %2.<br/><strong>Nun vas ser a desfacer estos cambeos.<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> L'instalador de %1 ta a piques de facer cambeos nel discu pa instalar %2.<br/><strong>Nun vas ser a desfacer esos cambeos.</strong> - + &Set up now &Configurar agora - + &Install now &Instalar agora - + Go &back Dir p'&atrás - + &Set up &Configurar - + &Install &Instalar - + Setup is complete. Close the setup program. Completóse la configuración. Zarra'l programa de configuración. - + The installation is complete. Close the installer. Completóse la instalación. Zarra l'instalador. - + Cancel setup without changing the system. Encaboxa la configuración ensin camudar el sistema. - + Cancel installation without changing the system. Encaboxa la instalación ensin camudar el sistema. - + &Next &Siguiente - + &Back &Atrás - + &Done &Fecho - + &Cancel &Encaboxar - + Cancel setup? ¿Encaboxar la configuración? - + Cancel installation? ¿Encaboxar la instalación? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. ¿De xuru que quies encaboxar el procesu actual de configuración? El programa de configuración va colar y van perdese tolos cambeos. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. ¿De xuru que quies encaboxar el procesu actual d'instalación? @@ -471,12 +491,12 @@ L'instalador va colar y van perdese tolos cambeos. CalamaresWindow - + %1 Setup Program Programa de configuración de %1 - + %1 Installer Instalador de %1 @@ -484,7 +504,7 @@ L'instalador va colar y van perdese tolos cambeos. CheckerContainer - + Gathering system information... Recoyendo la información del sistema... @@ -732,22 +752,32 @@ L'instalador va colar y van perdese tolos cambeos. La númberación y data van afitase en %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Instalación per rede. (Desactivada: Recibiéronse datos non válidos de grupos) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Esbilla de paquetes + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalación per rede. (Desactivada: Nun pue dise en cata de les llistes de paquetes, comprueba la conexón a internet) @@ -842,42 +872,42 @@ L'instalador va colar y van perdese tolos cambeos. ¡Les contraseñes nun concasen! - + Setup Failed Falló la configuración - + Installation Failed Falló la instalación - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Configuración completada - + Installation Complete Instalación completada - + The setup of %1 is complete. La configuración de %1 ta completada. - + The installation of %1 is complete. Completóse la instalación de %1. @@ -1474,72 +1504,72 @@ L'instalador va colar y van perdese tolos cambeos. GeneralRequirements - + has at least %1 GiB available drive space tien polo menos %1 GiB d'espaciu disponible nel discu - + There is not enough drive space. At least %1 GiB is required. Nun hai espaciu abondu nel discu. Ríquense polo menos %1 GiB. - + has at least %1 GiB working memory tien polo menos %1 GiB memoria de trabayu - + The system does not have enough working memory. At least %1 GiB is required. El sistema nun tien abonda memoria de trabayu. Ríquense polo menos %1 GiB. - + is plugged in to a power source ta enchufáu a una fonte d'enerxía - + The system is not plugged in to a power source. El sistema nun ta enchufáu a una fonte d'enerxía. - + is connected to the Internet ta coneutáu a internet - + The system is not connected to the Internet. El sistema nun ta coneutáu a internet. - + is running the installer as an administrator (root) ta executando l'instalador como alministrador (root) - + The setup program is not running with administrator rights. El programa de configuración nun ta executándose con drechos alministrativos. - + The installer is not running with administrator rights. L'instalador nun ta executándose con drechos alministrativos. - + has a screen large enough to show the whole installer tien una pantalla abondo grande como p'amosar tol instalador - + The screen is too small to display the setup program. La pantalla ye mui pequeña como p'amosar el programa de configuración. - + The screen is too small to display the installer. La pantalla ye mui pequeña como p'amosar l'instalador. @@ -1607,7 +1637,7 @@ L'instalador va colar y van perdese tolos cambeos. ¡Instala Konsole y volvi tentalo! - + Executing script: &nbsp;<code>%1</code> Executando'l script: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ L'instalador va colar y van perdese tolos cambeos. NetInstallViewStep - - + Package selection Esbilla de paquetes - + Office software Software ofimáticu - + Office package Paquete ofimáticu - + Browser software - + Browser package - + Web browser Restolador web - + Kernel Kernel - + Services Servicios - + Login - + Desktop Escritoriu - + Applications Aplicaciones - + Communication Comunicación - + Development Desendolcu - + Office Oficina - + Multimedia Multimedia - + Internet Internet - + Theming Estilu - + Gaming - + Utilities Utilidaes @@ -3702,12 +3731,12 @@ Salida: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Si va usar l'ordenador más d'una persona, pues crear más cuentes tres la configuración.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Si va usar l'ordenador más d'una persona, pues crear más cuentes tres la instalación.</small> @@ -3715,7 +3744,7 @@ Salida: UsersQmlViewStep - + Users Usuarios @@ -4099,102 +4128,102 @@ Salida: ¿Cómo te llames? - + Your Full Name - + What name do you want to use to log in? ¿Qué nome quies usar p'aniciar sesión? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? ¿Cómo va llamase esti ordenador? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Escueyi una contraseña pa caltener segura la cuenta. - + Password Contraseña - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Usar la mesma contraseña pa la cuenta d'alministrador. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts index 1262f0b3fc..068d6a9e41 100644 --- a/lang/calamares_az.ts +++ b/lang/calamares_az.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Avtomatik qoşulma ayarlarını idarə edin @@ -102,22 +102,42 @@ İnterfeys: - - Tools - Alətlər + + Crashes Calamares, so that Dr. Konqui can look at it. + Calamares çökür, belə ki, Dr. Konqui onu görə bilir. - + + Reloads the stylesheet from the branding directory. + Üslub cədvəlini marka kataloqundan yenidən yükləyir. + + + + Uploads the session log to the configured pastebin. + Sessiya jurnalını konfiqurasiya edilmiş pastebin'ə yükləyir. + + + + Send Session Log + Sessiya jurnalını göndərin + + + Reload Stylesheet Üslub cədvəlini yenidən yükləmək - + + Displays the tree of widget names in the log (for stylesheet debugging). + (Üslub cədvəli sazlamaları üçün) Jurnalda vidjet adları ağacını göstərir. + + + Widget Tree Vidjetlər ağacı - + Debug information Sazlama məlumatları @@ -286,13 +306,13 @@ - + &Yes &Bəli - + &No &Xeyr @@ -302,143 +322,147 @@ &Bağlamaq - + Install Log Paste URL Jurnal yerləşdirmə URL-nu daxil etmək - + The upload was unsuccessful. No web-paste was done. Yükləmə uğursuz oldu. Heç nə vebdə daxil edilmədi. - + Install log posted to %1 Link copied to clipboard - + Quraşdırma jurnalını burada yazın + +%1 + +Keçid mübadilə yaddaşına kopyalandı - + Calamares Initialization Failed Calamares işə salına bilmədi - + %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 quraşdırılmadı. Calamares konfiqurasiya edilmiş modulların hamısını yükləyə bilmədi. Bu Calamares'i, sizin distribütör tərəfindən necə istifadə edilməsindən asılı olan bir problemdir. - + <br/>The following modules could not be loaded: <br/>Yüklənə bilməyən modullar aşağıdakılardır: - + Continue with setup? Quraşdırılma davam etdirilsin? - + Continue with installation? Quraşdırılma davam etdirilsin? - + 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 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</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 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong> - + &Set up now &İndi ayarlamaq - + &Install now Q&uraşdırmağa başlamaq - + Go &back &Geriyə - + &Set up A&yarlamaq - + &Install Qu&raşdırmaq - + Setup is complete. Close the setup program. Quraşdırma başa çatdı. Quraşdırma proqramını bağlayın. - + The installation is complete. Close the installer. Quraşdırma başa çatdı. Quraşdırıcını bağlayın. - + Cancel setup without changing the system. Sistemi dəyişdirmədən quraşdırmanı ləğv etmək. - + Cancel installation without changing the system. Sistemə dəyişiklik etmədən quraşdırmadan imtina etmək. - + &Next İ&rəli - + &Back &Geriyə - + &Done &Hazır - + &Cancel İm&tina etmək - + Cancel setup? Quraşdırılmadan imtina edilsin? - + Cancel installation? Yüklənmədən imtina edilsin? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Siz doğrudanmı hazırkı quraşdırmadan imtina etmək istəyirsiniz? Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Siz doğrudanmı hazırkı yüklənmədən imtina etmək istəyirsiniz? @@ -471,12 +495,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CalamaresWindow - + %1 Setup Program %1 Quraşdırıcı proqram - + %1 Installer %1 Quraşdırıcı @@ -484,7 +508,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CheckerContainer - + Gathering system information... Sistem məlumatları toplanır ... @@ -732,22 +756,32 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Yerli say və tarix formatı %1 təyin olunacaq. - + Network Installation. (Disabled: Incorrect configuration) Şəbəkə üzərindən quraşdırmaq (Söndürüldü: Səhv tənzimlənmə) - + Network Installation. (Disabled: Received invalid groups data) Şəbəkə üzərindən quraşdırmaq (Söndürüldü: qruplar haqqında səhv məlumatlar alındı) - - Network Installation. (Disabled: internal error) - Şəbəkə üzərindən quraşdırmaq (Söndürüldü: Daxili xəta) + + Network Installation. (Disabled: Internal error) + Şəbəkənin quraşdırılması. (Söndürüldü: daxili xəta) - + + Network Installation. (Disabled: No package list) + Şəbəkənin quraşdırılması. (Söndürüldü: Paket siyahısı yoxdur) + + + + Package selection + Paket seçimi + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Şəbəkə üzərindən quraşdırmaq (Söndürüldü: paket siyahıları qəbul edilmir, şəbəkə bağlantınızı yoxlayın) @@ -842,42 +876,42 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Şifrənizin təkrarı eyni deyil! - + Setup Failed Quraşdırılma xətası - + Installation Failed Quraşdırılma alınmadı - + The setup of %1 did not complete successfully. - + %1 qurulması uğurla çaşa çatmadı. - + The installation of %1 did not complete successfully. - + %1 quraşdırılması uğurla tamamlanmadı. - + Setup Complete Quraşdırma tamamlandı - + Installation Complete Quraşdırma tamamlandı - + The setup of %1 is complete. %1 quraşdırmaq başa çatdı. - + The installation of %1 is complete. %1-n quraşdırılması başa çatdı. @@ -973,12 +1007,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Create new %1MiB partition on %3 (%2) with entries %4. - + Yeni %1MiB bölməsini %3 (%2) üzərində %4 girişləri ilə yaradın. Create new %1MiB partition on %3 (%2). - + Yeni %1MiB bölməsini %3 (%2) üzərində yaradın. @@ -988,12 +1022,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Yeni <strong>%1MiB</strong> bölməsini <strong>%3</strong> (%2) üzərində <em>%4</em> girişlərində yaradın. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Yeni <strong>%1MiB</strong> bölməsini <strong>%3</strong> (%2) üzərində yaradın. @@ -1341,7 +1375,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + <strong>Yeni</strong> %2 sistem bölməsində <em>%3</em> xüsusiyyətləri ilə %1 quraşdırın @@ -1351,37 +1385,37 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + <strong>Yeni</strong> %2 bölməsini <strong>%1</strong> qoşulma nöqtəsi və <em>%3</em> xüsusiyyətləri ilə qurun. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + <strong>yeni</strong> %2 bölməsini <strong>%1</strong>%3 qoşulma nöqtəsi ilə qurun. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + %3 <strong>%1</strong> sistem bölməsində <em>%4</em> xüsusiyyətləri ilə %2 quraşdırın. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + <strong>%1</strong> %3 bölməsini <strong>%2</strong> qoşulma nöqtəsi və <em>%4</em> xüsusiyyətləri ilə qurun. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + %3 bölməsinə <strong>%1</strong> ilə <strong>%2</strong>%4 qoşulma nöqtəsi ayarlamaq. Install %2 on %3 system partition <strong>%1</strong>. - %3dəki <strong>%1</strong> sistem bölməsinə %2 quraşdırmaq. + %3 <strong>%1</strong> sistem bölməsində %2 quraşdırın. Install boot loader on <strong>%1</strong>. - Ön yükləyicini <strong>%1</strong>də quraşdırmaq. + Ön yükləyicini <strong>%1</strong> üzərində quraşdırın. @@ -1474,72 +1508,72 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. GeneralRequirements - + has at least %1 GiB available drive space ən az %1 QB disk boş sahəsi var - + There is not enough drive space. At least %1 GiB is required. Kifayət qədər disk sahəsi yoxdur. Ən azı %1 QB tələb olunur. - + has at least %1 GiB working memory ən azı %1 QB iş yaddaşı var - + The system does not have enough working memory. At least %1 GiB is required. Sistemdə kifayət qədər iş yaddaşı yoxdur. Ən azı %1 GiB tələb olunur. - + is plugged in to a power source enerji mənbəyi qoşuludur - + The system is not plugged in to a power source. enerji mənbəyi qoşulmayıb. - + is connected to the Internet internetə qoşuludur - + The system is not connected to the Internet. Sistem internetə qoşulmayıb. - + is running the installer as an administrator (root) quraşdırıcını adminstrator (root) imtiyazları ilə başladılması - + The setup program is not running with administrator rights. Quraşdırıcı adminstrator imtiyazları ilə başladılmayıb. - + The installer is not running with administrator rights. Quraşdırıcı adminstrator imtiyazları ilə başladılmayıb. - + has a screen large enough to show the whole installer quraşdırıcını tam göstərmək üçün ekran kifayət qədər genişdir - + The screen is too small to display the setup program. Quraşdırıcı proqramı göstərmək üçün ekran çox kiçikdir. - + The screen is too small to display the installer. Bu quarşdırıcını göstərmək üçün ekran çox kiçikdir. @@ -1607,7 +1641,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Lütfən KDE Konsole tətbiqini quraşdırın və yenidən cəhd edin! - + Executing script: &nbsp;<code>%1</code> Ssenari icra olunur. &nbsp;<code>%1</code> @@ -1879,98 +1913,97 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. NetInstallViewStep - - + Package selection Paket seçimi - + Office software Ofis proqramı - + Office package Ofis paketi - + Browser software Veb bələdçi proqramı - + Browser package Veb bələdçi paketi - + Web browser Veb bələdçi - + Kernel Nüvə - + Services Xidmətlər - + Login Giriş - + Desktop İş Masası - + Applications Tətbiqlər - + Communication Rabitə - + Development Tərtibat - + Office Ofis - + Multimedia Multimediya - + Internet Internet - + Theming Mövzular, Temalar - + Gaming Oyun - + Utilities Vasitələr, Alətlər @@ -3705,12 +3738,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Əgər bu kompyuteri sizdən başqa şəxs istifadə edəcəkdirsə o zaman ayarlandıqdan sonra bir neçə istifadəçi hesabı yarada bilərsiniz.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Əgər bu kompyuteri sizdən başqa şəxs istifadə edəcəkdirsə o zaman quraşdırıldıqdan sonra bir neçə istifadəçi hesabı yarada bilərsiniz.</small> @@ -3718,7 +3751,7 @@ Output: UsersQmlViewStep - + Users İstifadəçilər @@ -3960,29 +3993,31 @@ Output: Installation Completed - + Quraşdırma başa çatdı %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 komputerinizə quraşdırıldı.<br/> + Siz indi yeni quraşdırılmış sistemə daxil ola bilərsiniz, və ya Canlı mühitdən istifadə etməyə davam edə bilərsiniz. Close Installer - + Quraşdırıcını bağlayın Restart System - + Sistemi yenidən başladın <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Quraşdırmanın tam jurnalı, Canlı mühit istifadəçisinin ev qovluğunda installation.log kimi mövcuddur.<br/> + Bu jurnal, hədəf sistemin /var/log/installation.log qovluğuna kopyalandı.</p> @@ -4134,102 +4169,102 @@ Output: Adınız nədir? - + Your Full Name Tam adınız - + What name do you want to use to log in? Giriş üçün hansı adı istifadə etmək istəyirsiniz? - + Login Name Giriş Adı - + If more than one person will use this computer, you can create multiple accounts after installation. Əgər bu komputeri bir neçə şəxs istifadə ediləcəksə o zaman quraşdırmadan sonra birdən çox hesab yarada bilərsiniz. - + What is the name of this computer? Bu kompyuterin adı nədir? - + Computer Name Kompyuterin adı - + This name will be used if you make the computer visible to others on a network. Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək. - + Choose a password to keep your account safe. Hesabınızın təhlükəsizliyi üçün şifrə seçin. - + Password Şifrə - + Repeat Password Şifrənin təkararı - + 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. Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. Güclü şifrə üçün rəqəm, hərf və durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı və müntəzəm olaraq dəyişdirilməlidir. - + Validate passwords quality Şifrənin keyfiyyətini yoxlamaq - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Bu qutu işarələndikdə, şifrənin etibarlıq səviyyəsi yoxlanılır və siz zəif şifrədən istifadə edə bilməyəcəksiniz. - + Log in automatically without asking for the password Şifrə soruşmadan sistemə daxil olmaq - + Reuse user password as root password İstifadəçi şifrəsini kök şifrəsi kimi istifadə etmək - + Use the same password for the administrator account. İdarəçi hesabı üçün eyni şifrədən istifadə etmək. - + Choose a root password to keep your account safe. Hesabınızı qorumaq üçün kök şifrəsini seçin. - + Root Password Kök Şifrəsi - + Repeat Root Password Kök Şifrəsini təkrar yazın - + Enter the same password twice, so that it can be checked for typing errors. Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts index d432fb1bd5..46f94c08cf 100644 --- a/lang/calamares_az_AZ.ts +++ b/lang/calamares_az_AZ.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Avtomatik qoşulma ayarlarını idarə edin @@ -102,22 +102,42 @@ İnterfeys: - - Tools - Alətlər + + Crashes Calamares, so that Dr. Konqui can look at it. + Calamares çökür, belə ki, Dr. Konqui onu görə bilir. - + + Reloads the stylesheet from the branding directory. + Üslub cədvəlini marka kataloqundan yenidən yükləyir. + + + + Uploads the session log to the configured pastebin. + Sessiya jurnalını konfiqurasiya edilmiş pastebin'ə yükləyir. + + + + Send Session Log + Sessiya jurnalını göndərin + + + Reload Stylesheet Üslub cədvəlini yenidən yükləmək - + + Displays the tree of widget names in the log (for stylesheet debugging). + (Üslub cədvəli sazlamaları üçün) Jurnalda vidjet adları ağacını göstərir. + + + Widget Tree Vidjetlər ağacı - + Debug information Sazlama məlumatları @@ -286,13 +306,13 @@ - + &Yes &Bəli - + &No &Xeyr @@ -302,143 +322,147 @@ &Bağlamaq - + Install Log Paste URL Jurnal yerləşdirmə URL-nu daxil etmək - + The upload was unsuccessful. No web-paste was done. Yükləmə uğursuz oldu. Heç nə vebdə daxil edilmədi. - + Install log posted to %1 Link copied to clipboard - + Quraşdırma jurnalını burada yazın + +%1 + +Keçid mübadilə yaddaşına kopyalandı - + Calamares Initialization Failed Calamares işə salına bilmədi - + %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 quraşdırılmadı. Calamares konfiqurasiya edilmiş modulların hamısını yükləyə bilmədi. Bu Calamares'i, sizin distribütör tərəfindən necə istifadə edilməsindən asılı olan bir problemdir. - + <br/>The following modules could not be loaded: <br/>Yüklənə bilməyən modullar aşağıdakılardır: - + Continue with setup? Quraşdırılma davam etdirilsin? - + Continue with installation? Quraşdırılma davam etdirilsin? - + 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 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</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 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong> - + &Set up now &İndi ayarlamaq - + &Install now Q&uraşdırmağa başlamaq - + Go &back &Geriyə - + &Set up A&yarlamaq - + &Install Qu&raşdırmaq - + Setup is complete. Close the setup program. Quraşdırma başa çatdı. Quraşdırma proqramını bağlayın. - + The installation is complete. Close the installer. Quraşdırma başa çatdı. Quraşdırıcını bağlayın. - + Cancel setup without changing the system. Sistemi dəyişdirmədən quraşdırmanı ləğv etmək. - + Cancel installation without changing the system. Sistemə dəyişiklik etmədən quraşdırmadan imtina etmək. - + &Next İ&rəli - + &Back &Geriyə - + &Done &Hazır - + &Cancel İm&tina etmək - + Cancel setup? Quraşdırılmadan imtina edilsin? - + Cancel installation? Yüklənmədən imtina edilsin? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Siz doğrudanmı hazırkı quraşdırmadan imtina etmək istəyirsiniz? Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Siz doğrudanmı hazırkı yüklənmədən imtina etmək istəyirsiniz? @@ -471,12 +495,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CalamaresWindow - + %1 Setup Program %1 Quraşdırıcı proqram - + %1 Installer %1 Quraşdırıcı @@ -484,7 +508,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CheckerContainer - + Gathering system information... Sistem məlumatları toplanır ... @@ -732,22 +756,32 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Yerli say və tarix formatı %1 təyin olunacaq. - + Network Installation. (Disabled: Incorrect configuration) Şəbəkə üzərindən quraşdırmaq (Söndürüldü: Səhv tənzimlənmə) - + Network Installation. (Disabled: Received invalid groups data) Şəbəkə üzərindən quraşdırmaq (Söndürüldü: qruplar haqqında səhv məlumatlar alındı) - - Network Installation. (Disabled: internal error) - Şəbəkə üzərindən quraşdırmaq (Söndürüldü: Daxili xəta) + + Network Installation. (Disabled: Internal error) + Şəbəkənin quraşdırılması. (Söndürüldü: daxili xəta) + + + + Network Installation. (Disabled: No package list) + Şəbəkənin quraşdırılması. (Söndürüldü: Paket siyahısı yoxdur) - + + Package selection + Paket seçimi + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Şəbəkə üzərindən quraşdırmaq (Söndürüldü: paket siyahıları qəbul edilmir, şəbəkə bağlantınızı yoxlayın) @@ -842,42 +876,42 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Şifrənizin təkrarı eyni deyil! - + Setup Failed Quraşdırılma xətası - + Installation Failed Quraşdırılma alınmadı - + The setup of %1 did not complete successfully. - + %1 qurulması uğurla çaşa çatmadı. - + The installation of %1 did not complete successfully. - + %1 quraşdırılması uğurla tamamlanmadı. - + Setup Complete Quraşdırma tamamlandı - + Installation Complete Quraşdırma tamamlandı - + The setup of %1 is complete. %1 quraşdırmaq başa çatdı. - + The installation of %1 is complete. %1-n quraşdırılması başa çatdı. @@ -973,12 +1007,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Create new %1MiB partition on %3 (%2) with entries %4. - + Yeni %1MiB bölməsini %3 (%2) üzərində %4 girişləri ilə yaradın. Create new %1MiB partition on %3 (%2). - + Yeni %1MiB bölməsini %3 (%2) üzərində yaradın. @@ -988,12 +1022,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Yeni <strong>%1MiB</strong> bölməsini <strong>%3</strong> (%2) üzərində <em>%4</em> girişlərində yaradın. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Yeni <strong>%1MiB</strong> bölməsini <strong>%3</strong> (%2) üzərində yaradın. @@ -1084,7 +1118,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Creating user %1 - İstifadəçi %1 yaradılır + İsitfadəçi %1 yaradılır @@ -1341,7 +1375,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + <strong>Yeni</strong> %2 sistem bölməsində <em>%3</em> xüsusiyyətləri ilə %1 quraşdırın @@ -1351,37 +1385,37 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + <strong>Yeni</strong> %2 bölməsini <strong>%1</strong> qoşulma nöqtəsi və <em>%3</em> xüsusiyyətləri ilə qurun. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + <strong>yeni</strong> %2 bölməsini <strong>%1</strong>%3 qoşulma nöqtəsi ilə qurun. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + %3 <strong>%1</strong> sistem bölməsində <em>%4</em> xüsusiyyətləri ilə %2 quraşdırın. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + <strong>%1</strong> %3 bölməsini <strong>%2</strong> qoşulma nöqtəsi və <em>%4</em> xüsusiyyətləri ilə qurun. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + %3 bölməsinə <strong>%1</strong> ilə <strong>%2</strong>%4 qoşulma nöqtəsi ayarlamaq. Install %2 on %3 system partition <strong>%1</strong>. - %3dəki <strong>%1</strong> sistem bölməsinə %2 quraşdırmaq. + %3 <strong>%1</strong> sistem bölməsində %2 quraşdırın. Install boot loader on <strong>%1</strong>. - Ön yükləyicini <strong>%1</strong>də quraşdırmaq. + Ön yükləyicini <strong>%1</strong> üzərində quraşdırın. @@ -1474,72 +1508,72 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. GeneralRequirements - + has at least %1 GiB available drive space ən az %1 QB disk boş sahəsi var - + There is not enough drive space. At least %1 GiB is required. Kifayət qədər disk sahəsi yoxdur. Ən azı %1 QB tələb olunur. - + has at least %1 GiB working memory ən azı %1 QB iş yaddaşı var - + The system does not have enough working memory. At least %1 GiB is required. Sistemdə kifayət qədər iş yaddaşı yoxdur. Ən azı %1 GiB tələb olunur. - + is plugged in to a power source enerji mənbəyi qoşuludur - + The system is not plugged in to a power source. enerji mənbəyi qoşulmayıb. - + is connected to the Internet internetə qoşuludur - + The system is not connected to the Internet. Sistem internetə qoşulmayıb. - + is running the installer as an administrator (root) quraşdırıcını adminstrator (root) imtiyazları ilə başladılması - + The setup program is not running with administrator rights. Quraşdırıcı adminstrator imtiyazları ilə başladılmayıb. - + The installer is not running with administrator rights. Quraşdırıcı adminstrator imtiyazları ilə başladılmayıb. - + has a screen large enough to show the whole installer quraşdırıcını tam göstərmək üçün ekran kifayət qədər genişdir - + The screen is too small to display the setup program. Quraşdırıcı proqramı göstərmək üçün ekran çox kiçikdir. - + The screen is too small to display the installer. Bu quarşdırıcını göstərmək üçün ekran çox kiçikdir. @@ -1607,7 +1641,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Lütfən KDE Konsole tətbiqini quraşdırın və yenidən cəhd edin! - + Executing script: &nbsp;<code>%1</code> Ssenari icra olunur. &nbsp;<code>%1</code> @@ -1879,98 +1913,97 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. NetInstallViewStep - - + Package selection Paket seçimi - + Office software Ofis proqramı - + Office package Ofis paketi - + Browser software Veb bələdçi proqramı - + Browser package Veb bələdçi paketi - + Web browser Veb bələdçi - + Kernel Nüvə - + Services Xidmətlər - + Login Giriş - + Desktop İş Masası - + Applications Tətbiqlər - + Communication Rabitə - + Development Tərtibat - + Office Ofis - + Multimedia Multimediya - + Internet Internet - + Theming Mövzular, Temalar - + Gaming Oyun - + Utilities Vasitələr, Alətlər @@ -2120,7 +2153,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. The password contains fewer than %n lowercase letters - Şifrə %n hərfdən az kiçik hərflərdən ibarətdir + Şifrə %n-dən(dan) az kiçik hərflərdən ibarətdir Şifrə %n hərfdən az kiçik hərflərdən ibarətdir @@ -3705,12 +3738,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Əgər bu kompyuteri sizdən başqa şəxs istifadə edəcəkdirsə o zaman ayarlandıqdan sonra bir neçə istifadəçi hesabı yarada bilərsiniz.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Əgər bu kompyuteri sizdən başqa şəxs istifadə edəcəkdirsə o zaman quraşdırıldıqdan sonra bir neçə istifadəçi hesabı yarada bilərsiniz.</small> @@ -3718,7 +3751,7 @@ Output: UsersQmlViewStep - + Users İstifadəçilər @@ -3960,29 +3993,31 @@ Output: Installation Completed - + Quraşdırma başa çatdı %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 komputerinizə quraşdırıldı.<br/> + Siz indi yeni quraşdırılmış sistemə daxil ola bilərsiniz, və ya Canlı mühitdən istifadə etməyə davam edə bilərsiniz. Close Installer - + Quraşdırıcını bağlayın Restart System - + Sistemi yenidən başladın <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Quraşdırmanın tam jurnalı, Canlı mühit istifadəçisinin ev qovluğunda installation.log kimi mövcuddur.<br/> + Bu jurnal, hədəf sistemin /var/log/installation.log qovluğuna kopyalandı.</p> @@ -4134,102 +4169,102 @@ Output: Adınız nədir? - + Your Full Name Tam adınız - + What name do you want to use to log in? Giriş üçün hansı adı istifadə etmək istəyirsiniz? - + Login Name Giriş Adı - + If more than one person will use this computer, you can create multiple accounts after installation. Əgər bu komputeri bir neçə şəxs istifadə ediləcəksə o zaman quraşdırmadan sonra birdən çox hesab yarada bilərsiniz. - + What is the name of this computer? Bu kompyuterin adı nədir? - + Computer Name Kompyuterin adı - + This name will be used if you make the computer visible to others on a network. Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək. - + Choose a password to keep your account safe. Hesabınızın təhlükəsizliyi üçün şifrə seçin. - + Password Şifrə - + Repeat Password Şifrənin təkararı - + 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. Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. Güclü şifrə üçün rəqəm, hərf və durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı və müntəzəm olaraq dəyişdirilməlidir. - + Validate passwords quality Şifrənin keyfiyyətini yoxlamaq - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Bu qutu işarələndikdə, şifrənin etibarlıq səviyyəsi yoxlanılır və siz zəif şifrədən istifadə edə bilməyəcəksiniz. - + Log in automatically without asking for the password Şifrə soruşmadan sistemə daxil olmaq - + Reuse user password as root password İstifadəçi şifrəsini kök şifrəsi kimi istifadə etmək - + Use the same password for the administrator account. İdarəçi hesabı üçün eyni şifrədən istifadə etmək. - + Choose a root password to keep your account safe. Hesabınızı qorumaq üçün kök şifrəsini seçin. - + Root Password Kök Şifrəsi - + Repeat Root Password Kök Şifrəsini təkrar yazın - + Enter the same password twice, so that it can be checked for typing errors. Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts index b0acdec042..51c4298bbe 100644 --- a/lang/calamares_be.ts +++ b/lang/calamares_be.ts @@ -102,22 +102,42 @@ Інтэрфейс: - - Tools - Інструменты + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Перазагрузіць табліцу стыляў - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Дрэва віджэтаў - + Debug information Адладачная інфармацыя @@ -290,13 +310,13 @@ - + &Yes &Так - + &No &Не @@ -306,17 +326,17 @@ &Закрыць - + Install Log Paste URL Уставіць журнал усталёўкі па URL - + The upload was unsuccessful. No web-paste was done. Запампаваць не атрымалася. - + Install log posted to %1 @@ -325,123 +345,123 @@ Link copied to clipboard - + Calamares Initialization Failed Не атрымалася ініцыялізаваць Calamares - + %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. У Calamares не атрымалася загрузіць усе падрыхтаваныя модулі. Гэтая праблема ўзнікла праз асаблівасці выкарыстання Calamares вашым дыстрыбутывам. - + <br/>The following modules could not be loaded: <br/>Не атрымалася загрузіць наступныя модулі: - + Continue with setup? Працягнуць усталёўку? - + 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> Праграма ўсталёўкі %1 гатовая ўнесці змены на ваш дыск, каб усталяваць %2.<br/><strong>Скасаваць змены будзе немагчыма.</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 гатовая ўнесці змены на ваш дыск, каб усталяваць %2.<br/><strong>Адрабіць змены будзе немагчыма.</strong> - + &Set up now &Усталяваць - + &Install now &Усталяваць - + Go &back &Назад - + &Set up &Усталяваць - + &Install &Усталяваць - + Setup is complete. Close the setup program. Усталёўка завершаная. Закрыйце праграму ўсталёўкі. - + The installation is complete. Close the installer. Усталёўка завершаная. Закрыйце праграму. - + Cancel setup without changing the system. Скасаваць усталёўку без змены сістэмы. - + Cancel installation without changing the system. Скасаваць усталёўку без змены сістэмы. - + &Next &Далей - + &Back &Назад - + &Done &Завершана - + &Cancel &Скасаваць - + Cancel setup? Скасаваць усталёўку? - + 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 install process? The installer will quit and all changes will be lost. Сапраўды хочаце скасаваць працэс усталёўкі? Праграма спыніць працу, а ўсе змены страцяцца. @@ -473,12 +493,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Праграма ўсталёўкі %1 - + %1 Installer Праграма ўсталёўкі %1 @@ -486,7 +506,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Збор інфармацыі пра сістэму... @@ -734,22 +754,32 @@ The installer will quit and all changes will be lost. Рэгіянальным фарматам лічбаў і датаў будзе %1. - + Network Installation. (Disabled: Incorrect configuration) Сеткавая ўсталёўка. (Адключана: хібная канфігурацыя) - + Network Installation. (Disabled: Received invalid groups data) Сеткавая ўсталёўка. (Адключана: атрыманы хібныя звесткі пра групы) - - Network Installation. (Disabled: internal error) - Сеціўная ўсталёўка. (Адключана: унутраная памылка) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Выбар пакункаў - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Сеткавая ўсталёўка. (Адключана: немагчыма атрымаць спіс пакункаў, праверце ваша сеткавае злучэнне) @@ -844,42 +874,42 @@ The installer will quit and all changes will be lost. Вашыя паролі не супадаюць! - + Setup Failed Усталёўка схібіла - + Installation Failed Не атрымалася ўсталяваць - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Усталёўка завершаная - + Installation Complete Усталёўка завершаная - + The setup of %1 is complete. Усталёўка %1 завершаная. - + The installation of %1 is complete. Усталёўка %1 завершаная. @@ -1476,72 +1506,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space даступна прынамсі %1 Гб вольнага месца - + There is not enough drive space. At least %1 GiB is required. Недастаткова месца. Неабходна прынамсі %1 Гб. - + has at least %1 GiB working memory даступна прынамсі %1 Гб аператыўнай памяці - + The system does not have enough working memory. At least %1 GiB is required. Недастаткова аператыўнай памяці. Патрэбна прынамсі %1 Гб. - + is plugged in to a power source падключана да крыніцы сілкавання - + The system is not plugged in to a power source. Не падключана да крыніцы сілкавання. - + is connected to the Internet ёсць злучэнне з інтэрнэтам - + The system is not connected to the Internet. Злучэнне з інтэрнэтам адсутнічае. - + is running the installer as an administrator (root) праграма ўсталёўкі запушчаная ад імя адміністратара (root) - + The setup program is not running with administrator rights. Праграма ўсталёўкі запушчаная без правоў адміністратара. - + The installer is not running with administrator rights. Праграма ўсталёўкі запушчаная без правоў адміністратара. - + 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 installer. Экран занадта малы для таго, каб адлюстраваць акно праграмы ўсталёўкі. @@ -1609,7 +1639,7 @@ The installer will quit and all changes will be lost. Калі ласка, ўсталюйце KDE Konsole і паўтарыце зноў! - + Executing script: &nbsp;<code>%1</code> Выкананне скрыпта: &nbsp;<code>%1</code> @@ -1881,98 +1911,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Выбар пакункаў - + Office software Офіс - + Office package Офісны пакунак - + Browser software Браўзер - + Browser package Пакунак браўзера - + Web browser Вэб-браўзер - + Kernel Ядро - + Services Службы - + Login Лагін - + Desktop Працоўнае асяроддзе - + Applications Праграмы - + Communication Стасункі - + Development Распрацоўка - + Office Офіс - + Multimedia Медыя - + Internet Інтэрнэт - + Theming Афармленне - + Gaming Гульні - + Utilities Утыліты @@ -3724,12 +3753,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Калі камп’ютарам карыстаецца некалькі чалавек, то вы можаце стварыць для іх акаўнты пасля завяршэння ўсталёўкі.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Калі камп’ютарам карыстаецца некалькі чалавек, то вы можаце стварыць для іх акаўнты пасля завяршэння ўсталёўкі.</small> @@ -3737,7 +3766,7 @@ Output: UsersQmlViewStep - + Users Карыстальнікі @@ -4155,102 +4184,102 @@ Output: Як ваша імя? - + Your Full Name Ваша поўнае імя - + What name do you want to use to log in? Якое імя вы хочаце выкарыстоўваць для ўваходу? - + Login Name Лагін - + If more than one person will use this computer, you can create multiple accounts after installation. Калі камп’ютарам карыстаецца некалькі чалавек, то вы можаце стварыць для іх акаўнты пасля завяршэння ўсталёўкі. - + What is the name of this computer? Якая назва гэтага камп’ютара? - + Computer Name Назва камп’ютара - + This name will be used if you make the computer visible to others on a network. Назва будзе выкарыстоўвацца для пазначэння камп’ютара ў сетцы. - + Choose a password to keep your account safe. Абярыце пароль для абароны вашага акаўнта. - + Password Пароль - + Repeat Password Паўтарыце пароль - + 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. Увядзіце двойчы аднолькавы пароль. Гэта неабходна для таго, каб пазбегнуць памылак. Надзейны пароль павінен складацца з літар, лічбаў, знакаў пунктуацыі. Ён павінен змяшчаць прынамсі 8 знакаў, яго перыядычна трэба змяняць. - + Validate passwords quality Праверка якасці пароляў - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Калі адзначана, будзе выконвацца праверка надзейнасці пароля, таму вы не зможаце выкарыстаць слабы пароль. - + Log in automatically without asking for the password Аўтаматычна ўваходзіць без уводу пароля - + Reuse user password as root password Выкарыстоўваць пароль карыстальніка як пароль адміністратара - + Use the same password for the administrator account. Выкарыстоўваць той жа пароль для акаўнта адміністратара. - + Choose a root password to keep your account safe. Абярыце пароль адміністратара для абароны вашага акаўнта. - + Root Password Пароль адміністратара - + Repeat Root Password Паўтарыце пароль адміністратара - + Enter the same password twice, so that it can be checked for typing errors. Увядзіце пароль двойчы, каб пазбегнуць памылак уводу. diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts index dace8bafa1..0fd0ba338c 100644 --- a/lang/calamares_bg.ts +++ b/lang/calamares_bg.ts @@ -102,22 +102,42 @@ Интерфейс: - - Tools - Инструменти + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Информация за отстраняване на грешки @@ -286,13 +306,13 @@ - + &Yes &Да - + &No &Не @@ -302,17 +322,17 @@ &Затвори - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed Инициализацията на Calamares се провали - + %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 не може да се инсталира. Calamares не можа да зареди всичките конфигурирани модули. Това е проблем с начина, по който Calamares е използван от дистрибуцията. - + <br/>The following modules could not be loaded: <br/>Следните модули не могат да се заредят: - + Continue with setup? Продължаване? - + 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 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 ще направи промени по вашия диск за да инсталира %2. <br><strong>Промените ще бъдат окончателни.</strong> - + &Set up now - + &Install now &Инсталирай сега - + Go &back В&ръщане - + &Set up - + &Install &Инсталирай - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Инсталацията е завършена. Затворете инсталаторa. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Отказ от инсталацията без промяна на системата. - + &Next &Напред - + &Back &Назад - + &Done &Готово - + &Cancel &Отказ - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. Наистина ли искате да отмените текущият процес на инсталиране? @@ -470,12 +490,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Инсталатор @@ -483,7 +503,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Събиране на системна информация... @@ -731,22 +751,32 @@ The installer will quit and all changes will be lost. Форматът на цифрите и датата ще бъде %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Мрежова инсталация. (Изключена: Получени са данни за невалидни групи) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Избор на пакети + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Мрежова инсталация. (Изключена: Списъкът с пакети не може да бъде извлечен, проверете Вашата Интернет връзка) @@ -842,42 +872,42 @@ The installer will quit and all changes will be lost. Паролите Ви не съвпадат! - + Setup Failed - + Installation Failed Неуспешна инсталация - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Инсталацията е завършена - + The setup of %1 is complete. - + The installation of %1 is complete. Инсталацията на %1 е завършена. @@ -1474,72 +1504,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source е включен към източник на захранване - + The system is not plugged in to a power source. Системата не е включена към източник на захранване. - + is connected to the Internet е свързан към интернет - + The system is not connected to the Internet. Системата не е свързана с интернет. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Инсталаторът не е стартиран с права на администратор. - + 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 installer. Екранът е твърде малък за инсталатора. @@ -1607,7 +1637,7 @@ The installer will quit and all changes will be lost. Моля, инсталирайте KDE Konsole и опитайте отново! - + Executing script: &nbsp;<code>%1</code> Изпълняване на скрипт: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Избор на пакети - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3699,12 +3728,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 installation.</small> @@ -3712,7 +3741,7 @@ Output: UsersQmlViewStep - + Users Потребители @@ -4096,102 +4125,102 @@ Output: Какво е вашето име? - + Your Full Name - + What name do you want to use to log in? Какво име искате да използвате за влизане? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Какво е името на този компютър? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Изберете парола за да държите вашият акаунт в безопасност. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Използвайте същата парола за администраторския акаунт. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts index 670a6c2ef9..709bbadcda 100644 --- a/lang/calamares_bn.ts +++ b/lang/calamares_bn.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information তথ্য ডিবাগ করুন @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? সেটআপ চালিয়ে যেতে চান? - + 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 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 ইনস্টলার %2 সংস্থাপন করতে আপনার ডিস্কে পরিবর্তন করতে যাচ্ছে। - + &Set up now - + &Install now এবংএখনই ইনস্টল করুন - + Go &back এবংফিরে যান - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next এবং পরবর্তী - + &Back এবং পেছনে - + &Done - + &Cancel এবংবাতিল করুন - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. আপনি কি সত্যিই বর্তমান সংস্থাপন প্রক্রিয়া বাতিল করতে চান? @@ -470,12 +490,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer 1% ইনস্টল @@ -483,7 +503,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... সিস্টেম তথ্য সংগ্রহ করা হচ্ছে... @@ -731,22 +751,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -841,42 +871,42 @@ The installer will quit and all changes will be lost. আপনার পাসওয়ার্ড মেলে না! - + Setup Failed - + Installation Failed ইনস্টলেশন ব্যর্থ হলো - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1473,72 +1503,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1606,7 +1636,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> স্ক্রিপ্ট কার্যকর করা হচ্ছে: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3695,12 +3724,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 installation.</small> @@ -3708,7 +3737,7 @@ Output: UsersQmlViewStep - + Users ব্যবহারকারীরা @@ -4092,102 +4121,102 @@ Output: আপনার নাম কি? - + Your Full Name - + What name do you want to use to log in? লগ-ইন করতে আপনি কোন নাম ব্যবহার করতে চান? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? এই কম্পিউটারের নাম কি? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. আপনার অ্যাকাউন্ট সুরক্ষিত রাখতে একটি পাসওয়ার্ড নির্বাচন করুন। - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. প্রশাসক হিসাবের জন্য একই গুপ্ত-সংকেত ব্যবহার করুন। - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index b2594aff10..4f048689f2 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -102,22 +102,42 @@ Interfície: - - Tools - Eines + + Crashes Calamares, so that Dr. Konqui can look at it. + Falla el Calamares, perquè el Dr. Konqui pugui mirar-s'ho. - + + Reloads the stylesheet from the branding directory. + Torna a carregar el full d'estil del directori de marques. + + + + Uploads the session log to the configured pastebin. + Puja el registre de la sessió a la carpeta d'enganxar configurada. + + + + Send Session Log + Envia el registre de la sessió + + + Reload Stylesheet Torna a carregar el full d’estil - + + Displays the tree of widget names in the log (for stylesheet debugging). + Mostra l'arbre dels noms dels ginys al registre (per a la depuració del full d'estil). + + + Widget Tree Arbre de ginys - + Debug information Informació de depuració @@ -286,13 +306,13 @@ - + &Yes &Sí - + &No &No @@ -302,17 +322,17 @@ Tan&ca - + Install Log Paste URL URL de publicació del registre d'instal·lació - + The upload was unsuccessful. No web-paste was done. La càrrega no s'ha fet correctament. No s'ha enganxat res a la xarxa. - + Install log posted to %1 @@ -325,124 +345,124 @@ Link copied to clipboard L'enllaç s'ha copiat al porta-retalls. - + Calamares Initialization Failed Ha fallat la inicialització de Calamares - + %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. No es pot instal·lar %1. El Calamares no ha pogut carregar tots els mòduls configurats. Aquest és un problema amb la manera com el Calamares és utilitzat per la distribució. - + <br/>The following modules could not be loaded: <br/>No s'han pogut carregar els mòduls següents: - + Continue with setup? Voleu continuar la configuració? - + Continue with installation? Voleu continuar la instal·lació? - + 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> El programa de configuració %1 està a punt de fer canvis al disc per tal de configurar %2.<br/><strong>No podreu desfer aquests canvis.</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> L'instal·lador per a %1 està a punt de fer canvis al disc per tal d'instal·lar-hi %2.<br/><strong>No podreu desfer aquests canvis.</strong> - + &Set up now Con&figura-ho ara - + &Install now &Instal·la'l ara - + Go &back Ves &enrere - + &Set up Con&figura-ho - + &Install &Instal·la - + Setup is complete. Close the setup program. La configuració s'ha acabat. Tanqueu el programa de configuració. - + The installation is complete. Close the installer. La instal·lació s'ha acabat. Tanqueu l'instal·lador. - + Cancel setup without changing the system. Cancel·la la configuració sense canviar el sistema. - + Cancel installation without changing the system. Cancel·leu la instal·lació sense canviar el sistema. - + &Next &Següent - + &Back &Enrere - + &Done &Fet - + &Cancel &Cancel·la - + Cancel setup? Voleu cancel·lar la configuració? - + Cancel installation? Voleu cancel·lar la instal·lació? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Realment voleu cancel·lar el procés de configuració actual? El programa de configuració es tancarà i es perdran tots els canvis. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Voleu cancel·lar el procés d'instal·lació actual? @@ -475,12 +495,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. CalamaresWindow - + %1 Setup Program Programa de configuració %1 - + %1 Installer Instal·lador de %1 @@ -488,7 +508,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. CheckerContainer - + Gathering system information... Es recopila informació del sistema... @@ -736,22 +756,32 @@ L'instal·lador es tancarà i tots els canvis es perdran. Els números i les dates de la configuració local s'establiran a %1. - + Network Installation. (Disabled: Incorrect configuration) Instal·lació per xarxa. (Inhabilitada: configuració incorrecta) - + Network Installation. (Disabled: Received invalid groups data) Instal·lació per xarxa. (Inhabilitada: dades de grups rebudes no vàlides) - - Network Installation. (Disabled: internal error) - Instal·lació per xarxa. (Inhabilitada: error intern) + + Network Installation. (Disabled: Internal error) + Instal·lació de xarxa. (Inhabilitat: error intern) + + + + Network Installation. (Disabled: No package list) + Instal·lació de xarxa. (Inhabilitat: no hi ha llista de paquets) + + + + Package selection + Selecció de paquets - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instal·lació per xarxa. (Inhabilitada: no es poden obtenir les llistes de paquets, comproveu la connexió.) @@ -846,42 +876,42 @@ L'instal·lador es tancarà i tots els canvis es perdran. Les contrasenyes no coincideixen! - + Setup Failed Ha fallat la configuració. - + Installation Failed La instal·lació ha fallat. - + The setup of %1 did not complete successfully. La configuració de %1 no s'ha completat correctament. - + The installation of %1 did not complete successfully. La instal·lació de %1 no s'ha completat correctament. - + Setup Complete Configuració completa - + Installation Complete Instal·lació acabada - + The setup of %1 is complete. La configuració de %1 ha acabat. - + The installation of %1 is complete. La instal·lació de %1 ha acabat. @@ -1478,72 +1508,72 @@ L'instal·lador es tancarà i tots els canvis es perdran. GeneralRequirements - + has at least %1 GiB available drive space tingui com a mínim %1 GiB d'espai de disc disponible. - + There is not enough drive space. At least %1 GiB is required. No hi ha prou espai de disc disponible. Com a mínim hi ha d'haver %1 GiB. - + has at least %1 GiB working memory tingui com a mínim %1 GiB de memòria de treball. - + The system does not have enough working memory. At least %1 GiB is required. El sistema no té prou memòria de treball. Com a mínim hi ha d'haver %1 GiB. - + is plugged in to a power source estigui connectat a una presa de corrent. - + The system is not plugged in to a power source. El sistema no està connectat a una presa de corrent. - + is connected to the Internet estigui connectat a Internet. - + The system is not connected to the Internet. El sistema no està connectat a Internet. - + is running the installer as an administrator (root) executi l'instal·lador com a administrador (arrel). - + The setup program is not running with administrator rights. El programa de configuració no s'executa amb privilegis d'administrador. - + The installer is not running with administrator rights. L'instal·lador no s'executa amb privilegis d'administrador. - + has a screen large enough to show the whole installer tingui una pantalla prou grossa per mostrar completament l'instal·lador. - + The screen is too small to display the setup program. La pantalla és massa petita per mostrar el programa de configuració. - + The screen is too small to display the installer. La pantalla és massa petita per mostrar l'instal·lador. @@ -1611,7 +1641,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. Si us plau, instal·leu el Konsole de KDE i torneu-ho a intentar! - + Executing script: &nbsp;<code>%1</code> S'executa l'script &nbsp;<code>%1</code> @@ -1883,98 +1913,97 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé NetInstallViewStep - - + Package selection Selecció de paquets - + Office software Programari d'oficina - + Office package Paquet d'oficina - + Browser software Programari de navegador - + Browser package Paquet de navegador - + Web browser Navegador web - + Kernel Nucli - + Services Serveis - + Login Entrada - + Desktop Escriptori - + Applications Aplicacions - + Communication Comunicació - + Development Desenvolupament - + Office Oficina - + Multimedia Multimèdia - + Internet Internet - + Theming Tema - + Gaming Jocs - + Utilities Utilitats @@ -3708,12 +3737,12 @@ La configuració pot continuar, però algunes característiques podrien estar in UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Si més d'una persona usarà aquest ordinador, podeu crear diversos comptes després de la configuració.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Si més d'una persona usarà aquest ordinador, podeu crear diversos comptes després de la instal·lació.</small> @@ -3721,7 +3750,7 @@ La configuració pot continuar, però algunes característiques podrien estar in UsersQmlViewStep - + Users Usuaris @@ -4141,102 +4170,102 @@ La configuració pot continuar, però algunes característiques podrien estar in Com us dieu? - + Your Full Name El nom complet - + What name do you want to use to log in? Quin nom voleu usar per iniciar la sessió? - + Login Name Nom d'entrada - + If more than one person will use this computer, you can create multiple accounts after installation. Si aquest ordinador l'usarà més d'una persona, podreu crear diversos comptes després de la instal·lació. - + What is the name of this computer? Com es diu aquest ordinador? - + Computer Name Nom de l'ordinador - + This name will be used if you make the computer visible to others on a network. Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa. - + Choose a password to keep your account safe. Trieu una contrasenya per tal de mantenir el compte segur. - + Password Contrasenya - + Repeat Password Repetiu la contrasenya. - + 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. Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia. Una bona contrasenya ha de contenir una barreja de lletres, números i signes de puntuació, hauria de tenir un mínim de 8 caràcters i s'hauria de modificar a intervals regulars. - + Validate passwords quality Valida la qualitat de les contrasenyes. - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no en podreu fer una de dèbil. - + Log in automatically without asking for the password Entra automàticament sense demanar la contrasenya. - + Reuse user password as root password Reutilitza la contrasenya d'usuari com a contrasenya d'arrel. - + Use the same password for the administrator account. Usa la mateixa contrasenya per al compte d'administració. - + Choose a root password to keep your account safe. Trieu una contrasenya d'arrel per mantenir el compte segur. - + Root Password Contrasenya d'arrel - + Repeat Root Password Repetiu la contrasenya d'arrel. - + Enter the same password twice, so that it can be checked for typing errors. Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia. diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts index 9b910f2361..cac8c4981a 100644 --- a/lang/calamares_ca@valencia.ts +++ b/lang/calamares_ca@valencia.ts @@ -102,22 +102,42 @@ Interfície: - - Tools - Eines + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Torna a carregar el full d'estil - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Arbre d'elements - + Debug information Informació de depuració @@ -286,13 +306,13 @@ - + &Yes &Sí - + &No &No @@ -302,17 +322,17 @@ Tan&ca - + Install Log Paste URL URL de publicació del registre d'instal·lació - + The upload was unsuccessful. No web-paste was done. La càrrega no s'ha fet correctament. No s'ha enganxat res a la xarxa. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed La inicialització del Calamares ha fallat. - + %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. No es pot instal·lar %1. El Calamares no ha pogut carregar tots els mòduls configurats. El problema es troba en com utilitza el Calamares la distribució. - + <br/>The following modules could not be loaded: <br/>No s'han pogut carregar els mòduls següents: - + Continue with setup? Voleu continuar la configuració? - + Continue with installation? Voleu continuar la instal·lació? - + 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> El programa de configuració %1 està a punt de fer canvis en el disc per a configurar %2.<br/><strong>No podreu desfer aquests canvis.</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> L'instal·lador per a %1 està a punt de fer canvis en el disc per tal d'instal·lar-hi %2.<br/><strong>No podreu desfer aquests canvis.</strong> - + &Set up now Con&figura-ho ara - + &Install now &Instal·la'l ara - + Go &back &Arrere - + &Set up Con&figuració - + &Install &Instal·la - + Setup is complete. Close the setup program. La configuració s'ha completat. Tanqueu el programa de configuració. - + The installation is complete. Close the installer. La instal·lació s'ha completat. Tanqueu l'instal·lador. - + Cancel setup without changing the system. Cancel·la la configuració sense canviar el sistema. - + Cancel installation without changing the system. Cancel·la la instal·lació sense canviar el sistema. - + &Next &Següent - + &Back A&rrere - + &Done &Fet - + &Cancel &Cancel·la - + Cancel setup? Voleu cancel·lar la configuració? - + Cancel installation? Voleu cancel·lar la instal·lació? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Voleu cancel·lar el procés de configuració actual? El programa de configuració es tancarà i es perdran tots els canvis. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Voleu cancel·lar el procés d'instal·lació actual? @@ -471,12 +491,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. CalamaresWindow - + %1 Setup Program Programa de configuració %1 - + %1 Installer Instal·lador de %1 @@ -484,7 +504,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. CheckerContainer - + Gathering system information... S'està obtenint la informació del sistema... @@ -732,22 +752,32 @@ L'instal·lador es tancarà i tots els canvis es perdran. Els números i les dates de la configuració local s'establiran en %1. - + Network Installation. (Disabled: Incorrect configuration) Instal·lació per xarxa. (Inhabilitada: configuració incorrecta) - + Network Installation. (Disabled: Received invalid groups data) Instal·lació per xarxa. (Inhabilitada: dades de grups rebudes no vàlides) - - Network Installation. (Disabled: internal error) - Instal·lació per xarxa. (Inhabilitada: error intern) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Selecció de paquets - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instal·lació per xarxa. (Inhabilitada: no es poden obtindre les llistes de paquets, comproveu la connexió.) @@ -842,42 +872,42 @@ L'instal·lador es tancarà i tots els canvis es perdran. Les contrasenyes no coincideixen. - + Setup Failed S'ha produït un error en la configuració. - + Installation Failed La instal·lació ha fallat. - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete S'ha completat la configuració. - + Installation Complete Ha acabat la instal·lació. - + The setup of %1 is complete. La configuració de %1 ha acabat. - + The installation of %1 is complete. La instal·lació de %1 ha acabat. @@ -1474,72 +1504,72 @@ L'instal·lador es tancarà i tots els canvis es perdran. GeneralRequirements - + has at least %1 GiB available drive space té com a mínim %1 GiB d'espai de disc disponible. - + There is not enough drive space. At least %1 GiB is required. No hi ha prou espai de disc disponible. Com a mínim hi ha d'haver %1 GiB. - + has at least %1 GiB working memory té com a mínim %1 GiB de memòria de treball. - + The system does not have enough working memory. At least %1 GiB is required. El sistema no té prou memòria de treball. Com a mínim cal que hi haja %1 GiB. - + is plugged in to a power source està connectat a la xarxa elèctrica - + The system is not plugged in to a power source. El sistema no està connectat a una xarxa elèctrica. - + is connected to the Internet està connectat a Internet - + The system is not connected to the Internet. El sistema no està connectat a Internet. - + is running the installer as an administrator (root) està executant l'instal·lador com a administrador (arrel). - + The setup program is not running with administrator rights. El programa de configuració no s'està executant amb privilegis d'administració. - + The installer is not running with administrator rights. L'instal·lador no s'està executant amb privilegis d'administració. - + has a screen large enough to show the whole installer té una pantalla suficientment gran per a mostrar completament l'instal·lador. - + The screen is too small to display the setup program. La pantalla és massa menuda per a mostrar el programa de configuració. - + The screen is too small to display the installer. La pantalla és massa menuda per a mostrar l'instal·lador. @@ -1607,7 +1637,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. Instal·leu el Konsole de KDE i torneu a intentar-ho. - + Executing script: &nbsp;<code>%1</code> S'està executant l'script &nbsp;<code>%1</code> @@ -1879,98 +1909,97 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé NetInstallViewStep - - + Package selection Selecció de paquets - + Office software Programari d'oficina - + Office package Paquet d'oficina - + Browser software Programari de navegador - + Browser package Paquet de navegador - + Web browser Navegador web - + Kernel Nucli - + Services Serveis - + Login Entrada - + Desktop Escriptori - + Applications Aplicacions - + Communication Comunicació - + Development Desenvolupament - + Office Oficina - + Multimedia Multimèdia - + Internet Internet - + Theming Tema - + Gaming Jugant - + Utilities Utilitats @@ -3704,12 +3733,12 @@ La configuració pot continuar, però és possible que algunes característiques UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Si hi ha més d'una persona que ha d'usar aquest ordinador, podeu crear diversos comptes després de la configuració.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Si hi ha més d'una persona que ha d'usar aquest ordinador, podeu crear diversos comptes després de la instal·lació.</small> @@ -3717,7 +3746,7 @@ La configuració pot continuar, però és possible que algunes característiques UsersQmlViewStep - + Users Usuaris @@ -4135,102 +4164,102 @@ La configuració pot continuar, però és possible que algunes característiques Quin és el vostre nom? - + Your Full Name Nom complet - + What name do you want to use to log in? Quin nom voleu utilitzar per a entrar al sistema? - + Login Name Nom d'entrada - + If more than one person will use this computer, you can create multiple accounts after installation. Si hi ha més d'una persona que ha d'usar aquest ordinador, podeu crear diversos comptes després de la instal·lació. - + What is the name of this computer? Quin és el nom d'aquest ordinador? - + Computer Name Nom de l'ordinador - + This name will be used if you make the computer visible to others on a network. Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa. - + Choose a password to keep your account safe. Seleccioneu una contrasenya per a mantindre el vostre compte segur. - + Password Contrasenya - + Repeat Password Repetiu la contrasenya - + 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. Escriviu la mateixa contrasenya dues vegades per a poder comprovar-ne els errors de mecanografia. Una bona contrasenya contindrà una barreja de lletres, números i signes de puntuació. Hauria de tindre un mínim de huit caràcters i s'hauria de canviar sovint. - + Validate passwords quality Valida la qualitat de les contrasenyes. - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no podreu indicar-ne una de dèbil. - + Log in automatically without asking for the password Entra automàticament sense demanar la contrasenya. - + Reuse user password as root password Reutilitza la contrasenya d'usuari com a contrasenya d'arrel. - + Use the same password for the administrator account. Usa la mateixa contrasenya per al compte d'administració. - + Choose a root password to keep your account safe. Trieu una contrasenya d'arrel per mantindre el compte segur. - + Root Password Contrasenya d'arrel - + Repeat Root Password Repetiu la contrasenya d'arrel. - + Enter the same password twice, so that it can be checked for typing errors. Escriviu la mateixa contrasenya dues vegades per a poder comprovar-ne els errors de mecanografia. diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts index d108a7b7ac..e1eb5256d1 100644 --- a/lang/calamares_cs_CZ.ts +++ b/lang/calamares_cs_CZ.ts @@ -102,22 +102,42 @@ Rozhraní: - - Tools - Nástroje + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + - + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet Znovunačíst sešit se styly - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Strom widgetu - + Debug information Ladící informace @@ -290,13 +310,13 @@ - + &Yes &Ano - + &No &Ne @@ -306,17 +326,17 @@ &Zavřít - + Install Log Paste URL URL pro vložení záznamu událostí při instalaci - + The upload was unsuccessful. No web-paste was done. Nahrání se nezdařilo. Na web nebylo nic vloženo. - + Install log posted to %1 @@ -325,124 +345,124 @@ Link copied to clipboard - + Calamares Initialization Failed Inicializace Calamares se nezdařila - + %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 nemůže být nainstalováno. Calamares se nepodařilo načíst všechny nastavené moduly. Toto je problém způsobu použití Calamares ve vámi používané distribuci. - + <br/>The following modules could not be loaded: <br/> Následující moduly se nepodařilo načíst: - + Continue with setup? Pokračovat s instalací? - + Continue with installation? Pokračovat v instalaci? - + 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> Instalátor %1 provede změny na datovém úložišti, aby bylo nainstalováno %2.<br/><strong>Změny nebude možné vrátit zpět.</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> Instalátor %1 provede změny na datovém úložišti, aby bylo nainstalováno %2.<br/><strong>Změny nebude možné vrátit zpět.</strong> - + &Set up now Na&stavit nyní - + &Install now &Spustit instalaci - + Go &back Jít &zpět - + &Set up Na&stavit - + &Install Na&instalovat - + Setup is complete. Close the setup program. Nastavení je dokončeno. Ukončete nastavovací program. - + The installation is complete. Close the installer. Instalace je dokončena. Ukončete instalátor. - + Cancel setup without changing the system. Zrušit nastavení bez změny v systému. - + Cancel installation without changing the system. Zrušení instalace bez provedení změn systému. - + &Next &Další - + &Back &Zpět - + &Done &Hotovo - + &Cancel &Storno - + Cancel setup? Zrušit nastavování? - + Cancel installation? Přerušit instalaci? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Opravdu chcete přerušit instalaci? Instalační program bude ukončen a všechny změny ztraceny. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Opravdu chcete instalaci přerušit? @@ -475,12 +495,12 @@ Instalační program bude ukončen a všechny změny ztraceny. CalamaresWindow - + %1 Setup Program Instalátor %1 - + %1 Installer %1 instalátor @@ -488,7 +508,7 @@ Instalační program bude ukončen a všechny změny ztraceny. CheckerContainer - + Gathering system information... Shromažďování informací o systému… @@ -736,22 +756,32 @@ Instalační program bude ukončen a všechny změny ztraceny. Formát zobrazení čísel, data a času bude nastaven dle národního prostředí %1. - + Network Installation. (Disabled: Incorrect configuration) Síťová instalace. (vypnuto: nesprávné nastavení) - + Network Installation. (Disabled: Received invalid groups data) Síťová instalace. (Vypnuto: Obdrženy neplatné údaje skupin) - - Network Installation. (Disabled: internal error) - Instalace ze sítě. (Vypnuto: vnitřní chyba) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Výběr balíčků - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Síťová instalace. (Vypnuto: Nedaří se stáhnout seznamy balíčků – zkontrolujte připojení k síti) @@ -846,42 +876,42 @@ Instalační program bude ukončen a všechny změny ztraceny. Zadání hesla se neshodují! - + Setup Failed Nastavení se nezdařilo - + Installation Failed Instalace se nezdařila - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Nastavení dokončeno - + Installation Complete Instalace dokončena - + The setup of %1 is complete. Nastavení %1 je dokončeno. - + The installation of %1 is complete. Instalace %1 je dokončena. @@ -1478,72 +1508,72 @@ Instalační program bude ukončen a všechny změny ztraceny. GeneralRequirements - + has at least %1 GiB available drive space má alespoň %1 GiB dostupného prostoru - + There is not enough drive space. At least %1 GiB is required. Nedostatek místa na úložišti. Je potřeba nejméně %1 GiB. - + has at least %1 GiB working memory má alespoň %1 GiB operační paměti - + The system does not have enough working memory. At least %1 GiB is required. Systém nemá dostatek operační paměti. Je potřeba nejméně %1 GiB. - + is plugged in to a power source je připojený ke zdroji napájení - + The system is not plugged in to a power source. Systém není připojen ke zdroji napájení. - + is connected to the Internet je připojený k Internetu - + The system is not connected to the Internet. Systém není připojený k Internetu. - + is running the installer as an administrator (root) instalátor je spuštěný s právy správce systému (root) - + The setup program is not running with administrator rights. Nastavovací program není spuštěn s právy správce systému. - + The installer is not running with administrator rights. Instalační program není spuštěn s právy správce systému. - + has a screen large enough to show the whole installer má obrazovku dostatečně velkou pro zobrazení celého instalátoru - + The screen is too small to display the setup program. Rozlišení obrazovky je příliš malé pro zobrazení nastavovacího programu. - + The screen is too small to display the installer. Rozlišení obrazovky je příliš malé pro zobrazení instalátoru. @@ -1611,7 +1641,7 @@ Instalační program bude ukončen a všechny změny ztraceny. Nainstalujte KDE Konsole a zkuste to znovu! - + Executing script: &nbsp;<code>%1</code> Spouštění skriptu: &nbsp;<code>%1</code> @@ -1883,98 +1913,97 @@ Instalační program bude ukončen a všechny změny ztraceny. NetInstallViewStep - - + Package selection Výběr balíčků - + Office software Aplikace pro kancelář - + Office package Balíček s kancelářským software - + Browser software Aplikace pro procházení webu - + Browser package Balíček s webovým prohlížečem - + Web browser Webový prohlížeč - + Kernel Jádro systému - + Services Služby - + Login Uživatelské jméno - + Desktop Desktop - + Applications Aplikace - + Communication Komunikace - + Development Vývoj - + Office Kancelář - + Multimedia Multimédia - + Internet Internet - + Theming Motivy vzhledu - + Gaming Hry - + Utilities Nástroje @@ -3726,12 +3755,12 @@ Výstup: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Pokud bude tento počítač používat více lidí, můžete přidat uživatelské účty po dokončení instalace.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Pokud bude tento počítač používat více lidí, můžete přidat uživatelské účty po dokončení instalace.</small> @@ -3739,7 +3768,7 @@ Výstup: UsersQmlViewStep - + Users Uživatelé @@ -4157,102 +4186,102 @@ Výstup: Jak se jmenujete? - + Your Full Name Vaše celé jméno - + What name do you want to use to log in? Jaké jméno chcete používat pro přihlašování do systému? - + Login Name Přihlašovací jméno - + If more than one person will use this computer, you can create multiple accounts after installation. Pokud bude tento počítač používat více než jedna osoba, můžete po instalaci vytvořit více účtů. - + What is the name of this computer? Jaký je název tohoto počítače? - + Computer Name Název počítače - + This name will be used if you make the computer visible to others on a network. Tento název se použije, pokud počítač zviditelníte ostatním v síti. - + Choose a password to keep your account safe. Zvolte si heslo pro ochranu svého účtu. - + Password Heslo - + Repeat Password Zopakování zadání hesla - + 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. Zadejte dvakrát stejné heslo, aby bylo možné zkontrolovat chyby při psaní. Dobré heslo by mělo obsahovat směs písmen, čísel a interpunkce a mělo by mít alespoň osm znaků. Zvažte také jeho pravidelnou změnu. - + Validate passwords quality Ověřte kvalitu hesel - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Když je toto zaškrtnuto, je prověřována odolnost hesla a nebude umožněno použít snadno prolomitelné heslo. - + Log in automatically without asking for the password Přihlaste se automaticky bez zadávání hesla - + Reuse user password as root password Použijte uživatelské heslo zároveň jako heslo root - + Use the same password for the administrator account. Použít stejné heslo i pro účet správce systému. - + Choose a root password to keep your account safe. Zvolte heslo uživatele root, aby byl váš účet v bezpečí. - + Root Password Heslo uživatele root - + Repeat Root Password Opakujte root heslo - + Enter the same password twice, so that it can be checked for typing errors. Zadejte dvakrát stejné heslo, aby bylo možné zkontrolovat chyby při psaní. diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index ebd5a655d9..2f5ff91911 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -102,22 +102,42 @@ Grænseflade: - - Tools - Værktøjer + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Genindlæs stilark - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Widgettræ - + Debug information Fejlretningsinformation @@ -286,13 +306,13 @@ - + &Yes &Ja - + &No &Nej @@ -302,17 +322,17 @@ &Luk - + Install Log Paste URL Indsættelses-URL for installationslog - + The upload was unsuccessful. No web-paste was done. Uploaden lykkedes ikke. Der blev ikke foretaget nogen webindsættelse. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed Initiering af Calamares mislykkedes - + %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 kan ikke installeres. Calamares kunne ikke indlæse alle de konfigurerede moduler. Det er et problem med den måde Calamares bruges på af distributionen. - + <br/>The following modules could not be loaded: <br/>Følgende moduler kunne ikke indlæses: - + Continue with setup? Fortsæt med opsætningen? - + Continue with installation? Fortsæt installationen? - + 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-opsætningsprogrammet er ved at foretage ændringer til din disk for at opsætte %2.<br/><strong>Det vil ikke være muligt at fortryde ændringerne.</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-installationsprogrammet er ved at foretage ændringer til din disk for at installere %2.<br/><strong>Det vil ikke være muligt at fortryde ændringerne.</strong> - + &Set up now &Opsæt nu - + &Install now &Installér nu - + Go &back Gå &tilbage - + &Set up &Opsæt - + &Install &Installér - + Setup is complete. Close the setup program. Opsætningen er fuldført. Luk opsætningsprogrammet. - + The installation is complete. Close the installer. Installationen er fuldført. Luk installationsprogrammet. - + Cancel setup without changing the system. Annullér opsætningen uden at ændre systemet. - + Cancel installation without changing the system. Annullér installation uden at ændre systemet. - + &Next &Næste - + &Back &Tilbage - + &Done &Færdig - + &Cancel &Annullér - + Cancel setup? Annullér opsætningen? - + Cancel installation? Annullér installationen? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Vil du virkelig annullere den igangværende opsætningsproces? Opsætningsprogrammet vil stoppe og alle ændringer vil gå tabt. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Vil du virkelig annullere den igangværende installationsproces? @@ -471,12 +491,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. CalamaresWindow - + %1 Setup Program %1-opsætningsprogram - + %1 Installer %1-installationsprogram @@ -484,7 +504,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. CheckerContainer - + Gathering system information... Indsamler systeminformation ... @@ -732,22 +752,32 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Lokalitet for tal og datoer indstilles til %1. - + Network Installation. (Disabled: Incorrect configuration) Netværksinstallation. (deaktiveret: forkert konfiguration) - + Network Installation. (Disabled: Received invalid groups data) Netværksinstallation. (deaktiveret: modtog ugyldige gruppers data) - - Network Installation. (Disabled: internal error) - Netværksinstallation. (deaktiveret: intern fejl) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Valg af pakke - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Netværksinstallation. (deaktiveret: kunne ikke hente pakkelister, tjek din netværksforbindelse) @@ -842,42 +872,42 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Dine adgangskoder er ikke ens! - + Setup Failed Opsætningen mislykkedes - + Installation Failed Installation mislykkedes - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Opsætningen er fuldført - + Installation Complete Installation fuldført - + The setup of %1 is complete. Opsætningen af %1 er fuldført. - + The installation of %1 is complete. Installationen af %1 er fuldført. @@ -1474,72 +1504,72 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. GeneralRequirements - + has at least %1 GiB available drive space har mindst %1 GiB ledig plads på drevet - + There is not enough drive space. At least %1 GiB is required. Der er ikke nok ledig plads på drevet. Mindst %1 GiB er påkrævet. - + has at least %1 GiB working memory har mindst %1 GiB hukkommelse - + The system does not have enough working memory. At least %1 GiB is required. Systemet har ikke nok arbejdshukommelse. Mindst %1 GiB er påkrævet. - + is plugged in to a power source er tilsluttet en strømkilde - + The system is not plugged in to a power source. Systemet er ikke tilsluttet en strømkilde. - + is connected to the Internet er forbundet til internettet - + The system is not connected to the Internet. Systemet er ikke forbundet til internettet. - + is running the installer as an administrator (root) kører installationsprogrammet som en administrator (root) - + The setup program is not running with administrator rights. Opsætningsprogrammet kører ikke med administratorrettigheder. - + The installer is not running with administrator rights. Installationsprogrammet kører ikke med administratorrettigheder. - + has a screen large enough to show the whole installer har en skærm, som er stor nok til at vise hele installationsprogrammet - + The screen is too small to display the setup program. Skærmen er for lille til at vise opsætningsprogrammet. - + The screen is too small to display the installer. Skærmen er for lille til at vise installationsprogrammet. @@ -1607,7 +1637,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Installér venligst KDE Konsole og prøv igen! - + Executing script: &nbsp;<code>%1</code> Eksekverer skript: &nbsp;<code>%1</code> @@ -1879,98 +1909,97 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. NetInstallViewStep - - + Package selection Valg af pakke - + Office software Kontorsoftware - + Office package Kontorpakke - + Browser software Browsersoftware - + Browser package Browserpakke - + Web browser Webbrowser - + Kernel Kerne - + Services Tjenester - + Login Log ind - + Desktop Skrivebord - + Applications Programmer - + Communication Kommunikation - + Development Udvikling - + Office Kontor - + Multimedia Multimedie - + Internet Internet - + Theming Tema - + Gaming Spil - + Utilities Redskaber @@ -3705,12 +3734,12 @@ setting UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Hvis mere end én person bruger computeren, kan du oprette flere konti efter opsætningen.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Hvis mere end én person bruger computeren, kan du oprette flere konti efter installationen.</small> @@ -3718,7 +3747,7 @@ setting UsersQmlViewStep - + Users Brugere @@ -4135,102 +4164,102 @@ setting Hvad er dit navn? - + Your Full Name Dit fulde navn - + What name do you want to use to log in? Hvilket navn skal bruges til at logge ind? - + Login Name Loginnavn - + If more than one person will use this computer, you can create multiple accounts after installation. Hvis mere end én person bruger computeren, kan du oprette flere konti efter installationen. - + What is the name of this computer? Hvad er navnet på computeren? - + Computer Name Computernavn - + This name will be used if you make the computer visible to others on a network. Navnet bruges, hvis du gør computeren synlig for andre på et netværk. - + Choose a password to keep your account safe. Vælg en adgangskode for at beskytte din konto. - + Password Adgangskode - + Repeat Password Gentag adgangskode - + 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. Skriv den samme adgangskode to gange, så den kan blive tjekket for skrivefejl. En god adgangskode indeholder en blanding af bogstaver, tal og specialtegn, bør være mindst 8 tegn langt og bør skiftes jævnligt. - + Validate passwords quality Validér kvaliteten af adgangskoderne - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Når boksen er tilvalgt, så foretages der tjek af adgangskodens styrke og du vil ikke være i stand til at bruge en svag adgangskode. - + Log in automatically without asking for the password Log ind automatisk uden at spørge efter adgangskoden - + Reuse user password as root password Genbrug brugeradgangskode som root-adgangskode - + Use the same password for the administrator account. Brug den samme adgangskode til administratorkontoen. - + Choose a root password to keep your account safe. Vælg en root-adgangskode til at holde din konto sikker - + Root Password Root-adgangskode - + Repeat Root Password Gentag root-adgangskode - + Enter the same password twice, so that it can be checked for typing errors. Skriv den samme adgangskode to gange, så den kan blive tjekket for skrivefejl. diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index cbc9fa0d99..cecd14c459 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Einstellungen für das automatische Einhängen bearbeiten @@ -102,22 +102,42 @@ Schnittstelle: - - Tools - Werkzeuge + + Crashes Calamares, so that Dr. Konqui can look at it. + Bringt Calamares zum Absturz, damit eine Untersuchung durch Dr. Konqui erfolgen kann. - + + Reloads the stylesheet from the branding directory. + Aktualisiert die Formatvorlage aus dem Herstellerverzeichnis. + + + + Uploads the session log to the configured pastebin. + Hochladen des Sitzungsprotokolls zum eingestellten Ziel. + + + + Send Session Log + Sitzungsprotokoll senden + + + Reload Stylesheet Stylesheet neu laden - + + Displays the tree of widget names in the log (for stylesheet debugging). + Vermerkt den Verzeichnisbaum der Widget-Namen im Protokoll (für die Fehlersuche bei Formatvorlagen) + + + Widget Tree Widget-Baum - + Debug information Debug-Information @@ -286,13 +306,13 @@ - + &Yes &Ja - + &No &Nein @@ -302,143 +322,147 @@ &Schließen - + Install Log Paste URL Internetadresse für das Senden des Installationsprotokolls - + The upload was unsuccessful. No web-paste was done. Das Hochladen ist fehlgeschlagen. Es wurde nichts an eine Internetadresse gesendet. - + Install log posted to %1 Link copied to clipboard - + Installationsprotokoll gesendet an + +%1 + +Link wurde in die Zwischenablage kopiert - + Calamares Initialization Failed Initialisierung von Calamares fehlgeschlagen - + %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 kann nicht installiert werden. Calamares war nicht in der Lage, alle konfigurierten Module zu laden. Dieses Problem hängt mit der Art und Weise zusammen, wie Calamares von der jeweiligen Distribution eingesetzt wird. - + <br/>The following modules could not be loaded: <br/>Die folgenden Module konnten nicht geladen werden: - + Continue with setup? Setup fortsetzen? - + Continue with installation? Installation fortsetzen? - + 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> Das %1 Installationsprogramm ist dabei, Änderungen an Ihrer Festplatte vorzunehmen, um %2 einzurichten.<br/><strong> Sie werden diese Änderungen nicht rückgängig machen können.</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> Das %1 Installationsprogramm wird Änderungen an Ihrer Festplatte vornehmen, um %2 zu installieren.<br/><strong>Diese Änderungen können nicht rückgängig gemacht werden.</strong> - + &Set up now &Jetzt einrichten - + &Install now Jetzt &installieren - + Go &back Gehe &zurück - + &Set up &Einrichten - + &Install &Installieren - + Setup is complete. Close the setup program. Setup ist abgeschlossen. Schließe das Installationsprogramm. - + The installation is complete. Close the installer. Die Installation ist abgeschlossen. Schließe das Installationsprogramm. - + Cancel setup without changing the system. Installation abbrechen ohne das System zu verändern. - + Cancel installation without changing the system. Installation abbrechen, ohne das System zu verändern. - + &Next &Weiter - + &Back &Zurück - + &Done &Erledigt - + &Cancel &Abbrechen - + Cancel setup? Installation abbrechen? - + Cancel installation? Installation abbrechen? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Wollen Sie die Installation wirklich abbrechen? Dadurch wird das Installationsprogramm beendet und alle Änderungen gehen verloren. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Wollen Sie wirklich die aktuelle Installation abbrechen? @@ -471,12 +495,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. CalamaresWindow - + %1 Setup Program %1 Installationsprogramm - + %1 Installer %1 Installationsprogramm @@ -484,7 +508,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. CheckerContainer - + Gathering system information... Sammle Systeminformationen... @@ -732,22 +756,32 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Das Format für Zahlen und Datum wird auf %1 gesetzt. - + Network Installation. (Disabled: Incorrect configuration) Netzwerk-Installation. (Deaktiviert: Ungültige Konfiguration) - + Network Installation. (Disabled: Received invalid groups data) Netzwerk-Installation. (Deaktiviert: Ungültige Gruppen-Daten eingegeben) - - Network Installation. (Disabled: internal error) - Netzwerk-Installation. (Deaktiviert: Interner Fehler) + + Network Installation. (Disabled: Internal error) + Netzwerkinstallation. (Deaktiviert: Interner Fehler) + + + + Network Installation. (Disabled: No package list) + Netzwerkinstallation. (Deaktiviert: Keine Paketliste) + + + + Package selection + Paketauswahl - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Netzwerk-Installation. (Deaktiviert: Paketlisten nicht erreichbar, prüfen Sie Ihre Netzwerk-Verbindung) @@ -842,42 +876,42 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Ihre Passwörter stimmen nicht überein! - + Setup Failed - Setup fehlgeschlagen + Einrichtung fehlgeschlagen - + Installation Failed Installation gescheitert - + The setup of %1 did not complete successfully. - + Die Einrichtung von %1 wurde nicht erfolgreich abgeschlossen. - + The installation of %1 did not complete successfully. - + Die Installation von %1 wurde nicht erfolgreich abgeschlossen. - + Setup Complete - Installation abgeschlossen + Einrichtung abgeschlossen - + Installation Complete Installation abgeschlossen - + The setup of %1 is complete. - Die Installation von %1 ist abgeschlossen. + Die Einrichtung von %1 ist abgeschlossen. - + The installation of %1 is complete. Die Installation von %1 ist abgeschlossen. @@ -973,12 +1007,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Create new %1MiB partition on %3 (%2) with entries %4. - + Erstelle neue %1MiB Partition auf %3 (%2) mit den Einträgen %4. Create new %1MiB partition on %3 (%2). - + Erstelle neue %1MiB Partition auf %3 (%2). @@ -988,12 +1022,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Erstelle neue <strong>%1MiB</strong>Partition auf <strong>%3</strong> (%2) mit den Einträgen <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Erstelle neue <strong>%1MiB</strong> Partition auf <strong>%3</strong> (%2). @@ -1341,7 +1375,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Installiere %1 auf <strong>neue</strong> %2 Systempartition mit den Funktionen <em>%3</em> @@ -1351,27 +1385,27 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Erstelle <strong>neue</strong> %2 Partition mit Einhängepunkt <strong>%1</strong> und den Funktionen <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Erstelle<strong>neue</strong> %2 Partition mit Einhängepunkt <strong>%1</strong>%3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Installiere %2 auf %3 Systempartition <strong>%1</strong> mit den Funktionen <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Erstelle %3 Partition <strong>%1</strong> mit Einhängepunkt <strong>%2</strong> und den Funktionen <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Erstelle %3 Partition <strong>%1</strong> mit Einhängepunkt <strong>%2</strong>%4. @@ -1437,7 +1471,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Finish - Beenden + Abschließen @@ -1474,72 +1508,72 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. GeneralRequirements - + has at least %1 GiB available drive space mindestens %1 GiB freien Festplattenplatz hat - + There is not enough drive space. At least %1 GiB is required. Zu wenig Speicherplatz auf der Festplatte. Es wird mindestens %1 GiB benötigt. - + has at least %1 GiB working memory mindestens %1 GiB Arbeitsspeicher hat - + The system does not have enough working memory. At least %1 GiB is required. Das System hat nicht genug Arbeitsspeicher. Es wird mindestens %1 GiB benötigt. - + is plugged in to a power source ist an eine Stromquelle angeschlossen - + The system is not plugged in to a power source. Der Computer ist an keine Stromquelle angeschlossen. - + is connected to the Internet ist mit dem Internet verbunden - + The system is not connected to the Internet. Der Computer ist nicht mit dem Internet verbunden. - + is running the installer as an administrator (root) führt das Installationsprogramm als Administrator (root) aus - + The setup program is not running with administrator rights. Das Installationsprogramm wird nicht mit Administratorrechten ausgeführt. - + The installer is not running with administrator rights. Das Installationsprogramm wird nicht mit Administratorrechten ausgeführt. - + has a screen large enough to show the whole installer hat einen ausreichend großen Bildschirm für die Anzeige des gesamten Installationsprogramm - + The screen is too small to display the setup program. Der Bildschirm ist zu klein, um das Installationsprogramm anzuzeigen. - + The screen is too small to display the installer. Der Bildschirm ist zu klein, um das Installationsprogramm anzuzeigen. @@ -1607,7 +1641,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Bitte installieren Sie das KDE-Programm namens Konsole und probieren Sie es erneut! - + Executing script: &nbsp;<code>%1</code> Führe Skript aus: &nbsp;<code>%1</code> @@ -1879,98 +1913,97 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. NetInstallViewStep - - + Package selection Paketauswahl - + Office software Office-Software - + Office package Office-Paket - + Browser software Browser-Software - + Browser package Browser-Paket - + Web browser Webbrowser - + Kernel Kernel - + Services Dienste - + Login Anmeldung - + Desktop Desktop - + Applications Anwendungen - + Communication Kommunikation - + Development Entwicklung - + Office Büro - + Multimedia Multimedia - + Internet Internet - + Theming Anpassung - + Gaming Spielen - + Utilities Dienstprogramme @@ -3704,12 +3737,12 @@ Ausgabe: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Falls dieser Computer von mehr als einer Person benutzt werden soll, können weitere Benutzerkonten nach der Installation eingerichtet werden.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Falls dieser Computer von mehr als einer Person benutzt werden soll, können weitere Benutzerkonten nach der Installation eingerichtet werden.</small> @@ -3717,7 +3750,7 @@ Ausgabe: UsersQmlViewStep - + Users Benutzer @@ -3953,7 +3986,7 @@ Ausgabe: Show debug information - Debug-Information anzeigen + Informationen zur Fehlersuche anzeigen @@ -3961,29 +3994,31 @@ Ausgabe: Installation Completed - + Installation abgeschlossen %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 wurde auf Ihrem Computer installiert.<br/> + Sie können nun per Neustart das installierte System starten oder weiterhin die Live-Umgebung benutzen. Close Installer - + Installationsprogramm schließen Restart System - + System neustarten <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Ein komplettes Protokoll der Installation ist als installation.log im Home-Verzeichnis des Live-Benutzers verfügbar.<br/> + Dieses Protokoll liegt als /var/log/installation.log im installierten System vor.</p> @@ -4135,102 +4170,102 @@ Ausgabe: Wie ist Ihr Vor- und Nachname? - + Your Full Name Ihr vollständiger Name - + What name do you want to use to log in? Welchen Namen möchten Sie zum Anmelden benutzen? - + Login Name Anmeldename - + If more than one person will use this computer, you can create multiple accounts after installation. Falls mehrere Personen diesen Computer benutzen, können Sie nach der Installation weitere Konten hinzufügen. - + What is the name of this computer? Wie ist der Name dieses Computers? - + Computer Name Computername - + This name will be used if you make the computer visible to others on a network. Dieser Name wird benutzt, wenn Sie den Computer im Netzwerk für andere sichtbar machen. - + Choose a password to keep your account safe. Wählen Sie ein Passwort, um Ihr Konto zu sichern. - + Password Passwort - + Repeat Password Passwort wiederholen - + 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. Geben Sie das Passwort zweimal ein, damit es auf Tippfehler überprüft werden kann. Ein gutes Passwort sollte eine Mischung aus Buchstaben, Zahlen sowie Sonderzeichen enthalten, mindestens acht Zeichen lang sein und regelmäßig geändert werden. - + Validate passwords quality Passwort-Qualität überprüfen - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Wenn dieses Kontrollkästchen aktiviert ist, wird die Passwortstärke überprüft und verhindert, dass Sie ein schwaches Passwort verwenden. - + Log in automatically without asking for the password Automatisch anmelden ohne Passwortabfrage - + Reuse user password as root password Benutzerpasswort als Root-Passwort benutzen - + Use the same password for the administrator account. Nutze das gleiche Passwort auch für das Administratorkonto. - + Choose a root password to keep your account safe. Wählen Sie ein Root-Passwort, um Ihr Konto zu schützen. - + Root Password Root-Passwort - + Repeat Root Password Root-Passwort wiederholen - + Enter the same password twice, so that it can be checked for typing errors. Geben Sie das Passwort zweimal ein, damit es auf Tippfehler überprüft werden kann. diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts index 16333af389..b9ef0eedc4 100644 --- a/lang/calamares_el.ts +++ b/lang/calamares_el.ts @@ -102,22 +102,42 @@ Διεπαφή: - - Tools - Εργαλεία + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Πληροφορίες αποσφαλμάτωσης @@ -286,13 +306,13 @@ - + &Yes &Ναι - + &No &Όχι @@ -302,17 +322,17 @@ &Κλείσιμο - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed Η αρχικοποίηση του Calamares απέτυχε - + %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: - + Continue with setup? Συνέχεια με την εγκατάσταση; - + 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 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 θα κάνει αλλαγές στον δίσκο για να εγκαταστήσετε το %2.<br/><strong>Δεν θα είστε σε θέση να αναιρέσετε τις αλλαγές.</strong> - + &Set up now - + &Install now &Εγκατάσταση τώρα - + Go &back Μετάβαση &πίσω - + &Set up - + &Install &Εγκατάσταση - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Η εγκτάσταση ολοκληρώθηκε. Κλείστε το πρόγραμμα εγκατάστασης. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Ακύρωση της εγκατάστασης χωρίς αλλαγές στο σύστημα. - + &Next &Επόμενο - + &Back &Προηγούμενο - + &Done &Ολοκληρώθηκε - + &Cancel &Ακύρωση - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. Θέλετε πραγματικά να ακυρώσετε τη διαδικασία εγκατάστασης; @@ -470,12 +490,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer Εφαρμογή εγκατάστασης του %1 @@ -483,7 +503,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Συλλογή πληροφοριών συστήματος... @@ -731,22 +751,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Επιλογή πακέτου + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -841,42 +871,42 @@ The installer will quit and all changes will be lost. Οι κωδικοί πρόσβασης δεν ταιριάζουν! - + Setup Failed - + Installation Failed Η εγκατάσταση απέτυχε - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1473,72 +1503,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source είναι συνδεδεμένος σε πηγή ρεύματος - + The system is not plugged in to a power source. Το σύστημα δεν είναι συνδεδεμένο σε πηγή ρεύματος. - + is connected to the Internet είναι συνδεδεμένος στο διαδίκτυο - + The system is not connected to the Internet. Το σύστημα δεν είναι συνδεδεμένο στο διαδίκτυο. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Το πρόγραμμα εγκατάστασης δεν εκτελείται με δικαιώματα διαχειριστή. - + 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 installer. Η οθόνη είναι πολύ μικρή για να απεικονίσει το πρόγραμμα εγκατάστασης @@ -1606,7 +1636,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> Εκτελείται το σενάριο: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Επιλογή πακέτου - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3695,12 +3724,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 installation.</small> @@ -3708,7 +3737,7 @@ Output: UsersQmlViewStep - + Users Χρήστες @@ -4092,102 +4121,102 @@ Output: Ποιο είναι το όνομά σας; - + Your Full Name - + What name do you want to use to log in? Ποιο όνομα θα θέλατε να χρησιμοποιείτε για σύνδεση; - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Ποιο είναι το όνομά του υπολογιστή; - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Επιλέξτε ένα κωδικό για να διατηρήσετε το λογαριασμό σας ασφαλή. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Χρησιμοποιήστε τον ίδιο κωδικό πρόσβασης για τον λογαριασμό διαχειριστή. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts index eb20be4c27..dfb3ddb95a 100644 --- a/lang/calamares_en.ts +++ b/lang/calamares_en.ts @@ -102,22 +102,42 @@ Interface: - - Tools - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + Reloads the stylesheet from the branding directory. + + + + Uploads the session log to the configured pastebin. + Uploads the session log to the configured pastebin. + + + + Send Session Log + Send Session Log + + + Reload Stylesheet Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + Displays the tree of widget names in the log (for stylesheet debugging). + + + Widget Tree Widget Tree - + Debug information Debug information @@ -286,13 +306,13 @@ - + &Yes &Yes - + &No &No @@ -302,17 +322,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 @@ -325,124 +345,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? @@ -475,12 +495,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 Setup Program - + %1 Installer %1 Installer @@ -488,7 +508,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Gathering system information... @@ -736,22 +756,32 @@ The installer will quit and all changes will be lost. The numbers and dates locale will be set to %1. - + Network Installation. (Disabled: Incorrect configuration) Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + Network Installation. (Disabled: Internal error) + + + + Network Installation. (Disabled: No package list) + Network Installation. (Disabled: No package list) + + + + Package selection + Package selection - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -846,42 +876,42 @@ The installer will quit and all changes will be lost. Your passwords do not match! - + 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. @@ -1478,72 +1508,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space has at least %1 GiB available drive space - + 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. @@ -1611,7 +1641,7 @@ The installer will quit and all changes will be lost. Please install KDE Konsole and try again! - + Executing script: &nbsp;<code>%1</code> Executing script: &nbsp;<code>%1</code> @@ -1883,98 +1913,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Package selection - + Office software Office software - + Office package Office package - + Browser software Browser software - + Browser package Browser package - + Web browser Web browser - + Kernel Kernel - + Services Services - + Login Login - + Desktop Desktop - + Applications Applications - + Communication Communication - + Development Development - + Office Office - + Multimedia Multimedia - + Internet Internet - + Theming Theming - + Gaming Gaming - + Utilities Utilities @@ -3708,12 +3737,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> @@ -3721,7 +3750,7 @@ Output: UsersQmlViewStep - + Users Users @@ -4141,102 +4170,102 @@ Output: What is your name? - + Your Full Name Your Full Name - + What name do you want to use to log in? What name do you want to use to log in? - + Login Name Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? What is the name of this computer? - + Computer Name Computer Name - + This name will be used if you make the computer visible to others on a network. This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Choose a password to keep your account safe. - + Password Password - + Repeat Password Repeat Password - + 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. 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. - + Validate passwords quality Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password Log in automatically without asking for the password - + Reuse user password as root password Reuse user password as root password - + Use the same password for the administrator account. Use the same password for the administrator account. - + Choose a root password to keep your account safe. Choose a root password to keep your account safe. - + Root Password Root Password - + Repeat Root Password Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts index 194caa7592..286894d8ad 100644 --- a/lang/calamares_en_GB.ts +++ b/lang/calamares_en_GB.ts @@ -102,22 +102,42 @@ Interface: - - Tools - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Debug information @@ -286,13 +306,13 @@ - + &Yes &Yes - + &No &No @@ -302,17 +322,17 @@ &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed Calamares Initialisation 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? - + 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 - + &Install now &Install now - + Go &back Go &back - + &Set up - + &Install &Install - + 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 installation without changing the system. Cancel installation without changing the system. - + &Next &Next - + &Back &Back - + &Done &Done - + &Cancel &Cancel - + 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 install process? The installer will quit and all changes will be lost. Do you really want to cancel the current install process? @@ -470,12 +490,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Installer @@ -483,7 +503,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Gathering system information... @@ -731,22 +751,32 @@ The installer will quit and all changes will be lost. The numbers and dates locale will be set to %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Package selection + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -841,42 +871,42 @@ The installer will quit and all changes will be lost. Your passwords do not match! - + Setup Failed - + Installation Failed Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. The installation of %1 is complete. @@ -1473,72 +1503,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + 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) - + 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 - + 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. @@ -1606,7 +1636,7 @@ The installer will quit and all changes will be lost. Please install KDE Konsole and try again! - + Executing script: &nbsp;<code>%1</code> Executing script: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3698,12 +3727,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 installation.</small> @@ -3711,7 +3740,7 @@ Output: UsersQmlViewStep - + Users Users @@ -4095,102 +4124,102 @@ Output: What is your name? - + Your Full Name - + What name do you want to use to log in? What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts index ab4efbc437..4db4d9025b 100644 --- a/lang/calamares_eo.ts +++ b/lang/calamares_eo.ts @@ -102,22 +102,42 @@ Interfaco: - - Tools - Iloj + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Reŝargu Stilfolio - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree KromprogrametArbo - + Debug information Sencimiga Informaĵo @@ -286,13 +306,13 @@ - + &Yes &Jes - + &No &Ne @@ -302,17 +322,17 @@ &Fermi - + Install Log Paste URL Retadreso de la alglua servilo - + The upload was unsuccessful. No web-paste was done. Alŝuto malsukcesinta. Neniu transpoŝigis al la reto. - + Install log posted to %1 @@ -325,123 +345,123 @@ Link copied to clipboard La retadreso estis copiita al vian tondujon. - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 &Aranĝu nun - + &Install now &Instali nun - + Go &back Iru &Reen - + &Set up &Aranĝu - + &Install &Instali - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Nuligi instalado sen ŝanĝante la sistemo. - + &Next &Sekva - + &Back &Reen - + &Done &Finita - + &Cancel &Nuligi - + Cancel setup? - + Cancel installation? Nuligi instalado? - + 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. Ĉu vi vere volas nuligi la instalan procedon? @@ -474,12 +494,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instalilo @@ -487,7 +507,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. CheckerContainer - + Gathering system information... @@ -735,22 +755,32 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -845,42 +875,42 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Agordaĵo Plenumita - + Installation Complete Instalaĵo Plenumita - + The setup of %1 is complete. La agordaĵo de %1 estas plenumita. - + The installation of %1 is complete. La instalaĵo de %1 estas plenumita. @@ -1477,72 +1507,72 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1610,7 +1640,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - + Executing script: &nbsp;<code>%1</code> @@ -1880,98 +1910,97 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3699,12 +3728,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 installation.</small> @@ -3712,7 +3741,7 @@ Output: UsersQmlViewStep - + Users @@ -4096,102 +4125,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts index 79da48d525..8a5d5455c7 100644 --- a/lang/calamares_es.ts +++ b/lang/calamares_es.ts @@ -103,22 +103,42 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar Interfaz: - - Tools - Herramientas + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Recargar Hoja de estilo - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Información de depuración. @@ -287,13 +307,13 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar - + &Yes &Sí - + &No &No @@ -303,17 +323,17 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar &Cerrar - + Install Log Paste URL Pegar URL Registro de Instalación - + The upload was unsuccessful. No web-paste was done. La carga no tuvo éxito. No se realizó pegado web. - + Install log posted to %1 @@ -322,123 +342,123 @@ Link copied to clipboard - + Calamares Initialization Failed La inicialización de Calamares falló - + %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 no se pudo instalar. Calamares no fue capaz de cargar todos los módulos configurados. Esto es un problema con la forma en que Calamares es usado por la distribución - + <br/>The following modules could not be loaded: Los siguientes módulos no se pudieron cargar: - + Continue with setup? ¿Continuar con la configuración? - + Continue with installation? Continuar con la instalación? - + 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> El programa de instalación %1 está a punto de hacer cambios en el disco con el fin de configurar %2.<br/><strong>No podrá deshacer estos cambios.</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> El instalador %1 va a realizar cambios en su disco para instalar %2.<br/><strong>No podrá deshacer estos cambios.</strong> - + &Set up now &Configurar ahora - + &Install now &Instalar ahora - + Go &back Regresar - + &Set up &Instalar - + &Install &Instalar - + Setup is complete. Close the setup program. La instalación se ha completado. Cierre el instalador. - + The installation is complete. Close the installer. La instalación se ha completado. Cierre el instalador. - + Cancel setup without changing the system. Cancelar instalación sin cambiar el sistema. - + Cancel installation without changing the system. Cancelar instalación sin cambiar el sistema. - + &Next &Siguiente - + &Back &Atrás - + &Done &Hecho - + &Cancel &Cancelar - + Cancel setup? ¿Cancelar la instalación? - + Cancel installation? ¿Cancelar la instalación? - + 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. ¿Realmente quiere cancelar el proceso de instalación? @@ -471,12 +491,12 @@ Saldrá del instalador y se perderán todos los cambios. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instalador @@ -484,7 +504,7 @@ Saldrá del instalador y se perderán todos los cambios. CheckerContainer - + Gathering system information... Obteniendo información del sistema... @@ -732,22 +752,32 @@ Saldrá del instalador y se perderán todos los cambios. La localización de números y fechas se establecerá a %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Instalación de red. (Deshabilitada: Se recibieron grupos de datos no válidos) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Selección de paquetes + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalación a través de la Red. (Desactivada: no se ha podido obtener una lista de paquetes, comprueba tu conexión a la red) @@ -842,42 +872,42 @@ Saldrá del instalador y se perderán todos los cambios. ¡Sus contraseñas no coinciden! - + Setup Failed Configuración Fallida - + Installation Failed Error en la Instalación - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Instalación completada - + The setup of %1 is complete. - + The installation of %1 is complete. Se ha completado la instalación de %1. @@ -1474,72 +1504,72 @@ Saldrá del instalador y se perderán todos los cambios. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. No hay suficiente espació en el disco duro. Se requiere al menos %1 GB libre. - + has at least %1 GiB working memory tiene al menos %1 GB de memoria. - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source esta conectado a una fuente de alimentación - + The system is not plugged in to a power source. El sistema no esta conectado a una fuente de alimentación. - + is connected to the Internet esta conectado a Internet - + The system is not connected to the Internet. El sistema no esta conectado a Internet - + is running the installer as an administrator (root) esta ejecutándose con permisos de administrador (root). - + The setup program is not running with administrator rights. El instalador no esta ejecutándose con permisos de administrador. - + The installer is not running with administrator rights. El instalador no esta ejecutándose con permisos de administrador. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. La pantalla es demasiado pequeña para mostrar el instalador. - + The screen is too small to display the installer. La pantalla es demasiado pequeña para mostrar el instalador. @@ -1607,7 +1637,7 @@ Saldrá del instalador y se perderán todos los cambios. ¡Por favor, instale KDE Konsole e inténtelo de nuevo! - + Executing script: &nbsp;<code>%1</code> Ejecutando script: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ Saldrá del instalador y se perderán todos los cambios. NetInstallViewStep - - + Package selection Selección de paquetes - + Office software Programas de oficina - + Office package Paquete de oficina - + Browser software - + Browser package - + Web browser - + Kernel Kernel - + Services Servicios - + Login - + Desktop - + Applications Aplicaciónes - + Communication - + Development - + Office Oficina - + Multimedia Multimedia - + Internet Internet - + Theming Temas - + Gaming Juegos - + Utilities Utilidades @@ -3699,12 +3728,12 @@ Salida: 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 installation.</small> @@ -3712,7 +3741,7 @@ Salida: UsersQmlViewStep - + Users Usuarios @@ -4096,102 +4125,102 @@ Salida: Nombre - + Your Full Name Su nombre completo - + What name do you want to use to log in? ¿Qué nombre desea usar para ingresar? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Nombre del equipo - + Computer Name Nombre de computadora - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Elija una contraseña para mantener su cuenta segura. - + Password Contraseña - + Repeat Password Repita la contraseña - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Usar la misma contraseña para la cuenta de administrador. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts index c5f6adfc4a..9690665808 100644 --- a/lang/calamares_es_MX.ts +++ b/lang/calamares_es_MX.ts @@ -102,22 +102,42 @@ Interfaz: - - Tools - Herramientas + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Información de depuración @@ -286,13 +306,13 @@ - + &Yes &Si - + &No &No @@ -302,17 +322,17 @@ &Cerrar - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed La inicialización de Calamares ha fallado - + %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 no pudo ser instalado. Calamares no pudo cargar todos los módulos configurados. Este es un problema con la forma en que Calamares esta siendo usada por la distribución. - + <br/>The following modules could not be loaded: <br/>Los siguientes módulos no pudieron ser cargados: - + Continue with setup? ¿Continuar con la instalación? - + Continue with installation? ¿Continuar con la instalación? - + 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> El %1 programa de instalación esta a punto de realizar cambios a su disco con el fin de establecer %2.<br/><strong>Usted no podrá deshacer estos cambios.</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> El instalador %1 va a realizar cambios en su disco para instalar %2.<br/><strong>No podrá deshacer estos cambios.</strong> - + &Set up now &Configurar ahora - + &Install now &Instalar ahora - + Go &back &Regresar - + &Set up &Configurar - + &Install &Instalar - + Setup is complete. Close the setup program. Configuración completa. Cierre el programa de instalación. - + The installation is complete. Close the installer. Instalación completa. Cierre el instalador. - + Cancel setup without changing the system. Cancelar la configuración sin cambiar el sistema. - + Cancel installation without changing the system. Cancelar instalación sin cambiar el sistema. - + &Next &Siguiente - + &Back &Atrás - + &Done &Hecho - + &Cancel &Cancelar - + Cancel setup? ¿Cancelar la configuración? - + Cancel installation? ¿Cancelar la instalación? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. ¿Realmente desea cancelar el actual proceso de configuración? El programa de instalación se cerrará y todos los cambios se perderán. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. ¿Realmente desea cancelar el proceso de instalación actual? @@ -471,12 +491,12 @@ El instalador terminará y se perderán todos los cambios. CalamaresWindow - + %1 Setup Program %1 Programa de instalación - + %1 Installer %1 Instalador @@ -484,7 +504,7 @@ El instalador terminará y se perderán todos los cambios. CheckerContainer - + Gathering system information... Obteniendo información del sistema... @@ -733,22 +753,32 @@ El instalador terminará y se perderán todos los cambios. Los números y datos locales serán establecidos a %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Instalación de Red. (Deshabilitada: Grupos de datos invalidos recibidos) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Selección de paquete + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalación de Red. (Deshabilitada: No se puede acceder a la lista de paquetes, verifique su conección de red) @@ -843,42 +873,42 @@ El instalador terminará y se perderán todos los cambios. Las contraseñas no coinciden! - + Setup Failed Fallo en la configuración. - + Installation Failed Instalación Fallida - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Instalación Completa - + The setup of %1 is complete. - + The installation of %1 is complete. La instalación de %1 está completa. @@ -1475,72 +1505,72 @@ El instalador terminará y se perderán todos los cambios. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source está conectado a una fuente de energía - + The system is not plugged in to a power source. El sistema no está conectado a una fuente de energía. - + is connected to the Internet está conectado a Internet - + The system is not connected to the Internet. El sistema no está conectado a Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. El instalador no se está ejecutando con privilegios de administrador. - + 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 installer. La pantalla es muy pequeña para mostrar el instalador @@ -1608,7 +1638,7 @@ El instalador terminará y se perderán todos los cambios. Favor instale la Konsola KDE e intentelo de nuevo! - + Executing script: &nbsp;<code>%1</code> Ejecutando script: &nbsp;<code>%1</code> @@ -1878,98 +1908,97 @@ El instalador terminará y se perderán todos los cambios. NetInstallViewStep - - + Package selection Selección de paquete - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3701,12 +3730,12 @@ Salida UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Si más de una persona usará esta computadora, puede crear múltiples cuentas después de la configuración</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Si más de una persona usará esta computadora, puede crear varias cuentas después de la instalación.</small> @@ -3714,7 +3743,7 @@ Salida UsersQmlViewStep - + Users Usuarios @@ -4098,102 +4127,102 @@ Salida ¿Cuál es su nombre? - + Your Full Name - + What name do you want to use to log in? ¿Qué nombre desea usar para acceder al sistema? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? ¿Cuál es el nombre de esta computadora? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Seleccione una contraseña para mantener segura su cuenta. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Usar la misma contraseña para la cuenta de administrador. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts index 3dd9caed8e..ba29564ec6 100644 --- a/lang/calamares_es_PR.ts +++ b/lang/calamares_es_PR.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Información de depuración @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Próximo - + &Back &Atrás - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed Falló la instalación - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,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 installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts index bad69099dc..c6dad0a2af 100644 --- a/lang/calamares_et.ts +++ b/lang/calamares_et.ts @@ -102,22 +102,42 @@ Liides: - - Tools - Tööriistad + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Silumisteave @@ -286,13 +306,13 @@ - + &Yes &Jah - + &No &Ei @@ -302,17 +322,17 @@ &Sulge - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed Calamarese alglaadimine ebaõnnestus - + %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 ei saa paigaldada. Calamares ei saanud laadida kõiki konfigureeritud mooduleid. See on distributsiooni põhjustatud Calamarese kasutamise viga. - + <br/>The following modules could not be loaded: <br/>Järgnevaid mooduleid ei saanud laadida: - + Continue with setup? Jätka seadistusega? - + 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 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 paigaldaja on tegemas muudatusi sinu kettale, et paigaldada %2.<br/><strong>Sa ei saa neid muudatusi tagasi võtta.</strong> - + &Set up now &Seadista kohe - + &Install now &Paigalda kohe - + Go &back Mine &tagasi - + &Set up &Seadista - + &Install &Paigalda - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Paigaldamine on lõpetatud. Sulge paigaldaja. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Tühista paigaldamine ilma süsteemi muutmata. - + &Next &Edasi - + &Back &Tagasi - + &Done &Valmis - + &Cancel &Tühista - + Cancel setup? - + Cancel installation? Tühista paigaldamine? - + 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. Kas sa tõesti soovid tühistada praeguse paigaldusprotsessi? @@ -470,12 +490,12 @@ Paigaldaja sulgub ning kõik muutused kaovad. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 paigaldaja @@ -483,7 +503,7 @@ Paigaldaja sulgub ning kõik muutused kaovad. CheckerContainer - + Gathering system information... Hangin süsteemiteavet... @@ -731,22 +751,32 @@ Paigaldaja sulgub ning kõik muutused kaovad. Arvude ja kuupäevade lokaaliks seatakse %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Võrgupaigaldus. (Keelatud: vastu võetud sobimatud grupiandmed) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Paketivalik + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Võrgupaigaldus. (Keelatud: paketinimistute saamine ebaõnnestus, kontrolli oma võrguühendust) @@ -841,42 +871,42 @@ Paigaldaja sulgub ning kõik muutused kaovad. Sinu paroolid ei ühti! - + Setup Failed - + Installation Failed Paigaldamine ebaõnnestus - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Seadistus valmis - + Installation Complete Paigaldus valmis - + The setup of %1 is complete. - + The installation of %1 is complete. %1 paigaldus on valmis. @@ -1473,72 +1503,72 @@ Paigaldaja sulgub ning kõik muutused kaovad. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source on ühendatud vooluallikasse - + The system is not plugged in to a power source. Süsteem pole ühendatud vooluallikasse. - + is connected to the Internet on ühendatud Internetti - + The system is not connected to the Internet. Süsteem pole ühendatud Internetti. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Paigaldaja pole käivitatud administraatoriõigustega. - + 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 installer. Ekraan on paigaldaja kuvamiseks liiga väike. @@ -1606,7 +1636,7 @@ Paigaldaja sulgub ning kõik muutused kaovad. Palun paigalda KDE Konsole ja proovi uuesti! - + Executing script: &nbsp;<code>%1</code> Käivitan skripti: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ Paigaldaja sulgub ning kõik muutused kaovad. NetInstallViewStep - - + Package selection Paketivalik - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3698,12 +3727,12 @@ Väljund: 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 installation.</small> @@ -3711,7 +3740,7 @@ Väljund: UsersQmlViewStep - + Users Kasutajad @@ -4095,102 +4124,102 @@ Väljund: Mis on su nimi? - + Your Full Name - + What name do you want to use to log in? Mis nime soovid sisselogimiseks kasutada? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Mis on selle arvuti nimi? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Vali parool, et hoida oma konto turvalisena. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Kasuta sama parooli administraatorikontole. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts index 275dff6b06..f9b6b44e1e 100644 --- a/lang/calamares_eu.ts +++ b/lang/calamares_eu.ts @@ -102,22 +102,42 @@ Interfasea: - - Tools - Tresnak + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Arazte informazioa @@ -286,13 +306,13 @@ - + &Yes &Bai - + &No &Ez @@ -302,17 +322,17 @@ &Itxi - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed Calamares instalazioak huts egin du - + %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 ezin da instalatu. Calamares ez da gai konfiguratutako modulu guztiak kargatzeko. Arazao hau banaketak Calamares erabiltzen duen eragatik da. - + <br/>The following modules could not be loaded: <br/> Ondorengo moduluak ezin izan dira kargatu: - + Continue with setup? Ezarpenarekin jarraitu? - + Continue with installation? Instalazioarekin jarraitu? - + 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> %1 instalatzailea zure diskoan aldaketak egitera doa %2 instalatzeko.<br/><strong>Ezingo dituzu desegin aldaketa hauek.</strong> - + &Set up now - + &Install now &Instalatu orain - + Go &back &Atzera - + &Set up - + &Install &Instalatu - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Instalazioa burutu da. Itxi instalatzailea. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Instalazioa bertan behera utsi da sisteman aldaketarik gabe. - + &Next &Hurrengoa - + &Back &Atzera - + &Done E&ginda - + &Cancel &Utzi - + Cancel setup? - + Cancel installation? Bertan behera utzi instalazioa? - + 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. Ziur uneko instalazio prozesua bertan behera utzi nahi duzula? @@ -470,12 +490,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instalatzailea @@ -483,7 +503,7 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. CheckerContainer - + Gathering system information... Sistemaren informazioa eskuratzen... @@ -731,22 +751,32 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Zenbaki eta daten eskualdea %1-(e)ra ezarri da. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Pakete aukeraketa + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -841,42 +871,42 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Pasahitzak ez datoz bat! - + Setup Failed - + Installation Failed Instalazioak huts egin du - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Instalazioa amaitua - + The setup of %1 is complete. - + The installation of %1 is complete. %1 instalazioa amaitu da. @@ -1473,72 +1503,72 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. Sistema ez dago indar iturri batetara konektatuta. - + is connected to the Internet Internetera konektatuta dago - + The system is not connected to the Internet. Sistema ez dago Internetera konektatuta. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Instalatzailea ez dabil exekutatzen administrari eskubideekin. - + 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 installer. Pantaila txikiegia da instalatzailea erakusteko. @@ -1606,7 +1636,7 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Mesedez instalatu KDE kontsola eta saiatu berriz! - + Executing script: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. NetInstallViewStep - - + Package selection Pakete aukeraketa - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3697,12 +3726,12 @@ Irteera: 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 installation.</small> @@ -3710,7 +3739,7 @@ Irteera: UsersQmlViewStep - + Users Erabiltzaileak @@ -4094,102 +4123,102 @@ Irteera: Zein da zure izena? - + Your Full Name - + What name do you want to use to log in? Zein izen erabili nahi duzu saioa hastean? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Zein da ordenagailu honen izena? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Aukeratu pasahitza zure kontua babesteko. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Erabili pasahitz bera administratzaile kontuan. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts index d7a27ef6ac..ec0753b7f2 100644 --- a/lang/calamares_fa.ts +++ b/lang/calamares_fa.ts @@ -102,22 +102,42 @@ رابط: - - Tools - ابزارها + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + - + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet بارگزاری مجدد برگه‌شیوه - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree درخت ابزارک‌ها - + Debug information اطّلاعات اشکال‌زدایی @@ -286,13 +306,13 @@ - + &Yes &بله - + &No &خیر @@ -302,17 +322,17 @@ &بسته - + 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 @@ -321,124 +341,124 @@ Link copied to clipboard - + 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 نمی‌تواند نصب شود. کالاماریس نمی‌تواند همه ماژول‌های پیکربندی را بالا بیاورد. این یک مشکل در نحوه استفاده کالاماریس توسط توزیع است. - + <br/>The following modules could not be loaded: <br/>این ماژول نمی‌تواند بالا بیاید: - + Continue with setup? ادامهٔ برپایی؟ - + 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> برنامه نصب %1 در شرف ایجاد تغییرات در دیسک شما به منظور راه‌اندازی %2 است. <br/><strong>شما قادر نخواهید بود تا این تغییرات را برگردانید.</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 می‌خواهد برای نصب %2 تغییراتی در دیسکتان بدهد. <br/><strong>نخواهید توانست این تغییرات را برگردانید.</strong> - + &Set up now &همین حالا راه‌انداری کنید - + &Install now &اکنون نصب شود - + Go &back &بازگشت - + &Set up &راه‌اندازی - + &Install &نصب - + Setup is complete. Close the setup program. نصب انجام شد. برنامه نصب را ببندید. - + The installation is complete. Close the installer. نصب انجام شد. نصاب را ببندید. - + Cancel setup without changing the system. لغو راه‌اندازی بدون تغییر سیستم. - + Cancel installation without changing the system. لغو نصب بدون تغییر کردن سیستم. - + &Next &بعدی - + &Back &پیشین - + &Done &انجام شد - + &Cancel &لغو - + Cancel setup? لغو راه‌اندازی؟ - + 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 install process? The installer will quit and all changes will be lost. واقعاً می خواهید فرایند نصب فعلی را لغو کنید؟ @@ -471,12 +491,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 برنامه راه‌اندازی - + %1 Installer نصب‌کنندهٔ %1 @@ -484,7 +504,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... جمع‌آوری اطلاعات سیستم... @@ -732,22 +752,32 @@ The installer will quit and all changes will be lost. محلی و اعداد و تاریخ ها روی٪ 1 تنظیم می شوند. - + Network Installation. (Disabled: Incorrect configuration) نصب شبکه‌ای. (از کار افتاده: پیکربندی نادرست) - + Network Installation. (Disabled: Received invalid groups data) نصب شبکه‌ای. (از کار افتاده: دریافت داده‌های گروه‌های نامعتبر) - - Network Installation. (Disabled: internal error) - نصب شبکه‌ای. (از کار افتاده: خطای داخلی) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + گزینش بسته‌ها - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) نصب شبکه‌ای. (از کار افتاده: ناتوان در گرفتن فهرست بسته‌ها. اتّصال شبکه‌تان را بررسی کنید) @@ -842,42 +872,42 @@ The installer will quit and all changes will be lost. گذرواژه‌هایتان مطابق نیستند! - + Setup Failed راه‌اندازی شکست خورد. - + Installation Failed نصب شکست خورد - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete برپایی کامل شد - + Installation Complete نصب کامل شد - + The setup of %1 is complete. برپایی %1 کامل شد. - + The installation of %1 is complete. نصب %1 کامل شد. @@ -1474,72 +1504,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source به برق وصل است. - + The system is not plugged in to a power source. سامانه به برق وصل نیست. - + is connected to the Internet به اینترنت وصل است - + The system is not connected to the Internet. سامانه به اینترنت وصل نیست. - + is running the installer as an administrator (root) دارد نصب‌کننده را به عنوان یک مدیر (ریشه) اجرا می‌کند - + The setup program is not running with administrator rights. برنامهٔ برپایی با دسترسی‌های مدیر اجرا نشده‌است. - + The installer is not running with administrator rights. برنامهٔ نصب کننده با دسترسی‌های مدیر اجرا نشده‌است. - + 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 installer. صفحه برای نمایش نصب‌کننده خیلی کوچک است. @@ -1607,7 +1637,7 @@ The installer will quit and all changes will be lost. لطفاً Konsole کی‌دی‌ای را نصب کرده و دوباره تلاش کنید! - + Executing script: &nbsp;<code>%1</code> در حال اجرای کدنوشته: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection گزینش بسته‌ها - + Office software نرم‌افزار اداری - + Office package بستهٔ اداری - + Browser software نرم‌افزار مرورگر - + Browser package بستهٔ مرورگر - + Web browser مرورگر وب - + Kernel کرنل - + Services خدمت‌ها - + Login ورود - + Desktop میزکار - + Applications برنامه‌های کاربردی - + Communication ارتباطات - + Development توسعه - + Office اداری - + Multimedia چندرسانه‌ای - + Internet اینترنت - + Theming شخصی‌سازی - + Gaming بازی - + Utilities ابزارها @@ -3696,12 +3725,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 installation.</small> @@ -3709,7 +3738,7 @@ Output: UsersQmlViewStep - + Users کاربران @@ -4094,102 +4123,102 @@ Output: نامتان چیست؟ - + Your Full Name نام کاملتان - + What name do you want to use to log in? برای ورود می خواهید از چه نامی استفاده کنید؟ - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? نام این رایانه چیست؟ - + Computer Name نام رایانه - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. برای امن نگه داشتن حسابتان، گذرواژه‌ای برگزینید. - + Password گذرواژه - + Repeat Password تکرار TextLabel - + 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. رمز ورود یکسان را دو بار وارد کنید ، تا بتوان آن را از نظر اشتباه تایپ بررسی کرد. یک رمز ورود خوب شامل ترکیبی از حروف ، اعداد و علائم نگارشی است ، باید حداقل هشت حرف داشته باشد و باید در فواصل منظم تغییر یابد. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. وقتی این کادر علامت گذاری شد ، بررسی قدرت رمز عبور انجام می شود و دیگر نمی توانید از رمز عبور ضعیف استفاده کنید. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. استفاده از گذرواژهٔ یکسان برای حساب مدیر. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index 16ec5d3ece..4045f5247e 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -102,22 +102,42 @@ Käyttöliittymä: - - Tools - Työkalut + + Crashes Calamares, so that Dr. Konqui can look at it. + Kaada Calamares, jotta tohtori Konqui voi katsoa sitä. - + + Reloads the stylesheet from the branding directory. + Lataa tyylisivu tuotemerkin kansiosta uudelleen. + + + + Uploads the session log to the configured pastebin. + Lataa istunnon loki määritettyn pastebin-tiedostoon. + + + + Send Session Log + Lähetä istunnon loki + + + Reload Stylesheet Virkistä tyylisivu - + + Displays the tree of widget names in the log (for stylesheet debugging). + Näyttää sovelman nimen hakemistopuun lokissa (tyylisivun virheenkorjausta varten). + + + Widget Tree Widget puurakenne - + Debug information Vianetsinnän tiedot @@ -225,7 +245,7 @@ QML Step <i>%1</i>. - QML-vaihe <i>%1</i>. + QML vaihe <i>%1</i>. @@ -286,13 +306,13 @@ - + &Yes &Kyllä - + &No &Ei @@ -302,17 +322,17 @@ &Sulje - + Install Log Paste URL - Asenna lokitiedon URL-osoite + Asenna lokiliitoksen URL-osoite - + The upload was unsuccessful. No web-paste was done. - Lähettäminen epäonnistui. Web-liittämistä ei tehty. + Lähettäminen epäonnistui. Verkko-liittämistä ei tehty. - + Install log posted to %1 @@ -325,124 +345,124 @@ Link copied to clipboard Linkki kopioitu leikepöydälle - + Calamares Initialization Failed Calamaresin alustaminen epäonnistui - + %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 ei voi asentaa. Calamares ei voinut ladata kaikkia määritettyjä moduuleja. Ongelma on siinä, miten jakelu käyttää Calamaresia. - + <br/>The following modules could not be loaded: <br/>Seuraavia moduuleja ei voitu ladata: - + Continue with setup? Jatketaanko asennusta? - + Continue with installation? Jatka asennusta? - + 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 asennusohjelma on aikeissa tehdä muutoksia levylle, jotta voit määrittää kohteen %2.<br/><strong>Et voi kumota näitä muutoksia.</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> Asennus ohjelman %1 on tehtävä muutoksia levylle, jotta %2 voidaan asentaa.<br/><strong>Et voi kumota näitä muutoksia.</strong> - + &Set up now &Määritä nyt - + &Install now &Asenna nyt - + Go &back Mene &takaisin - + &Set up &Määritä - + &Install &Asenna - + Setup is complete. Close the setup program. Asennus on valmis. Sulje asennusohjelma. - + The installation is complete. Close the installer. Asennus on valmis. Sulje asennusohjelma. - + Cancel setup without changing the system. Peruuta asennus muuttamatta järjestelmää. - + Cancel installation without changing the system. Peruuta asennus tekemättä muutoksia järjestelmään. - + &Next &Seuraava - + &Back &Takaisin - + &Done &Valmis - + &Cancel &Peruuta - + Cancel setup? Peruuta asennus? - + Cancel installation? Peruuta asennus? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Haluatko todella peruuttaa nykyisen asennuksen? Asennusohjelma lopetetaan ja kaikki muutokset menetetään. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Oletko varma että haluat peruuttaa käynnissä olevan asennusprosessin? @@ -475,20 +495,20 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. CalamaresWindow - + %1 Setup Program - %1 Asennusohjelma + %1 asennusohjelma - + %1 Installer - %1 Asennusohjelma + %1 asentaja CheckerContainer - + Gathering system information... Kerätään järjestelmän tietoja... @@ -551,17 +571,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - EFI-osiota ei löydy mistään tässä järjestelmässä. Siirry takaisin ja käytä manuaalista osiointia, kun haluat määrittää %1 + Järjestelmäosiota EFI ei löydy tästä järjestelmästä. Siirry takaisin ja käytä manuaalista osiointia, kun haluat määrittää %1 The EFI system partition at %1 will be used for starting %2. - EFI-järjestelmän osiota %1 käytetään käynnistettäessä %2. + Järjestelmäosiota EFI %1 käytetään %2 käynnistämiseen. EFI system partition: - EFI järjestelmäosio: + EFI järjestelmän osio: @@ -582,7 +602,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - <strong>Asenna nykyisen rinnalle</strong><br/>Asennus ohjelma supistaa osion tehdäkseen tilaa kohteelle %1. + <strong>Asenna nykyisen rinnalle</strong><br/>Asennusohjelma supistaa osiota tehdäkseen tilaa kohteelle %1. @@ -610,42 +630,42 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. 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/> - Tässä kiintolevyssä on jo käyttöjärjestelmä, mutta osiotaulukko <strong>%1</strong> on erilainen kuin tarvittava <strong>%2</strong>.<br/> + Tällä kiintolevyllä on jo käyttöjärjestelmä, mutta osiotaulukko <strong>%1</strong> on erilainen kuin tarvittava <strong>%2</strong>.<br/> This storage device has one of its partitions <strong>mounted</strong>. - Tähän kiintolevyyn on <strong>asennettu</strong> yksi osioista. + Tähän kiintolevyyn on <strong>kiinnitetty</strong> yksi osioista. This storage device is a part of an <strong>inactive RAID</strong> device. - Tämä kiintolevy on osa <strong>passiivista RAID</strong> -laitetta. + Tämä kiintolevy on osa <strong>passiivista RAID</strong> kokoonpanoa. No Swap - Ei välimuistia + Swap ei Reuse Swap - Kierrätä välimuistia + Swap käytä uudellen Swap (no Hibernate) - Välimuisti (ei lepotilaa) + Swap (ei lepotilaa) Swap (with Hibernate) - Välimuisti (lepotilan kanssa) + Swap (lepotilan kanssa) Swap to file - Välimuisti tiedostona + Swap tiedostona @@ -653,12 +673,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Clear mounts for partitioning operations on %1 - Poista osiointitoimenpiteitä varten tehdyt liitokset kohteesta %1 + Tyhjennä osiointia varten tehdyt liitokset kohteesta %1 Clearing mounts for partitioning operations on %1. - Tyhjennät kiinnitys osiointitoiminnoille %1. + Tyhjennetään liitokset %1 osiointia varten. @@ -681,7 +701,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Cannot get list of temporary mounts. - Väliaikaisten kiinnitysten luetteloa ei voi hakea. + Väliaikaisten liitosten luetteloa ei voi hakea. @@ -736,22 +756,32 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Numerot ja päivämäärät, paikallinen asetus on %1. - + Network Installation. (Disabled: Incorrect configuration) Verkko asennus. (Ei käytössä: virheellinen määritys) - + Network Installation. (Disabled: Received invalid groups data) Verkkoasennus. (Ei käytössä: Vastaanotettiin virheellisiä ryhmän tietoja) - - Network Installation. (Disabled: internal error) - Verkon asennus. (Ei käytössä: sisäinen virhe) + + Network Installation. (Disabled: Internal error) + Verkon asennus (Poistettu käytöstä: sisäinen virhe) + + + + Network Installation. (Disabled: No package list) + Verkon asennus (Poistettu käytöstä: ei pakettien listaa) + + + + Package selection + Paketin valinta - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Verkkoasennus. (Ei käytössä: Pakettiluetteloita ei voi hakea, tarkista verkkoyhteys) @@ -794,12 +824,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. <h1>Welcome to the Calamares installer for %1</h1> - <h1>Tervetuloa Calamares -asennusohjelmaan %1</h1> + <h1>Tervetuloa Calamares asentajaan %1</h1> <h1>Welcome to the %1 installer</h1> - <h1>Tervetuloa %1 -asennusohjelmaan</h1> + <h1>Tervetuloa %1 asentajaan</h1> @@ -809,12 +839,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. '%1' is not allowed as username. - '%1' ei ole sallittu käyttäjänimenä. + Käyttäjänimessä '%1' ei ole sallittu. Your username must start with a lowercase letter or underscore. - Käyttäjätunnuksesi täytyy alkaa pienillä kirjaimilla tai alaviivoilla. + Sinun käyttäjänimi täytyy alkaa pienellä kirjaimella tai alaviivalla. @@ -824,17 +854,17 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Your hostname is too short. - Isäntänimesi on liian lyhyt. + Koneen nimi on liian lyhyt. Your hostname is too long. - Isäntänimesi on liian pitkä. + Koneen nimi on liian pitkä. '%1' is not allowed as hostname. - '%1' ei ole sallittu koneen nimenä. + Koneen nimessä '%1' ei ole sallittu. @@ -847,42 +877,42 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Salasanasi eivät täsmää! - + Setup Failed Asennus epäonnistui - + Installation Failed Asentaminen epäonnistui - + The setup of %1 did not complete successfully. Määrityksen %1 asennus ei onnistunut. - + The installation of %1 did not complete successfully. Asennus %1 ei onnistunut. - + Setup Complete Asennus valmis - + Installation Complete Asennus valmis - + The setup of %1 is complete. Asennus %1 on valmis. - + The installation of %1 is complete. Asennus %1 on valmis. @@ -915,7 +945,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Partition &Type: - Osion &Tyyppi: + Osion &tyyppi: @@ -930,7 +960,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Fi&le System: - Tie&dosto järjestelmä: + Tiedostojärjeste&lmä: @@ -1479,72 +1509,72 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. GeneralRequirements - + has at least %1 GiB available drive space vähintään %1 GiB vapaata levytilaa - + There is not enough drive space. At least %1 GiB is required. Levytilaa ei ole riittävästi. Vähintään %1 GiB tarvitaan. - + has at least %1 GiB working memory vähintään %1 GiB työmuistia - + The system does not have enough working memory. At least %1 GiB is required. Järjestelmässä ei ole tarpeeksi työmuistia. Vähintään %1 GiB vaaditaan. - + is plugged in to a power source on yhdistetty virtalähteeseen - + The system is not plugged in to a power source. Järjestelmä ei ole kytketty virtalähteeseen. - + is connected to the Internet on yhdistetty internetiin - + The system is not connected to the Internet. Järjestelmä ei ole yhteydessä internetiin. - + is running the installer as an administrator (root) ajaa asennusohjelmaa järjestelmänvalvojana (root) - + The setup program is not running with administrator rights. Asennus -ohjelma ei ole käynnissä järjestelmänvalvojan oikeuksin. - + The installer is not running with administrator rights. Asennus -ohjelma ei ole käynnissä järjestelmänvalvojan oikeuksin. - + has a screen large enough to show the whole installer näytöllä on riittävän suuri tarkkuus asentajalle - + The screen is too small to display the setup program. Näyttö on liian pieni, jotta asennus -ohjelma voidaan näyttää. - + The screen is too small to display the installer. Näyttö on liian pieni asentajan näyttämiseksi. @@ -1612,7 +1642,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Asenna KDE konsole ja yritä uudelleen! - + Executing script: &nbsp;<code>%1</code> Suoritetaan skripti: &nbsp;<code>%1</code> @@ -1884,98 +1914,97 @@ hiiren vieritystä skaalaamiseen. NetInstallViewStep - - + Package selection Paketin valinta - + Office software Office-ohjelmisto - + Office package Office-paketti - + Browser software Selainohjelmisto - + Browser package Selainpaketti - + Web browser Nettiselain - + Kernel Kernel - + Services Palvelut - + Login Kirjaudu - + Desktop Työpöytä - + Applications Sovellukset - + Communication Viestintä - + Development Ohjelmistokehitys - + Office Toimisto - + Multimedia Multimedia - + Internet Internetti - + Theming Teema - + Gaming Pelit - + Utilities Apuohjelmat @@ -3710,12 +3739,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Jos useampi kuin yksi henkilö käyttää tätä tietokonetta, voit luoda useita tilejä asennuksen jälkeen.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Jos useampi kuin yksi henkilö käyttää tätä tietokonetta, voit luoda useita tilejä asennuksen jälkeen.</small> @@ -3723,7 +3752,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. UsersQmlViewStep - + Users Käyttäjät @@ -4143,102 +4172,102 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Mikä on nimesi? - + Your Full Name Koko nimesi - + What name do you want to use to log in? Mitä nimeä haluat käyttää sisäänkirjautumisessa? - + Login Name Kirjautumisnimi - + If more than one person will use this computer, you can create multiple accounts after installation. Jos tätä tietokonetta käyttää useampi kuin yksi henkilö, voit luoda useita tilejä asennuksen jälkeen. - + What is the name of this computer? Mikä on tämän tietokoneen nimi? - + Computer Name Tietokoneen nimi - + This name will be used if you make the computer visible to others on a network. Tätä nimeä käytetään, jos teet tietokoneen näkyväksi verkon muille käyttäjille. - + Choose a password to keep your account safe. Valitse salasana pitääksesi tilisi turvallisena. - + Password Salasana - + Repeat Password Toista salasana - + 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. Syötä sama salasana kahdesti, jotta se voidaan tarkistaa kirjoittamisvirheiden varalta. Hyvä salasana sisältää sekoituksen kirjaimia, numeroita ja välimerkkejä. Vähintään kahdeksan merkkiä pitkä ja se on vaihdettava säännöllisin väliajoin. - + Validate passwords quality Tarkista salasanojen laatu - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Kun tämä valintaruutu on valittu, salasanan vahvuus tarkistetaan, etkä voi käyttää heikkoa salasanaa. - + Log in automatically without asking for the password Kirjaudu automaattisesti ilman salasanaa - + Reuse user password as root password Käytä käyttäjän salasanaa myös root-salasanana - + Use the same password for the administrator account. Käytä pääkäyttäjän tilillä samaa salasanaa. - + Choose a root password to keep your account safe. Valitse root-salasana, jotta tilisi pysyy turvassa. - + Root Password Root salasana - + Repeat Root Password Toista Root salasana - + Enter the same password twice, so that it can be checked for typing errors. Syötä sama salasana kahdesti, jotta se voidaan tarkistaa kirjoitusvirheiden varalta. diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index c65d36f7bd..5b44eb61fd 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -102,22 +102,42 @@ Interface: - - Tools - Outils + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Recharger la feuille de style - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Arbre de Widget - + Debug information Informations de dépannage @@ -286,13 +306,13 @@ - + &Yes &Oui - + &No &Non @@ -302,17 +322,17 @@ &Fermer - + Install Log Paste URL URL de copie du journal d'installation - + The upload was unsuccessful. No web-paste was done. L'envoi a échoué. La copie sur le web n'a pas été effectuée. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed L'initialisation de Calamares a échoué - + %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 n'a pas pu être installé. Calamares n'a pas pu charger tous les modules configurés. C'est un problème avec la façon dont Calamares est utilisé par la distribution. - + <br/>The following modules could not be loaded: Les modules suivants n'ont pas pu être chargés : - + Continue with setup? Poursuivre la configuration ? - + Continue with installation? Continuer avec l'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> Le programme de configuration de %1 est sur le point de procéder aux changements sur le disque afin de configurer %2.<br/> <strong>Vous ne pourrez pas annulez ces changements.</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> L'installateur %1 est sur le point de procéder aux changements sur le disque afin d'installer %2.<br/> <strong>Vous ne pourrez pas annulez ces changements.<strong> - + &Set up now &Configurer maintenant - + &Install now &Installer maintenant - + Go &back &Retour - + &Set up &Configurer - + &Install &Installer - + Setup is complete. Close the setup program. La configuration est terminée. Fermer le programme de configuration. - + The installation is complete. Close the installer. L'installation est terminée. Fermer l'installateur. - + Cancel setup without changing the system. Annuler la configuration sans toucher au système. - + Cancel installation without changing the system. Annuler l'installation sans modifier votre système. - + &Next &Suivant - + &Back &Précédent - + &Done &Terminé - + &Cancel &Annuler - + Cancel setup? Annuler la configuration ? - + Cancel installation? Abandonner l'installation ? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Voulez-vous vraiment abandonner le processus de configuration ? Le programme de configuration se fermera et les changements seront perdus. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Voulez-vous vraiment abandonner le processus d'installation ? @@ -471,12 +491,12 @@ L'installateur se fermera et les changements seront perdus. CalamaresWindow - + %1 Setup Program Programme de configuration de %1 - + %1 Installer Installateur %1 @@ -484,7 +504,7 @@ L'installateur se fermera et les changements seront perdus. CheckerContainer - + Gathering system information... Récupération des informations système... @@ -732,22 +752,32 @@ L'installateur se fermera et les changements seront perdus. Les nombres et les dates seront réglés sur %1. - + Network Installation. (Disabled: Incorrect configuration) Installation réseau. (Désactivée : configuration incorrecte) - + Network Installation. (Disabled: Received invalid groups data) Installation par le réseau. (Désactivée : données de groupes reçues invalides) - - Network Installation. (Disabled: internal error) - Installation réseau. (Désactivée : erreur interne) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Sélection des paquets - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Installation par le réseau (Désactivée : impossible de récupérer leslistes de paquets, vérifiez la connexion réseau) @@ -842,42 +872,42 @@ L'installateur se fermera et les changements seront perdus. Vos mots de passe ne correspondent pas ! - + Setup Failed Échec de la configuration - + Installation Failed L'installation a échoué - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Configuration terminée - + Installation Complete Installation terminée - + The setup of %1 is complete. La configuration de %1 est terminée. - + The installation of %1 is complete. L'installation de %1 est terminée. @@ -1474,72 +1504,72 @@ L'installateur se fermera et les changements seront perdus. GeneralRequirements - + has at least %1 GiB available drive space a au moins %1 Gio d'espace disque disponible - + There is not enough drive space. At least %1 GiB is required. Il n'y a pas assez d'espace disque. Au moins %1 Gio sont requis. - + has at least %1 GiB working memory a au moins %1 Gio de mémoire vive - + The system does not have enough working memory. At least %1 GiB is required. Le système n'a pas assez de mémoire vive. Au moins %1 Gio sont requis. - + is plugged in to a power source est relié à une source de courant - + The system is not plugged in to a power source. Le système n'est pas relié à une source de courant. - + is connected to the Internet est connecté à Internet - + The system is not connected to the Internet. Le système n'est pas connecté à Internet. - + is running the installer as an administrator (root) a démarré l'installateur en tant qu'administrateur (root) - + The setup program is not running with administrator rights. Le programme de configuration ne dispose pas des droits administrateur. - + The installer is not running with administrator rights. L'installateur ne dispose pas des droits administrateur. - + has a screen large enough to show the whole installer a un écran assez large pour afficher l'intégralité de l'installateur - + The screen is too small to display the setup program. L'écran est trop petit pour afficher le programme de configuration. - + The screen is too small to display the installer. L'écran est trop petit pour afficher l'installateur. @@ -1607,7 +1637,7 @@ L'installateur se fermera et les changements seront perdus. Veuillez installer KDE Konsole et réessayer! - + Executing script: &nbsp;<code>%1</code> Exécution en cours du script : &nbsp;<code>%1</code> @@ -1878,98 +1908,97 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de NetInstallViewStep - - + Package selection Sélection des paquets - + Office software Logiciel de bureau - + Office package Suite bureautique - + Browser software Logiciel de navigation - + Browser package Navigateur Web - + Web browser Navigateur web - + Kernel Noyau - + Services Services - + Login Connexion - + Desktop Bureau - + Applications Applications - + Communication Communication - + Development Développement - + Office Bureautique - + Multimedia Multimédia - + Internet Internet - + Theming Thèmes - + Gaming Jeux - + Utilities Utilitaires @@ -3701,12 +3730,12 @@ Sortie UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>si plusieurs personnes utilisent cet ordinateur, vous pourrez créer plusieurs comptes après la configuration.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>si plusieurs personnes utilisent cet ordinateur, vous pourrez créer plusieurs comptes après l'installation.</small> @@ -3714,7 +3743,7 @@ Sortie UsersQmlViewStep - + Users Utilisateurs @@ -4098,102 +4127,102 @@ Sortie Quel est votre nom ? - + Your Full Name Nom complet - + What name do you want to use to log in? Quel nom souhaitez-vous utiliser pour la connexion ? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Quel est le nom de votre ordinateur ? - + Computer Name Nom de l'ordinateur - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Veuillez saisir le mot de passe pour sécuriser votre compte. - + Password Mot de passe - + Repeat Password Répéter le mot de passe - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quand cette case est cochée, la vérification de la puissance du mot de passe est activée et vous ne pourrez pas utiliser de mot de passe faible. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Utiliser le même mot de passe pour le compte administrateur. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_fr_CH.ts b/lang/calamares_fr_CH.ts index a42fd77131..71f8136f8a 100644 --- a/lang/calamares_fr_CH.ts +++ b/lang/calamares_fr_CH.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,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 installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts index 7f333adfce..9dbc70b49e 100644 --- a/lang/calamares_fur.ts +++ b/lang/calamares_fur.ts @@ -102,22 +102,42 @@ Interface: - - Tools - Struments + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Torne cjarie sfuei di stîl - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Arbul dai widget - + Debug information Informazions di debug @@ -286,13 +306,13 @@ - + &Yes &Sì - + &No &No @@ -302,17 +322,17 @@ S&iere - + Install Log Paste URL URL de copie dal regjistri di instalazion - + The upload was unsuccessful. No web-paste was done. Il cjariament sù pe rêt al è lât strucj. No je stade fate nissune copie sul web. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed Inizializazion di Calamares falide - + %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. No si pues instalâ %1. Calamares nol è rivât a cjariâ ducj i modui configurâts. Chest probleme achì al è causât de distribuzion e di cemût che al ven doprât Calamares. - + <br/>The following modules could not be loaded: <br/>I modui chi sot no puedin jessi cjariâts: - + Continue with setup? Continuâ cu la configurazion? - + Continue with installation? Continuâ cu la instalazion? - + 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> Il program di configurazion %1 al sta par aplicâ modifichis al disc, di mût di podê instalâ %2.<br/><strong>No si podarà tornâ indaûr e anulâ chestis modifichis.</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> Il program di instalazion %1 al sta par aplicâ modifichis al disc, di mût di podê instalâ %2.<br/><strong>No tu podarâs tornâ indaûr e anulâ chestis modifichis.</strong> - + &Set up now &Configure cumò - + &Install now &Instale cumò - + Go &back &Torne indaûr - + &Set up &Configure - + &Install &Instale - + Setup is complete. Close the setup program. Configurazion completade. Siere il program di configurazion. - + The installation is complete. Close the installer. La instalazion e je stade completade. Siere il program di instalazion. - + Cancel setup without changing the system. Anule la configurazion cence modificâ il sisteme. - + Cancel installation without changing the system. Anulâ la instalazion cence modificâ il sisteme. - + &Next &Sucessîf - + &Back &Indaûr - + &Done &Fat - + &Cancel &Anule - + Cancel setup? Anulâ la configurazion? - + Cancel installation? Anulâ la instalazion? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Anulâ pardabon il procès di configurazion? Il program di configurazion al jessarà e dutis lis modifichis a laran pierdudis. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Anulâ pardabon il procès di instalazion? @@ -471,12 +491,12 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< CalamaresWindow - + %1 Setup Program Program di configurazion di %1 - + %1 Installer Program di instalazion di %1 @@ -484,7 +504,7 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< CheckerContainer - + Gathering system information... Daûr a dâ dongje lis informazions dal sisteme... @@ -732,22 +752,32 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< La localizazion dai numars e des datis e vignarà configurade a %1. - + Network Installation. (Disabled: Incorrect configuration) Instalazion di rêt (Disabilitade: configurazion no valide) - + Network Installation. (Disabled: Received invalid groups data) Instalazion di rêt. (Disabilitade: ricevûts dâts di grups no valits) - - Network Installation. (Disabled: internal error) - Instalazion di rêt. (Disabilitade: erôr interni) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Selezion pachets - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalazion di rêt. (Disabilitade: impussibil recuperâ la liste dai pachets, controlâ la conession di rêt) @@ -842,42 +872,42 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Lis passwords no corispuindin! - + Setup Failed Configurazion falide - + Installation Failed Instalazion falide - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Configurazion completade - + Installation Complete Instalazion completade - + The setup of %1 is complete. La configurazion di %1 e je completade. - + The installation of %1 is complete. La instalazion di %1 e je completade. @@ -1474,72 +1504,72 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< GeneralRequirements - + has at least %1 GiB available drive space al à almancul %1 GiB di spazi disponibil - + There is not enough drive space. At least %1 GiB is required. No si à vonde spazi libar te unitât. Al covente spazi par almancul %1 GiB. - + has at least %1 GiB working memory al à almancul %1 GiB di memorie di lavôr - + The system does not have enough working memory. At least %1 GiB is required. Il sisteme nol à vonde memorie di lavôr. Al covente spazi par almancul %1 GiB. - + is plugged in to a power source al è tacât a une prese di alimentazion - + The system is not plugged in to a power source. Il sisteme nol è tacât a une prese di alimentazion. - + is connected to the Internet al è tacât a internet - + The system is not connected to the Internet. Il sisteme nol è tacât a internet. - + is running the installer as an administrator (root) al sta eseguint il program di instalazion come aministradôr (root) - + The setup program is not running with administrator rights. Il program di configurazion nol è in esecuzion cui permès di aministradôr. - + The installer is not running with administrator rights. Il program di instalazion nol è in esecuzion cui permès di aministradôr. - + has a screen large enough to show the whole installer al à un schermi avonde grant par mostrâ dut il program di instalazion - + The screen is too small to display the setup program. Il schermi al è masse piçul par visualizâ il program di configurazion. - + The screen is too small to display the installer. Il schermi al è masse piçul par visualizâ il program di instalazion. @@ -1607,7 +1637,7 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Par plasê instale KDE Konsole e torne prove! - + Executing script: &nbsp;<code>%1</code> Esecuzion script: &nbsp;<code>%1</code> @@ -1879,98 +1909,97 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< NetInstallViewStep - - + Package selection Selezion pachets - + Office software Software pal ufici - + Office package Pachet pal ufici - + Browser software Software par navigâ - + Browser package Pachet par navigadôr - + Web browser Navigadôr web - + Kernel Kernel - + Services Servizis - + Login Acès - + Desktop Scritori - + Applications Aplicazions - + Communication Comunicazion - + Development Disvilup - + Office Ufici - + Multimedia Multimedia - + Internet Internet - + Theming Personalizazion teme - + Gaming Zûcs - + Utilities Utilitâts @@ -3704,12 +3733,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Se chest computer al vignarà doprât di plui di une persone, si pues creâ plui accounts dopo vê completade la configurazion.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Se chest computer al vignarà doprât di plui di une persone, si pues creâ plui accounts dopo vê completade la instalazion.</small> @@ -3717,7 +3746,7 @@ Output: UsersQmlViewStep - + Users Utents @@ -4135,102 +4164,102 @@ Output: Ce non âstu? - + Your Full Name Il to non complet - + What name do you want to use to log in? Ce non vûstu doprâ pe autenticazion? - + Login Name Non di acès - + If more than one person will use this computer, you can create multiple accounts after installation. Se chest computer al vignarà doprât di plui personis, tu puedis creâ plui account dopo vê completade la instalazion. - + What is the name of this computer? Ce non aial chest computer? - + Computer Name Non dal computer - + This name will be used if you make the computer visible to others on a network. Si doprarà chest non se tu rindis visibil a altris chest computer suntune rêt. - + Choose a password to keep your account safe. Sielç une password par tignî il to account al sigûr. - + Password Password - + Repeat Password Ripeti password - + 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. Inserìs la stesse password dôs voltis, in mût di evitâ erôrs di batidure. Une buine password e contignarà un miscliç di letaris, numars e puntuazions, e sarà lungje almancul vot caratars e si scugnarà cambiâle a intervai regolârs. - + Validate passwords quality Convalidâ la cualitât des passwords - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Cuant che cheste casele e je selezionade, il control su la fuarce de password al ven fat e no si podarà doprâ une password debile. - + Log in automatically without asking for the password Jentre in automatic cence domandâ la password - + Reuse user password as root password Torne dopre la password dal utent pe password di root - + Use the same password for the administrator account. Dopre la stesse password pal account di aministradôr. - + Choose a root password to keep your account safe. Sielç une password di root par tignî il to account al sigûr. - + Root Password Password di root - + Repeat Root Password Ripeti password di root - + Enter the same password twice, so that it can be checked for typing errors. Inserìs la stesse password dôs voltis, in mût di evitâ erôrs di batidure. diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts index 3235f7d083..13921e7183 100644 --- a/lang/calamares_gl.ts +++ b/lang/calamares_gl.ts @@ -103,22 +103,42 @@ Interface - - Tools - Ferramentas + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Informe de depuración de erros. @@ -287,13 +307,13 @@ - + &Yes &Si - + &No &Non @@ -303,17 +323,17 @@ &Pechar - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -322,123 +342,123 @@ Link copied to clipboard - + Calamares Initialization Failed Fallou a inicialización do Calamares - + %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. Non é posíbel instalar %1. O calamares non foi quen de cargar todos os módulos configurados. Este é un problema relacionado con como esta distribución utiliza o Calamares. - + <br/>The following modules could not be loaded: <br/> Non foi posíbel cargar os módulos seguintes: - + Continue with setup? Continuar coa posta en marcha? - + 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 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> O %1 instalador está a piques de realizar cambios no seu disco para instalar %2.<br/><strong>Estes cambios non poderán desfacerse.</strong> - + &Set up now - + &Install now &Instalar agora - + Go &back Ir &atrás - + &Set up - + &Install &Instalar - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Completouse a instalacion. Peche o instalador - + Cancel setup without changing the system. - + Cancel installation without changing the system. Cancelar a instalación sen cambiar o sistema - + &Next &Seguinte - + &Back &Atrás - + &Done &Feito - + &Cancel &Cancelar - + Cancel setup? - + Cancel installation? Cancelar a instalación? - + 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. Desexa realmente cancelar o proceso actual de instalación? @@ -471,12 +491,12 @@ O instalador pecharase e perderanse todos os cambios. CalamaresWindow - + %1 Setup Program - + %1 Installer Instalador de %1 @@ -484,7 +504,7 @@ O instalador pecharase e perderanse todos os cambios. CheckerContainer - + Gathering system information... A reunir a información do sistema... @@ -732,22 +752,32 @@ O instalador pecharase e perderanse todos os cambios. A localización de números e datas será establecida a %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Instalación de rede. (Desactivado: Recibírense datos de grupos incorrectos) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Selección de pacotes. + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Installación por rede. (Desactivadas. Non se pudo recupera-la lista de pacotes, comprobe a sua conexión a rede) @@ -842,42 +872,42 @@ O instalador pecharase e perderanse todos os cambios. Os contrasinais non coinciden! - + Setup Failed - + Installation Failed Erro na instalación - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Instalacion completa - + The setup of %1 is complete. - + The installation of %1 is complete. Completouse a instalación de %1 @@ -1474,72 +1504,72 @@ O instalador pecharase e perderanse todos os cambios. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source está conectado a unha fonte de enerxía - + The system is not plugged in to a power source. O sistema non está conectado a unha fonte de enerxía. - + is connected to the Internet está conectado á Internet - + The system is not connected to the Internet. O sistema non está conectado á Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. O instalador non se está a executar con dereitos de administrador. - + 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 installer. A pantalla é demasiado pequena para mostrar o instalador. @@ -1607,7 +1637,7 @@ O instalador pecharase e perderanse todos os cambios. Instale KDE Konsole e ténteo de novo! - + Executing script: &nbsp;<code>%1</code> Executando o script: &nbsp; <code>%1</code> @@ -1877,98 +1907,97 @@ O instalador pecharase e perderanse todos os cambios. NetInstallViewStep - - + Package selection Selección de pacotes. - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3699,12 +3728,12 @@ Saída: 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 installation.</small> @@ -3712,7 +3741,7 @@ Saída: UsersQmlViewStep - + Users Usuarios @@ -4096,102 +4125,102 @@ Saída: Cal é o seu nome? - + Your Full Name - + What name do you want to use to log in? Cal é o nome que quere usar para entrar? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Cal é o nome deste computador? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Escolla un contrasinal para mante-la sua conta segura. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Empregar o mesmo contrasinal para a conta de administrador. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts index 20b7b62fb2..86e9f956f6 100644 --- a/lang/calamares_gu.ts +++ b/lang/calamares_gu.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,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 installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index 7171eb1d8e..2a2d68f76b 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -19,12 +19,12 @@ 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. - מערכת זו הופעלה בתצורת אתחול <strong>EFI</strong>.<br><br> כדי להגדיר הפעלה מתצורת אתחול EFI, על תכנית ההתקנה להתקין מנהל אתחול מערכת, לדוגמה <strong>GRUB</strong> או <strong>systemd-boot</strong> על <strong>מחיצת מערכת EFI</strong>. פעולה זו היא אוטומטית, אלא אם כן העדפתך היא להגדיר מחיצות באופן ידני, במקרה זה יש לבחור זאת או להגדיר בעצמך. + מערכת זו הופעלה בסביבת אתחול <strong>EFI</strong>.<br><br> להגדרת הפעלה מסביבת אתחול EFI, על אשף ההתקנה להתקין מנהל אתחול מערכת, למשל <strong>GRUB</strong> או <strong>systemd-boot</strong> על <strong>מחיצת מערכת EFI</strong>. פעולה זו היא אוטומטית, אלא אם העדפתך היא להגדיר מחיצות באופן ידני, במקרה זה יש לבחור זאת או להגדיר בעצמך. 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. - מערכת זו הופעלה בתצורת אתחול <strong>BIOS</strong>.<br><br> כדי להגדיר הפעלה מתצורת אתחול BIOS, על תכנית ההתקנה להתקין מנהל אתחול מערכת, לדוגמה <strong>GRUB</strong>, בתחילת המחיצה או על ה־<strong>Master Boot Record</strong> בצמוד להתחלה של טבלת המחיצות (מועדף). פעולה זו היא אוטומטית, אלא אם כן תבחר להגדיר מחיצות באופן ידני, במקרה זה יש להגדיר זאת בעצמך. + מערכת זו הופעלה בסביבת אתחול <strong>BIOS</strong>.<br><br> להגדרת הפעלה מסביבת אתחול BIOS, על אשף ההתקנה להתקין מנהל אתחול מערכת, למשל <strong>GRUB</strong>, בתחילת המחיצה או על ה־<strong>Master Boot Record</strong> בצמוד להתחלה של טבלת המחיצות (מועדף). פעולה זו היא אוטומטית, אלא אם העדפתך היא להגדיר מחיצות באופן ידני, במקרה זה יש להגדיר זאת בעצמך. @@ -102,22 +102,42 @@ מנשק: - - Tools - כלים + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + - + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet טעינת גיליון הסגנון מחדש - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree עץ וידג׳טים - + Debug information מידע על ניפוי שגיאות @@ -290,13 +310,13 @@ - + &Yes &כן - + &No &לא @@ -306,17 +326,17 @@ &סגירה - + Install Log Paste URL כתובת הדבקת יומן התקנה - + The upload was unsuccessful. No web-paste was done. ההעלאה לא הצליחה. לא בוצעה הדבקה לאינטרנט. - + Install log posted to %1 @@ -325,128 +345,128 @@ Link copied to clipboard - + Calamares Initialization Failed הפעלת Calamares נכשלה - + %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. ל־Calamares אין אפשרות לטעון את המודולים המוגדרים. מדובר בתקלה באופן בו ההפצה משתמשת ב־Calamares. - + <br/>The following modules could not be loaded: <br/>לא ניתן לטעון את המודולים הבאים: - + Continue with setup? להמשיך בהתקנה? - + 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> תכנית ההתקנה של %1 עומדת לבצע שינויים בכונן הקשיח שלך לטובת התקנת %2.<br/><strong>לא תהיה לך אפשרות לבטל את השינויים האלה.</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 עומדת לבצע שינויים בכונן שלך לטובת התקנת %2.<br/><strong>לא תהיה אפשרות לבטל את השינויים הללו.</strong> + אשף התקנת %1 עומד לבצע שינויים בכונן שלך לטובת התקנת %2.<br/><strong>לא תהיה אפשרות לבטל את השינויים הללו.</strong> - + &Set up now להת&קין כעת - + &Install now להת&קין כעת - + Go &back ח&זרה - + &Set up להת&קין - + &Install הת&קנה - + Setup is complete. Close the setup program. ההתקנה הושלמה. נא לסגור את תכנית ההתקנה. - + The installation is complete. Close the installer. תהליך ההתקנה הושלם. נא לסגור את תכנית ההתקנה. - + Cancel setup without changing the system. ביטול ההתקנה ללא שינוי המערכת. - + Cancel installation without changing the system. ביטול התקנה ללא ביצוע שינוי במערכת. - + &Next &קדימה - + &Back &אחורה - + &Done &סיום - + &Cancel &ביטול - + Cancel setup? לבטל את ההתקנה? - + 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 install process? The installer will quit and all changes will be lost. האם אכן ברצונך לבטל את תהליך ההתקנה? -תכנית ההתקנה תיסגר וכל השינויים יאבדו. +אשף ההתקנה ייסגר וכל השינויים יאבדו. @@ -475,12 +495,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program תכנית התקנת %1 - + %1 Installer אשף התקנת %1 @@ -488,7 +508,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... נאסף מידע על המערכת… @@ -736,22 +756,32 @@ The installer will quit and all changes will be lost. תבנית של המספרים והתאריכים של המיקום יוגדרו להיות %1. - + Network Installation. (Disabled: Incorrect configuration) התקנת רשת. (מושבתת: תצורה שגויה) - + Network Installation. (Disabled: Received invalid groups data) התקנה מהרשת. (מושבתת: המידע שהתקבל על קבוצות שגוי) - - Network Installation. (Disabled: internal error) - התקנת רשת. (מושבתת: שגיאה פנימית) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + - + + Package selection + בחירת חבילות + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) התקנה מהרשת. (מושבתת: לא ניתן לקבל רשימות של חבילות תכנה, נא לבדוק את החיבור לרשת) @@ -798,7 +828,7 @@ The installer will quit and all changes will be lost. <h1>Welcome to the %1 installer</h1> - <h1>ברוך בואך לתכנית התקנת %1</h1> + <h1>ברוך בואך להתקנת %1</h1> @@ -846,42 +876,42 @@ The installer will quit and all changes will be lost. הסיסמאות לא תואמות! - + Setup Failed ההתקנה נכשלה - + Installation Failed ההתקנה נכשלה - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete ההתקנה הושלמה - + Installation Complete ההתקנה הושלמה - + The setup of %1 is complete. ההתקנה של %1 הושלמה. - + The installation of %1 is complete. ההתקנה של %1 הושלמה. @@ -919,12 +949,12 @@ The installer will quit and all changes will be lost. &Primary - &ראשי + &ראשית E&xtended - מ&ורחב + מ&ורחבת @@ -954,12 +984,12 @@ The installer will quit and all changes will be lost. Logical - לוגי + לוגית Primary - ראשי + ראשית @@ -1171,7 +1201,7 @@ The installer will quit and all changes will be lost. The installer failed to delete partition %1. - כשל של תכנית ההתקנה במחיקת המחיצה %1. + אשף ההתקנה נכשל במחיקת המחיצה %1. @@ -1478,72 +1508,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space יש לפחות %1 GiB פנויים בכונן - + There is not enough drive space. At least %1 GiB is required. נפח האחסון לא מספיק. נדרשים %1 GiB לפחות. - + has at least %1 GiB working memory יש לפחות %1 GiB זיכרון לעבודה - + The system does not have enough working memory. At least %1 GiB is required. כמות הזיכרון הנדרשת לפעולה אינה מספיקה. נדרשים %1 GiB לפחות. - + is plugged in to a power source מחובר לספק חשמל חיצוני - + The system is not plugged in to a power source. המערכת לא מחוברת לספק חשמל חיצוני. - + is connected to the Internet מחובר לאינטרנט - + The system is not connected to the Internet. המערכת לא מחוברת לאינטרנט. - + is running the installer as an administrator (root) ההתקנה מופעלת תחת חשבון מורשה ניהול (root) - + The setup program is not running with administrator rights. תכנית ההתקנה אינה פועלת עם הרשאות ניהול. - + The installer is not running with administrator rights. אשף ההתקנה לא רץ עם הרשאות מנהל. - + 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 installer. גודל המסך קטן מכדי להציג את תכנית ההתקנה. @@ -1611,7 +1641,7 @@ The installer will quit and all changes will be lost. נא להתקין את KDE Konsole ולנסות שוב! - + Executing script: &nbsp;<code>%1</code> הסקריפט מופעל: &nbsp; <code>%1</code> @@ -1875,106 +1905,105 @@ The installer will quit and all changes will be lost. 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. - נא לבחור את המיקום המועדף עליכם על המפה כדי שתכנית ההתקנה תוכל להציע הגדרות מקומיות - ואזור זמן עבורכם. ניתן לכוונן את ההגדרות המוצעות להלן. לחפש במפה על ידי משיכה להזזתה ובכפתורים +/- כדי להתקרב/להתרחק + נא לבחור את המיקום המועדף עליך במפה כדי שאשף ההתקנה יוכל להציע הגדרות מקומיות + ואזור זמן עבורך. ניתן להתאים את ההגדרות המוצעות למטה. ניתן לחפש במפה על ידי משיכה להזזתה ובכפתורים +/- כדי להתקרב/להתרחק או להשתמש בגלילת העכבר לטובת שליטה בתקריב. NetInstallViewStep - - + Package selection בחירת חבילות - + Office software תכנה של כלים משרדיים - + Office package חבילת כלים משרדיים - + Browser software תכנה של דפדפן - + Browser package חבילת דפדפן - + Web browser דפדפן - + Kernel ליבה - + Services שירותים - + Login כניסה - + Desktop שולחן עבודה - + Applications יישומים - + Communication תקשורת - + Development פיתוח - + Office כלי משרד - + Multimedia מולטימדיה - + Internet אינטרנט - + Theming עיצוב - + Gaming משחקים - + Utilities כלים @@ -3208,7 +3237,7 @@ Output: The installer failed to resize partition %1 on disk '%2'. - תהליך ההתקנה נכשל בשינוי גודל המחיצה %1 על כונן '%2'. + אשף ההתקנה נכשל בשינוי גודל המחיצה %1 על כונן '%2'. @@ -3432,7 +3461,7 @@ Output: The installer failed to set flags on partition %1. - תהליך ההתקנה נכשל בעת הצבת סימונים במחיצה %1. + אשף ההתקנה נכשל בהצבת סימונים במחיצה %1. @@ -3726,12 +3755,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>אם מחשב זה מיועד לשימוש לטובת למעלה ממשתמש אחד, ניתן ליצור מגוון חשבונות לאחר ההתקנה.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>אם מחשב זה מיועד לשימוש לטובת למעלה ממשתמש אחד, ניתן ליצור מגוון חשבונות לאחר ההתקנה.</small> @@ -3739,7 +3768,7 @@ Output: UsersQmlViewStep - + Users משתמשים @@ -3906,7 +3935,7 @@ Output: About %1 setup - אודות התקנת %1 + על אודות התקנת %1 @@ -4157,102 +4186,102 @@ Output: מה שמך? - + Your Full Name שמך המלא - + What name do you want to use to log in? איזה שם ברצונך שישמש אותך לכניסה? - + Login Name שם הכניסה - + If more than one person will use this computer, you can create multiple accounts after installation. אם במחשב זה יש יותר ממשתמש אחד, ניתן ליצור מגוון חשבונות לאחר ההתקנה. - + What is the name of this computer? מהו השם של המחשב הזה? - + Computer Name שם המחשב - + This name will be used if you make the computer visible to others on a network. השם הזה יהיה בשימוש אם המחשב הזה יהיה גלוי לשאר הרשת. - + Choose a password to keep your account safe. נא לבחור סיסמה להגנה על חשבונך. - + Password סיסמה - + Repeat Password חזרה על הסיסמה - + 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. יש להקליד את אותה הסיסמה פעמיים כדי שניתן יהיה לבדוק שגיאות הקלדה. סיסמה טובה אמורה להכיל שילוב של אותיות, מספרים וסימני פיסוק, להיות באורך של שמונה תווים לפחות ויש להחליף אותה במרווחי זמן קבועים. - + Validate passwords quality אימות איכות הסיסמאות - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. כשתיבה זו מסומנת, בדיקת אורך סיסמה מתבצעת ולא תהיה לך אפשרות להשתמש בסיסמה חלשה. - + Log in automatically without asking for the password להיכנס אוטומטית מבלי לבקש סיסמה - + Reuse user password as root password להשתמש בסיסמת המשתמש גם בשביל משתמש העל (root) - + Use the same password for the administrator account. להשתמש באותה הסיסמה בשביל חשבון המנהל. - + Choose a root password to keep your account safe. נא לבחור סיסמה למשתמש העל (root) כדי להגן על חשבונך. - + Root Password סיסמה למשתמש העל (root) - + Repeat Root Password נא לחזור על סיסמת משתמש העל - + Enter the same password twice, so that it can be checked for typing errors. נא להקליד את הסיסמה פעמיים כדי לאפשר זיהוי של שגיאות הקלדה. diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts index a91072f871..e914157f9d 100644 --- a/lang/calamares_hi.ts +++ b/lang/calamares_hi.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + स्वतः माउंट सेटिंग्स हेतु प्रबंधन @@ -102,22 +102,42 @@ अंतरफलक : - - Tools - साधन + + Crashes Calamares, so that Dr. Konqui can look at it. + Dr. Konqui द्वारा जाँच के लिए Calamares की कार्यप्रणाली निरस्त करने हेतु। + + + + Reloads the stylesheet from the branding directory. + ब्रांड डायरेक्टरी से शैली पत्र पुनः लोड करने हेतु। + + + + Uploads the session log to the configured pastebin. + सत्र लॉग फाइल को विन्यस्त पेस्टबिन साइट पर अपलोड करने हेतु। + + + + Send Session Log + सत्र लॉग फाइल भेजें - + Reload Stylesheet शैली पत्रक पुनः लोड करें - + + Displays the tree of widget names in the log (for stylesheet debugging). + (शैली दोषमार्जन हेतु) लॉग फाइल में विजेट नाम प्रदर्शन। + + + Widget Tree विजेट ट्री - + Debug information डीबग संबंधी जानकारी @@ -286,13 +306,13 @@ - + &Yes हाँ (&Y) - + &No नहीं (&N) @@ -302,143 +322,147 @@ बंद करें (&C) - + Install Log Paste URL इंस्टॉल प्रक्रिया की लॉग फ़ाइल पेस्ट करें - + The upload was unsuccessful. No web-paste was done. अपलोड विफल रहा। इंटरनेट पर पेस्ट नहीं हो सका। - + Install log posted to %1 Link copied to clipboard - + यहाँ इंस्टॉल की लॉग फ़ाइल पेस्ट की गई + +%1 + +लिंक को क्लिपबोर्ड पर कॉपी किया गया - + Calamares Initialization Failed Calamares का आरंभीकरण विफल रहा - + %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 इंस्टॉल नहीं किया जा सका। Calamares सभी विन्यस्त मॉड्यूल लोड करने में विफल रहा। यह आपके लिनक्स वितरण द्वारा Calamares के उपयोग से संबंधित एक समस्या है। - + <br/>The following modules could not be loaded: <br/>निम्नलिखित मॉड्यूल लोड नहीं हो सकें : - + Continue with setup? सेटअप करना जारी रखें? - + 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> %2 सेटअप करने हेतु %1 सेटअप प्रोग्राम आपकी डिस्क में बदलाव करने वाला है।<br/><strong>आप इन बदलावों को पूर्ववत नहीं कर पाएंगे।</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> %2 इंस्टॉल करने के लिए %1 इंस्टॉलर आपकी डिस्क में बदलाव करने वाला है।<br/><strong>आप इन बदलावों को पूर्ववत नहीं कर पाएंगे।</strong> - + &Set up now अभी सेटअप करें (&S) - + &Install now अभी इंस्टॉल करें (&I) - + Go &back वापस जाएँ (&b) - + &Set up सेटअप करें (&S) - + &Install इंस्टॉल करें (&I) - + Setup is complete. Close the setup program. सेटअप पूर्ण हुआ। सेटअप प्रोग्राम बंद कर दें। - + The installation is complete. Close the installer. इंस्टॉल पूर्ण हुआ।अब इंस्टॉलर को बंद करें। - + Cancel setup without changing the system. सिस्टम में बदलाव किये बिना सेटअप रद्द करें। - + Cancel installation without changing the system. सिस्टम में बदलाव किये बिना इंस्टॉल रद्द करें। - + &Next आगे (&N) - + &Back वापस (&B) - + &Done हो गया (&D) - + &Cancel रद्द करें (&C) - + Cancel setup? सेटअप रद्द करें? - + 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 install process? The installer will quit and all changes will be lost. क्या आप वाकई वर्तमान इंस्टॉल प्रक्रिया रद्द करना चाहते हैं? @@ -471,12 +495,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 सेटअप प्रोग्राम - + %1 Installer %1 इंस्टॉलर @@ -484,7 +508,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... सिस्टम की जानकारी प्राप्त की जा रही है... @@ -732,22 +756,32 @@ The installer will quit and all changes will be lost. संख्या व दिनांक स्थानिकी %1 सेट की जाएगी। - + Network Installation. (Disabled: Incorrect configuration) नेटवर्क इंस्टॉल। (निष्क्रिय : गलत विन्यास) - + Network Installation. (Disabled: Received invalid groups data) नेटवर्क इंस्टॉल (निष्क्रिय है : प्राप्त किया गया समूह डाटा अमान्य है) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) नेटवर्क इंस्टॉल। (निष्क्रिय : आंतरिक त्रुटि) - + + Network Installation. (Disabled: No package list) + नेटवर्क इंस्टॉल। (निष्क्रिय : पैकेज सूची अनुपलब्ध) + + + + Package selection + पैकेज चयन + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) नेटवर्क इंस्टॉल। (निष्क्रिय है : पैकेज सूची प्राप्त करने में असमर्थ, अपना नेटवर्क कनेक्शन जाँचें) @@ -842,42 +876,42 @@ The installer will quit and all changes will be lost. आपके कूटशब्द मेल नहीं खाते! - + Setup Failed - सेटअप विफल रहा + सेटअप विफल - + Installation Failed - इंस्टॉल विफल रहा। + इंस्टॉल विफल - + The setup of %1 did not complete successfully. - + %1 का सेटअप सफलतापूर्वक पूर्ण नहीं हुआ। - + The installation of %1 did not complete successfully. - + %1 का इंस्टॉल सफलतापूर्वक पूर्ण नहीं हुआ। - + Setup Complete - सेटअप पूर्ण हुआ + सेटअप पूर्ण - + Installation Complete - इंस्टॉल पूर्ण हुआ + इंस्टॉल पूर्ण - + The setup of %1 is complete. %1 का सेटअप पूर्ण हुआ। - + The installation of %1 is complete. %1 का इंस्टॉल पूर्ण हुआ। @@ -973,12 +1007,12 @@ The installer will quit and all changes will be lost. Create new %1MiB partition on %3 (%2) with entries %4. - + %3 (%2) पर %4 प्रविष्टि युक्त %1 एमबी का नया विभाजन बनाएँ। Create new %1MiB partition on %3 (%2). - + %3 (%2) पर %1 एमबी का नया विभाजन बनाएँ। @@ -988,12 +1022,12 @@ The installer will quit and all changes will be lost. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + <strong>%3</strong> (%2) पर <em>%4</em> प्रविष्टि युक्त <strong>%1 एमबी</strong> का नया विभाजन बनाएँ। Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + <strong>%3</strong> (%2) पर <strong>%1 एमबी</strong> का नया विभाजन बनाएँ। @@ -1341,7 +1375,7 @@ The installer will quit and all changes will be lost. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + <strong>नवीन</strong> सिस्टम विभाजन %2 पर %1 को <em>%3</em> विशेषताओं सहित इंस्टॉल करें। @@ -1351,27 +1385,27 @@ 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 सहित सेट करें। Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + %3 सिस्टम विभाजन <strong>%1</strong> %2 को <em>%4</em> विशेषताओं सहित इंस्टॉल करें। 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>विशेषताओं सहित सेट करें। Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + %3 विभाजन <strong>%1</strong> माउंट पॉइंट <strong>%2</strong>%4 सहित सेट करें। @@ -1437,7 +1471,7 @@ The installer will quit and all changes will be lost. Finish - समाप्त करें + समाप्त @@ -1445,7 +1479,7 @@ The installer will quit and all changes will be lost. Finish - समाप्त करें + समाप्त @@ -1474,72 +1508,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space कम-से-कम %1 GiB स्पेस ड्राइव पर उपलब्ध हो - + There is not enough drive space. At least %1 GiB is required. ड्राइव में पर्याप्त स्पेस नहीं है। कम-से-कम %1 GiB होना आवश्यक है। - + has at least %1 GiB working memory कम-से-कम %1 GiB मेमोरी उपलब्ध हो - + The system does not have enough working memory. At least %1 GiB is required. सिस्टम में पर्याप्त मेमोरी नहीं है। कम-से-कम %1 GiB होनी आवश्यक है। - + is plugged in to a power source पॉवर के स्रोत से कनेक्ट है - + The system is not plugged in to a power source. सिस्टम पॉवर के स्रोत से कनेक्ट नहीं है। - + is connected to the Internet इंटरनेट से कनेक्ट है - + The system is not connected to the Internet. सिस्टम इंटरनेट से कनेक्ट नहीं है। - + is running the installer as an administrator (root) इंस्टॉलर को प्रबंधक(रुट) के अंतर्गत चला रहा है - + The setup program is not running with administrator rights. सेटअप प्रोग्राम के पास प्रबंधक अधिकार नहीं है। - + The installer is not running with administrator rights. इंस्टॉलर के पास प्रबंधक अधिकार नहीं है। - + 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 installer. इंस्टॉलर प्रदर्शित करने हेतु स्क्रीन काफ़ी छोटी है। @@ -1607,7 +1641,7 @@ The installer will quit and all changes will be lost. कृपया केडीई Konsole इंस्टॉल कर, पुनः प्रयास करें। - + Executing script: &nbsp;<code>%1</code> निष्पादित स्क्रिप्ट : &nbsp;<code>%1</code> @@ -1879,98 +1913,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection पैकेज चयन - + Office software ऑफिस सॉफ्टवेयर - + Office package ऑफिस पैकेज - + Browser software ब्राउज़र सॉफ्टवेयर - + Browser package ब्राउज़र पैकेज - + Web browser वेब ब्राउज़र - + Kernel कर्नेल - + Services सेवाएँ - + Login लॉगिन - + Desktop डेस्कटॉप - + Applications अनुप्रयोग - + Communication संचार - + Development सॉफ्टवेयर विकास - + Office ऑफिस - + Multimedia मल्टीमीडिया - + Internet इंटरनेट - + Theming थीम - + Gaming खेल - + Utilities साधन @@ -2158,7 +2191,7 @@ The installer will quit and all changes will be lost. The password contains fewer than %n digits - कूटशब्द में %n से कम अंक है + कूटशब्द में %n से कम अंक हैं कूटशब्द में %n से कम अंक हैं @@ -3704,12 +3737,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>यदि एक से अधिक व्यक्ति इस कंप्यूटर का उपयोग करेंगे, तो आप सेटअप के उपरांत एकाधिक अकाउंट बना सकते हैं।</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>यदि एक से अधिक व्यक्ति इस कंप्यूटर का उपयोग करेंगे, तो आप इंस्टॉल के उपरांत एकाधिक अकाउंट बना सकते हैं।</small> @@ -3717,7 +3750,7 @@ Output: UsersQmlViewStep - + Users उपयोक्ता @@ -3961,29 +3994,31 @@ Output: Installation Completed - + इंस्टॉल पूर्ण %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + आपके कंप्यूटर पर %1 इंस्टॉल हो चुका है।<br/> + अब आप नए सिस्टम को पुनः आरंभ, या फिर लाइव वातावरण उपयोग करना जारी रख सकते हैं। Close Installer - + इंस्टॉलर बंद करें Restart System - + सिस्टम पुनः आरंभ करें <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>इंस्टॉल प्रक्रिया की पूर्ण लॉग installation.log फाइल के रूप में लाइव उपयोक्ता की होम डायरेक्टरी में उपलब्ध है।<br/> + यह लॉग फाइल लक्षित सिस्टम में %1 पर भी कॉपी की गई है।</p> @@ -4135,102 +4170,102 @@ Output: आपका नाम क्या है? - + Your Full Name आपका पूरा नाम - + What name do you want to use to log in? लॉग इन के लिए आप किस नाम का उपयोग करना चाहते हैं? - + Login Name लॉगिन नाम - + If more than one person will use this computer, you can create multiple accounts after installation. यदि एक से अधिक व्यक्ति इस कंप्यूटर का उपयोग करेंगे, तो आप इंस्टॉल के उपरांत एकाधिक अकाउंट बना सकते हैं। - + What is the name of this computer? इस कंप्यूटर का नाम ? - + Computer Name कंप्यूटर का नाम - + This name will be used if you make the computer visible to others on a network. यदि आपका कंप्यूटर किसी नेटवर्क पर दृश्यमान होता है, तो यह नाम उपयोग किया जाएगा। - + Choose a password to keep your account safe. अपना अकाउंट सुरक्षित रखने के लिए पासवर्ड चुनें । - + Password कूटशब्द - + Repeat Password कूटशब्द पुनः दर्ज करें - + 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. एक ही कूटशब्द दो बार दर्ज़ करें, ताकि उसे टाइप त्रुटि हेतु जाँचा जा सके। एक अच्छे कूटशब्द में अक्षर, अंक व विराम चिन्हों का मेल होता है, उसमें कम-से-कम आठ अक्षर होने चाहिए, और उसे नियमित अंतराल पर बदलते रहना चाहिए। - + Validate passwords quality कूटशब्द गुणवत्ता प्रमाणीकरण - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. यह बॉक्स टिक करने के परिणाम स्वरुप कूटशब्द-क्षमता की जाँच होगी व आप कमज़ोर कूटशब्द उपयोग नहीं कर पाएंगे। - + Log in automatically without asking for the password कूटशब्द बिना पूछे ही स्वतः लॉग इन करें - + Reuse user password as root password रुट कूटशब्द हेतु भी उपयोक्ता कूटशब्द उपयोग करें - + Use the same password for the administrator account. प्रबंधक अकाउंट के लिए भी यही कूटशब्द उपयोग करें। - + Choose a root password to keep your account safe. अकाउंट सुरक्षा हेतु रुट कूटशब्द चुनें। - + Root Password रुट कूटशब्द - + Repeat Root Password रुट कूटशब्द पुनः दर्ज करें - + Enter the same password twice, so that it can be checked for typing errors. समान कूटशब्द दो बार दर्ज करें, ताकि टाइपिंग त्रुटि हेतु जाँच की जा सकें। diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts index 845d382ed8..955a5d3d9b 100644 --- a/lang/calamares_hr.ts +++ b/lang/calamares_hr.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Upravljajte postavkama automatskog montiranja @@ -102,22 +102,42 @@ Sučelje: - - Tools - Alati + + Crashes Calamares, so that Dr. Konqui can look at it. + Ruši Calamares, tako da ga dr. Konqui može pogledati. + + + + Reloads the stylesheet from the branding directory. + Ponovno učitava tablicu stilova iz branding direktorija + + + + Uploads the session log to the configured pastebin. + Učitaj zapisnik sesije u konfigurirani pastebin. + + + + Send Session Log + Učitaj zapisnik sesije - + Reload Stylesheet Ponovno učitaj stilsku tablicu - + + Displays the tree of widget names in the log (for stylesheet debugging). + Prikazuje stablo imena dodataka u zapisniku (za otklanjanje pogrešaka u tablici stilova). + + + Widget Tree Stablo widgeta - + Debug information Debug informacija @@ -288,13 +308,13 @@ - + &Yes &Da - + &No &Ne @@ -304,143 +324,147 @@ &Zatvori - + Install Log Paste URL URL za objavu dnevnika instaliranja - + The upload was unsuccessful. No web-paste was done. Objava dnevnika instaliranja na web nije uspjela. - + Install log posted to %1 Link copied to clipboard - + Instaliraj zapisnik objavljen na + +%1 + +Veza je kopirana u međuspremnik - + Calamares Initialization Failed Inicijalizacija Calamares-a nije uspjela - + %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 se ne može se instalirati. Calamares nije mogao učitati sve konfigurirane module. Ovo je problem s načinom na koji se Calamares koristi u distribuciji. - + <br/>The following modules could not be loaded: <br/>Sljedeći moduli se nisu mogli učitati: - + Continue with setup? Nastaviti s postavljanjem? - + Continue with installation? Nastaviti sa instalacijom? - + 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> Instalacijski program %1 će izvršiti promjene na vašem disku kako bi postavio %2. <br/><strong>Ne možete poništiti te promjene.</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 instalacijski program će napraviti promjene na disku kako bi instalirao %2.<br/><strong>Nećete moći vratiti te promjene.</strong> - + &Set up now &Postaviti odmah - + &Install now &Instaliraj sada - + Go &back Idi &natrag - + &Set up &Postaviti - + &Install &Instaliraj - + Setup is complete. Close the setup program. Instalacija je završena. Zatvorite instalacijski program. - + The installation is complete. Close the installer. Instalacija je završena. Zatvorite instalacijski program. - + Cancel setup without changing the system. Odustanite od instalacije bez promjena na sustavu. - + Cancel installation without changing the system. Odustanite od instalacije bez promjena na sustavu. - + &Next &Sljedeće - + &Back &Natrag - + &Done &Gotovo - + &Cancel &Odustani - + Cancel setup? Prekinuti instalaciju? - + Cancel installation? Prekinuti instalaciju? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Stvarno želite prekinuti instalacijski proces? Instalacijski program će izaći i sve promjene će biti izgubljene. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Stvarno želite prekinuti instalacijski proces? @@ -473,12 +497,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. CalamaresWindow - + %1 Setup Program %1 instalacijski program - + %1 Installer %1 Instalacijski program @@ -486,7 +510,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. CheckerContainer - + Gathering system information... Skupljanje informacija o sustavu... @@ -734,22 +758,32 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Regionalne postavke brojeva i datuma će se postaviti na %1. - + Network Installation. (Disabled: Incorrect configuration) Mrežna instalacija. (Onemogućeno: Neispravna konfiguracija) - + Network Installation. (Disabled: Received invalid groups data) Mrežna instalacija. (Onemogućeno: Primanje nevažećih podataka o grupama) - - Network Installation. (Disabled: internal error) - Mrežna instalacija. (Onemogućeno: unutarnja pogreška) + + Network Installation. (Disabled: Internal error) + Mrežna instalacija. (Onemogućeno: Interna pogreška) - + + Network Installation. (Disabled: No package list) + Mrežna instalacija. (Onemogućeno: nedostaje lista paketa) + + + + Package selection + Odabir paketa + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Mrežna instalacija. (Onemogućeno: Ne mogu dohvatiti listu paketa, provjerite da li ste spojeni na mrežu) @@ -844,42 +878,42 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Lozinke se ne podudaraju! - + Setup Failed Instalacija nije uspjela - + Installation Failed Instalacija nije uspjela - + The setup of %1 did not complete successfully. - + Postavljanje %1 nije uspješno završilo. - + The installation of %1 did not complete successfully. - + Instalacija %1 nije uspješno završila. - + Setup Complete Instalacija je završena - + Installation Complete Instalacija je završena - + The setup of %1 is complete. Instalacija %1 je završena. - + The installation of %1 is complete. Instalacija %1 je završena. @@ -975,12 +1009,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. Create new %1MiB partition on %3 (%2) with entries %4. - + Stvori novu %1MiB particiju na %3 (%2) s unosima %4. Create new %1MiB partition on %3 (%2). - + Stvori novu %1MiB particiju na %3 (%2). @@ -990,12 +1024,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Stvori novu <strong>%1MiB</strong> particiju na <strong>%3</strong> (%2) sa unosima <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Stvori novu <strong>%1MiB</strong> particiju na <strong>%3</strong> (%2). @@ -1343,7 +1377,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Instaliraj %1 na <strong>novu</strong> %2 sistemsku particiju sa značajkama <em>%3</em> @@ -1353,27 +1387,27 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Postavi <strong>novu</strong> %2 particiju s točkom montiranja <strong>%1</strong> i značajkama <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Postavi <strong>novu</strong> %2 particiju s točkom montiranja <strong>%1</strong> %3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Instaliraj %2 na %3 sistemsku particiju <strong>%1</strong> sa značajkama <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Postavi %3 particiju <strong>%1</strong> s točkom montiranja <strong>%2</strong> i značajkama <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Postavi %3 particiju <strong>%1</strong> s točkom montiranja <strong>%2</strong> %4. @@ -1476,72 +1510,72 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. GeneralRequirements - + has at least %1 GiB available drive space ima barem %1 GB dostupne slobodne memorije na disku - + There is not enough drive space. At least %1 GiB is required. Nema dovoljno prostora na disku. Potrebno je najmanje %1 GB. - + has at least %1 GiB working memory ima barem %1 GB radne memorije - + The system does not have enough working memory. At least %1 GiB is required. Ovaj sustav nema dovoljno radne memorije. Potrebno je najmanje %1 GB. - + is plugged in to a power source je spojeno na izvor struje - + The system is not plugged in to a power source. Ovaj sustav nije spojen na izvor struje. - + is connected to the Internet je spojeno na Internet - + The system is not connected to the Internet. Ovaj sustav nije spojen na internet. - + is running the installer as an administrator (root) pokreće instalacijski program kao administrator (root) - + The setup program is not running with administrator rights. Instalacijski program nije pokrenut sa administratorskim dozvolama. - + The installer is not running with administrator rights. Instalacijski program nije pokrenut sa administratorskim dozvolama. - + has a screen large enough to show the whole installer ima zaslon dovoljno velik da može prikazati cijeli instalacijski program - + The screen is too small to display the setup program. Zaslon je premalen za prikaz instalacijskog programa. - + The screen is too small to display the installer. Zaslon je premalen za prikaz instalacijskog programa. @@ -1609,7 +1643,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Molimo vas da instalirate KDE terminal i pokušajte ponovno! - + Executing script: &nbsp;<code>%1</code> Izvršavam skriptu: &nbsp;<code>%1</code> @@ -1881,98 +1915,97 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje. NetInstallViewStep - - + Package selection Odabir paketa - + Office software Uredski softver - + Office package Uredski paket - + Browser software Preglednici - + Browser package Paket preglednika - + Web browser Web preglednik - + Kernel Kernel - + Services Servisi - + Login Prijava - + Desktop Radna površina - + Applications Aplikacije - + Communication Komunikacija - + Development Razvoj - + Office Ured - + Multimedia Multimedija - + Internet Internet - + Theming Izgled - + Gaming Igranje - + Utilities Alati @@ -3715,12 +3748,12 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Ako će više osoba koristiti ovo računalo, možete postaviti više korisničkih računa poslije instalacije.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Ako će više osoba koristiti ovo računalo, možete postaviti više korisničkih računa poslije instalacije.</small> @@ -3728,7 +3761,7 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene UsersQmlViewStep - + Users Korisnici @@ -3972,29 +4005,31 @@ Liberating Software. Installation Completed - + Instalacija je završila %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 je instaliran na vaše računalo.<br/> + Možete ponovno pokrenuti vaš novi sustav ili nastaviti koristiti trenutno okruženje. Close Installer - + Zatvori instalacijski program Restart System - + Ponovno pokretanje sustava <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Potpuni zapisnik instalacije dostupan je kao installation.log u home direktoriju Live korisnika.<br/> + Ovaj se zapisnik kopira u /var/log/installation.log ciljnog sustava.</p> @@ -4145,102 +4180,102 @@ Postavke regije utječu na format brojeva i datuma. Trenutne postavke su <str Koje je tvoje ime? - + Your Full Name Vaše puno ime - + What name do you want to use to log in? Koje ime želite koristiti za prijavu? - + Login Name Korisničko ime - + If more than one person will use this computer, you can create multiple accounts after installation. Ako će više korisnika koristiti ovo računalo, nakon instalacije možete otvoriti više računa. - + What is the name of this computer? Koje je ime ovog računala? - + Computer Name Ime računala - + This name will be used if you make the computer visible to others on a network. Ovo će se ime upotrebljavati ako računalo učinite vidljivim drugima na mreži. - + Choose a password to keep your account safe. Odaberite lozinku da bi račun bio siguran. - + Password Lozinka - + Repeat Password Ponovite lozinku - + 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. Dvaput unesite istu lozinku kako biste je mogli provjeriti ima li pogrešaka u tipkanju. Dobra lozinka sadržavat će mješavinu slova, brojeva i interpunkcije, treba imati najmanje osam znakova i treba je mijenjati u redovitim intervalima. - + Validate passwords quality Provjerite kvalitetu lozinki - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Kad je ovaj okvir potvrđen, bit će napravljena provjera jakosti lozinke te nećete moći koristiti slabu lozinku. - + Log in automatically without asking for the password Automatska prijava bez traženja lozinke - + Reuse user password as root password Upotrijebite lozinku korisnika kao root lozinku - + Use the same password for the administrator account. Koristi istu lozinku za administratorski račun. - + Choose a root password to keep your account safe. Odaberite root lozinku da biste zaštitili svoj račun. - + Root Password Root lozinka - + Repeat Root Password Ponovite root lozinku - + Enter the same password twice, so that it can be checked for typing errors. Dvaput unesite istu lozinku kako biste mogli provjeriti ima li pogrešaka u tipkanju. diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts index 0b2e9dab22..e758560e0c 100644 --- a/lang/calamares_hu.ts +++ b/lang/calamares_hu.ts @@ -102,22 +102,42 @@ Interfész: - - Tools - Eszközök + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Stílusok újratöltése - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Modul- fa - + Debug information Hibakeresési információk @@ -286,13 +306,13 @@ - + &Yes &Igen - + &No &Nem @@ -302,17 +322,17 @@ &Bezár - + Install Log Paste URL Telepítési napló beillesztési URL-je. - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed A Calamares előkészítése meghiúsult - + %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. A(z) %1 nem telepíthető. A Calamares nem tudta betölteni a konfigurált modulokat. Ez a probléma abból fakad, ahogy a disztribúció a Calamarest használja. - + <br/>The following modules could not be loaded: <br/>A következő modulok nem tölthetőek be: - + Continue with setup? Folytatod a telepítéssel? - + Continue with installation? Folytatja a telepítést? - + 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> A %1 telepítő változtatásokat fog végrehajtani a lemezen a %2 telepítéséhez. <br/><strong>Ezután már nem tudja visszavonni a változtatásokat.</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> A %1 telepítő változtatásokat fog elvégezni, hogy telepítse a következőt: %2.<br/><strong>A változtatások visszavonhatatlanok lesznek.</strong> - + &Set up now &Telepítés most - + &Install now &Telepítés most - + Go &back Menj &vissza - + &Set up &Telepítés - + &Install &Telepítés - + Setup is complete. Close the setup program. Telepítés sikerült. Zárja be a telepítőt. - + The installation is complete. Close the installer. A telepítés befejeződött, Bezárhatod a telepítőt. - + Cancel setup without changing the system. Telepítés megszakítása a rendszer módosítása nélkül. - + Cancel installation without changing the system. Kilépés a telepítőből a rendszer megváltoztatása nélkül. - + &Next &Következő - + &Back &Vissza - + &Done &Befejez - + &Cancel &Mégse - + Cancel setup? Megszakítja a telepítést? - + Cancel installation? Abbahagyod a telepítést? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Valóban megszakítod a telepítési eljárást? A telepítő ki fog lépni és minden változtatás elveszik. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Biztos abba szeretnéd hagyni a telepítést? @@ -471,12 +491,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. CalamaresWindow - + %1 Setup Program %1 Program telepítése - + %1 Installer %1 Telepítő @@ -484,7 +504,7 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. CheckerContainer - + Gathering system information... Rendszerinformációk gyűjtése... @@ -732,22 +752,32 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. A számok és dátumok területi beállítása %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Hálózati Telepítés. (Letiltva: Hibás adat csoportok fogadva) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Csomag választása + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Hálózati telepítés. (Kikapcsolva: A csomagokat nem lehet letölteni, ellenőrizd a hálózati kapcsolatot) @@ -843,42 +873,42 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>A két jelszó nem egyezik! - + Setup Failed Telepítési hiba - + Installation Failed Telepítés nem sikerült - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Telepítés Sikerült - + Installation Complete A telepítés befejeződött. - + The setup of %1 is complete. A telepítésből %1 van kész. - + The installation of %1 is complete. A %1 telepítése elkészült. @@ -1475,72 +1505,72 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> GeneralRequirements - + has at least %1 GiB available drive space legalább %1 GiB lemezterület elérhető - + There is not enough drive space. At least %1 GiB is required. Nincs elég lemezterület. Legalább %1 GiB szükséges. - + has at least %1 GiB working memory legalább %1 GiB memória elérhető - + The system does not have enough working memory. At least %1 GiB is required. A rendszer nem tartalmaz elég memóriát. Legalább %1 GiB szükséges. - + is plugged in to a power source csatlakoztatva van külső áramforráshoz - + The system is not plugged in to a power source. A rendszer nincs csatlakoztatva külső áramforráshoz - + is connected to the Internet csatlakozik az internethez - + The system is not connected to the Internet. A rendszer nem csatlakozik az internethez. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. A telepítő program nem adminisztrátori joggal fut. - + The installer is not running with administrator rights. A telepítő nem adminisztrátori jogokkal fut. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. A képernyő mérete túl kicsi a telepítő program megjelenítéséhez. - + The screen is too small to display the installer. A képernyőméret túl kicsi a telepítő megjelenítéséhez. @@ -1608,7 +1638,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Kérlek telepítsd a KDE Konsole-t és próbáld újra! - + Executing script: &nbsp;<code>%1</code> Script végrehajása: &nbsp;<code>%1</code> @@ -1878,98 +1908,97 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> NetInstallViewStep - - + Package selection Csomag választása - + Office software - + Office package - + Browser software - + Browser package - + Web browser Böngésző - + Kernel Kernel - + Services Szolgáltatások - + Login Bejelentkezés - + Desktop Asztal - + Applications Alkalmazások - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3702,12 +3731,12 @@ Calamares hiba %1. UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Ha egynél több személy használja a számítógépet akkor létrehozhat több felhasználói fiókot telepítés után.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Ha egynél több személy használja a számítógépet akkor létrehozhat több felhasználói fiókot telepítés után.</small> @@ -3715,7 +3744,7 @@ Calamares hiba %1. UsersQmlViewStep - + Users Felhasználók @@ -4099,102 +4128,102 @@ Calamares hiba %1. Mi a neved? - + Your Full Name - + What name do you want to use to log in? Milyen felhasználónévvel szeretnél bejelentkezni? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Mi legyen a számítógép neve? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Adj meg jelszót a felhasználói fiókod védelmére. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Ugyanaz a jelszó használata az adminisztrátor felhasználóhoz. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index 160ba1b68b..04e1036942 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -102,22 +102,42 @@ Antarmuka: - - Tools - Alat + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Muat ulang Lembar gaya - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Informasi debug @@ -284,13 +304,13 @@ - + &Yes &Ya - + &No &Tidak @@ -300,17 +320,17 @@ &Tutup - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -319,123 +339,123 @@ Link copied to clipboard - + Calamares Initialization Failed Inisialisasi Calamares Gagal - + %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 tidak dapat terinstal. Calamares tidak dapat memuat seluruh modul konfigurasi. Terdapat masalah dengan Calamares karena sedang digunakan oleh distribusi. - + <br/>The following modules could not be loaded: <br/>Modul berikut tidak dapat dimuat. - + Continue with setup? Lanjutkan dengan setelan ini? - + Continue with installation? Lanjutkan instalasi? - + 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> Installer %1 akan membuat perubahan ke disk Anda untuk memasang %2.<br/><strong>Anda tidak dapat membatalkan perubahan tersebut.</strong> - + &Set up now - + &Install now &Instal sekarang - + Go &back &Kembali - + &Set up - + &Install &Instal - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Instalasi sudah lengkap. Tutup installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Batalkan instalasi tanpa mengubah sistem yang ada. - + &Next &Berikutnya - + &Back &Kembali - + &Done &Kelar - + &Cancel &Batal - + Cancel setup? - + Cancel installation? Batalkan instalasi? - + 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. Apakah Anda benar-benar ingin membatalkan proses instalasi ini? @@ -468,12 +488,12 @@ Instalasi akan ditutup dan semua perubahan akan hilang. CalamaresWindow - + %1 Setup Program - + %1 Installer Installer %1 @@ -481,7 +501,7 @@ Instalasi akan ditutup dan semua perubahan akan hilang. CheckerContainer - + Gathering system information... Mengumpulkan informasi sistem... @@ -729,22 +749,32 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Nomor dan tanggal lokal akan disetel ke %1. - + Network Installation. (Disabled: Incorrect configuration) Pemasangan jaringan. (Dimatikan: Konfigurasi yang tidak sesuai) - + Network Installation. (Disabled: Received invalid groups data) Instalasi jaringan. (Menonaktifkan: Penerimaan kelompok data yang tidak sah) - - Network Installation. (Disabled: internal error) - Pemasangan jaringan. (Dimatikan: kesalahan internal) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Pemilihan paket - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalasi Jaringan. (Dinonfungsikan: Tak mampu menarik daftar paket, periksa sambungan jaringanmu) @@ -840,42 +870,42 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Sandi Anda tidak sama! - + Setup Failed Pengaturan Gagal - + Installation Failed Instalasi Gagal - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Instalasi Lengkap - + The setup of %1 is complete. - + The installation of %1 is complete. Instalasi %1 telah lengkap. @@ -1472,72 +1502,72 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source terhubung dengan sumber listrik - + The system is not plugged in to a power source. Sistem tidak terhubung dengan sumber listrik. - + is connected to the Internet terkoneksi dengan internet - + The system is not connected to the Internet. Sistem tidak terkoneksi dengan internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Installer tidak dijalankan dengan kewenangan administrator. - + 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 installer. Layar terlalu kecil untuk menampilkan installer. @@ -1605,7 +1635,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Silahkan instal KDE Konsole dan ulangi lagi! - + Executing script: &nbsp;<code>%1</code> Mengeksekusi skrip: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. NetInstallViewStep - - + Package selection Pemilihan paket - + Office software Perangkat lunak perkantoran - + Office package Paket perkantoran - + Browser software Peramban perangkat lunak - + Browser package Peramban paket - + Web browser Peramban web - + Kernel Inti - + Services Jasa - + Login Masuk - + Desktop Desktop - + Applications Aplikasi - + Communication Komunikasi - + Development Pengembangan - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3690,12 +3719,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. 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 installation.</small> @@ -3703,7 +3732,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. UsersQmlViewStep - + Users Pengguna @@ -4098,102 +4127,102 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Siapa nama Anda? - + Your Full Name - + What name do you want to use to log in? Nama apa yang ingin Anda gunakan untuk log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Apakah nama dari komputer ini? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Pilih sebuah kata sandi untuk menjaga keamanan akun Anda. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Gunakan sandi yang sama untuk akun administrator. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_id_ID.ts b/lang/calamares_id_ID.ts index 7f10fa7d05..2eae5886f3 100644 --- a/lang/calamares_id_ID.ts +++ b/lang/calamares_id_ID.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -284,13 +304,13 @@ - + &Yes - + &No @@ -300,17 +320,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -319,123 +339,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -467,12 +487,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -480,7 +500,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -728,22 +748,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -838,42 +868,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1470,72 +1500,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1603,7 +1633,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1873,98 +1903,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3683,12 +3712,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 installation.</small> @@ -3696,7 +3725,7 @@ Output: UsersQmlViewStep - + Users @@ -4080,102 +4109,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ie.ts b/lang/calamares_ie.ts index 873af5d969..3b5e219475 100644 --- a/lang/calamares_ie.ts +++ b/lang/calamares_ie.ts @@ -102,22 +102,42 @@ - - Tools - Utensiles + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + - + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes &Yes - + &No &No @@ -302,17 +322,17 @@ C&luder - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? Continuar li configuration? - + Continue with installation? Continuar li 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 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 &Configurar nu - + &Install now &Installar nu - + Go &back Ear &retro - + &Set up &Configurar - + &Install &Installar - + Setup is complete. Close the setup program. Configuration es completat. Ples cluder li configurator. - + The installation is complete. Close the installer. Installation es completat. Ples cluder li installator. - + Cancel setup without changing the system. Anullar li configuration sin modificationes del sistema. - + Cancel installation without changing the system. Anullar li installation sin modificationes del sistema. - + &Next &Sequent - + &Back &Retro - + &Done &Finir - + &Cancel A&nullar - + Cancel setup? Anullar li configuration? - + Cancel installation? Anullar li 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 install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Configiration de %1 - + %1 Installer Installator de %1 @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Selection de paccages + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed Configuration ne successat - + Installation Failed Installation ne successat - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Configuration es completat - + Installation Complete Installation es completat - + The setup of %1 is complete. Li configuration de %1 es completat. - + The installation of %1 is complete. Li installation de %1 es completat. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Selection de paccages - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel Nucleo - + Services Servicios - + Login - + Desktop - + Applications Applicationes - + Communication Communication - + Development - + Office Officie - + Multimedia - + Internet - + Theming Temas - + Gaming Ludes - + Utilities Utensiles @@ -3694,12 +3723,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 installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users Usatores @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts index a7c0f8d929..ccee0ec0cf 100644 --- a/lang/calamares_is.ts +++ b/lang/calamares_is.ts @@ -102,22 +102,42 @@ Viðmót: - - Tools - Verkfæri + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Endurhlaða stílblað - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Greinar viðmótshluta - + Debug information Villuleitarupplýsingar @@ -286,13 +306,13 @@ - + &Yes &Já - + &No &Nei @@ -302,17 +322,17 @@ &Loka - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed Calamares uppsetning mistókst - + %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: - + Continue with setup? Halda áfram með uppsetningu? - + Continue with installation? Halda áfram með uppsetningu? - + 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> %1 uppsetningarforritið er um það bil að gera breytingar á diskinum til að setja upp %2.<br/><strong>Þú munt ekki geta afturkallað þessar breytingar.</strong> - + &Set up now &Setja upp núna - + &Install now Setja &inn núna - + Go &back Fara til &baka - + &Set up &Setja upp - + &Install &Setja upp - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Uppsetning er lokið. Lokaðu uppsetningarforritinu. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Hætta við uppsetningu ánþess að breyta kerfinu. - + &Next &Næst - + &Back &Til baka - + &Done &Búið - + &Cancel &Hætta við - + Cancel setup? Hætta við uppsetningu? - + Cancel installation? Hætta við uppsetningu? - + 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. Viltu virkilega að hætta við núverandi uppsetningarferli? @@ -470,12 +490,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 uppsetningarforrit @@ -483,7 +503,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. CheckerContainer - + Gathering system information... Söfnun kerfis upplýsingar... @@ -731,22 +751,32 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Valdir pakkar + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -841,42 +871,42 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Lykilorð passa ekki! - + Setup Failed Uppsetning mistókst - + Installation Failed Uppsetning mistókst - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Uppsetningu lokið - + Installation Complete Uppsetningu lokið - + The setup of %1 is complete. Uppsetningu á %1 er lokið. - + The installation of %1 is complete. Uppsetningu á %1 er lokið. @@ -1473,72 +1503,72 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source er í sambandi við aflgjafa - + The system is not plugged in to a power source. Kerfið er ekki í sambandi við aflgjafa. - + is connected to the Internet er tengd við Internetið - + The system is not connected to the Internet. Kerfið er ekki tengd við internetið. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Uppsetningarforritið er ekki keyrandi með kerfisstjóraheimildum. - + 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 installer. Skjárinn er of lítill til að birta uppsetningarforritið. @@ -1606,7 +1636,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. - + Executing script: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. NetInstallViewStep - - + Package selection Valdir pakkar - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3695,12 +3724,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 installation.</small> @@ -3708,7 +3737,7 @@ Output: UsersQmlViewStep - + Users Notendur @@ -4092,102 +4121,102 @@ Output: Hvað heitir þú? - + Your Full Name - + What name do you want to use to log in? Hvaða nafn vilt þú vilt nota til að skrá þig inn? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Hvað er nafnið á þessari tölvu? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Veldu lykilorð til að halda reikningnum þínum öruggum. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Nota sama lykilorð fyrir kerfisstjóra reikning. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts index 0a8fe85d03..8df85420ab 100644 --- a/lang/calamares_it_IT.ts +++ b/lang/calamares_it_IT.ts @@ -102,22 +102,42 @@ Interfaccia: - - Tools - Strumenti + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Ricarica il foglio di stile - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Albero dei Widget - + Debug information Informazioni di debug @@ -286,13 +306,13 @@ - + &Yes &Si - + &No &No @@ -302,17 +322,17 @@ &Chiudi - + Install Log Paste URL URL di copia del log d'installazione - + The upload was unsuccessful. No web-paste was done. Il caricamento è fallito. Non è stata fatta la copia sul web. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed Inizializzazione di Calamares fallita - + %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 non può essere installato. Calamares non ha potuto caricare tutti i moduli configurati. Questo è un problema del modo in cui Calamares viene utilizzato dalla distribuzione. - + <br/>The following modules could not be loaded: <br/>I seguenti moduli non possono essere caricati: - + Continue with setup? Procedere con la configurazione? - + Continue with installation? Continuare l'installazione? - + 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> Il programma d'installazione %1 sta per modificare il disco di per installare %2. Non sarà possibile annullare queste modifiche. - + 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> Il programma d'installazione %1 sta per eseguire delle modifiche al tuo disco per poter installare %2.<br/><strong> Non sarà possibile annullare tali modifiche.</strong> - + &Set up now &Installa adesso - + &Install now &Installa adesso - + Go &back &Indietro - + &Set up &Installazione - + &Install &Installa - + Setup is complete. Close the setup program. Installazione completata. Chiudere il programma d'installazione. - + The installation is complete. Close the installer. L'installazione è terminata. Chiudere il programma d'installazione. - + Cancel setup without changing the system. Annulla l'installazione senza modificare il sistema. - + Cancel installation without changing the system. Annullare l'installazione senza modificare il sistema. - + &Next &Avanti - + &Back &Indietro - + &Done &Fatto - + &Cancel &Annulla - + Cancel setup? Annullare l'installazione? - + Cancel installation? Annullare l'installazione? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Si vuole annullare veramente il processo di installazione? Il programma d'installazione verrà terminato e tutti i cambiamenti saranno persi. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Si vuole davvero annullare l'installazione in corso? @@ -470,12 +490,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse CalamaresWindow - + %1 Setup Program %1 Programma d'installazione - + %1 Installer %1 Programma di installazione @@ -483,7 +503,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse CheckerContainer - + Gathering system information... Raccolta delle informazioni di sistema... @@ -731,22 +751,32 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse I numeri e le date locali saranno impostati a %1. - + Network Installation. (Disabled: Incorrect configuration) Installazione di rete. (Disabilitato: Configurazione non valida) - + Network Installation. (Disabled: Received invalid groups data) Installazione di rete. (Disabilitata: Ricevuti dati dei gruppi non validi) - - Network Installation. (Disabled: internal error) - Installazione di rete (disabilitata: errore interno) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Selezione del pacchetto - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Installazione di rete. (Disabilitata: impossibile recuperare le liste dei pacchetti, controllare la connessione di rete) @@ -841,42 +871,42 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Le password non corrispondono! - + Setup Failed Installazione fallita - + Installation Failed Installazione non riuscita - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Installazione completata - + Installation Complete Installazione completata - + The setup of %1 is complete. L'installazione di %1 è completa - + The installation of %1 is complete. L'installazione di %1 è completata. @@ -1473,72 +1503,72 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse GeneralRequirements - + has at least %1 GiB available drive space ha almeno %1 GiB di spazio disponibile - + There is not enough drive space. At least %1 GiB is required. Non c'è abbastanza spazio sul disco. E' richiesto almeno %1 GiB - + has at least %1 GiB working memory ha almeno %1 GiB di memoria - + The system does not have enough working memory. At least %1 GiB is required. Il sistema non ha abbastanza memoria. E' richiesto almeno %1 GiB - + is plugged in to a power source è collegato a una presa di alimentazione - + The system is not plugged in to a power source. Il sistema non è collegato a una presa di alimentazione. - + is connected to the Internet è connesso a Internet - + The system is not connected to the Internet. Il sistema non è connesso a internet. - + is running the installer as an administrator (root) sta eseguendo il programma di installazione come amministratore (root) - + The setup program is not running with administrator rights. Il programma di installazione non è stato lanciato con i permessi di amministratore. - + The installer is not running with administrator rights. Il programma di installazione non è stato avviato con i diritti di amministrazione. - + has a screen large enough to show the whole installer ha uno schermo abbastanza grande da mostrare l'intero programma di installazione - + The screen is too small to display the setup program. Lo schermo è troppo piccolo per mostrare il programma di installazione - + The screen is too small to display the installer. Schermo troppo piccolo per mostrare il programma d'installazione. @@ -1606,7 +1636,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Si prega di installare KDE Konsole e riprovare! - + Executing script: &nbsp;<code>%1</code> Esecuzione script: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse NetInstallViewStep - - + Package selection Selezione del pacchetto - + Office software Software per ufficio - + Office package Pacchetto per ufficio - + Browser software Software navigazione web - + Browser package Pacchetto navigazione web - + Web browser Browser web - + Kernel Kernel - + Services Servizi - + Login Accesso - + Desktop Ambiente desktop - + Applications Applicazioni - + Communication Comunicazione - + Development Sviluppo - + Office Ufficio - + Multimedia Multimedia - + Internet Internet - + Theming Personalizzazione tema - + Gaming Giochi - + Utilities Utilità @@ -3698,12 +3727,12 @@ Output: UsersPage - + <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>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> @@ -3711,7 +3740,7 @@ Output: UsersQmlViewStep - + Users Utenti @@ -4116,102 +4145,102 @@ Output: Qual è il tuo nome? - + Your Full Name Nome Completo - + What name do you want to use to log in? Quale nome usare per l'autenticazione? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Qual è il nome di questo computer? - + Computer Name Nome Computer - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Scegliere una password per rendere sicuro il tuo account. - + Password Password - + Repeat Password Ripetere Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quando questa casella è selezionata, la robustezza della password viene verificata e non sarà possibile utilizzare password deboli. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Usare la stessa password per l'account amministratore. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index 2666b1df5a..a0fb111d9d 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + 自動マウント設定を管理する @@ -19,12 +19,12 @@ 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. - このシステムは<strong>EFI</strong> ブート環境で起動しました。<br><br>EFI環境からの起動について設定するためには、<strong>EFI システムパーティション</strong>に <strong>GRUB</strong> あるいは <strong>systemd-boot</strong> といったブートローダーアプリケーションを配置しなければなりません。手動によるパーティショニングを選択する場合、EFI システムパーティションを選択あるいは作成しなければなりません。そうでない場合は、この操作は自動的に行われます。 + このシステムは<strong>EFI</strong> ブート環境で起動しました。<br><br>EFI環境からの起動を設定するには、<strong>EFI システムパーティション</strong>に <strong>GRUB</strong> や <strong>systemd-boot</strong> などのブートローダーアプリケーションを配置する必要があります。手動パーティショニングを選択しなければ、これは自動的に行われます。手動パーティショニングを選択する場合は、選択するか、自分で作成する必要があります。 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. - このシステムは <strong>BIOS</strong> ブート環境で起動しました。<br><br> BIOS環境からの起動について設定するためには、パーティションの開始位置あるいはパーティションテーブルの開始位置の近く (推奨) にある<strong>マスターブートレコード</strong>に <strong>GRUB</strong> のようなブートローダーをインストールしなければなりません。手動によるパーティショニングを選択する場合はユーザー自身で設定しなければなりません。そうでない場合は、この操作は自動的に行われます。 + このシステムは <strong>BIOS</strong> ブート環境で起動されました。<br><br>BIOS 環境からの起動を設定するため、このインストーラーはパーティションの先頭またはパーティションテーブルの先頭近くの<strong>マスターブートレコード</strong>に、<strong>GRUB</strong> などのブートローダーをインストールする必要があります（推奨）。手動パーティションニングを選択しない限り、これは自動的に行われます。手動パーティションニングを選択した場合は、自分で設定する必要があります。 @@ -102,22 +102,42 @@ インターフェース: - - Tools - ツール + + Crashes Calamares, so that Dr. Konqui can look at it. + Calamares をクラッシュさせ、Dr. Konqui で見られるようにする。 - + + Reloads the stylesheet from the branding directory. + ブランディングディレクトリからスタイルシートをリロードする。 + + + + Uploads the session log to the configured pastebin. + 設定されたペーストビンにセッションログをアップロードする。 + + + + Send Session Log + セッションログを送信 + + + Reload Stylesheet スタイルシートを再読み込む - + + Displays the tree of widget names in the log (for stylesheet debugging). + ログにウィジェット名のツリーを表示する（スタイルシートのデバッグ用）。 + + + Widget Tree ウィジェットツリー - + Debug information デバッグ情報 @@ -197,7 +217,7 @@ Working directory %1 for python job %2 is not readable. - python ジョブ %2 において作業ディレクトリ %1 が読み込めません。 + python ジョブ %2 の作業ディレクトリ %1 が読み取れません。 @@ -284,13 +304,13 @@ - + &Yes はい (&Y) - + &No いいえ (&N) @@ -300,143 +320,147 @@ 閉じる (&C) - + Install Log Paste URL インストールログを貼り付けるURL - + The upload was unsuccessful. No web-paste was done. アップロードは失敗しました。 ウェブへの貼り付けは行われませんでした。 - + Install log posted to %1 Link copied to clipboard - + インストールログをこちらに送信しました + +%1 + +クリップボードにリンクをコピーしました - + Calamares Initialization Failed Calamares によるインストールに失敗しました。 - + %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 をインストールできません。Calamares はすべてのモジュールをロードすることをできませんでした。これは、Calamares のこのディストリビューションでの使用法による問題です。 - + <br/>The following modules could not be loaded: <br/>以下のモジュールがロードできませんでした。: - + Continue with setup? セットアップを続行しますか？ - + 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> %1 のセットアッププログラムは %2 のセットアップのためディスクの内容を変更します。<br/><strong>これらの変更は取り消しできません。</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 インストーラーは %2 をインストールするためディスクの内容を変更しようとしています。<br/><strong>これらの変更は取り消せません。</strong> - + &Set up now セットアップしています (&S) - + &Install now 今すぐインストール (&I) - + Go &back 戻る (&B) - + &Set up セットアップ （&S） - + &Install インストール (&I) - + Setup is complete. Close the setup program. セットアップが完了しました。プログラムを閉じます。 - + The installation is complete. Close the installer. インストールが完了しました。インストーラーを閉じます。 - + Cancel setup without changing the system. システムを変更することなくセットアップを中断します。 - + Cancel installation without changing the system. システムを変更しないでインストールを中止します。 - + &Next 次へ (&N) - + &Back 戻る (&B) - + &Done 実行 (&D) - + &Cancel 中止 (&C) - + Cancel setup? セットアップを中止しますか？ - + 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 install process? The installer will quit and all changes will be lost. 本当に現在の作業を中止しますか？ @@ -469,12 +493,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 セットアッププログラム - + %1 Installer %1 インストーラー @@ -482,7 +506,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... システム情報を取得しています... @@ -515,7 +539,7 @@ The installer will quit and all changes will be lost. <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - <strong>手動パーティション</strong><br/>パーティションの作成、あるいはサイズ変更を行うことができます。 + <strong>手動パーティション</strong><br/>パーティションを自分で作成またはサイズ変更することができます。 @@ -530,7 +554,7 @@ The installer will quit and all changes will be lost. %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - %1 は %2MiB に縮小され新たに %4 に %3MiB のパーティションが作成されます。 + %1 は %2MiB に縮小され、%4 に新しい %3MiB のパーティションが作成されます。 @@ -647,7 +671,7 @@ The installer will quit and all changes will be lost. Clear mounts for partitioning operations on %1 - %1 のパーティション操作のため、マウントを解除 + %1 のパーティション操作のため、マウントを解除する @@ -657,7 +681,7 @@ The installer will quit and all changes will be lost. Cleared all mounts for %1 - %1 のすべてのマウントを解除 + %1 のすべてのマウントを解除しました @@ -665,7 +689,7 @@ The installer will quit and all changes will be lost. Clear all temporary mounts. - すべての一時的なマウントをクリア + すべての一時的なマウントをクリアする @@ -730,22 +754,32 @@ The installer will quit and all changes will be lost. 数値と日付のロケールを %1 に設定します。 - + Network Installation. (Disabled: Incorrect configuration) ネットワークインストール。(無効: 不正な設定) - + Network Installation. (Disabled: Received invalid groups data) ネットワークインストール (不可: 無効なグループデータを受け取りました) - - Network Installation. (Disabled: internal error) - ネットワークインストール。（無効: 内部エラー） + + Network Installation. (Disabled: Internal error) + ネットワークインストール（無効: 内部エラー） + + + + Network Installation. (Disabled: No package list) + ネットワークインストール（無効: パッケージリストなし） - + + Package selection + パッケージの選択 + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) ネットワークインストール。(無効: パッケージリストを取得できません。ネットワーク接続を確認してください。) @@ -840,43 +874,43 @@ The installer will quit and all changes will be lost. パスワードが一致していません！ - + Setup Failed セットアップに失敗しました。 - + Installation Failed インストールに失敗 - + The setup of %1 did not complete successfully. - + %1 のセットアップは正常に完了しませんでした。 - + The installation of %1 did not complete successfully. - + %1 のインストールは正常に完了しませんでした。 - + Setup Complete セットアップが完了しました - + Installation Complete インストールが完了 - + The setup of %1 is complete. %1 のセットアップが完了しました。 - + The installation of %1 is complete. %1 のインストールは完了です。 @@ -972,43 +1006,43 @@ The installer will quit and all changes will be lost. Create new %1MiB partition on %3 (%2) with entries %4. - + %3 (%2) にエントリ %4 の新しい %1MiB パーティションを作成する。 Create new %1MiB partition on %3 (%2). - + %3 (%2) に新しい %1MiB パーティションを作成する。 Create new %2MiB partition on %4 (%3) with file system %1. - %4 (%3) に新たにファイルシステム %1 の %2MiB のパーティションが作成されます。 + %4 (%3) にファイルシステム %1 の新しい %2MiB パーティションを作成する。 Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + <strong>%3</strong> (%2) にエントリ <em>%4</em> の新しい <strong>%1MiB</strong> パーティションを作成する。 Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + <strong>%3</strong> (%2) に新しい <strong>%1MiB</strong> パーティションを作成する。 Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - Create new <strong>%4</strong> (%3) に新たにファイルシステム<strong>%1</strong>の <strong>%2MiB</strong> のパーティションが作成されます。 + <strong>%4</strong> (%3) にファイルシステム <strong>%1</strong> の新しい <strong>%2MiB</strong> パーティションを作成する。 Creating new %1 partition on %2. - %2 に新しく %1 パーティションを作成しています。 + %2 に新しい %1 パーティションを作成しています。 The installer failed to create partition on disk '%1'. - インストーラーはディスク '%1' にパーティションを作成することに失敗しました。 + インストーラーはディスク '%1' にパーティションを作成できませんでした。 @@ -1021,7 +1055,7 @@ The installer will quit and all changes will be lost. Creating a new partition table will delete all existing data on the disk. - パーティションテーブルを作成することによって、ディスク上のデータがすべて削除されます。 + 新しいパーティションテーブルを作成すると、ディスク上の既存のデータがすべて削除されます。 @@ -1044,22 +1078,22 @@ The installer will quit and all changes will be lost. Create new %1 partition table on %2. - %2 に新しく %1 パーティションテーブルを作成 + %2 に新しい %1 パーティションテーブルを作成する。 Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). - <strong>%2</strong> (%3) に新しく <strong>%1</strong> パーティションテーブルを作成 + <strong>%2</strong> (%3) に新しい <strong>%1</strong> パーティションテーブルを作成する。 Creating new %1 partition table on %2. - %2 に新しく %1 パーティションテーブルを作成しています。 + %2 に新しい %1 パーティションテーブルを作成しています。 The installer failed to create a partition table on %1. - インストーラーは%1 へのパーティションテーブルの作成に失敗しました。 + インストーラーは %1 のパーティションテーブル作成に失敗しました。 @@ -1072,7 +1106,7 @@ The installer will quit and all changes will be lost. Create user <strong>%1</strong>. - ユーザー <strong>%1</strong> を作成。 + ユーザー <strong>%1</strong> を作成する。 @@ -1109,22 +1143,22 @@ The installer will quit and all changes will be lost. Create new volume group named %1. - 新しいボリュームグループ %1 を作成。 + 新しいボリュームグループ %1 を作成する。 Create new volume group named <strong>%1</strong>. - 新しいボリュームグループ <strong>%1</strong> を作成。 + 新しいボリュームグループ <strong>%1</strong> を作成する。 Creating new volume group named %1. - 新しいボリュームグループ %1 を作成。 + 新しいボリュームグループ %1 を作成しています。 The installer failed to create a volume group named '%1'. - インストーラーは新しいボリュームグループ '%1' の作成に失敗しました。 + インストーラーはボリュームグループ名 '%1' の作成に失敗しました。 @@ -1179,12 +1213,12 @@ The installer will quit and all changes will be lost. 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. - このデバイスは<strong>ループ</strong> デバイスです。<br><br> ブロックデバイスとしてふるまうファイルを作成する、パーティションテーブルを持たない仮想デバイスです。このセットアップの種類は通常単一のファイルシステムで構成されます。 + このデバイスは<strong>ループ</strong> デバイスです。<br><br> ブロックデバイスとしてアクセスできるファイルを作成する、パーティションテーブルを持たない仮想デバイスです。この種のセットアップは通常、単一のファイルシステムで構成されます。 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. - インストーラが、選択したストレージデバイス上の<strong>パーティションテーブルを検出することができません。</strong><br><br>デバイスにはパーティションテーブルが存在しないか、パーティションテーブルが未知のタイプまたは破損しています。<br>このインストーラーでは、自動であるいは、パーティションページによって手動で、新しいパーティションテーブルを作成することができます。 + インストーラーが、選択したストレージデバイス上の<strong>パーティションテーブルを検出できません。</strong><br><br>デバイスのパーティションテーブルが存在しないか、破損しているか、タイプが不明です。<br>このインストーラーは、自動的に、または手動パーティショニングページを介して、新しいパーティションテーブルを作成できます。 @@ -1340,37 +1374,37 @@ The installer will quit and all changes will be lost. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + <em>%3</em> 機能の<strong>新しい</strong> %2 システムパーティションに、%1 をインストールする Install %1 on <strong>new</strong> %2 system partition. - <strong>新しい</strong> %2 システムパーティションに %1 をインストール。 + <strong>新しい</strong> %2 システムパーティションに %1 をインストールする。 Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + マウントポイント <strong>%1</strong> に、<em>%3</em> 機能の<strong>新しい</strong> %2 パーティションをセットアップする。 Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + マウントポイント <strong>%1</strong> %3 に<strong>新しい</strong> %2 パーティションをセットアップする。 Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + <em>%4</em> 機能の %3 システムパーティション <strong>%1</strong> に %2 をインストールする。 Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + マウントポイント <strong>%2</strong> に、<em>%4</em> 機能の %3 パーティション <strong>%1</strong> をセットアップする。 Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + マウントポイント <strong>%2</strong> %4 に、%3 パーティション <strong>%1</strong> をセットアップする。 @@ -1473,74 +1507,74 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space 利用可能な容量が少なくとも %1 GiB - + There is not enough drive space. At least %1 GiB is required. 空き容量が十分ではありません。少なくとも %1 GiB 必要です。 - + has at least %1 GiB working memory %1 GiB以降のメモリーがあります - + The system does not have enough working memory. At least %1 GiB is required. 十分なメモリがありません。少なくとも %1 GiB 必要です。 - + is plugged in to a power source 電源が接続されていること - + The system is not plugged in to a power source. システムに電源が接続されていません。 - + is connected to the Internet インターネットに接続されていること - + The system is not connected to the Internet. システムはインターネットに接続されていません。 - + is running the installer as an administrator (root) は管理者（root）としてインストーラーを実行しています - + The setup program is not running with administrator rights. セットアッププログラムは管理者権限で実行されていません。 - + The installer is not running with administrator rights. インストーラーは管理者権限で実行されていません。 - + 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 installer. - インストーラーを表示するためには、画面が小さすぎます。 + 画面が小さすぎてインストーラーを表示できません。 @@ -1548,7 +1582,7 @@ The installer will quit and all changes will be lost. Collecting information about your machine. - マシンの情報を収集しています。 + お使いのマシンの情報を収集しています。 @@ -1564,17 +1598,17 @@ The installer will quit and all changes will be lost. Could not create directories <code>%1</code>. - <code>%1</code>のフォルダを作成されませんでした。 + ディレクトリ <code>%1</code> を作成できませんでした。 Could not open file <code>%1</code>. - <code>%1</code>のファイルを開くられませんでした。 + ファイル <code>%1</code> を開けませんでした。 Could not write to file <code>%1</code>. - ファイル <code>%1</code>に書き込めません。 + ファイル <code>%1</code> に書き込めませんでした。 @@ -1582,7 +1616,7 @@ The installer will quit and all changes will be lost. Creating initramfs with mkinitcpio. - mkinitcpioとinitramfsを作成しています。 + mkinitcpio と initramfs を作成しています。 @@ -1606,7 +1640,7 @@ The installer will quit and all changes will be lost. KDE Konsole をインストールして再度試してください！ - + Executing script: &nbsp;<code>%1</code> スクリプトの実行: &nbsp;<code>%1</code> @@ -1822,7 +1856,7 @@ The installer will quit and all changes will be lost. Encrypted rootfs setup error - 暗号化したrootfsセットアップエラー + 暗号化された rootfs のセットアップエラー @@ -1879,98 +1913,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection パッケージの選択 - + Office software オフィスソフトウェア - + Office package オフィスパッケージ - + Browser software ブラウザソフトウェア - + Browser package ブラウザパッケージ - + Web browser ウェブブラウザ - + Kernel カーネル - + Services サービス - + Login ログイン - + Desktop デスクトップ - + Applications アプリケーション - + Communication コミュニケーション - + Development 開発 - + Office オフィス - + Multimedia マルチメディア - + Internet インターネット - + Theming テーマ - + Gaming ゲーム - + Utilities ユーティリティー @@ -2232,7 +2265,7 @@ The installer will quit and all changes will be lost. Password generation failed - required entropy too low for settings - パスワード生成に失敗 - 設定のためのエントロピーが低すぎます + パスワードの生成に失敗しました - 設定に必要なエントロピーが低すぎます @@ -2633,7 +2666,7 @@ The installer will quit and all changes will be lost. 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 上のパーティションテーブルには既にプライマリパーティション %2 が配置されており、追加することができません。プライマリパーティションを消去して代わりに拡張パーティションを追加してください。 + %1 のパーティションテーブルにはすでに %2 個のプライマリパーティションがあり、これ以上追加できません。代わりに1つのプライマリパーティションを削除し、拡張パーティションを追加してください。 @@ -2661,12 +2694,12 @@ The installer will quit and all changes will be lost. <strong>Replace</strong> a partition with %1. - パーティションを %1 に<strong>置き換える。</strong> + パーティションを %1 に<strong>置き換える</strong>。 <strong>Manual</strong> partitioning. - <strong>手動</strong>でパーティションを設定する。 + <strong>手動</strong>パーティショニング。 @@ -2681,7 +2714,7 @@ The installer will quit and all changes will be lost. <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - ディスク <strong>%2</strong> (%3) 上のパーティションを %1 に<strong>置き換える。</strong> + ディスク <strong>%2</strong> (%3) のパーティションを %1 に<strong>置き換える</strong>。 @@ -2711,12 +2744,12 @@ The installer will quit and all changes will be lost. An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - %1 を起動するには、EFIシステムパーティションが必要です。<br/> <br/> EFIシステムパーティションを設定するには、戻って、<strong>%3</strong> フラグを有効にしたFAT32ファイルシステムを選択または作成し、マウントポイントを <strong>%2</strong> にします。<br/> <br/>EFIシステムパーティションを設定せずに続行すると、システムが起動しない場合があります。 + %1 を起動するには EFI システムパーティションが必要です。<br/> <br/>EFI システムパーティションを設定するには、戻って、<strong>%3</strong> フラグを有効にした FAT32 ファイルシステムを選択または作成し、マウントポイントを <strong>%2</strong> にします。<br/><br/>EFI システムパーティションを設定せずに続行すると、システムが起動しない場合があります。 An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - ％1 を起動するには、EFIシステムパーティションが必要です。<br/> <br/> パーティションはマウントポイント <strong>%2</strong> に設定されましたが、<strong>%3</strong> フラグが設定されていません。フラグを設定するには、戻ってパーティションを編集してください。フラグを設定せずに続行すると、システムが起動しない場合があります。 + %1 を起動するには EFI システムパーティションが必要です。<br/><br/>パーティションはマウントポイント <strong>%2</strong> に設定されましたが、<strong>%3</strong> フラグが設定されていません。フラグを設定するには、戻ってパーティションを編集してください。フラグを設定せずに続行すると、システムが起動しない場合があります。 @@ -2726,12 +2759,12 @@ The installer will quit and all changes will be lost. Option to use GPT on BIOS - BIOSでGPTを使用するためのオプション + 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>bios_grub</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>bios_grub</strong>フラグを有効にして 8 MB の未フォーマットのパーティションを作成します。GPTに設定したBIOSシステムで %1 を起動するには、未フォーマットの 8 MB パーティションが必要です。 + GPT パーティションテーブルは、すべてのシステムに最適なオプションです。このインストーラーは、BIOS システムのこのようなセットアップもサポートしています。<br/><br/>BIOS で GPT パーティションテーブルを設定するには（まだ行っていない場合）、前に戻ってパーティションテーブルを GPT に設定し、<strong>bios_grub</strong> フラグを有効にして 8 MB の未フォーマットのパーティションを作成します。GPT に設定した BIOS システムで %1 を起動するには、未フォーマットの 8 MB パーティションが必要です。 @@ -2741,12 +2774,12 @@ The installer will quit and all changes will be lost. 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> (暗号化) を選択してください。 + ブートパーティションは暗号化されたルートパーティションとともにセットアップされましたが、ブートパーティションは暗号化されていません。<br/><br/>重要なシステムファイルが暗号化されていないパーティションに残されているため、このようなセットアップは安全上の懸念があります。<br/>セットアップを続行することはできますが、後でシステムの起動中にファイルシステムが解除されます。<br/>ブートパーティションを暗号化させるには、前の画面に戻って、再度パーティションを作成し、パーティション作成ウィンドウ内で<strong>Encrypt</strong> (暗号化) を選択してください。 has at least one disk device available. - 少なくとも1枚のディスクは使用可能。 + は少なくとも1つのディスクデバイスを利用可能です。 @@ -2783,7 +2816,7 @@ The installer will quit and all changes will be lost. 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 installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. - KDE Plasma デスクトップの外観を選んでください。この作業はスキップでき、インストール後に外観を設定することができます。外観を選択し、クリックすることにより外観のプレビューが表示されます。 + KDE Plasma デスクトップの外観を選んでください。この作業をスキップして、インストール後に外観を設定することもできます。外観の選択をクリックすると、外観のプレビューが表示されます。 @@ -2804,7 +2837,7 @@ The installer will quit and all changes will be lost. No files configured to save for later. - 保存するための設定ファイルがありません。 + 後で保存するよう設定されたファイルがありません。 @@ -3103,7 +3136,7 @@ Output: The file-system resize job has an invalid configuration and will not run. - ファイルシステムのサイズ変更ジョブが不当な設定であるため、作動しません。 + ファイルシステムのサイズ変更ジョブの設定が無効です。実行しません。 @@ -3695,20 +3728,20 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - <small>もし複数の人間がこのコンピュータを使用する場合、セットアップの後で複数のアカウントを作成できます。</small> + <small>複数の人がこのコンピューターを使用する場合は、セットアップ後に複数のアカウントを作成できます。</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> - <small>もし複数の人間がこのコンピュータを使用する場合、インストールの後で複数のアカウントを作成できます。</small> + <small>複数の人がこのコンピューターを使用する場合は、インストール後に複数のアカウントを作成できます。</small> UsersQmlViewStep - + Users ユーザー情報 @@ -3952,29 +3985,31 @@ Output: Installation Completed - + インストールが完了しました %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 がコンピューターにインストールされました。<br/> + 再起動して新しいシステムを使用するか、ライブ環境をこのまま使用することができます。 Close Installer - + インストーラーを閉じる Restart System - + システムを再起動 <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>インストールの完全なログは、ライブユーザーのホームディレクトリにある installation.log として入手できます。<br/> + このログは、ターゲットシステムの /var/log/installation.log にコピーされます。</p> @@ -4126,102 +4161,102 @@ Output: あなたの名前は何ですか？ - + Your Full Name あなたのフルネーム - + What name do you want to use to log in? ログイン時に使用する名前は何ですか？ - + Login Name ログイン名 - + If more than one person will use this computer, you can create multiple accounts after installation. 複数のユーザーがこのコンピュータを使用する場合は、インストール後に複数のアカウントを作成できます。 - + What is the name of this computer? このコンピュータの名前は何ですか？ - + Computer Name コンピュータの名前 - + This name will be used if you make the computer visible to others on a network. この名前は、コンピューターをネットワーク上の他のユーザーに表示する場合に使用されます。 - + Choose a password to keep your account safe. アカウントを安全に使うため、パスワードを選択してください - + Password パスワード - + Repeat Password パスワードを再度入力 - + 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. 同じパスワードを2回入力して、入力エラーをチェックできるようにします。適切なパスワードは文字、数字、句読点が混在する8文字以上のもので、定期的に変更する必要があります。 - + Validate passwords quality パスワードの品質を検証する - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. このボックスをオンにするとパスワードの強度チェックが行われ、弱いパスワードを使用できなくなります。 - + Log in automatically without asking for the password パスワードを要求せずに自動的にログインする - + Reuse user password as root password rootパスワードとしてユーザーパスワードを再利用する - + Use the same password for the administrator account. 管理者アカウントと同じパスワードを使用する。 - + Choose a root password to keep your account safe. アカウントを安全に保つために、rootパスワードを選択してください。 - + Root Password rootパスワード - + Repeat Root Password rootパスワードを再入力 - + Enter the same password twice, so that it can be checked for typing errors. 同じパスワードを2回入力して、入力エラーをチェックできるようにします。 diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts index 57bbdb4af2..ad7fbd0b5e 100644 --- a/lang/calamares_kk.ts +++ b/lang/calamares_kk.ts @@ -102,22 +102,42 @@ - - Tools - Саймандар + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Жөндеу ақпараты @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Алға - + &Back А&ртқа - + &Done - + &Cancel Ба&с тарту - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,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 installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users Пайдаланушылар @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts index c12caa7157..5a0d5394c3 100644 --- a/lang/calamares_kn.ts +++ b/lang/calamares_kn.ts @@ -102,22 +102,42 @@ - - Tools - ಉಪಕರಣಗಳು + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes ಹೌದು - + &No ಇಲ್ಲ @@ -302,17 +322,17 @@ ಮುಚ್ಚಿರಿ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next ಮುಂದಿನ - + &Back ಹಿಂದಿನ - + &Done - + &Cancel ರದ್ದುಗೊಳಿಸು - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed ಅನುಸ್ಥಾಪನೆ ವಿಫಲವಾಗಿದೆ - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,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 installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts index 812068eba5..094e4b8d70 100644 --- a/lang/calamares_ko.ts +++ b/lang/calamares_ko.ts @@ -102,22 +102,42 @@ 인터페이스: - - Tools - 도구 + + Crashes Calamares, so that Dr. Konqui can look at it. + Dr. Konqui가 그것을 볼 수 있도록, Calamares를 충돌시킵니다. - + + Reloads the stylesheet from the branding directory. + 브랜딩 디렉터리에서 스타일 시트를 다시 불러옵니다. + + + + Uploads the session log to the configured pastebin. + 세션 로그를 구성된 pastebin에 업로드합니다. + + + + Send Session Log + 세션 로그 보내기 + + + Reload Stylesheet 스타일시트 새로고침 - + + Displays the tree of widget names in the log (for stylesheet debugging). + 로그에 위젯 이름의 트리를 표시합니다 (스타일 시트 디버깅 용). + + + Widget Tree 위젯 트리 - + Debug information 디버그 정보 @@ -284,13 +304,13 @@ - + &Yes 예(&Y) - + &No 아니오(&N) @@ -300,17 +320,17 @@ 닫기(&C) - + Install Log Paste URL 로그 붙여넣기 URL 설치 - + The upload was unsuccessful. No web-paste was done. 업로드에 실패했습니다. 웹 붙여넣기가 수행되지 않았습니다. - + Install log posted to %1 @@ -323,124 +343,124 @@ Link copied to clipboard 링크가 클립보드에 복사되었습니다. - + 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 가 설치될 수 없습니다. 깔라마레스가 모든 구성된 모듈을 불러올 수 없었습니다. 이것은 깔라마레스가 배포판에서 사용되는 방식에서 발생한 문제입니다. - + <br/>The following modules could not be loaded: 다음 모듈 불러오기 실패: - + Continue with setup? 설치를 계속하시겠습니까? - + 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> %1 설치 프로그램이 %2을(를) 설정하기 위해 디스크를 변경하려고 하는 중입니다.<br/><strong>이러한 변경은 취소할 수 없습니다.</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 설치 관리자가 %2를 설치하기 위해 사용자의 디스크의 내용을 변경하려고 합니다. <br/> <strong>이 변경 작업은 되돌릴 수 없습니다.</strong> - + &Set up now 지금 설치 (&S) - + &Install now 지금 설치 (&I) - + Go &back 뒤로 이동 (&b) - + &Set up 설치 (&S) - + &Install 설치(&I) - + Setup is complete. Close the setup program. 설치가 완료 되었습니다. 설치 프로그램을 닫습니다. - + The installation is complete. Close the installer. 설치가 완료되었습니다. 설치 관리자를 닫습니다. - + Cancel setup without changing the system. 시스템을 변경 하지 않고 설치를 취소합니다. - + Cancel installation without changing the system. 시스템 변경 없이 설치를 취소합니다. - + &Next 다음 (&N) - + &Back 뒤로 (&B) - + &Done 완료 (&D) - + &Cancel 취소 (&C) - + Cancel setup? 설치를 취소 하시겠습니까? - + 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 install process? The installer will quit and all changes will be lost. 정말로 현재 설치 프로세스를 취소하시겠습니까? @@ -473,12 +493,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 설치 프로그램 - + %1 Installer %1 설치 관리자 @@ -486,7 +506,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... 시스템 정보 수집 중... @@ -734,22 +754,32 @@ The installer will quit and all changes will be lost. 숫자와 날짜 로케일이 %1로 설정됩니다. - + Network Installation. (Disabled: Incorrect configuration) 네트워크 설치. (사용안함: 잘못된 환경설정) - + Network Installation. (Disabled: Received invalid groups data) 네트워크 설치. (불가: 유효하지 않은 그룹 데이터를 수신했습니다) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) 네트워크 설치. (사용안함: 내부 오류) - + + Network Installation. (Disabled: No package list) + 네트워크 설치. (사용안함: 패키지 목록 없음) + + + + Package selection + 패키지 선택 + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) 네트워크 설치. (불가: 패키지 목록을 가져올 수 없습니다. 네트워크 연결을 확인해주세요) @@ -844,42 +874,42 @@ The installer will quit and all changes will be lost. 암호가 일치하지 않습니다! - + Setup Failed 설치 실패 - + Installation Failed 설치 실패 - + The setup of %1 did not complete successfully. %1 설정이 제대로 완료되지 않았습니다. - + The installation of %1 did not complete successfully. %1 설치가 제대로 완료되지 않았습니다. - + Setup Complete 설치 완료 - + Installation Complete 설치 완료 - + The setup of %1 is complete. %1 설치가 완료되었습니다. - + The installation of %1 is complete. %1의 설치가 완료되었습니다. @@ -1476,72 +1506,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space %1 GiB 이상의 사용 가능한 드라이브 공간이 있음 - + There is not enough drive space. At least %1 GiB is required. 드라이브 공간이 부족합니다. %1 GiB 이상이 필요합니다. - + has at least %1 GiB working memory %1 GiB 이상의 작동 메모리가 있습니다. - + The system does not have enough working memory. At least %1 GiB is required. 시스템에 충분한 작동 메모리가 없습니다. %1 GiB 이상이 필요합니다. - + is plugged in to a power source 전원 공급이 연결되어 있습니다 - + The system is not plugged in to a power source. 이 시스템은 전원 공급이 연결되어 있지 않습니다 - + is connected to the Internet 인터넷에 연결되어 있습니다 - + The system is not connected to the Internet. 이 시스템은 인터넷에 연결되어 있지 않습니다. - + is running the installer as an administrator (root) 설치 관리자를 관리자(루트)로 실행 중입니다 - + The setup program is not running with administrator rights. 설치 프로그램이 관리자 권한으로 실행되고 있지 않습니다. - + The installer is not running with administrator rights. 설치 관리자가 관리자 권한으로 동작하고 있지 않습니다. - + 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 installer. 설치 관리자를 표시하기에는 화면이 너무 작습니다. @@ -1609,7 +1639,7 @@ The installer will quit and all changes will be lost. KDE Konsole을 설치한 후에 다시 시도해주세요! - + Executing script: &nbsp;<code>%1</code> 스크립트 실행: &nbsp;<code>%1</code> @@ -1881,98 +1911,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection 패키지 선택 - + Office software 오피스 소프트웨어 - + Office package 오피스 패키지 - + Browser software 브라우저 소프트웨어 - + Browser package 브라우저 패키지 - + Web browser 웹 브라우저 - + Kernel 커널 - + Services 서비스 - + Login 로그인 - + Desktop 데스크탑 - + Applications 애플리케이션 - + Communication 통신 - + Development 개발 - + Office 오피스 - + Multimedia 멀티미디어 - + Internet 인터넷 - + Theming 테마 - + Gaming 게임 - + Utilities 유틸리티 @@ -3697,12 +3726,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>둘 이상의 사용자가 이 컴퓨터를 사용할 경우, 설정 후 계정을 여러 개 만들 수 있습니다.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>둘 이상의 사용자가 이 컴퓨터를 사용할 경우 설치 후 계정을 여러 개 만들 수 있습니다.</small> @@ -3710,7 +3739,7 @@ Output: UsersQmlViewStep - + Users 사용자 @@ -4130,102 +4159,102 @@ Output: 이름이 무엇인가요? - + Your Full Name 전체 이름 - + What name do you want to use to log in? 로그인할 때 사용할 이름은 무엇인가요? - + Login Name 로그인 이름 - + If more than one person will use this computer, you can create multiple accounts after installation. 다수의 사용자가 이 컴퓨터를 사용하는 경우, 설치를 마친 후에 여러 계정을 만들 수 있습니다. - + What is the name of this computer? 이 컴퓨터의 이름은 무엇인가요? - + Computer Name 컴퓨터 이름 - + This name will be used if you make the computer visible to others on a network. 이 이름은 네트워크의 다른 사용자가 이 컴퓨터를 볼 수 있게 하는 경우에 사용됩니다. - + Choose a password to keep your account safe. 사용자 계정의 보안을 유지하기 위한 암호를 선택하세요. - + Password 비밀번호 - + Repeat Password 비밀번호 반복 - + 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. 입력 오류를 확인할 수 있도록 동일한 암호를 두 번 입력합니다. 올바른 암호에는 문자, 숫자 및 구두점이 혼합되어 있으며 길이는 8자 이상이어야 하며 정기적으로 변경해야 합니다. - + Validate passwords quality 암호 품질 검증 - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. 이 확인란을 선택하면 비밀번호 강도 검사가 수행되며 불충분한 비밀번호를 사용할 수 없습니다. - + Log in automatically without asking for the password 암호를 묻지 않고 자동으로 로그인합니다 - + Reuse user password as root password 사용자 암호를 루트 암호로 재사용합니다 - + Use the same password for the administrator account. 관리자 계정에 대해 같은 암호를 사용합니다. - + Choose a root password to keep your account safe. 당신의 계정을 안전하게 보호하기 위해서 루트 암호를 선택하세요. - + Root Password 루트 암호 - + Repeat Root Password 루트 암호 확인 - + Enter the same password twice, so that it can be checked for typing errors. 입력 오류를 확인하기 위해서 동일한 암호를 두번 입력해주세요. diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts index 2c6a263c2b..b83daef1a2 100644 --- a/lang/calamares_lo.ts +++ b/lang/calamares_lo.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -284,13 +304,13 @@ - + &Yes - + &No @@ -300,17 +320,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -319,123 +339,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -467,12 +487,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -480,7 +500,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -728,22 +748,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -838,42 +868,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1470,72 +1500,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1603,7 +1633,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1873,98 +1903,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3683,12 +3712,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 installation.</small> @@ -3696,7 +3725,7 @@ Output: UsersQmlViewStep - + Users @@ -4080,102 +4109,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index 7e4fec5217..571a7b2894 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -102,22 +102,42 @@ Sąsaja: - - Tools - Įrankiai + + Crashes Calamares, so that Dr. Konqui can look at it. + Užstrigdina Calamares, kad Dr. Konqui galėtų pažiūrėti kas nutiko. - + + Reloads the stylesheet from the branding directory. + Iš naujo įkelia stilių aprašą iš prekių ženklo katalogo. + + + + Uploads the session log to the configured pastebin. + Išsiunčia seanso žurnalą į sukonfigūruotą įdėjimų dėklą. + + + + Send Session Log + Siųsti seanso žurnalą + + + Reload Stylesheet Iš naujo įkelti stilių aprašą - + + Displays the tree of widget names in the log (for stylesheet debugging). + Rodo žurnale valdiklių pavadinimų medį (stilių aprašo derinimui). + + + Widget Tree Valdiklių medis - + Debug information Derinimo informacija @@ -290,13 +310,13 @@ - + &Yes &Taip - + &No &Ne @@ -306,17 +326,17 @@ &Užverti - + Install Log Paste URL Diegimo žurnalo įdėjimo URL - + The upload was unsuccessful. No web-paste was done. Įkėlimas buvo nesėkmingas. Nebuvo atlikta jokio įdėjimo į saityną. - + Install log posted to %1 @@ -329,124 +349,124 @@ Link copied to clipboard Nuoroda nukopijuota į iškarpinę - + Calamares Initialization Failed Calamares inicijavimas nepavyko - + %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. Nepavyksta įdiegti %1. Calamares nepavyko įkelti visų sukonfigūruotų modulių. Tai yra problema, susijusi su tuo, kaip distribucija naudoja diegimo programą Calamares. - + <br/>The following modules could not be loaded: <br/>Nepavyko įkelti šių modulių: - + Continue with setup? Tęsti sąranką? - + Continue with installation? Tęsti diegimą? - + 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 sąrankos programa, siekdama nustatyti %2, ketina atlikti pakeitimus diske.<br/><strong>Šių pakeitimų nebegalėsite atšaukti.</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 diegimo programa, siekdama įdiegti %2, ketina atlikti pakeitimus diske.<br/><strong>Šių pakeitimų nebegalėsite atšaukti.</strong> - + &Set up now Nu&statyti dabar - + &Install now Į&diegti dabar - + Go &back &Grįžti - + &Set up Nu&statyti - + &Install Į&diegti - + Setup is complete. Close the setup program. Sąranka užbaigta. Užverkite sąrankos programą. - + The installation is complete. Close the installer. Diegimas užbaigtas. Užverkite diegimo programą. - + Cancel setup without changing the system. Atsisakyti sąrankos, nieko sistemoje nekeičiant. - + Cancel installation without changing the system. Atsisakyti diegimo, nieko sistemoje nekeičiant. - + &Next &Toliau - + &Back &Atgal - + &Done A&tlikta - + &Cancel A&tsisakyti - + Cancel setup? Atsisakyti sąrankos? - + Cancel installation? Atsisakyti diegimo? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Ar tikrai norite atsisakyti dabartinio sąrankos proceso? Sąrankos programa užbaigs darbą ir visi pakeitimai bus prarasti. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Ar tikrai norite atsisakyti dabartinio diegimo proceso? @@ -479,12 +499,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. CalamaresWindow - + %1 Setup Program %1 sąrankos programa - + %1 Installer %1 diegimo programa @@ -492,7 +512,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. CheckerContainer - + Gathering system information... Renkama sistemos informacija... @@ -740,22 +760,32 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Skaičių ir datų lokalė bus nustatyta į %1. - + Network Installation. (Disabled: Incorrect configuration) Tinklo diegimas. (Išjungtas: Neteisinga konfigūracija) - + Network Installation. (Disabled: Received invalid groups data) Tinklo diegimas. (Išjungtas: Gauti neteisingi grupių duomenys) - - Network Installation. (Disabled: internal error) - Tinklo diegimas. (Išjungtas: vidinė klaida) + + Network Installation. (Disabled: Internal error) + Tinklo diegimas. (Išjungtas: Vidinė klaida) + + + + Network Installation. (Disabled: No package list) + Tinklo diegimas. (Išjungtas: Nėra paketų sąrašo) + + + + Package selection + Paketų pasirinkimas - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Tinklo diegimas. (Išjungta: Nepavyksta gauti paketų sąrašus, patikrinkite savo tinklo ryšį) @@ -850,42 +880,42 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Jūsų slaptažodžiai nesutampa! - + Setup Failed Sąranka patyrė nesėkmę - + Installation Failed Diegimas nepavyko - + The setup of %1 did not complete successfully. %1 sąranka nebuvo užbaigta sėkmingai. - + The installation of %1 did not complete successfully. %1 nebuvo užbaigtas sėkmingai. - + Setup Complete Sąranka užbaigta - + Installation Complete Diegimas užbaigtas - + The setup of %1 is complete. %1 sąranka yra užbaigta. - + The installation of %1 is complete. %1 diegimas yra užbaigtas. @@ -1482,72 +1512,72 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. GeneralRequirements - + has at least %1 GiB available drive space turi bent %1 GiB laisvos vietos diske - + There is not enough drive space. At least %1 GiB is required. Neužtenka vietos diske. Reikia bent %1 GiB. - + has at least %1 GiB working memory turi bent %1 GiB darbinės atminties - + The system does not have enough working memory. At least %1 GiB is required. Sistemai neužtenka darbinės atminties. Reikia bent %1 GiB. - + is plugged in to a power source prijungta prie maitinimo šaltinio - + The system is not plugged in to a power source. Sistema nėra prijungta prie maitinimo šaltinio. - + is connected to the Internet prijungta prie Interneto - + The system is not connected to the Internet. Sistema nėra prijungta prie Interneto. - + is running the installer as an administrator (root) vykdo diegimo programą pagrindinio naudotojo (root) teisėmis - + The setup program is not running with administrator rights. Sąrankos programa yra vykdoma be administratoriaus teisių. - + The installer is not running with administrator rights. Diegimo programa yra vykdoma be administratoriaus teisių. - + has a screen large enough to show the whole installer turi ekraną, pakankamai didelį, kad rodytų visą diegimo programą - + The screen is too small to display the setup program. Ekranas yra per mažas, kad būtų parodyta sąrankos programa. - + The screen is too small to display the installer. Ekranas yra per mažas, kad būtų parodyta diegimo programa. @@ -1615,7 +1645,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Įdiekite KDE Konsole ir bandykite dar kartą! - + Executing script: &nbsp;<code>%1</code> Vykdomas scenarijus: &nbsp;<code>%1</code> @@ -1887,98 +1917,97 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. NetInstallViewStep - - + Package selection Paketų pasirinkimas - + Office software Raštinės programinė įranga - + Office package Raštinės paketas - + Browser software Naršyklės programinė įranga - + Browser package Naršyklės paketas - + Web browser Saityno naršyklė - + Kernel Branduolys - + Services Tarnybos - + Login Prisijungimas - + Desktop Darbalaukis - + Applications Programos - + Communication Komunikacija - + Development Plėtojimas - + Office Raštinė - + Multimedia Multimedija - + Internet Internetas - + Theming Apipavidalinimas - + Gaming Žaidimai - + Utilities Paslaugų programos @@ -3730,12 +3759,12 @@ Išvestis: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Jei šiuo kompiuteriu naudosis keli žmonės, po sąrankos galite sukurti papildomas paskyras.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Jei šiuo kompiuteriu naudosis keli žmonės, po diegimo galite sukurti papildomas paskyras.</small> @@ -3743,7 +3772,7 @@ Išvestis: UsersQmlViewStep - + Users Naudotojai @@ -4163,102 +4192,102 @@ Išvestis: Koks jūsų vardas? - + Your Full Name Jūsų visas vardas - + What name do you want to use to log in? Kokį vardą norite naudoti prisijungimui? - + Login Name Prisijungimo vardas - + If more than one person will use this computer, you can create multiple accounts after installation. Jei šiuo kompiuteriu naudosis keli žmonės, po diegimo galėsite sukurti papildomas paskyras. - + What is the name of this computer? Koks šio kompiuterio vardas? - + Computer Name Kompiuterio vardas - + This name will be used if you make the computer visible to others on a network. Šis vardas bus naudojamas, jeigu padarysite savo kompiuterį matomą kitiems naudotojams tinkle. - + Choose a password to keep your account safe. Apsaugokite savo paskyrą slaptažodžiu - + Password Slaptažodis - + Repeat Password Pakartokite slaptažodį - + 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. Norint įsitikinti, kad rašydami slaptažodį nesuklydote, įrašykite tą patį slaptažodį du kartus. Stiprus slaptažodis yra raidžių, skaičių ir punktuacijos ženklų mišinys, jis turi būti mažiausiai aštuonių simbolių, be to, turėtų būti reguliariai keičiamas. - + Validate passwords quality Tikrinti slaptažodžių kokybę - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Pažymėjus šį langelį, bus atliekamas slaptažodžio stiprumo tikrinimas ir negalėsite naudoti silpną slaptažodį. - + Log in automatically without asking for the password Prisijungti automatiškai, neklausiant slaptažodžio - + Reuse user password as root password Naudotojo slaptažodį naudoti pakartotinai kaip pagrindinio naudotojo (root) slaptažodį - + Use the same password for the administrator account. Naudoti tokį patį slaptažodį administratoriaus paskyrai. - + Choose a root password to keep your account safe. Pasirinkite pagrindinio naudotojo (root) slaptažodį, kad apsaugotumėte savo paskyrą. - + Root Password Pagrindinio naudotojo (Root) slaptažodis - + Repeat Root Password Pakartokite pagrindinio naudotojo (Root) slaptažodį - + Enter the same password twice, so that it can be checked for typing errors. Norint įsitikinti, kad rašydami slaptažodį nesuklydote, įrašykite tą patį slaptažodį du kartus. diff --git a/lang/calamares_lv.ts b/lang/calamares_lv.ts index 64f623b79b..092c814bcb 100644 --- a/lang/calamares_lv.ts +++ b/lang/calamares_lv.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -288,13 +308,13 @@ - + &Yes - + &No @@ -304,17 +324,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -323,123 +343,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -471,12 +491,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -484,7 +504,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -732,22 +752,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -842,42 +872,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1474,72 +1504,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1607,7 +1637,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3705,12 +3734,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 installation.</small> @@ -3718,7 +3747,7 @@ Output: UsersQmlViewStep - + Users @@ -4102,102 +4131,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts index dd96ecff36..27d50ddd96 100644 --- a/lang/calamares_mk.ts +++ b/lang/calamares_mk.ts @@ -102,22 +102,42 @@ - - Tools - Алатки + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Инсталацијата е готова. Исклучете го инсталерот. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,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 installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts index 75ac2f8c05..581a834f3a 100644 --- a/lang/calamares_ml.ts +++ b/lang/calamares_ml.ts @@ -102,22 +102,42 @@ സമ്പർക്കമുഖം: - - Tools - ഉപകരണങ്ങൾ + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet ശൈലീപുസ്തകം പുതുക്കുക - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree വിഡ്ജറ്റ് ട്രീ - + Debug information ഡീബഗ് വിവരങ്ങൾ @@ -286,13 +306,13 @@ - + &Yes വേണം (&Y) - + &No വേണ്ട (&N) @@ -302,17 +322,17 @@ അടയ്ക്കുക (&C) - + Install Log Paste URL ഇൻസ്റ്റാൾ ലോഗ് പകർപ്പിന്റെ വിലാസം - + The upload was unsuccessful. No web-paste was done. അപ്‌ലോഡ് പരാജയമായിരുന്നു. വെബിലേക്ക് പകർത്തിയില്ല. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + 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 ഇൻസ്റ്റാൾ ചെയ്യാൻ കഴിയില്ല. ക്രമീകരിച്ച എല്ലാ മൊഡ്യൂളുകളും ലോഡുചെയ്യാൻ കാലാമറെസിന് കഴിഞ്ഞില്ല. വിതരണത്തിൽ കാലാമറെസ് ഉപയോഗിക്കുന്ന രീതിയിലുള്ള ഒരു പ്രശ്നമാണിത്. - + <br/>The following modules could not be loaded: <br/>താഴെ പറയുന്ന മൊഡ്യൂളുകൾ ലഭ്യമാക്കാനായില്ല: - + Continue with setup? സജ്ജീകരണപ്രക്രിയ തുടരണോ? - + 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> %2 സജ്ജീകരിക്കുന്നതിന് %1 സജ്ജീകരണ പ്രോഗ്രാം നിങ്ങളുടെ ഡിസ്കിൽ മാറ്റങ്ങൾ വരുത്താൻ പോകുന്നു.<br/><strong>നിങ്ങൾക്ക് ഈ മാറ്റങ്ങൾ പഴയപടിയാക്കാൻ കഴിയില്ല</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> %2 ഇൻസ്റ്റാളുചെയ്യുന്നതിന് %1 ഇൻസ്റ്റാളർ നിങ്ങളുടെ ഡിസ്കിൽ മാറ്റങ്ങൾ വരുത്താൻ പോകുന്നു.<br/><strong>നിങ്ങൾക്ക് ഈ മാറ്റങ്ങൾ പഴയപടിയാക്കാൻ കഴിയില്ല.</strong> - + &Set up now ഉടൻ സജ്ജീകരിക്കുക (&S) - + &Install now ഉടൻ ഇൻസ്റ്റാൾ ചെയ്യുക (&I) - + Go &back പുറകോട്ടു പോകുക - + &Set up സജ്ജീകരിക്കുക (&S) - + &Install ഇൻസ്റ്റാൾ (&I) - + Setup is complete. Close the setup program. സജ്ജീകരണം പൂർത്തിയായി. പ്രയോഗം അടയ്ക്കുക. - + The installation is complete. Close the installer. ഇൻസ്റ്റളേഷൻ പൂർത്തിയായി. ഇൻസ്റ്റാളർ അടയ്ക്കുക - + Cancel setup without changing the system. സിസ്റ്റത്തിന് മാറ്റമൊന്നും വരുത്താതെ സജ്ജീകരണപ്രക്രിയ റദ്ദാക്കുക. - + Cancel installation without changing the system. സിസ്റ്റത്തിന് മാറ്റമൊന്നും വരുത്താതെ ഇൻസ്റ്റളേഷൻ റദ്ദാക്കുക. - + &Next അടുത്തത് (&N) - + &Back പുറകോട്ട് (&B) - + &Done ചെയ്‌തു - + &Cancel റദ്ദാക്കുക (&C) - + Cancel setup? സജ്ജീകരണം റദ്ദാക്കണോ? - + 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 install process? The installer will quit and all changes will be lost. നിലവിലുള്ള ഇൻസ്റ്റാൾ പ്രക്രിയ റദ്ദാക്കണോ? @@ -471,12 +491,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 സജ്ജീകരണപ്രയോഗം - + %1 Installer %1 ഇൻസ്റ്റാളർ @@ -484,7 +504,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... സിസ്റ്റത്തെക്കുറിച്ചുള്ള വിവരങ്ങൾ ശേഖരിക്കുന്നു... @@ -732,22 +752,32 @@ The installer will quit and all changes will be lost. സംഖ്യ & തീയതി രീതി %1 ആയി ക്രമീകരിക്കും. - + Network Installation. (Disabled: Incorrect configuration) നെറ്റ്‌വർക്ക് ഇൻസ്റ്റാളേഷൻ. (പ്രവർത്തനരഹിതമാക്കി: തെറ്റായ ക്രമീകരണം) - + Network Installation. (Disabled: Received invalid groups data) നെറ്റ്‌വർക്ക് ഇൻസ്റ്റാളേഷൻ. (അപ്രാപ്‌തമാക്കി: അസാധുവായ ഗ്രൂപ്പുകളുടെ ഡാറ്റ ലഭിച്ചു) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + പാക്കേജു് തിരഞ്ഞെടുക്കല്‍ + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) നെറ്റ്‌വർക്ക് ഇൻസ്റ്റാളേഷൻ. (അപ്രാപ്‌തമാക്കി: പാക്കേജ് ലിസ്റ്റുകൾ നേടാനായില്ല, നിങ്ങളുടെ നെറ്റ്‌വർക്ക് കണക്ഷൻ പരിശോധിക്കുക) @@ -842,42 +872,42 @@ The installer will quit and all changes will be lost. നിങ്ങളുടെ പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല! - + Setup Failed സജ്ജീകരണപ്രക്രിയ പരാജയപ്പെട്ടു - + Installation Failed ഇൻസ്റ്റളേഷൻ പരാജയപ്പെട്ടു - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete സജ്ജീകരണം പൂർത്തിയായി - + Installation Complete ഇൻസ്റ്റാളേഷൻ പൂർത്തിയായി - + The setup of %1 is complete. %1 ന്റെ സജ്ജീകരണം പൂർത്തിയായി. - + The installation of %1 is complete. %1 ന്റെ ഇൻസ്റ്റാളേഷൻ പൂർത്തിയായി. @@ -1474,72 +1504,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space %1 GiB ഡിസ്ക്സ്പെയ്സ് എങ്കിലും ലഭ്യമായിരിക്കണം. - + There is not enough drive space. At least %1 GiB is required. ആവശ്യത്തിനു ഡിസ്ക്സ്പെയ്സ് ലഭ്യമല്ല. %1 GiB എങ്കിലും വേണം. - + has at least %1 GiB working memory %1 GiB RAM എങ്കിലും ലഭ്യമായിരിക്കണം. - + The system does not have enough working memory. At least %1 GiB is required. സിസ്റ്റത്തിൽ ആവശ്യത്തിനു RAM ലഭ്യമല്ല. %1 GiB എങ്കിലും വേണം. - + is plugged in to a power source ഒരു ഊർജ്ജസ്രോതസ്സുമായി ബന്ധിപ്പിച്ചിരിക്കുന്നു - + The system is not plugged in to a power source. സിസ്റ്റം ഒരു ഊർജ്ജസ്രോതസ്സിലേക്ക് ബന്ധിപ്പിച്ചിട്ടില്ല. - + is connected to the Internet ഇന്റർനെറ്റിലേക്ക് ബന്ധിപ്പിച്ചിരിക്കുന്നു - + The system is not connected to the Internet. സിസ്റ്റം ഇന്റർനെറ്റുമായി ബന്ധിപ്പിച്ചിട്ടില്ല. - + is running the installer as an administrator (root) ഇൻസ്റ്റാളർ കാര്യനിർവാഹകരിൽ ഒരാളായിട്ടാണ് (root) പ്രവർത്തിപ്പിക്കുന്നത് - + The setup program is not running with administrator rights. സെറ്റപ്പ് പ്രോഗ്രാം അഡ്മിനിസ്ട്രേറ്റർ അവകാശങ്ങൾ ഇല്ലാതെയാണ് പ്രവർത്തിക്കുന്നത്. - + The installer is not running with administrator rights. ഇൻസ്റ്റാളർ അഡ്മിനിസ്ട്രേറ്റർ അവകാശങ്ങൾ ഇല്ലാതെയാണ് പ്രവർത്തിക്കുന്നത് - + 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 installer. ഇൻസ്റ്റാളർ കാണിക്കാൻ തക്ക വലുപ്പം സ്ക്രീനിനില്ല. @@ -1607,7 +1637,7 @@ The installer will quit and all changes will be lost. കെഡിഇ കൺസോൾ ഇൻസ്റ്റാൾ ചെയ്ത് വീണ്ടും ശ്രമിക്കുക! - + Executing script: &nbsp;<code>%1</code> സ്ക്രിപ്റ്റ് നിർവ്വഹിക്കുന്നു:&nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection പാക്കേജു് തിരഞ്ഞെടുക്കല്‍ - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3699,12 +3728,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>ഒന്നിലധികം ആളുകൾ ഈ കമ്പ്യൂട്ടർ ഉപയോഗിക്കുമെങ്കിൽ, താങ്കൾക്ക് സജ്ജീകരണത്തിന് ശേഷം നിരവധി അക്കൗണ്ടുകൾ സൃഷ്ടിക്കാം.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>ഒന്നിലധികം ആളുകൾ ഈ കമ്പ്യൂട്ടർ ഉപയോഗിക്കുമെങ്കിൽ, താങ്കൾക്ക് ഇൻസ്റ്റളേഷന് ശേഷം നിരവധി അക്കൗണ്ടുകൾ സൃഷ്ടിക്കാം.</small> @@ -3712,7 +3741,7 @@ Output: UsersQmlViewStep - + Users ഉപയോക്താക്കൾ @@ -4096,102 +4125,102 @@ Output: നിങ്ങളുടെ പേരെന്താണ് ? - + Your Full Name താങ്കളുടെ മുഴുവൻ പേരു് - + What name do you want to use to log in? ലോഗിൻ ചെയ്യാൻ നിങ്ങൾ ഏത് നാമം ഉപയോഗിക്കാനാണു ആഗ്രഹിക്കുന്നത്? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? ഈ കമ്പ്യൂട്ടറിന്റെ നാമം എന്താണ് ? - + Computer Name കമ്പ്യൂട്ടറിന്റെ പേര് - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. നിങ്ങളുടെ അക്കൗണ്ട് സുരക്ഷിതമായി സൂക്ഷിക്കാൻ ഒരു രഹസ്യവാക്ക് തിരഞ്ഞെടുക്കുക. - + Password രഹസ്യവാക്ക് - + Repeat Password രഹസ്യവാക്ക് വീണ്ടും - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. ഈ കള്ളി തിരഞ്ഞെടുക്കുമ്പോൾ, രഹസ്യവാക്കിന്റെ ബലപരിശോധന നടപ്പിലാക്കുകയും, ആയതിനാൽ താങ്കൾക്ക് ദുർബലമായ ഒരു രഹസ്യവാക്ക് ഉപയോഗിക്കാൻ സാധിക്കാതെ വരുകയും ചെയ്യും. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. അഡ്മിനിസ്ട്രേറ്റർ അക്കൗണ്ടിനും ഇതേ രഹസ്യവാക്ക് ഉപയോഗിക്കുക. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts index 402e61e30d..1fa074bc1d 100644 --- a/lang/calamares_mr.ts +++ b/lang/calamares_mr.ts @@ -102,22 +102,42 @@ अंतराफलक : - - Tools - साधने + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information दोषमार्जन माहिती @@ -286,13 +306,13 @@ - + &Yes &होय - + &No &नाही @@ -302,17 +322,17 @@ &बंद करा - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now &आता अधिष्ठापित करा - + Go &back &मागे जा - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. अधिष्ठापना संपूर्ण झाली. अधिष्ठापक बंद करा. - + Cancel setup without changing the system. - + Cancel installation without changing the system. प्रणालीत बदल न करता अधिष्टापना रद्द करा. - + &Next &पुढे - + &Back &मागे - + &Done &पूर्ण झाली - + &Cancel &रद्द करा - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 अधिष्ठापक @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. तुमचा परवलीशब्द जुळत नाही - + Setup Failed - + Installation Failed अधिष्ठापना अयशस्वी झाली - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,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 installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users वापरकर्ते @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts index a6b94c9aec..6c5f4fb586 100644 --- a/lang/calamares_nb.ts +++ b/lang/calamares_nb.ts @@ -102,22 +102,42 @@ Grensesnitt: - - Tools - Verktøy + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Debug informasjon @@ -286,13 +306,13 @@ - + &Yes &Ja - + &No &Nei @@ -302,17 +322,17 @@ &Lukk - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? Fortsette å sette opp? - + 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 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 vil nå gjøre endringer på harddisken, for å installere %2. <br/><strong>Du vil ikke kunne omgjøre disse endringene.</strong> - + &Set up now - + &Install now &Installer nå - + Go &back Gå &tilbake - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Installasjonen er fullført. Lukk installeringsprogrammet. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Neste - + &Back &Tilbake - + &Done &Ferdig - + &Cancel &Avbryt - + Cancel setup? - + Cancel installation? Avbryte installasjon? - + 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. Vil du virkelig avbryte installasjonen? @@ -470,12 +490,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Installasjonsprogram @@ -483,7 +503,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. CheckerContainer - + Gathering system information... @@ -731,22 +751,32 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -841,42 +871,42 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + Setup Failed - + Installation Failed Installasjon feilet - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Installasjon fullført - + The setup of %1 is complete. - + The installation of %1 is complete. Installasjonen av %1 er fullført. @@ -1473,72 +1503,72 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source er koblet til en strømkilde - + The system is not plugged in to a power source. Systemet er ikke koblet til en strømkilde. - + is connected to the Internet er tilkoblet Internett - + The system is not connected to the Internet. Systemet er ikke tilkoblet Internett. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1606,7 +1636,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + Executing script: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3695,12 +3724,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 installation.</small> @@ -3708,7 +3737,7 @@ Output: UsersQmlViewStep - + Users Brukere @@ -4092,102 +4121,102 @@ Output: Hva heter du? - + Your Full Name - + What name do you want to use to log in? Hvilket navn vil du bruke for å logge inn? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ne.ts b/lang/calamares_ne.ts index 8df2e202ea..0bea96a554 100644 --- a/lang/calamares_ne.ts +++ b/lang/calamares_ne.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,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 installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts index add06a9efe..c3038912ea 100644 --- a/lang/calamares_ne_NP.ts +++ b/lang/calamares_ne_NP.ts @@ -102,22 +102,42 @@ - - Tools - औजारहरु + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. सेटअप सकियो । सेटअप प्रोग्राम बन्द गर्नु होस  - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. पासवर्डहरू मिलेन ।  - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,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 installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts index f88a2eeada..53c2848ecc 100644 --- a/lang/calamares_nl.ts +++ b/lang/calamares_nl.ts @@ -102,22 +102,42 @@ Interface: - - Tools - Hulpmiddelen + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Stylesheet opnieuw inlezen. - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Widget-boom - + Debug information Debug informatie @@ -286,13 +306,13 @@ - + &Yes &ja - + &No &Nee @@ -302,17 +322,17 @@ &Sluiten - + Install Log Paste URL URL voor het verzenden van het installatielogboek - + The upload was unsuccessful. No web-paste was done. Het uploaden is mislukt. Web-plakken niet gedaan. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed Calamares Initialisatie mislukt - + %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 kan niet worden geïnstalleerd. Calamares kon niet alle geconfigureerde modules laden. Dit is een probleem met hoe Calamares wordt gebruikt door de distributie. - + <br/>The following modules could not be loaded: <br/>The volgende modules konden niet worden geladen: - + Continue with setup? Doorgaan met installatie? - + Continue with installation? Doorgaan met installatie? - + 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> Het %1 voorbereidingsprogramma zal nu aanpassingen maken aan je schijf om %2 te installeren.<br/><strong>Deze veranderingen kunnen niet ongedaan gemaakt worden.</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> Het %1 installatieprogramma zal nu aanpassingen maken aan je schijf om %2 te installeren.<br/><strong>Deze veranderingen kunnen niet ongedaan gemaakt worden.</strong> - + &Set up now Nu &Inrichten - + &Install now Nu &installeren - + Go &back Ga &terug - + &Set up &Inrichten - + &Install &Installeer - + Setup is complete. Close the setup program. De voorbereiding is voltooid. Sluit het voorbereidingsprogramma. - + The installation is complete. Close the installer. De installatie is voltooid. Sluit het installatie-programma. - + Cancel setup without changing the system. Voorbereiding afbreken zonder aanpassingen aan het systeem. - + Cancel installation without changing the system. Installatie afbreken zonder aanpassingen aan het systeem. - + &Next &Volgende - + &Back &Terug - + &Done Voltooi&d - + &Cancel &Afbreken - + Cancel setup? Voorbereiding afbreken? - + Cancel installation? Installatie afbreken? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Wil je het huidige voorbereidingsproces echt afbreken? Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Wil je het huidige installatieproces echt afbreken? @@ -471,12 +491,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. CalamaresWindow - + %1 Setup Program %1 Voorbereidingsprogramma - + %1 Installer %1 Installatieprogramma @@ -484,7 +504,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. CheckerContainer - + Gathering system information... Systeeminformatie verzamelen... @@ -732,22 +752,32 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. De getal- en datumnotatie worden ingesteld op %1. - + Network Installation. (Disabled: Incorrect configuration) Netwerkinstallatie. (Uitgeschakeld: Ongeldige configuratie) - + Network Installation. (Disabled: Received invalid groups data) Netwerkinstallatie. (Uitgeschakeld: ongeldige gegevens over groepen) - - Network Installation. (Disabled: internal error) - Netwerkinstallatie. (Uitgeschakeld: interne fout) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Pakketkeuze - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Netwerkinstallatie. (Uitgeschakeld: kon de pakketlijsten niet binnenhalen, controleer de netwerkconnectie) @@ -842,42 +872,42 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Je wachtwoorden komen niet overeen! - + Setup Failed Voorbereiding mislukt - + Installation Failed Installatie Mislukt - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Voorbereiden voltooid - + Installation Complete Installatie Afgerond. - + The setup of %1 is complete. De voorbereiden van %1 is voltooid. - + The installation of %1 is complete. De installatie van %1 is afgerond. @@ -1474,72 +1504,72 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. GeneralRequirements - + has at least %1 GiB available drive space tenminste %1 GiB vrije schijfruimte heeft - + There is not enough drive space. At least %1 GiB is required. Er is niet genoeg schijfruimte. Tenminste %1 GiB is vereist. - + has at least %1 GiB working memory tenminste %1 GiB werkgeheugen heeft - + The system does not have enough working memory. At least %1 GiB is required. Het systeem heeft niet genoeg intern geheugen. Tenminste %1 GiB is vereist. - + is plugged in to a power source aangesloten is op netstroom - + The system is not plugged in to a power source. Dit systeem is niet aangesloten op netstroom. - + is connected to the Internet verbonden is met het Internet - + The system is not connected to the Internet. Dit systeem is niet verbonden met het Internet. - + is running the installer as an administrator (root) is het installatieprogramma aan het uitvoeren als administrator (root) - + The setup program is not running with administrator rights. Het voorbereidingsprogramma draait zonder administratorrechten. - + The installer is not running with administrator rights. Het installatieprogramma draait zonder administratorrechten. - + has a screen large enough to show the whole installer heeft een scherm groot genoeg om het hele installatieprogramma te weergeven - + The screen is too small to display the setup program. Het scherm is te klein on het voorbereidingsprogramma te laten zien. - + The screen is too small to display the installer. Het scherm is te klein on het installatieprogramma te laten zien. @@ -1607,7 +1637,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Gelieve KDE Konsole te installeren en opnieuw te proberen! - + Executing script: &nbsp;<code>%1</code> Script uitvoeren: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. NetInstallViewStep - - + Package selection Pakketkeuze - + Office software Kantoor software - + Office package Kantoorpakket - + Browser software Browser software - + Browser package Browserpakket - + Web browser Webbrowser - + Kernel Kernel - + Services Diensten - + Login Login - + Desktop Desktop - + Applications Applicaties - + Communication Communicatie - + Development Ontwikkelen - + Office Kantoor - + Multimedia Multimedia - + Internet Internet - + Theming Thema - + Gaming Spellen - + Utilities Gereedschappen @@ -3700,12 +3729,12 @@ De installatie kan niet doorgaan. UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Als meer dan één persoon deze computer zal gebruiken, kan je meerdere accounts aanmaken na installatie.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Als meer dan één persoon deze computer zal gebruiken, kan je meerdere accounts aanmaken na installatie.</small> @@ -3713,7 +3742,7 @@ De installatie kan niet doorgaan. UsersQmlViewStep - + Users Gebruikers @@ -4119,102 +4148,102 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige Wat is je naam? - + Your Full Name Volledige naam - + What name do you want to use to log in? Welke naam wil je gebruiken om in te loggen? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Wat is de naam van deze computer? - + Computer Name Computer Naam - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Kies een wachtwoord om uw account veilig te houden. - + Password Wachtwoord - + Repeat Password Herhaal wachtwoord - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Wanneer dit vakje is aangevinkt, wachtwoordssterkte zal worden gecontroleerd en je zal geen zwak wachtwoord kunnen gebruiken. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Gebruik hetzelfde wachtwoord voor het administratoraccount. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts index 8aeb73ff15..21b7cfcba1 100644 --- a/lang/calamares_pl.ts +++ b/lang/calamares_pl.ts @@ -102,22 +102,42 @@ Interfejs: - - Tools - Narzędzia + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Informacje debugowania @@ -290,13 +310,13 @@ - + &Yes &Tak - + &No &Nie @@ -306,17 +326,17 @@ Zam&knij - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -325,123 +345,123 @@ Link copied to clipboard - + Calamares Initialization Failed Błąd inicjacji programu Calamares - + %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 nie może zostać zainstalowany. Calamares nie mógł wczytać wszystkich skonfigurowanych modułów. Jest to problem ze sposobem, w jaki Calamares jest używany przez dystrybucję. - + <br/>The following modules could not be loaded: <br/>Następujące moduły nie mogły zostać wczytane: - + Continue with setup? Kontynuować z programem instalacyjnym? - + 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 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> Instalator %1 zamierza przeprowadzić zmiany na Twoim dysku, aby zainstalować %2.<br/><strong>Nie będziesz mógł cofnąć tych zmian.</strong> - + &Set up now - + &Install now &Zainstaluj teraz - + Go &back &Cofnij się - + &Set up - + &Install Za&instaluj - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Instalacja ukończona pomyślnie. Możesz zamknąć instalator. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Anuluj instalację bez dokonywania zmian w systemie. - + &Next &Dalej - + &Back &Wstecz - + &Done &Ukończono - + &Cancel &Anuluj - + Cancel setup? Anulować ustawianie? - + Cancel installation? Anulować instalację? - + 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. Czy na pewno chcesz anulować obecny proces instalacji? @@ -474,12 +494,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. CalamaresWindow - + %1 Setup Program - + %1 Installer Instalator %1 @@ -487,7 +507,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. CheckerContainer - + Gathering system information... Zbieranie informacji o systemie... @@ -735,22 +755,32 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Format liczb i daty zostanie ustawiony na %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Instalacja sieciowa. (Niedostępna: Otrzymano nieprawidłowe dane grupowe) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Wybór pakietów + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalacja sieciowa. (Wyłączona: Nie można pobrać listy pakietów, sprawdź swoje połączenie z siecią) @@ -845,42 +875,42 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Twoje hasła nie są zgodne! - + Setup Failed Nieudane ustawianie - + Installation Failed Wystąpił błąd instalacji - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Ustawianie ukończone - + Installation Complete Instalacja zakończona - + The setup of %1 is complete. Ustawianie %1 jest ukończone. - + The installation of %1 is complete. Instalacja %1 ukończyła się pomyślnie. @@ -1477,72 +1507,72 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source jest podłączony do źródła zasilania - + The system is not plugged in to a power source. System nie jest podłączony do źródła zasilania. - + is connected to the Internet jest podłączony do Internetu - + The system is not connected to the Internet. System nie jest podłączony do Internetu. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Instalator jest uruchomiony bez praw administratora. - + 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 installer. Zbyt niska rozdzielczość ekranu, aby wyświetlić instalator. @@ -1610,7 +1640,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Zainstaluj KDE Konsole i spróbuj ponownie! - + Executing script: &nbsp;<code>%1</code> Wykonywanie skryptu: &nbsp;<code>%1</code> @@ -1880,98 +1910,97 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. NetInstallViewStep - - + Package selection Wybór pakietów - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3721,12 +3750,12 @@ i nie uruchomi się 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 installation.</small> @@ -3734,7 +3763,7 @@ i nie uruchomi się UsersQmlViewStep - + Users Użytkownicy @@ -4118,102 +4147,102 @@ i nie uruchomi się Jak się nazywasz? - + Your Full Name - + What name do you want to use to log in? Jakiego imienia chcesz używać do logowania się? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Jaka jest nazwa tego komputera? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Wybierz hasło, aby chronić swoje konto. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Użyj tego samego hasła dla konta administratora. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index 524f0dfac3..e6191cdbbd 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Gerenciar configurações de automontagem @@ -102,22 +102,42 @@ Interface: - - Tools - Ferramentas + + Crashes Calamares, so that Dr. Konqui can look at it. + Trava o Calamares, para que o Dr. Konqui possa examiná-lo. - + + Reloads the stylesheet from the branding directory. + Recarrega a folha de estilo do diretório de marca. + + + + Uploads the session log to the configured pastebin. + Envia o registro da sessão para o pastebin configurado. + + + + Send Session Log + Enviar Registro da Sessão + + + Reload Stylesheet Recarregar folha de estilo - + + Displays the tree of widget names in the log (for stylesheet debugging). + Mostra a árvore de nomes de widget no registro (para a depuração da folha de estilo). + + + Widget Tree Árvore de widgets - + Debug information Informações de depuração @@ -286,13 +306,13 @@ - + &Yes &Sim - + &No &Não @@ -302,143 +322,147 @@ &Fechar - + Install Log Paste URL Colar URL de Registro de Instalação - + The upload was unsuccessful. No web-paste was done. Não foi possível fazer o upload. Nenhuma colagem foi feita na web. - + Install log posted to %1 Link copied to clipboard - + Registro de instalação postado em + +%1 + +Link copiado para a área de transferência - + Calamares Initialization Failed Falha na inicialização do Calamares - + %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 não pôde ser instalado. O Calamares não conseguiu carregar todos os módulos configurados. Este é um problema com o modo em que o Calamares está sendo utilizado pela distribuição. - + <br/>The following modules could not be loaded: <br/>Os seguintes módulos não puderam ser carregados: - + Continue with setup? Continuar com configuração? - + Continue with installation? Continuar com a instalação? - + 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> O programa de configuração %1 está prestes a fazer mudanças no seu disco de modo a configurar %2.<br/><strong>Você não será capaz de desfazer estas mudanças.</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> O instalador %1 está prestes a fazer alterações no disco a fim de instalar %2.<br/><strong>Você não será capaz de desfazer estas mudanças.</strong> - + &Set up now &Configurar agora - + &Install now &Instalar agora - + Go &back &Voltar - + &Set up &Configurar - + &Install &Instalar - + Setup is complete. Close the setup program. A configuração está completa. Feche o programa de configuração. - + The installation is complete. Close the installer. A instalação está completa. Feche o instalador. - + Cancel setup without changing the system. Cancelar configuração sem alterar o sistema. - + Cancel installation without changing the system. Cancelar instalação sem modificar o sistema. - + &Next &Próximo - + &Back &Voltar - + &Done &Concluído - + &Cancel &Cancelar - + Cancel setup? Cancelar a configuração? - + Cancel installation? Cancelar a instalação? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Você realmente quer cancelar o processo atual de configuração? O programa de configuração será fechado e todas as mudanças serão perdidas. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Você deseja realmente cancelar a instalação atual? @@ -471,12 +495,12 @@ O instalador será fechado e todas as alterações serão perdidas. CalamaresWindow - + %1 Setup Program Programa de configuração %1 - + %1 Installer Instalador %1 @@ -484,7 +508,7 @@ O instalador será fechado e todas as alterações serão perdidas. CheckerContainer - + Gathering system information... Coletando informações do sistema... @@ -732,22 +756,32 @@ O instalador será fechado e todas as alterações serão perdidas.A localidade dos números e datas será definida como %1. - + Network Installation. (Disabled: Incorrect configuration) Instalação via Rede. (Desabilitada: Configuração incorreta) - + Network Installation. (Disabled: Received invalid groups data) Instalação pela Rede. (Desabilitado: Recebidos dados de grupos inválidos) - - Network Installation. (Disabled: internal error) - Instalação de rede. (Desativada: erro interno) + + Network Installation. (Disabled: Internal error) + Instalação por Rede. (Desabilitada: Erro interno) + + + + Network Installation. (Disabled: No package list) + Instalação por Rede. (Desabilitada: Sem lista de pacotes) - + + Package selection + Seleção de pacotes + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalação pela Rede. (Desabilitada: Não foi possível adquirir lista de pacotes, verifique sua conexão com a internet) @@ -842,42 +876,42 @@ O instalador será fechado e todas as alterações serão perdidas.As senhas não estão iguais! - + Setup Failed A Configuração Falhou - + Installation Failed Falha na Instalação - + The setup of %1 did not complete successfully. - + A configuração de %1 não foi completada com sucesso. - + The installation of %1 did not complete successfully. - + A instalação de %1 não foi completada com sucesso. - + Setup Complete Configuração Concluída - + Installation Complete Instalação Completa - + The setup of %1 is complete. A configuração de %1 está concluída. - + The installation of %1 is complete. A instalação do %1 está completa. @@ -973,12 +1007,12 @@ O instalador será fechado e todas as alterações serão perdidas. Create new %1MiB partition on %3 (%2) with entries %4. - + Criar nova partição de %1MiB em %3 (%2) com entradas %4. Create new %1MiB partition on %3 (%2). - + Criar nova partição de %1MiB em %3 (%2). @@ -988,12 +1022,12 @@ O instalador será fechado e todas as alterações serão perdidas. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Criar nova partição de <strong>%1MiB</strong> em <strong>%3</strong> (%2) com entradas <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Criar nova partição de <strong>%1MiB</strong> em <strong>%3</strong> (%2). @@ -1341,7 +1375,7 @@ O instalador será fechado e todas as alterações serão perdidas. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Instalar %1 em <strong>nova</strong> partição do sistema %2 com recursos <em>%3</em> @@ -1351,27 +1385,27 @@ O instalador será fechado e todas as alterações serão perdidas. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Configurar <strong>nova</strong> partição %2 com ponto de montagem <strong>%1</strong> e recursos <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Configurar <strong>nova</strong> partição %2 com ponto de montagem <strong>%1</strong>%3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Instalar %2 em partição do sistema %3 <strong>%1</strong> com recursos <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Configurar partição %3 <strong>%1</strong> com ponto de montagem <strong>%2</strong> e recursos <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Configurar partição %3 <strong>%1</strong> com ponto de montagem <strong>%2</strong>%4. @@ -1474,72 +1508,72 @@ O instalador será fechado e todas as alterações serão perdidas. GeneralRequirements - + has at least %1 GiB available drive space tenha pelo menos %1 GiB disponível de espaço no disco - + There is not enough drive space. At least %1 GiB is required. Não há espaço suficiente no disco. Pelo menos %1 GiB é requerido. - + has at least %1 GiB working memory tenha pelo menos %1 GiB de memória de trabalho - + The system does not have enough working memory. At least %1 GiB is required. O sistema não tem memória de trabalho o suficiente. Pelo menos %1 GiB é requerido. - + is plugged in to a power source está conectado a uma fonte de energia - + The system is not plugged in to a power source. O sistema não está conectado a uma fonte de energia. - + is connected to the Internet está conectado à Internet - + The system is not connected to the Internet. O sistema não está conectado à Internet. - + is running the installer as an administrator (root) está executando o instalador como administrador (root) - + The setup program is not running with administrator rights. O programa de configuração não está sendo executado com direitos de administrador. - + The installer is not running with administrator rights. O instalador não está sendo executado com permissões de administrador. - + has a screen large enough to show the whole installer tem uma tela grande o suficiente para mostrar todo o instalador - + The screen is too small to display the setup program. A tela é muito pequena para exibir o programa de configuração. - + The screen is too small to display the installer. A tela é muito pequena para exibir o instalador. @@ -1607,7 +1641,7 @@ O instalador será fechado e todas as alterações serão perdidas.Por favor, instale o Konsole do KDE e tente novamente! - + Executing script: &nbsp;<code>%1</code> Executando script: &nbsp;<code>%1</code> @@ -1879,98 +1913,97 @@ O instalador será fechado e todas as alterações serão perdidas. NetInstallViewStep - - + Package selection Seleção de pacotes - + Office software Software de office - + Office package Pacote office - + Browser software Softwares de browser - + Browser package Pacote de browser - + Web browser Navegador web - + Kernel Kernel - + Services Seriços - + Login Login - + Desktop Área de trabalho - + Applications Aplicações - + Communication Comunicação - + Development Desenvolvimento - + Office Escritório - + Multimedia Multimídia - + Internet Internet - + Theming Temas - + Gaming Jogos - + Utilities Utilitários @@ -3704,12 +3737,12 @@ Saída: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Se mais de uma pessoa for utilizar este computador, você poderá criar múltiplas contas após terminar a configuração.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Se mais de uma pessoa for utilizar este computador, você poderá criar múltiplas contas após terminar de instalar.</small> @@ -3717,7 +3750,7 @@ Saída: UsersQmlViewStep - + Users Usuários @@ -3961,29 +3994,31 @@ Saída: Installation Completed - + Instalação Completa %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 foi instalado no seu computador.<br/> + Você pode agora reiniciar em seu novo sistema, ou continuar usando o ambiente Live. Close Installer - + Fechar Instalador Restart System - + Reiniciar Sistema <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Um registro completo da instalação está disponível como installation.log no diretório home do usuário Live.<br/> + Esse registro é copiado para /var/log/installation.log do sistema alvo.</p> @@ -4135,102 +4170,102 @@ Saída: Qual é o seu nome? - + Your Full Name Seu nome completo - + What name do you want to use to log in? Qual nome você quer usar para entrar? - + Login Name Nome do Login - + If more than one person will use this computer, you can create multiple accounts after installation. Se mais de uma pessoa for usar este computador, você poderá criar múltiplas contas após a instalação. - + What is the name of this computer? Qual é o nome deste computador? - + Computer Name Nome do computador - + This name will be used if you make the computer visible to others on a network. Este nome será usado se você fizer o computador ficar visível para outros numa rede. - + Choose a password to keep your account safe. Escolha uma senha para manter a sua conta segura. - + Password Senha - + Repeat Password Repita a senha - + 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. Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. Uma boa senha contém uma mistura de letras, números e sinais de pontuação, deve ter pelo menos oito caracteres, e deve ser alterada em intervalos regulares. - + Validate passwords quality Validar qualidade das senhas - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quando esta caixa estiver marcada, será feita a verificação da força da senha e você não poderá usar uma senha fraca. - + Log in automatically without asking for the password Entrar automaticamente sem perguntar pela senha - + Reuse user password as root password Reutilizar a senha de usuário como senha de root - + Use the same password for the administrator account. Usar a mesma senha para a conta de administrador. - + Choose a root password to keep your account safe. Escolha uma senha de root para manter sua conta segura. - + Root Password Senha de Root - + Repeat Root Password Repita a Senha de Root - + Enter the same password twice, so that it can be checked for typing errors. Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index c3ec77d14a..97d628eb1b 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -102,22 +102,42 @@ Interface: - - Tools - Ferramentas + + Crashes Calamares, so that Dr. Konqui can look at it. + Faz o Calamares falhar, para que o Dr. Konqui o possa observar. - + + Reloads the stylesheet from the branding directory. + Recarregar a folha de estilo do diretório de marca. + + + + Uploads the session log to the configured pastebin. + Envia o registo da sessão para o pastebin configurado. + + + + Send Session Log + Enviar registo de sessão + + + Reload Stylesheet Recarregar Folha de estilo - + + Displays the tree of widget names in the log (for stylesheet debugging). + Apresenta a árvore de nomes de widgets no registo (para depuração de folhas de estilo). + + + Widget Tree Árvore de Widgets - + Debug information Informação de depuração @@ -286,13 +306,13 @@ - + &Yes &Sim - + &No &Não @@ -302,17 +322,17 @@ &Fechar - + Install Log Paste URL Instalar o Registo Colar URL - + The upload was unsuccessful. No web-paste was done. O carregamento não teve êxito. Nenhuma pasta da web foi feita. - + Install log posted to %1 @@ -325,124 +345,124 @@ Link copied to clipboard Ligação copiada para a área de transferência - + Calamares Initialization Failed Falha na Inicialização do Calamares - + %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 não pode ser instalado. O Calamares não foi capaz de carregar todos os módulos configurados. Isto é um problema da maneira como o Calamares é usado pela distribuição. - + <br/>The following modules could not be loaded: <br/>Os módulos seguintes não puderam ser carregados: - + Continue with setup? Continuar com a configuração? - + Continue with installation? Continuar com a instalação? - + 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> O programa de instalação %1 está prestes a fazer alterações no seu disco para configurar o %2.<br/><strong>Você não poderá desfazer essas alterações.</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> O %1 instalador está prestes a fazer alterações ao seu disco em ordem para instalar %2.<br/><strong>Não será capaz de desfazer estas alterações.</strong> - + &Set up now &Instalar agora - + &Install now &Instalar agora - + Go &back Voltar &atrás - + &Set up &Instalar - + &Install &Instalar - + Setup is complete. Close the setup program. Instalação completa. Feche o programa de instalação. - + The installation is complete. Close the installer. A instalação está completa. Feche o instalador. - + Cancel setup without changing the system. Cancelar instalação sem alterar o sistema. - + Cancel installation without changing the system. Cancelar instalar instalação sem modificar o sistema. - + &Next &Próximo - + &Back &Voltar - + &Done &Feito - + &Cancel &Cancelar - + Cancel setup? Cancelar instalação? - + Cancel installation? Cancelar a instalação? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Quer mesmo cancelar o processo de instalação atual? O programa de instalação irá fechar todas as alterações serão perdidas. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Tem a certeza que pretende cancelar o atual processo de instalação? @@ -475,12 +495,12 @@ O instalador será encerrado e todas as alterações serão perdidas. CalamaresWindow - + %1 Setup Program %1 Programa de Instalação - + %1 Installer %1 Instalador @@ -488,7 +508,7 @@ O instalador será encerrado e todas as alterações serão perdidas. CheckerContainer - + Gathering system information... A recolher informação de sistema... @@ -736,22 +756,32 @@ O instalador será encerrado e todas as alterações serão perdidas.Os números e datas locais serão definidos para %1. - + Network Installation. (Disabled: Incorrect configuration) Instalação de rede. (Desativada: Configuração incorreta) - + Network Installation. (Disabled: Received invalid groups data) Instalação de Rede. (Desativada: Recebeu dados de grupos inválidos) - - Network Installation. (Disabled: internal error) - Instalação de rede. (Desativada: erro interno) + + Network Installation. (Disabled: Internal error) + Instalação de rede. (Desativada: Erro interno) + + + + Network Installation. (Disabled: No package list) + Instalação de rede. (Desativada: Sem lista de pacotes) + + + + Package selection + Seleção de pacotes - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalação de rede. (Desativada: Incapaz de buscar listas de pacotes, verifique a sua ligação de rede) @@ -846,42 +876,42 @@ O instalador será encerrado e todas as alterações serão perdidas.As suas palavras-passe não coincidem! - + Setup Failed Falha de Instalação - + Installation Failed Falha na Instalação - + The setup of %1 did not complete successfully. A configuração de %1 não foi concluída com sucesso. - + The installation of %1 did not complete successfully. A instalação de %1 não foi concluída com sucesso. - + Setup Complete Instalação Completa - + Installation Complete Instalação Completa - + The setup of %1 is complete. A instalação de %1 está completa. - + The installation of %1 is complete. A instalação de %1 está completa. @@ -1478,72 +1508,72 @@ O instalador será encerrado e todas as alterações serão perdidas. GeneralRequirements - + has at least %1 GiB available drive space tem pelo menos %1 GiB de espaço livre em disco - + There is not enough drive space. At least %1 GiB is required. Não existe espaço livre suficiente em disco. É necessário pelo menos %1 GiB. - + has at least %1 GiB working memory tem pelo menos %1 GiB de memória disponível - + The system does not have enough working memory. At least %1 GiB is required. O sistema não tem memória disponível suficiente. É necessário pelo menos %1 GiB. - + is plugged in to a power source está ligado a uma fonte de energia - + The system is not plugged in to a power source. O sistema não está ligado a uma fonte de energia. - + is connected to the Internet está ligado à internet - + The system is not connected to the Internet. O sistema não está ligado à internet. - + is running the installer as an administrator (root) está a executar o instalador como um administrador (root) - + The setup program is not running with administrator rights. O programa de instalação está agora a correr com direitos de administrador. - + The installer is not running with administrator rights. O instalador não está a ser executado com permissões de administrador. - + has a screen large enough to show the whole installer tem um ecrã grande o suficiente para mostrar todo o instalador - + The screen is too small to display the setup program. O ecrã é demasiado pequeno para mostrar o programa de instalação. - + The screen is too small to display the installer. O ecrã tem um tamanho demasiado pequeno para mostrar o instalador. @@ -1611,7 +1641,7 @@ O instalador será encerrado e todas as alterações serão perdidas.Por favor instale a consola KDE e tente novamente! - + Executing script: &nbsp;<code>%1</code> A executar script: &nbsp;<code>%1</code> @@ -1883,98 +1913,97 @@ O instalador será encerrado e todas as alterações serão perdidas. NetInstallViewStep - - + Package selection Seleção de pacotes - + Office software Programas de Escritório - + Office package Pacote de escritório - + Browser software Software de navegação - + Browser package Pacote de navegador - + Web browser Navegador - + Kernel Kernel - + Services Serviços - + Login Entrar - + Desktop Ambiente de trabalho - + Applications Aplicações - + Communication Comunicação - + Development Desenvolvimento - + Office Escritório - + Multimedia Multimédia - + Internet Internet - + Theming Temas - + Gaming Jogos - + Utilities Utilitários @@ -3708,12 +3737,12 @@ Saída de Dados: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Se mais de uma pessoa usar este computador, você pode criar várias contas após a configuração.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Se mais de uma pessoa usar este computador, você pode criar várias contas após a instalação.</small> @@ -3721,7 +3750,7 @@ Saída de Dados: UsersQmlViewStep - + Users Utilizadores @@ -4141,102 +4170,102 @@ Saída de Dados: Qual é o seu nome? - + Your Full Name O seu nome completo - + What name do you want to use to log in? Que nome deseja usar para iniciar a sessão? - + Login Name Nome de utilizador - + If more than one person will use this computer, you can create multiple accounts after installation. Se mais do que uma pessoa utilizar este computador, poderá criar várias contas após a instalação. - + What is the name of this computer? Qual o nome deste computador? - + Computer Name Nome do computador - + This name will be used if you make the computer visible to others on a network. Este nome será utilizado se tornar o computador visível a outros numa rede. - + Choose a password to keep your account safe. Escolha uma palavra-passe para manter a sua conta segura. - + Password Palavra-passe - + Repeat Password Repita a palavra-passe - + 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. Introduzir a mesma palavra-passe duas vezes, para que possa ser verificada a existência de erros de escrita. Uma boa palavra-passe conterá uma mistura de letras, números e pontuação, deve ter pelo menos oito caracteres, e deve ser alterada a intervalos regulares. - + Validate passwords quality Validar qualidade das palavras-passe - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quando esta caixa é assinalada, a verificação da força da palavra-passe é feita e não será possível utilizar uma palavra-passe fraca. - + Log in automatically without asking for the password Iniciar sessão automaticamente sem pedir a palavra-passe - + Reuse user password as root password Reutilizar palavra-passe de utilizador como palavra-passe de root - + Use the same password for the administrator account. Usar a mesma palavra-passe para a conta de administrador. - + Choose a root password to keep your account safe. Escolha uma palavra-passe de root para manter a sua conta segura. - + Root Password Palavra-passe de root - + Repeat Root Password Repetir palavra-passe de root - + Enter the same password twice, so that it can be checked for typing errors. Introduzir a mesma palavra-passe duas vezes, para que possa ser verificada a existência de erros de escrita. diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts index 8df2b6084d..15dabc5489 100644 --- a/lang/calamares_ro.ts +++ b/lang/calamares_ro.ts @@ -102,22 +102,42 @@ Interfața: - - Tools - Unelte + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Reincarcă stilul - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Lista widget - + Debug information Informație pentru depanare @@ -288,13 +308,13 @@ - + &Yes &Da - + &No &Nu @@ -304,17 +324,17 @@ În&chide - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -323,123 +343,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? Continuați configurarea? - + 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 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> Programul de instalare %1 este pregătit să facă schimbări pe discul dumneavoastră pentru a instala %2.<br/><strong>Nu veți putea anula aceste schimbări.</strong> - + &Set up now - + &Install now &Instalează acum - + Go &back Î&napoi - + &Set up - + &Install Instalează - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Instalarea este completă. Închide instalatorul. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Anulează instalarea fără schimbarea sistemului. - + &Next &Următorul - + &Back &Înapoi - + &Done &Gata - + &Cancel &Anulează - + Cancel setup? - + Cancel installation? Anulez instalarea? - + 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. Doriți să anulați procesul curent de instalare? @@ -472,12 +492,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. CalamaresWindow - + %1 Setup Program - + %1 Installer Program de instalare %1 @@ -485,7 +505,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. CheckerContainer - + Gathering system information... Se adună informații despre sistem... @@ -733,22 +753,32 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Formatul numerelor și datelor calendaristice va fi %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Instalare prin rețea. (Dezactivată: S-au recepționat grupuri de date invalide) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Selecția pachetelor + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalarea rețelei. (Dezactivat: Nu se pot obține listele de pachete, verificați conexiunea la rețea) @@ -843,42 +873,42 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Parolele nu se potrivesc! - + Setup Failed - + Installation Failed Instalare eșuată - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Instalarea s-a terminat - + The setup of %1 is complete. - + The installation of %1 is complete. Instalarea este %1 completă. @@ -1475,72 +1505,72 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source este alimentat cu curent - + The system is not plugged in to a power source. Sistemul nu este alimentat cu curent. - + is connected to the Internet este conectat la Internet - + The system is not connected to the Internet. Sistemul nu este conectat la Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Programul de instalare nu rulează cu privilegii de administrator. - + 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 installer. Ecranu este prea mic pentru a afișa instalatorul. @@ -1608,7 +1638,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Trebuie să instalezi KDE Konsole și să încerci din nou! - + Executing script: &nbsp;<code>%1</code> Se execută scriptul: &nbsp;<code>%1</code> @@ -1878,98 +1908,97 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. NetInstallViewStep - - + Package selection Selecția pachetelor - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3712,12 +3741,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 installation.</small> @@ -3725,7 +3754,7 @@ Output UsersQmlViewStep - + Users Utilizatori @@ -4109,102 +4138,102 @@ Output Cum vă numiți? - + Your Full Name - + What name do you want to use to log in? Ce nume doriți să utilizați pentru logare? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Care este numele calculatorului? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Alegeți o parolă pentru a menține contul în siguranță. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Folosește aceeași parolă pentru contul de administrator. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts index ef195144f6..1cc038db7a 100644 --- a/lang/calamares_ru.ts +++ b/lang/calamares_ru.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Управлять настройками авто-монтирования @@ -102,22 +102,42 @@ Интерфейс: - - Tools - Инструменты + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + - + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + Отправить журнал сессии + + + Reload Stylesheet Перезагрузить таблицу стилей - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Дерево виджетов - + Debug information Отладочная информация @@ -290,13 +310,13 @@ - + &Yes &Да - + &No &Нет @@ -306,17 +326,17 @@ &Закрыть - + Install Log Paste URL Адрес для отправки журнала установки - + The upload was unsuccessful. No web-paste was done. Загрузка не удалась. Веб-вставка не была завершена. - + Install log posted to %1 @@ -325,124 +345,124 @@ Link copied to clipboard - + Calamares Initialization Failed Ошибка инициализации Calamares - + %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. Calamares не удалось загрузить все сконфигурированные модули. Эта проблема вызвана тем, как ваш дистрибутив использует Calamares. - + <br/>The following modules could not be loaded: <br/>Не удалось загрузить следующие модули: - + Continue with setup? Продолжить установку? - + 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> Программа установки %1 готова внести изменения на Ваш диск, чтобы установить %2.<br/><strong>Отменить эти изменения будет невозможно.</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 готова внести изменения на Ваш диск, чтобы установить %2.<br/><strong>Отменить эти изменения будет невозможно.</strong> - + &Set up now &Настроить сейчас - + &Install now Приступить к &установке - + Go &back &Назад - + &Set up &Настроить - + &Install &Установить - + Setup is complete. Close the setup program. Установка завершена. Закройте программу установки. - + The installation is complete. Close the installer. Установка завершена. Закройте установщик. - + Cancel setup without changing the system. Отменить установку без изменения системы. - + Cancel installation without changing the system. Отменить установку без изменения системы. - + &Next &Далее - + &Back &Назад - + &Done &Готово - + &Cancel О&тмена - + Cancel setup? Отменить установку? - + 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 install process? The installer will quit and all changes will be lost. Действительно прервать процесс установки? Программа установки сразу прекратит работу, все изменения будут потеряны. @@ -474,12 +494,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Программа установки %1 - + %1 Installer Программа установки %1 @@ -487,7 +507,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Сбор информации о системе... @@ -722,7 +742,7 @@ The installer will quit and all changes will be lost. Set timezone to %1/%2. - + Установить часовой пояс на %1/%2 @@ -735,22 +755,32 @@ The installer will quit and all changes will be lost. Региональным форматом чисел и дат будет установлен %1. - + Network Installation. (Disabled: Incorrect configuration) Сетевая установка. (Отключено: неверная конфигурация) - + Network Installation. (Disabled: Received invalid groups data) Установка по сети. (Отключено: получены неверные сведения о группах) - - Network Installation. (Disabled: internal error) - Сетевая установка. (Отключено: внутренняя ошибка) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + - + + Package selection + Выбор пакетов + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Установка по сети. (Отключено: не удается получить список пакетов, проверьте сетевое подключение) @@ -807,7 +837,7 @@ The installer will quit and all changes will be lost. '%1' is not allowed as username. - + '%1' нельзя использовать как имя пользователя @@ -832,7 +862,7 @@ The installer will quit and all changes will be lost. '%1' is not allowed as hostname. - + '%1' нельзя использовать как имя хоста @@ -845,42 +875,42 @@ The installer will quit and all changes will be lost. Пароли не совпадают! - + Setup Failed Сбой установки - + Installation Failed Установка завершилась неудачей - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Установка завершена - + Installation Complete Установка завершена - + The setup of %1 is complete. Установка %1 завершена. - + The installation of %1 is complete. Установка %1 завершена. @@ -1081,23 +1111,23 @@ The installer will quit and all changes will be lost. Preserving home directory - + Сохранение домашней папки Creating user %1 - + Создание пользователя %1 Configuring user %1 - + Настройка пользователя %1 Setting file permissions - + Установка прав доступа файла @@ -1477,72 +1507,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space доступно как минимум %1 ГБ свободного дискового пространства - + There is not enough drive space. At least %1 GiB is required. Недостаточно места на дисках. Необходимо как минимум %1 ГБ. - + has at least %1 GiB working memory доступно как минимум %1 ГБ оперативной памяти - + The system does not have enough working memory. At least %1 GiB is required. Недостаточно оперативной памяти. Необходимо как минимум %1 ГБ. - + is plugged in to a power source подключено сетевое питание - + The system is not plugged in to a power source. Сетевое питание не подключено. - + is connected to the Internet присутствует выход в сеть Интернет - + The system is not connected to the Internet. Отсутствует выход в Интернет. - + is running the installer as an administrator (root) запуск установщика с правами администратора (root) - + The setup program is not running with administrator rights. Программа установки запущена без прав администратора. - + The installer is not running with administrator rights. Программа установки не запущена с привилегиями администратора. - + 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 installer. Экран слишком маленький, чтобы отобразить окно установщика. @@ -1610,7 +1640,7 @@ The installer will quit and all changes will be lost. Установите KDE Konsole и попробуйте ещё раз! - + Executing script: &nbsp;<code>%1</code> Выполняется сценарий: &nbsp;<code>%1</code> @@ -1849,7 +1879,7 @@ The installer will quit and all changes will be lost. Generate machine-id. - + Генерация идентификатора устройства @@ -1880,98 +1910,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Выбор пакетов - + Office software Офисное программное обеспечение - + Office package Офисный пакет - + Browser software Браузерное программное обеспечение - + Browser package Браузерный пакет - + Web browser Веб-браузер - + Kernel Ядро - + Services Сервисы - + Login - + Вход - + Desktop Рабочий стол - + Applications Приложения - + Communication Общение - + Development Разработка - + Office Офис - + Multimedia Мультимедиа - + Internet Интернет - + Theming Темы - + Gaming Игры - + Utilities Утилиты @@ -2020,7 +2049,7 @@ The installer will quit and all changes will be lost. Select your preferred Region, or use the default one based on your current location. - + Выберите ваш регион или используйте стандартный на основе вашего текущего местоположения. @@ -2032,12 +2061,12 @@ The installer will quit and all changes will be lost. Select your preferred Zone within your Region. - + Выберите ваш предпочитаемый пояс в регионе Zones - + Пояса @@ -3516,7 +3545,7 @@ Output: Preparing groups. - + Подготовка групп @@ -3721,12 +3750,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Если этот компьютер будет использоваться несколькими людьми, вы сможете создать учетные записи для них после установки.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Если этот компьютер используется несколькими людьми, Вы сможете создать соответствующие учетные записи сразу после установки.</small> @@ -3734,7 +3763,7 @@ Output: UsersQmlViewStep - + Users Пользователи @@ -3753,7 +3782,7 @@ Output: Key Column header for key/value - + Ключ @@ -3911,7 +3940,7 @@ Output: <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.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. - + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> Благодарим<a href="https://calamares.io/team/">команду Calamares </a> и <a href="https://www.transifex.com/calamares/calamares/">команду10команду переводчиков Calamares</a>.<br/><br/>Разработка <a href="https://calamares.io/">Calamares</a> спонсирована <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. @@ -3983,7 +4012,7 @@ Output: Restart System - + Перезапустить систему @@ -4119,102 +4148,102 @@ Output: Как Вас зовут? - + Your Full Name Ваше полное имя - + What name do you want to use to log in? Какое имя Вы хотите использовать для входа? - + Login Name Имя пользователя - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Какое имя у компьютера? - + Computer Name Имя компьютера - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Выберите пароль для защиты вашей учетной записи. - + Password Пароль - + Repeat Password Повторите пароль - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Когда этот флажок установлен, выполняется проверка надежности пароля, и вы не сможете использовать слабый пароль. - + Log in automatically without asking for the password - + Reuse user password as root password - + Использовать пароль пользователя как пароль суперпользователя - + Use the same password for the administrator account. Использовать тот же пароль для аккаунта администратора. - + Choose a root password to keep your account safe. - + Root Password - + Пароль суперпользователя - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. @@ -4251,7 +4280,7 @@ Output: Donate - + Пожертвовать diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts index ca2abdc584..f6ac64656d 100644 --- a/lang/calamares_si.ts +++ b/lang/calamares_si.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,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 installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts index c93cfe9924..c7b5c6809e 100644 --- a/lang/calamares_sk.ts +++ b/lang/calamares_sk.ts @@ -102,22 +102,42 @@ Rozhranie: - - Tools - Nástroje + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + - + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet Znovu načítať hárok so štýlmi - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Strom miniaplikácií - + Debug information Ladiace informácie @@ -290,13 +310,13 @@ - + &Yes _Áno - + &No _Nie @@ -306,17 +326,17 @@ _Zavrieť - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. Odovzdanie nebolo úspešné. Nebolo dokončené žiadne webové vloženie. - + Install log posted to %1 @@ -325,124 +345,124 @@ Link copied to clipboard - + Calamares Initialization Failed Zlyhala inicializácia inštalátora Calamares - + %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. Nie je možné nainštalovať %1. Calamares nemohol načítať všetky konfigurované moduly. Je problém s tým, ako sa Calamares používa pri distribúcii. - + <br/>The following modules could not be loaded: <br/>Nebolo možné načítať nasledujúce moduly - + Continue with setup? Pokračovať v inštalácii? - + Continue with installation? Pokračovať v inštalácii? - + 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> Inštalačný program distribúcie %1 sa chystá vykonať zmeny na vašom disku, aby nainštaloval distribúciu %2. <br/><strong>Tieto zmeny nebudete môcť vrátiť späť.</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> Inštalátor distribúcie %1 sa chystá vykonať zmeny na vašom disku, aby nainštaloval distribúciu %2. <br/><strong>Tieto zmeny nebudete môcť vrátiť späť.</strong> - + &Set up now &Inštalovať teraz - + &Install now &Inštalovať teraz - + Go &back Prejsť s&päť - + &Set up &Inštalovať - + &Install _Inštalovať - + Setup is complete. Close the setup program. Inštalácia je dokončená. Zavrite inštalačný program. - + The installation is complete. Close the installer. Inštalácia je dokončená. Zatvorí inštalátor. - + Cancel setup without changing the system. Zrušenie inštalácie bez zmien v systéme. - + Cancel installation without changing the system. Zruší inštaláciu bez zmeny systému. - + &Next Ď&alej - + &Back &Späť - + &Done _Dokončiť - + &Cancel &Zrušiť - + Cancel setup? Zrušiť inštaláciu? - + Cancel installation? Zrušiť inštaláciu? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Naozaj chcete zrušiť aktuálny priebeh inštalácie? Inštalačný program bude ukončený a zmeny budú stratené. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Skutočne chcete zrušiť aktuálny priebeh inštalácie? @@ -475,12 +495,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. CalamaresWindow - + %1 Setup Program Inštalačný program distribúcie %1 - + %1 Installer Inštalátor distribúcie %1 @@ -488,7 +508,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. CheckerContainer - + Gathering system information... Zbierajú sa informácie o počítači... @@ -737,22 +757,32 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Miestne nastavenie čísel a dátumov bude nastavené na %1. - + Network Installation. (Disabled: Incorrect configuration) Sieťová inštalácia. (Zakázaná: Nesprávna konfigurácia) - + Network Installation. (Disabled: Received invalid groups data) Sieťová inštalácia. (Zakázaná: Boli prijaté neplatné údaje o skupinách) - - Network Installation. (Disabled: internal error) - Sieťová inštalácia. (Zakázaná: vnútorná chyba) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Výber balíkov - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Sieťová inštalácia. (Zakázaná: Nie je možné získať zoznamy balíkov. Skontrolujte vaše sieťové pripojenie.) @@ -847,42 +877,42 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Vaše heslá sa nezhodujú! - + Setup Failed Inštalácia zlyhala - + Installation Failed Inštalácia zlyhala - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Inštalácia dokončená - + Installation Complete Inštalácia dokončená - + The setup of %1 is complete. Inštalácia distribúcie %1 je dokončená. - + The installation of %1 is complete. Inštalácia distribúcie %1s je dokončená. @@ -1479,72 +1509,72 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. GeneralRequirements - + has at least %1 GiB available drive space obsahuje aspoň %1 GiB voľného miesta na disku - + There is not enough drive space. At least %1 GiB is required. Nie je dostatok miesta na disku. Vyžaduje sa aspoň %1 GiB. - + has at least %1 GiB working memory obsahuje aspoň %1 GiB voľnej operačnej pamäte - + The system does not have enough working memory. At least %1 GiB is required. Počítač neobsahuje dostatok operačnej pamäte. Vyžaduje sa aspoň %1 GiB. - + is plugged in to a power source je pripojený k zdroju napájania - + The system is not plugged in to a power source. Počítač nie je pripojený k zdroju napájania. - + is connected to the Internet je pripojený k internetu - + The system is not connected to the Internet. Počítač nie je pripojený k internetu. - + is running the installer as an administrator (root) má spustený inštalátor s právami správcu (root) - + The setup program is not running with administrator rights. Inštalačný program nie je spustený s právami správcu. - + The installer is not running with administrator rights. Inštalátor nie je spustený s právami správcu. - + has a screen large enough to show the whole installer má obrazovku dostatočne veľkú na zobrazenie celého inštalátora - + The screen is too small to display the setup program. Obrazovka je príliš malá na to, aby bolo možné zobraziť inštalačný program. - + The screen is too small to display the installer. Obrazovka je príliš malá na to, aby bolo možné zobraziť inštalátor. @@ -1612,7 +1642,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Prosím, nainštalujte Konzolu prostredia KDE a skúste to znovu! - + Executing script: &nbsp;<code>%1</code> Spúšťa sa skript: &nbsp;<code>%1</code> @@ -1883,98 +1913,97 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. NetInstallViewStep - - + Package selection Výber balíkov - + Office software Kancelársky softvér - + Office package Kancelársky balík - + Browser software Prehliadač - + Browser package Balík prehliadača - + Web browser Webový prehliadač - + Kernel Jadro - + Services Služby - + Login Prihlásenie - + Desktop Pracovné prostredie - + Applications Aplikácie - + Communication Komunikácia - + Development Vývoj - + Office Kancelária - + Multimedia Multimédiá - + Internet Internet - + Theming Motívy - + Gaming Hry - + Utilities Nástroje @@ -3726,12 +3755,12 @@ Výstup: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Ak bude tento počítač používať viac ako jedna osoba, môžete nastaviť viacero účtov po inštalácii.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Ak bude tento počítač používať viac ako jedna osoba, môžete nastaviť viacero účtov po inštalácii.</small> @@ -3739,7 +3768,7 @@ Výstup: UsersQmlViewStep - + Users Používatelia @@ -4136,102 +4165,102 @@ Výstup: Aké je vaše meno? - + Your Full Name Vaše celé meno - + What name do you want to use to log in? Aké meno chcete použiť na prihlásenie? - + Login Name Prihlasovacie meno - + If more than one person will use this computer, you can create multiple accounts after installation. Ak bude tento počítač používať viac ako jedna osoba, môžete po inštalácii vytvoriť viacero účtov. - + What is the name of this computer? Aký je názov tohto počítača? - + Computer Name Názov počítača - + This name will be used if you make the computer visible to others on a network. Tento názov bude použitý, keď zviditeľníte počítač ostatným v sieti. - + Choose a password to keep your account safe. Zvoľte heslo pre zachovanie vášho účtu v bezpečí. - + Password Heslo - + Repeat Password Zopakovanie hesla - + 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. Zadajte rovnaké heslo dvakrát, aby sa predišlo preklepom. Dobré heslo by malo obsahovať mix písmen, čísel a diakritiky, malo by mať dĺžku aspoň osem znakov a malo by byť pravidelne menené. - + Validate passwords quality Overiť kvalitu hesiel - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Keď je zaškrtnuté toto políčko, kontrola kvality hesla bude ukončená a nebudete môcť použiť slabé heslo. - + Log in automatically without asking for the password Prihlásiť automaticky bez pýtania hesla - + Reuse user password as root password Znovu použiť používateľské heslo ako heslo správcu - + Use the same password for the administrator account. Použiť rovnaké heslo pre účet správcu. - + Choose a root password to keep your account safe. Zvoľte heslo správcu pre zachovanie vášho účtu v bezpečí. - + Root Password Heslo správcu - + Repeat Root Password Zopakovanie hesla správcu - + Enter the same password twice, so that it can be checked for typing errors. Zadajte rovnaké heslo dvakrát, aby sa predišlo preklepom. diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts index 7a8bc6a57e..d173238707 100644 --- a/lang/calamares_sl.ts +++ b/lang/calamares_sl.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -290,13 +310,13 @@ - + &Yes - + &No @@ -306,17 +326,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -325,123 +345,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Naprej - + &Back &Nazaj - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? Preklic namestitve? - + 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. Ali res želite preklicati trenutni namestitveni proces? @@ -474,12 +494,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Namestilnik @@ -487,7 +507,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. CheckerContainer - + Gathering system information... Zbiranje informacij o sistemu ... @@ -735,22 +755,32 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -845,42 +875,42 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Setup Failed - + Installation Failed Namestitev je spodletela - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1477,72 +1507,72 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source je priklopljen na vir napajanja - + The system is not plugged in to a power source. - + is connected to the Internet je povezan s spletom - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1610,7 +1640,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Executing script: &nbsp;<code>%1</code> @@ -1880,98 +1910,97 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3717,12 +3746,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 installation.</small> @@ -3730,7 +3759,7 @@ Output: UsersQmlViewStep - + Users @@ -4114,102 +4143,102 @@ Output: Vaše ime? - + Your Full Name - + What name do you want to use to log in? Katero ime želite uporabiti za prijavljanje? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Ime računalnika? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Izberite geslo za zaščito vašega računa. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts index 3dcf7ddf19..e5270710a6 100644 --- a/lang/calamares_sq.ts +++ b/lang/calamares_sq.ts @@ -102,22 +102,42 @@ Ndërfaqe: - - Tools - Mjete + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Ringarko Fletëstilin - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Pemë Widget-esh - + Debug information Të dhëna diagnostikimi @@ -286,13 +306,13 @@ - + &Yes &Po - + &No &Jo @@ -302,17 +322,17 @@ &Mbylle - + Install Log Paste URL URL Ngjitjeje Regjistri Instalimi - + The upload was unsuccessful. No web-paste was done. Ngarkimi s’qe i suksesshëm. S’u bë hedhje në web. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed Gatitja e Calamares-it Dështoi - + %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 s’mund të instalohet. Calamares s’qe në gjendje të ngarkonte krejt modulet e formësuar. Ky është një problem që lidhet me mënyrën se si përdoret Calamares nga shpërndarja. - + <br/>The following modules could not be loaded: <br/>S’u ngarkuan dot modulet vijues: - + Continue with setup? Të vazhdohet me rregullimin? - + Continue with installation? Të vazhdohet me instalimin? - + 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> Programi i rregullimit %1 është një hap larg nga bërja e ndryshimeve në diskun tuaj, që të mund të rregullojë %2.<br/><strong>S’do të jeni në gjendje t’i zhbëni këto ndryshime.</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> Instaluesi %1 është një hap larg nga bërja e ndryshimeve në diskun tuaj, që të mund të instalojë %2.<br/><strong>S’do të jeni në gjendje t’i zhbëni këto ndryshime.</strong> - + &Set up now &Rregulloje tani - + &Install now &Instaloje tani - + Go &back Kthehu &mbrapsht - + &Set up &Rregulloje - + &Install &Instaloje - + Setup is complete. Close the setup program. Rregullimi është i plotë. Mbylleni programin e rregullimit. - + The installation is complete. Close the installer. Instalimi u plotësua. Mbylleni instaluesin. - + Cancel setup without changing the system. Anuloje rregullimin pa ndryshuar sistemin. - + Cancel installation without changing the system. Anuloje instalimin pa ndryshuar sistemin. - + &Next Pas&uesi - + &Back &Mbrapsht - + &Done &U bë - + &Cancel &Anuloje - + Cancel setup? Të anulohet rregullimi? - + Cancel installation? Të anulohet instalimi? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Doni vërtet të anulohet procesi i tanishëm i rregullimit? Programi i rregullimit do të mbyllet dhe krejt ndryshimet do të humbin. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Doni vërtet të anulohet procesi i tanishëm i instalimit? @@ -471,12 +491,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. CalamaresWindow - + %1 Setup Program Programi i Rregullimit të %1 - + %1 Installer Instalues %1 @@ -484,7 +504,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. CheckerContainer - + Gathering system information... Po grumbullohen të dhëna mbi sistemin… @@ -732,22 +752,32 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Si vendore për numra dhe data do të vihet %1. - + Network Installation. (Disabled: Incorrect configuration) Instalim Nga Rrjeti. (E çaktivizuar: Formësim i pasaktë) - + Network Installation. (Disabled: Received invalid groups data) Instalim Nga Rrjeti. (U çaktivizua: U morën të dhëna të pavlefshme grupesh) - - Network Installation. (Disabled: internal error) - Instalim Nga Rrjeti. (E çaktivizuar: gabim i brendshëm) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Përzgjedhje paketash - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalim Nga Rrjeti. (U çaktivizua: S’arrihet të sillen lista paketash, kontrolloni lidhjen tuaj në rrjet) @@ -842,42 +872,42 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Fjalëkalimet tuaj s’përputhen! - + Setup Failed Rregullimi Dështoi - + Installation Failed Instalimi Dështoi - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Rregullim i Plotësuar - + Installation Complete Instalimi u Plotësua - + The setup of %1 is complete. Rregullimi i %1 u plotësua. - + The installation of %1 is complete. Instalimi i %1 u plotësua. @@ -1474,72 +1504,72 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. GeneralRequirements - + has at least %1 GiB available drive space ka të paktën %1 GiB hapësirë të përdorshme - + There is not enough drive space. At least %1 GiB is required. S’ka hapësirë të mjaftueshme. Lypset të paktën %1 GiB. - + has at least %1 GiB working memory ka të paktën %1 GiB kujtesë të përdorshme - + The system does not have enough working memory. At least %1 GiB is required. Sistemi s’ka kujtesë të mjaftueshme për të punuar. Lypsen të paktën %1 GiB. - + is plugged in to a power source është në prizë - + The system is not plugged in to a power source. Sistemi s'është i lidhur me ndonjë burim rryme. - + is connected to the Internet është lidhur në Internet - + The system is not connected to the Internet. Sistemi s’është i lidhur në Internet. - + is running the installer as an administrator (root) po e xhiron instaluesin si një përgjegjës (rrënjë) - + The setup program is not running with administrator rights. Programi i rregullimit nuk po xhirohen me të drejta përgjegjësi. - + The installer is not running with administrator rights. Instaluesi s’po xhirohet me të drejta përgjegjësi. - + has a screen large enough to show the whole installer ka një ekran të mjaftueshëm për të shfaqur krejt instaluesin - + The screen is too small to display the setup program. Ekrani është shumë i vogël për të shfaqur programin e rregullimit. - + The screen is too small to display the installer. Ekrani është shumë i vogël për shfaqjen e instaluesit. @@ -1607,7 +1637,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Ju lutemi, instaloni KDE Konsole dhe riprovoni! - + Executing script: &nbsp;<code>%1</code> Po përmbushet programthi: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. NetInstallViewStep - - + Package selection Përzgjedhje paketash - + Office software Software zyrash - + Office package Paketë zyrash - + Browser software Software shfletuesi - + Browser package Paketë shfletuesi - + Web browser Shfletues - + Kernel Kernel - + Services Shërbime - + Login Hyrje - + Desktop Desktop - + Applications Aplikacione - + Communication Komunikim - + Development Zhvillim - + Office Zyrë - + Multimedia Multimedia - + Internet Internet - + Theming Tema - + Gaming Lojëra - + Utilities Të dobishme @@ -3702,12 +3731,12 @@ Përfundim: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni disa llogari, pas rregullimit.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni disa llogari, pas instalimit.</small> @@ -3715,7 +3744,7 @@ Përfundim: UsersQmlViewStep - + Users Përdorues @@ -4133,102 +4162,102 @@ Përfundim: Cili është emri juaj? - + Your Full Name Emri Juaj i Plotë - + What name do you want to use to log in? Ç’emër doni të përdorni për t’u futur? - + Login Name Emër Hyrjeje - + If more than one person will use this computer, you can create multiple accounts after installation. Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni llogari të shumta pas instalimit. - + What is the name of this computer? Cili është emri i këtij kompjuteri? - + Computer Name Emër Kompjuteri - + This name will be used if you make the computer visible to others on a network. Ky emër do të përdoret nëse e bëni kompjuterin të dukshëm për të tjerët në një rrjet. - + Choose a password to keep your account safe. Zgjidhni një fjalëkalim për ta mbajtur llogarinë tuaj të parrezikuar. - + Password Fjalëkalim - + Repeat Password Ripërsëritni Fjalëkalimin - + 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. Jepeni të njëjtin fjalëkalim dy herë, që të kontrollohet për gabime shkrimi. Një fjalëkalim i mirë do të përmbante një përzierje shkronjash, numrash dhe shenjash pikësimi, do të duhej të ishte të paktën tetë shenja i gjatë, dhe do të duhej të ndryshohej periodikisht. - + Validate passwords quality Vlerëso cilësi fjalëkalimi - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Kur i vihet shenjë kësaj kutize, bëhet kontroll fortësie fjalëkalimi dhe s’do të jeni në gjendje të përdorni një fjalëkalim të dobët. - + Log in automatically without asking for the password Kryej hyrje vetvetiu, pa kërkuar fjalëkalimin. - + Reuse user password as root password Ripërdor fjalëkalim përdoruesi si fjalëkalim përdoruesi rrënjë - + Use the same password for the administrator account. Përdor të njëjtin fjalëkalim për llogarinë e përgjegjësit. - + Choose a root password to keep your account safe. Që ta mbani llogarinë tuaj të parrezik, zgjidhni një fjalëkalim rrënje - + Root Password Fjalëkalim Rrënje - + Repeat Root Password Përsëritni Fjalëkalim Rrënje - + Enter the same password twice, so that it can be checked for typing errors. Jepeni të njëjtin fjalëkalim dy herë, që të mund të kontrollohet për gabime shkrimi. diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts index 0909db92a0..c86c45f022 100644 --- a/lang/calamares_sr.ts +++ b/lang/calamares_sr.ts @@ -102,22 +102,42 @@ Сучеље: - - Tools - Алатке + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -288,13 +308,13 @@ - + &Yes - + &No @@ -304,17 +324,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -323,123 +343,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? Наставити са подешавањем? - + 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 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 - + &Install now &Инсталирај сада - + Go &back Иди &назад - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Следеће - + &Back &Назад - + &Done - + &Cancel &Откажи - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. Да ли стварно желите да прекинете текући процес инсталације? @@ -472,12 +492,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 инсталер @@ -485,7 +505,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -733,22 +753,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Избор пакета + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -843,42 +873,42 @@ The installer will quit and all changes will be lost. Лозинке се не поклапају! - + Setup Failed - + Installation Failed Инсталација није успела - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1475,72 +1505,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1608,7 +1638,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1878,98 +1908,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Избор пакета - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3706,12 +3735,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 installation.</small> @@ -3719,7 +3748,7 @@ Output: UsersQmlViewStep - + Users Корисници @@ -4103,102 +4132,102 @@ Output: Како се зовете? - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Како ћете звати ваш рачунар? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Изаберите лозинку да обезбедите свој налог. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts index 2d4f052273..229b98bd7d 100644 --- a/lang/calamares_sr@latin.ts +++ b/lang/calamares_sr@latin.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -288,13 +308,13 @@ - + &Yes - + &No @@ -304,17 +324,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -323,123 +343,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Dalje - + &Back &Nazad - + &Done - + &Cancel &Prekini - + Cancel setup? - + Cancel installation? Prekini instalaciju? - + 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. Da li stvarno želite prekinuti trenutni proces instalacije? @@ -472,12 +492,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instaler @@ -485,7 +505,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. CheckerContainer - + Gathering system information... @@ -733,22 +753,32 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -843,42 +873,42 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. Vaše lozinke se ne poklapaju - + Setup Failed - + Installation Failed Neuspješna instalacija - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1475,72 +1505,72 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source je priključen na izvor struje - + The system is not plugged in to a power source. - + is connected to the Internet ima vezu sa internetom - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1608,7 +1638,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Executing script: &nbsp;<code>%1</code> @@ -1878,98 +1908,97 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3706,12 +3735,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 installation.</small> @@ -3719,7 +3748,7 @@ Output: UsersQmlViewStep - + Users Korisnici @@ -4103,102 +4132,102 @@ Output: Kako se zovete? - + Your Full Name - + What name do you want to use to log in? Koje ime želite koristiti da se prijavite? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Kako želite nazvati ovaj računar? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Odaberite lozinku da biste zaštitili Vaš korisnički nalog. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index e30f2463c8..e1045e73bb 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -102,22 +102,42 @@ Gränssnitt: - - Tools - Verktyg + + Crashes Calamares, so that Dr. Konqui can look at it. + Kraschar Calamares, så att Dr. Konqui kan titta på det. + + + + Reloads the stylesheet from the branding directory. + Laddar om stilmall från branding katalogen. + + + + Uploads the session log to the configured pastebin. + Laddar upp sessionsloggen till den konfigurerade pastebin. + + + + Send Session Log + Skicka Session Logg - + Reload Stylesheet Ladda om stilmall - + + Displays the tree of widget names in the log (for stylesheet debugging). + Visar trädet med widgetnamn i loggen (för stilmalls felsökning). + + + Widget Tree Widgetträd - + Debug information Avlusningsinformation @@ -286,13 +306,13 @@ - + &Yes &Ja - + &No &Nej @@ -302,17 +322,17 @@ &Stäng - + Install Log Paste URL URL till installationslogg - + The upload was unsuccessful. No web-paste was done. Sändningen misslyckades. Ingenting sparades på webbplatsen. - + Install log posted to %1 @@ -325,123 +345,123 @@ Link copied to clipboard Länken kopierades till urklipp - + Calamares Initialization Failed Initieringen av Calamares misslyckades - + %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 kan inte installeras. Calamares kunde inte ladda alla konfigurerade moduler. Detta är ett problem med hur Calamares används av distributionen. - + <br/>The following modules could not be loaded: <br/>Följande moduler kunde inte hämtas: - + Continue with setup? Fortsätt med installation? - + Continue with installation? Vill du fortsätta med installationen? - + 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-installeraren är på väg att göra ändringar på disk för att installera %2.<br/><strong>Du kommer inte att kunna ångra dessa ändringar.</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-installeraren är på väg att göra ändringar för att installera %2.<br/><strong>Du kommer inte att kunna ångra dessa ändringar.</strong> - + &Set up now &Installera nu - + &Install now &Installera nu - + Go &back Gå &bakåt - + &Set up &Installera - + &Install &Installera - + Setup is complete. Close the setup program. Installationen är klar. Du kan avsluta installationsprogrammet. - + The installation is complete. Close the installer. Installationen är klar. Du kan avsluta installationshanteraren. - + Cancel setup without changing the system. Avbryt inställningarna utan att förändra systemet. - + Cancel installation without changing the system. Avbryt installationen utan att förändra systemet. - + &Next &Nästa - + &Back &Bakåt - + &Done &Klar - + &Cancel Avbryt - + Cancel setup? Avbryt inställningarna? - + Cancel installation? Avbryt installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Vill du verkligen avbryta den nuvarande uppstartsprocessen? Uppstartsprogrammet kommer avsluta och alla ändringar kommer förloras. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Är du säker på att du vill avsluta installationen i förtid? @@ -474,12 +494,12 @@ Alla ändringar kommer att gå förlorade. CalamaresWindow - + %1 Setup Program %1 Installationsprogram - + %1 Installer %1-installationsprogram @@ -487,7 +507,7 @@ Alla ändringar kommer att gå förlorade. CheckerContainer - + Gathering system information... Samlar systeminformation... @@ -735,22 +755,32 @@ Alla ändringar kommer att gå förlorade. Systemspråket för siffror och datum kommer sättas till %1. - + Network Installation. (Disabled: Incorrect configuration) Nätverksinstallation. (Inaktiverad: inkorrekt konfiguration) - + Network Installation. (Disabled: Received invalid groups data) Nätverksinstallation. (Inaktiverad: Fick felaktig gruppdata) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) Nätverksinstallation. (Inaktiverad: internt fel) - + + Network Installation. (Disabled: No package list) + Nätverksinstallation. (Inaktiverad: Ingen paketlista) + + + + Package selection + Paketval + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Nätverksinstallation. (Inaktiverad: Kan inte hämta paketlistor, kontrollera nätverksanslutningen) @@ -845,42 +875,42 @@ Alla ändringar kommer att gå förlorade. Lösenorden överensstämmer inte! - + Setup Failed Inställningarna misslyckades - + Installation Failed Installationen misslyckades - + The setup of %1 did not complete successfully. Installationen av %1 slutfördes inte korrekt. - + The installation of %1 did not complete successfully. Installationen av %1 slutfördes inte korrekt. - + Setup Complete Inställningarna är klara - + Installation Complete Installationen är klar - + The setup of %1 is complete. Inställningarna för %1 är klara. - + The installation of %1 is complete. Installationen av %1 är klar. @@ -1477,72 +1507,72 @@ Alla ändringar kommer att gå förlorade. GeneralRequirements - + has at least %1 GiB available drive space har minst %1 GiB tillgängligt på hårddisken - + There is not enough drive space. At least %1 GiB is required. Det finns inte tillräckligt med hårddiskutrymme. Minst %1 GiB krävs. - + has at least %1 GiB working memory har minst %1 GiB arbetsminne - + The system does not have enough working memory. At least %1 GiB is required. Systemet har inte tillräckligt med fungerande minne. Minst %1 GiB krävs. - + is plugged in to a power source är ansluten till en strömkälla - + The system is not plugged in to a power source. Systemet är inte anslutet till någon strömkälla. - + is connected to the Internet är ansluten till internet - + The system is not connected to the Internet. Systemet är inte anslutet till internet. - + is running the installer as an administrator (root) körs installationsprogammet med administratörsrättigheter (root) - + The setup program is not running with administrator rights. Installationsprogammet körs inte med administratörsrättigheter. - + The installer is not running with administrator rights. Installationsprogammet körs inte med administratörsrättigheter. - + has a screen large enough to show the whole installer har en tillräckligt stor skärm för att visa hela installationsprogrammet - + The screen is too small to display the setup program. Skärmen är för liten för att visa installationsprogrammet. - + The screen is too small to display the installer. Skärmen är för liten för att visa installationshanteraren. @@ -1610,7 +1640,7 @@ Alla ändringar kommer att gå förlorade. Installera KDE Konsole och försök igen! - + Executing script: &nbsp;<code>%1</code> Kör skript: &nbsp;<code>%1</code> @@ -1883,98 +1913,97 @@ Sök på kartan genom att dra NetInstallViewStep - - + Package selection Paketval - + Office software Kontors programvara - + Office package Kontors paket - + Browser software Webbläsare - + Browser package Webbläsare - + Web browser Webbläsare - + Kernel Kärna - + Services Tjänster - + Login Inloggning - + Desktop Skrivbord - + Applications Program - + Communication Kommunikation - + Development Utveckling - + Office Kontorsprogram - + Multimedia Multimedia - + Internet Internet - + Theming Teman - + Gaming Gaming - + Utilities Verktyg @@ -3708,12 +3737,12 @@ Installationen kan inte fortsätta.</p> UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Om mer än en person skall använda datorn så kan du skapa flera användarkonton när inställningarna är klara.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Om mer än en person skall använda datorn så kan du skapa flera användarkonton när installationen är klar.</small> @@ -3721,7 +3750,7 @@ Installationen kan inte fortsätta.</p> UsersQmlViewStep - + Users Användare @@ -4141,102 +4170,102 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand Vad heter du? - + Your Full Name Ditt Fullständiga namn - + What name do you want to use to log in? Vilket namn vill du använda för att logga in? - + Login Name Inloggningsnamn - + If more than one person will use this computer, you can create multiple accounts after installation. Om mer än en person skall använda datorn så kan du skapa flera användarkonton efter installationen. - + What is the name of this computer? Vad är namnet på datorn? - + Computer Name Datornamn - + This name will be used if you make the computer visible to others on a network. Detta namn kommer användas om du gör datorn synlig för andra i ett nätverk. - + Choose a password to keep your account safe. Välj ett lösenord för att hålla ditt konto säkert. - + Password Lösenord - + Repeat Password Repetera Lösenord - + 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. Ange samma lösenord två gånger, så att det kan kontrolleras för stavfel. Ett bra lösenord innehåller en blandning av bokstäver, nummer och interpunktion, bör vara minst åtta tecken långt, och bör ändras regelbundet. - + Validate passwords quality Validera lösenords kvalite - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. När den här rutan är förkryssad kommer kontroll av lösenordsstyrka att genomföras, och du kommer inte kunna använda ett svagt lösenord. - + Log in automatically without asking for the password Logga in automatiskt utan att fråga efter ett lösenord. - + Reuse user password as root password Återanvänd användarlösenord som root lösenord - + Use the same password for the administrator account. Använd samma lösenord för administratörskontot. - + Choose a root password to keep your account safe. Välj ett root lösenord för att hålla ditt konto säkert. - + Root Password Root Lösenord - + Repeat Root Password Repetera Root Lösenord - + Enter the same password twice, so that it can be checked for typing errors. Ange samma lösenord två gånger, så att det kan kontrolleras för stavfel. diff --git a/lang/calamares_te.ts b/lang/calamares_te.ts index acbe41d0d8..2b8af99bfb 100644 --- a/lang/calamares_te.ts +++ b/lang/calamares_te.ts @@ -104,22 +104,42 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి ఇంటర్ఫేస్ - - Tools - టూల్స్ + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet రీలోడ్ స్టైల్షీట్ - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree విడ్జెట్ ట్రీ - + Debug information డీబగ్ సమాచారం @@ -288,13 +308,13 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి - + &Yes - + &No @@ -304,17 +324,17 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -323,123 +343,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -471,12 +491,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -484,7 +504,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -732,22 +752,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -842,42 +872,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1474,72 +1504,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1607,7 +1637,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3696,12 +3725,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 installation.</small> @@ -3709,7 +3738,7 @@ Output: UsersQmlViewStep - + Users @@ -4093,102 +4122,102 @@ Output: మీ పేరు ఏమిటి ? - + Your Full Name - + What name do you want to use to log in? ప్రవేశించడానికి ఈ పేరుని ఉపయోగిస్తారు - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. మీ ఖాతా ను భద్రపరుచుకోవడానికి ఒక మంత్రమును ఎంచుకోండి - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts index 7c5eb677b8..9b69b06f6c 100644 --- a/lang/calamares_tg.ts +++ b/lang/calamares_tg.ts @@ -102,22 +102,42 @@ Интерфейс: - - Tools - Абзорҳо + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Аз нав бор кардани варақаи услубҳо - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Дарахти виҷетҳо - + Debug information Иттилооти ислоҳи нуқсонҳо @@ -286,13 +306,13 @@ - + &Yes &Ҳа - + &No &Не @@ -302,17 +322,17 @@ &Пӯшидан - + Install Log Paste URL Гузоштани нишонии URL-и сабти рӯйдодҳои насб - + The upload was unsuccessful. No web-paste was done. Боркунӣ иҷро нашуд. Гузариш ба шабака иҷро нашуд. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed Омодашавии Calamares қатъ шуд - + %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 насб карда намешавад. Calamares ҳамаи модулҳои танзимкардашударо бор карда натавонист. Ин мушкилие мебошад, ки бо ҳамин роҳ Calamares дар дистрибутиви ҷорӣ кор мекунад. - + <br/>The following modules could not be loaded: <br/>Модулҳои зерин бор карда намешаванд: - + Continue with setup? Танзимкуниро идома медиҳед? - + 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> Барномаи танзимкунии %1 барои танзим кардани %2 ба диски компютери шумо тағйиротро ворид мекунад.<br/><strong>Шумо ин тағйиротро ботил карда наметавонед.</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 барои насб кардани %2 ба диски компютери шумо тағйиротро ворид мекунад.<br/><strong>Шумо ин тағйиротро ботил карда наметавонед.</strong> - + &Set up now &Ҳозир танзим карда шавад - + &Install now &Ҳозир насб карда шавад - + Go &back &Бозгашт - + &Set up &Танзим кардан - + &Install &Насб кардан - + Setup is complete. Close the setup program. Танзим ба анҷом расид. Барномаи танзимкуниро пӯшед. - + The installation is complete. Close the installer. Насб ба анҷом расид. Барномаи насбкуниро пӯшед. - + Cancel setup without changing the system. Бекор кардани танзимкунӣ бе тағйирдиҳии низом. - + Cancel installation without changing the system. Бекор кардани насбкунӣ бе тағйирдиҳии низом. - + &Next &Навбатӣ - + &Back &Ба қафо - + &Done &Анҷоми кор - + &Cancel &Бекор кардан - + Cancel setup? Танзимкуниро бекор мекунед? - + 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 install process? The installer will quit and all changes will be lost. Шумо дар ҳақиқат мехоҳед, ки раванди насбкунии ҷориро бекор намоед? @@ -471,12 +491,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Барномаи танзимкунии %1 - + %1 Installer Насбкунандаи %1 @@ -484,7 +504,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Ҷамъкунии иттилооти низомӣ... @@ -732,22 +752,32 @@ The installer will quit and all changes will be lost. Низоми рақамҳо ва санаҳо ба %1 танзим карда мешавад. - + Network Installation. (Disabled: Incorrect configuration) Насбкунии шабака. (Ғайрифаъол: Танзимоти нодуруст) - + Network Installation. (Disabled: Received invalid groups data) Насбкунии шабака. (Ғайрифаъол: Иттилооти гурӯҳии нодуруст қабул шуд) - - Network Installation. (Disabled: internal error) - Насбкунии шабака. (Ғайрифаъол: Хатои дохилӣ) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Интихоби бастаҳо - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Насбкунии шабака. (Ғайрифаъол: Рӯйхати қуттиҳо гирифта намешавад. Пайвасти шабакаро тафтиш кунед) @@ -842,42 +872,42 @@ The installer will quit and all changes will be lost. Ниҳонвожаҳои шумо мувофиқат намекунанд! - + Setup Failed Танзимкунӣ қатъ шуд - + Installation Failed Насбкунӣ қатъ шуд - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Анҷоми танзимкунӣ - + Installation Complete Насбкунӣ ба анҷом расид - + The setup of %1 is complete. Танзимкунии %1 ба анҷом расид. - + The installation of %1 is complete. Насбкунии %1 ба анҷом расид. @@ -1474,72 +1504,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space ақаллан %1 ГБ фазои диск дастрас аст - + There is not enough drive space. At least %1 GiB is required. Дар диск фазои кофӣ нест. Ақаллан %1 ГБ лозим аст. - + has at least %1 GiB working memory ақаллан %1 ГБ ҳофизаи корӣ дастрас аст - + The system does not have enough working memory. At least %1 GiB is required. Низом дорои ҳофизаи кории кофӣ намебошад. Ақаллан %1 ГБ лозим аст. - + is plugged in to a power source низом ба манбаи барқ пайваст карда шуд - + The system is not plugged in to a power source. Компютер бояд ба манбаи барқ пайваст карда шавад - + is connected to the Internet пайвасти Интернет дастрас аст - + The system is not connected to the Internet. Компютер ба Интернет пайваст карда нашуд. - + is running the installer as an administrator (root) насбкунанда бо ҳуқуқҳои маъмурӣ (root) иҷро шуда истодааст. - + The setup program is not running with administrator rights. Барномаи насбкунӣ бе ҳуқуқҳои маъмурӣ иҷро шуда истодааст. - + The installer is not running with administrator rights. Насбкунанда бе ҳуқуқҳои маъмурӣ иҷро шуда истодааст. - + 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 installer. Экран барои нишон додани насбкунанда хеле хурд аст. @@ -1607,7 +1637,7 @@ The installer will quit and all changes will be lost. Лутфан, KDE Konsole-ро насб намуда, аз нав кӯшиш кунед! - + Executing script: &nbsp;<code>%1</code> Иҷрокунии нақши: &nbsp;<code>%1</code> @@ -1879,98 +1909,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Интихоби бастаҳо - + Office software Нармафзори идорӣ - + Office package Бастаҳои идорӣ - + Browser software Нармафзори браузерӣ - + Browser package Бастаҳои браузерӣ - + Web browser Браузери сомона - + Kernel Ҳаста - + Services Хидматҳо - + Login Воридшавӣ - + Desktop Мизи корӣ - + Applications Барномаҳо - + Communication Воситаҳои алоқа - + Development Барномарезӣ - + Office Идора - + Multimedia Мултимедиа - + Internet Интернет - + Theming Мавзӯъҳо - + Gaming Бозиҳо - + Utilities Барномаҳои муфид @@ -3704,12 +3733,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Агар зиёда аз як корбар ин компютерро истифода барад, шумо метавонед баъд аз танзимкунӣ якчанд ҳисобро эҷод намоед.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Агар зиёда аз як корбар ин компютерро истифода барад, шумо метавонед баъд аз насбкунӣ якчанд ҳисобро эҷод намоед.</small> @@ -3717,7 +3746,7 @@ Output: UsersQmlViewStep - + Users Корбарон @@ -4135,102 +4164,102 @@ Output: Номи шумо чист? - + Your Full Name Номи пурраи шумо - + What name do you want to use to log in? Кадом номро барои ворид шудан ба низом истифода мебаред? - + Login Name Номи корбар - + If more than one person will use this computer, you can create multiple accounts after installation. Агар зиёда аз як корбар ин компютерро истифода барад, шумо метавонед баъд аз насбкунӣ якчанд ҳисобро эҷод намоед. - + What is the name of this computer? Номи ин компютер чист? - + Computer Name Номи компютери шумо - + This name will be used if you make the computer visible to others on a network. Ин ном истифода мешавад, агар шумо компютери худро барои дигарон дар шабака намоён кунед. - + Choose a password to keep your account safe. Барои эмин нигоҳ доштани ҳисоби худ ниҳонвожаеро интихоб намоед. - + Password Ниҳонвожаро ворид намоед - + Repeat Password Ниҳонвожаро тасдиқ намоед - + 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. Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад. Ниҳонвожаи хуб бояд дар омезиш калимаҳо, рақамҳо ва аломатҳои китобатиро дар бар гирад, ақаллан аз ҳашт аломат иборат шавад ва мунтазам иваз карда шавад. - + Validate passwords quality Санҷиши сифати ниҳонвожаҳо - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Агар шумо ин имконро интихоб кунед, қувваи ниҳонвожа тафтиш карда мешавад ва шумо ниҳонвожаи заифро истифода карда наметавонед. - + Log in automatically without asking for the password Ба таври худкор бе дархости ниҳонвожа ворид карда шавад - + Reuse user password as root password Ниҳонвожаи корбар ҳам барои ниҳонвожаи root истифода карда шавад - + Use the same password for the administrator account. Ниҳонвожаи ягона барои ҳисоби маъмурӣ истифода бурда шавад. - + Choose a root password to keep your account safe. Барои эмин нигоҳ доштани ҳисоби худ ниҳонвожаи root-ро интихоб намоед. - + Root Password Ниҳонвожаи root - + Repeat Root Password Ниҳонвожаи root-ро тасдиқ намоед - + Enter the same password twice, so that it can be checked for typing errors. Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад. diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts index 120620f91b..5fc69ea822 100644 --- a/lang/calamares_th.ts +++ b/lang/calamares_th.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information ข้อมูลดีบั๊ก @@ -284,13 +304,13 @@ - + &Yes - + &No @@ -300,17 +320,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -319,123 +339,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? ดำเนินการติดตั้งต่อหรือไม่? - + 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 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 กำลังพยายามที่จะทำการเปลี่ยนแปลงในดิสก์ของคุณเพื่อติดตั้ง %2<br/><strong>คุณจะไม่สามารถยกเลิกการเปลี่ยนแปลงเหล่านี้ได้</strong> - + &Set up now - + &Install now &ติดตั้งตอนนี้ - + Go &back กลั&บไป - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &N ถัดไป - + &Back &B ย้อนกลับ - + &Done - + &Cancel &C ยกเลิก - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. คุณต้องการยกเลิกกระบวนการติดตั้งที่กำลังดำเนินการอยู่หรือไม่? @@ -468,12 +488,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer ตัวติดตั้ง %1 @@ -481,7 +501,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... กำลังรวบรวมข้อมูลของระบบ... @@ -729,22 +749,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -839,42 +869,42 @@ The installer will quit and all changes will be lost. รหัสผ่านของคุณไม่ตรงกัน! - + Setup Failed - + Installation Failed การติดตั้งล้มเหลว - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete การติดตั้งเสร็จสิ้น - + The setup of %1 is complete. - + The installation of %1 is complete. การติดตั้ง %1 เสร็จสิ้น @@ -1471,72 +1501,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source เชื่อมต่อปลั๊กเข้ากับแหล่งจ่ายไฟ - + The system is not plugged in to a power source. - + is connected to the Internet เชื่อมต่อกับอินเทอร์เน็ต - + The system is not connected to the Internet. ระบบไม่ได้เชื่อมต่อกับอินเทอร์เน็ต - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1604,7 +1634,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1874,98 +1904,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel เคอร์เนล - + Services บริการ - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3684,12 +3713,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 installation.</small> @@ -3697,7 +3726,7 @@ Output: UsersQmlViewStep - + Users ผู้ใช้ @@ -4081,102 +4110,102 @@ Output: ชื่อของคุณคือ? - + Your Full Name ชื่อเต็มของคุณ - + What name do you want to use to log in? ชื่อที่คุณต้องการใช้ในการล็อกอิน? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? คอมพิวเตอร์เครื่องนี้ชื่อ? - + Computer Name ชื่อคอมพิวเตอร์ - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. เลือกรหัสผ่านเพื่อรักษาบัญชีผู้ใช้ของคุณให้ปลอดภัย - + Password รหัสผ่าน - + Repeat Password กรอกรหัสผ่านซ้ำ - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index 6d20b7370d..d289683cbb 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Otomatik bağlama ayarlarını yönet @@ -102,22 +102,42 @@ Arayüz: - - Tools - Araçlar + + Crashes Calamares, so that Dr. Konqui can look at it. + Calamares çöker, böylece Dr. Konqui bakabilir. - + + Reloads the stylesheet from the branding directory. + Stil sayfasını marka dizininden yeniden yükler. + + + + Uploads the session log to the configured pastebin. + Oturum günlüğünü yapılandırılmış pastebin'e yükler. + + + + Send Session Log + Oturum Günlüğünü Gönder + + + Reload Stylesheet Stil 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). + + + Widget Tree Gereç Ağacı - + Debug information Hata ayıklama bilgisi @@ -286,13 +306,13 @@ - + &Yes &Evet - + &No &Hayır @@ -302,143 +322,147 @@ &Kapat - + Install Log Paste URL Günlük Yapıştırma URL'sini Yükle - + The upload was unsuccessful. No web-paste was done. Yükleme başarısız oldu. Web yapıştırması yapılmadı. - + Install log posted to %1 Link copied to clipboard - + Şurada yayınlanan günlüğü yükle + +%1 + +link panoya kopyalandı - + Calamares Initialization Failed Calamares Başlatılamadı - + %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. - + <br/>The following modules could not be loaded: <br/>Aşağıdaki modüller yüklenemedi: - + Continue with setup? Kuruluma devam et? - + Continue with installation? Kurulum devam etsin mi? - + 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 ayarlamak 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> - + &Set up now &Şimdi kur - + &Install now &Şimdi yükle - + Go &back Geri &git - + &Set up &Kur - + &Install &Yükle - + Setup is complete. Close the setup program. Kurulum tamamlandı. Kurulum programını kapatın. - + The installation is complete. Close the installer. Yükleme işi tamamlandı. Sistem yükleyiciyi kapatın. - + Cancel setup without changing the system. Sistemi değiştirmeden kurulumu iptal edin. - + Cancel installation without changing the system. Sistemi değiştirmeden kurulumu iptal edin. - + &Next &Sonraki - + &Back &Geri - + &Done &Tamam - + &Cancel &Vazgeç - + Cancel setup? Kurulum iptal edilsin mi? - + Cancel installation? Yüklemeyi iptal et? - + 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. - + 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? @@ -471,12 +495,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. CalamaresWindow - + %1 Setup Program %1 Kurulum Uygulaması - + %1 Installer %1 Yükleniyor @@ -484,7 +508,7 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. CheckerContainer - + Gathering system information... Sistem bilgileri toplanıyor... @@ -733,22 +757,32 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Sayılar ve günler için sistem yereli %1 olarak ayarlanacak. - + Network Installation. (Disabled: Incorrect configuration) Ağ Kurulum. (Devre dışı: Yanlış yapılandırma) - + Network Installation. (Disabled: Received invalid groups data) Ağ Kurulum. (Devre dışı: Geçersiz grup verileri alındı) - - Network Installation. (Disabled: internal error) - Ağ Kurulum. (Devre dışı: dahili hata) + + Network Installation. (Disabled: Internal error) + Ağ Kurulumu. (Devre Dışı: Dahili hata) - + + Network Installation. (Disabled: No package list) + Ağ Kurulumu. (Devre Dışı: Paket listesi yok) + + + + Package selection + Paket seçimi + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Ağ Üzerinden Kurulum. (Devre Dışı: Paket listeleri alınamıyor, ağ bağlantısını kontrol ediniz) @@ -845,42 +879,42 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.Parolanız eşleşmiyor! - + Setup Failed Kurulum Başarısız - + Installation Failed Kurulum Başarısız - + The setup of %1 did not complete successfully. - + %1 kurulumu başarısız oldu tamamlanmadı. - + The installation of %1 did not complete successfully. - + %1 kurulumu başarısız oldu tamamlanmadı. - + Setup Complete Kurulum Tamanlandı - + Installation Complete Kurulum Tamamlandı - + The setup of %1 is complete. %1 kurulumu tamamlandı. - + The installation of %1 is complete. Kurulum %1 oranında tamamlandı. @@ -976,12 +1010,12 @@ 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. Create new %1MiB partition on %3 (%2). - + %3 (%2) üzerinde yeni bir %1MiB bölüm oluşturun. @@ -991,12 +1025,12 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. 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. 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. @@ -1344,7 +1378,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. 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 yükleyin @@ -1354,27 +1388,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. 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. 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 yükleyin. 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. 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. @@ -1477,73 +1511,73 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. GeneralRequirements - + has at least %1 GiB available drive space En az %1 GB disk sürücü alanı var - + 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. - + has at least %1 GiB working memory 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. - + is plugged in to a power source Bir güç kaynağına takılı olduğundan... - + The system is not plugged in to a power source. Sistem güç kaynağına bağlı değil. - + is connected to the Internet İnternete bağlı olduğundan... - + The system is not connected to the Internet. Sistem internete bağlı değil. - + is running the installer as an administrator (root) yükleyiciyi yönetici (kök) olarak çalıştırıyor - + The setup program is not running with administrator rights. Kurulum uygulaması yönetici haklarıyla çalışmıyor. - + The installer is not running with administrator rights. Sistem yükleyici yönetici haklarına sahip olmadan çalışmıyor. - + has a screen large enough to show the whole installer yükleyicinin tamamını gösterecek kadar büyük bir ekrana sahip - + The screen is too small to display the setup program. Kurulum uygulamasını görüntülemek için ekran çok küçük. - + The screen is too small to display the installer. Ekran, sistem yükleyiciyi görüntülemek için çok küçük. @@ -1611,7 +1645,7 @@ Sistem güç kaynağına bağlı değil. Lütfen KDE Konsole yükle ve tekrar dene! - + Executing script: &nbsp;<code>%1</code> Komut durumu: &nbsp;<code>%1</code> @@ -1883,98 +1917,97 @@ Sistem güç kaynağına bağlı değil. NetInstallViewStep - - + Package selection Paket seçimi - + Office software Ofis yazılımı - + Office package Ofis paketi - + Browser software Tarayıcı yazılımı - + Browser package Tarayıcı paketi - + Web browser İnternet tarayıcısı - + Kernel Çekirdek - + Services Servisler - + Login Oturum aç - + Desktop Masaüstü - + Applications Uygulamalar - + Communication İletişim - + Development Gelişim - + Office Ofis - + Multimedia Multimedya - + Internet İnternet - + Theming Temalar - + Gaming Oyunlar - + Utilities Bileşenler @@ -3711,12 +3744,12 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. UsersPage - + <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>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> @@ -3724,7 +3757,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. UsersQmlViewStep - + Users Kullanıcı Tercihleri @@ -3968,29 +4001,31 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. Installation Completed - + Yükleme Tamamlandı %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 yüklendi.<br/> + Kurduğunuz sistemi şimdi yeniden başlayabilir veya Canlı ortamı kullanmaya devam edebilirsiniz. Close Installer - + Yükleyiciyi Kapat Restart System - + Sistemi Yeniden Başlat <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Kurulumun tam günlüğü, Live kullanıcısının ana dizininde installation.log olarak mevcuttur.<br/> + Bu günlük, hedef sistemin /var/log/installation.log dosyasına kopyalanır.</p> @@ -4142,102 +4177,102 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Adınız nedir? - + Your Full Name Tam Adınız - + What name do you want to use to log in? Giriş için hangi adı kullanmak istersiniz? - + Login Name Kullanıcı 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. - + What is the name of this computer? Bu bilgisayarın adı nedir? - + Computer Name Bilgisayar Adı - + This name will be used if you make the computer visible to others on a network. Bilgisayarı ağ üzerinde herkese görünür yaparsanız bu ad kullanılacaktır. - + Choose a password to keep your account safe. Hesabınızın güvenliğini sağlamak için bir parola belirleyiniz. - + Password Şifre - + Repeat Password Şifreyi Tekrarla - + 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. Yazım hataları açısından kontrol edilebilmesi için aynı parolayı iki kez girin. İyi bir şifre, harflerin, sayıların ve noktalama işaretlerinin bir karışımını içerecektir, en az sekiz karakter uzunluğunda olmalı ve düzenli aralıklarla değiştirilmelidir. - + Validate passwords quality Parola kalitesini doğrulayın - + 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ü kontrolü yapılır ve zayıf bir parola kullanamazsınız. - + Log in automatically without asking for the password Parola sormadan otomatik olarak oturum açın - + Reuse user password as root password Kullanıcı şifresini yetkili kök şifre olarak kullan - + Use the same password for the administrator account. Yönetici ile kullanıcı aynı şifreyi kullansın. - + Choose a root password to keep your account safe. Hesabınızı güvende tutmak için bir kök şifre seçin. - + Root Password Kök Şifre - + Repeat Root Password Kök Şifresini Tekrarla - + Enter the same password twice, so that it can be checked for typing errors. Yazım hataları açısından kontrol edilebilmesi için aynı parolayı iki kez girin. diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts index db4b54756f..b5a94cf863 100644 --- a/lang/calamares_uk.ts +++ b/lang/calamares_uk.ts @@ -102,22 +102,42 @@ Інтерфейс: - - Tools - Інструменти + + Crashes Calamares, so that Dr. Konqui can look at it. + Ініціює аварійне завершення роботи Calamares, щоб дані можна було переглянути у Dr. Konqui. + + + + Reloads the stylesheet from the branding directory. + Перезавантажує таблицю стилів із каталогу бренда. + + + + Uploads the session log to the configured pastebin. + Вивантажує журнал сеансу до налаштованої служби зберігання. + + + + Send Session Log + Надіслати журнал сеансу - + Reload Stylesheet Перезавантажити таблицю стилів - + + Displays the tree of widget names in the log (for stylesheet debugging). + Показує ієрархію назв віджетів у журналі (для діагностики таблиці стилів). + + + Widget Tree Дерево віджетів - + Debug information Діагностична інформація @@ -290,13 +310,13 @@ - + &Yes &Так - + &No &Ні @@ -306,17 +326,17 @@ &Закрити - + Install Log Paste URL Адреса для вставлення журналу встановлення - + The upload was unsuccessful. No web-paste was done. Не вдалося вивантажити дані. - + Install log posted to %1 @@ -329,124 +349,124 @@ Link copied to clipboard Посилання скопійовано до буфера обміну - + Calamares Initialization Failed Помилка ініціалізації Calamares - + %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 неможливо встановити. Calamares не зміг завантажити всі налаштовані модулі. Ця проблема зв'язана з тим, як Calamares використовується дистрибутивом. - + <br/>The following modules could not be loaded: <br/>Не вдалося завантажити наступні модулі: - + Continue with setup? Продовжити встановлення? - + 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> Програма налаштування %1 збирається внести зміни до вашого диска, щоб налаштувати %2. <br/><strong> Ви не зможете скасувати ці зміни.</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 має намір внести зміни до розподілу вашого диска, щоб встановити %2.<br/><strong>Ці зміни неможливо буде скасувати.</strong> - + &Set up now &Налаштувати зараз - + &Install now &Встановити зараз - + Go &back Перейти &назад - + &Set up &Налаштувати - + &Install &Встановити - + Setup is complete. Close the setup program. Встановлення виконано. Закрити програму встановлення. - + The installation is complete. Close the installer. Встановлення виконано. Завершити роботу засобу встановлення. - + Cancel setup without changing the system. Скасувати налаштування без зміни системи. - + Cancel installation without changing the system. Скасувати встановлення без зміни системи. - + &Next &Вперед - + &Back &Назад - + &Done &Закінчити - + &Cancel &Скасувати - + Cancel setup? Скасувати налаштування? - + 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 install process? The installer will quit and all changes will be lost. Чи ви насправді бажаєте скасувати процес встановлення? @@ -479,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Програма для налаштовування %1 - + %1 Installer Засіб встановлення %1 @@ -492,7 +512,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Збираємо інформацію про систему... @@ -740,22 +760,32 @@ The installer will quit and all changes will be lost. %1 буде встановлено як локаль чисел та дат. - + Network Installation. (Disabled: Incorrect configuration) Встановлення за допомогою мережі. (Вимкнено: помилкові налаштування) - + Network Installation. (Disabled: Received invalid groups data) Встановлення через мережу. (Вимкнено: Отримано неправильні дані про групи) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) Встановлення з мережі. (Вимкнено: внутрішня помилка) - + + Network Installation. (Disabled: No package list) + Встановлення з мережі. (Вимкнено: немає списку пакунків) + + + + Package selection + Вибір пакетів + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Встановлення через мережу. (Вимкнено: Неможливо отримати список пакетів, перевірте ваше підключення до мережі) @@ -850,42 +880,42 @@ The installer will quit and all changes will be lost. Паролі не збігаються! - + Setup Failed Помилка встановлення - + Installation Failed Помилка під час встановлення - + The setup of %1 did not complete successfully. Налаштування %1 не завершено успішно. - + The installation of %1 did not complete successfully. Встановлення %1 не завершено успішно. - + Setup Complete Налаштовування завершено - + Installation Complete Встановлення завершено - + The setup of %1 is complete. Налаштовування %1 завершено. - + The installation of %1 is complete. Встановлення %1 завершено. @@ -1482,72 +1512,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space містить принаймні %1 ГіБ місця на диску - + There is not enough drive space. At least %1 GiB is required. На диску недостатньо місця. Потрібно принаймні %1 ГіБ. - + has at least %1 GiB working memory має принаймні %1 ГіБ робочої пам'яті - + The system does not have enough working memory. At least %1 GiB is required. У системі немає достатнього об'єму робочої пам'яті. Потрібно принаймні %1 ГіБ. - + is plugged in to a power source підключена до джерела живлення - + The system is not plugged in to a power source. Система не підключена до джерела живлення. - + is connected to the Internet з'єднано з мережею Інтернет - + The system is not connected to the Internet. Система не з'єднана з мережею Інтернет. - + is running the installer as an administrator (root) виконує засіб встановлення від імені адміністратора (root) - + The setup program is not running with administrator rights. Програму для налаштовування запущено не від імені адміністратора. - + The installer is not running with administrator rights. Засіб встановлення запущено без прав адміністратора. - + 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 installer. Екран замалий для показу вікна засобу встановлення. @@ -1615,7 +1645,7 @@ The installer will quit and all changes will be lost. Будь ласка встановіть KDE Konsole і спробуйте знову! - + Executing script: &nbsp;<code>%1</code> Виконується скрипт: &nbsp;<code>%1</code> @@ -1887,98 +1917,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Вибір пакетів - + Office software Офісні програми - + Office package Офісний пакунок - + Browser software Браузери - + Browser package Пакунок браузера - + Web browser Переглядач інтернету - + Kernel Ядро - + Services Служби - + Login Вхід до системи - + Desktop Стільниця - + Applications Програми - + Communication Спілкування - + Development Розробка - + Office Офіс - + Multimedia Звук та відео - + Internet Інтернет - + Theming Теми - + Gaming Ігри - + Utilities Інструменти @@ -3731,12 +3760,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Якщо за цим комп'ютером працюватимуть декілька користувачів, ви можете створити декілька облікових записів після налаштовування.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Якщо за цим комп'ютером працюватимуть декілька користувачів, ви можете створити декілька облікових записів після встановлення.</small> @@ -3744,7 +3773,7 @@ Output: UsersQmlViewStep - + Users Користувачі @@ -4163,102 +4192,102 @@ Output: Ваше ім'я? - + Your Full Name Ваше ім'я повністю - + What name do you want to use to log in? Яке ім'я ви бажаєте використовувати для входу? - + Login Name Запис для входу - + If more than one person will use this computer, you can create multiple accounts after installation. Якщо за цим комп'ютером працюватимуть декілька користувачів, ви можете створити декілька облікових записів після встановлення. - + What is the name of this computer? Назва цього комп'ютера? - + Computer Name Назва комп'ютера - + This name will be used if you make the computer visible to others on a network. Цю назву буде використано, якщо ви зробите комп'ютер видимим іншим у мережі. - + Choose a password to keep your account safe. Оберіть пароль, щоб тримати ваш обліковий рахунок у безпеці. - + Password Пароль - + Repeat Password Повторіть пароль - + 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. Введіть один й той самий пароль двічі, для перевірки щодо помилок введення. Надійному паролю слід містити суміш літер, чисел та розділових знаків, бути довжиною хоча б вісім символів та регулярно змінюватись. - + Validate passwords quality Перевіряти якість паролів - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Якщо позначено цей пункт, буде виконано перевірку складності пароля. Ви не зможете скористатися надто простим паролем. - + Log in automatically without asking for the password Входити автоматично без пароля - + Reuse user password as root password Використати пароль користувача як пароль root - + Use the same password for the administrator account. Використовувати той самий пароль і для облікового рахунку адміністратора. - + Choose a root password to keep your account safe. Виберіть пароль root для захисту вашого облікового запису. - + Root Password Пароль root - + Repeat Root Password Повторіть пароль root - + Enter the same password twice, so that it can be checked for typing errors. Введіть один й той самий пароль двічі, щоб убезпечитися від помилок при введенні. diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts index 0acd364cb8..2a9c67dcab 100644 --- a/lang/calamares_ur.ts +++ b/lang/calamares_ur.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,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 installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts index 130ea84331..dc5c7a4ca8 100644 --- a/lang/calamares_uz.ts +++ b/lang/calamares_uz.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -284,13 +304,13 @@ - + &Yes - + &No @@ -300,17 +320,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -319,123 +339,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -467,12 +487,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -480,7 +500,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -728,22 +748,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -838,42 +868,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1470,72 +1500,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1603,7 +1633,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1873,98 +1903,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3683,12 +3712,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 installation.</small> @@ -3696,7 +3725,7 @@ Output: UsersQmlViewStep - + Users @@ -4080,102 +4109,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts index 719af5c43d..5ac35384cd 100644 --- a/lang/calamares_vi.ts +++ b/lang/calamares_vi.ts @@ -102,22 +102,42 @@ Giao diện: - - Tools - Công cụ + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Tải lại bảng định kiểu - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Cây công cụ - + Debug information Thông tin gỡ lỗi @@ -284,13 +304,13 @@ - + &Yes &Có - + &No &Không @@ -300,17 +320,17 @@ Đón&g - + Install Log Paste URL URL để gửi nhật ký cài đặt - + The upload was unsuccessful. No web-paste was done. Tải lên không thành công. Không có quá trình gửi lên web nào được thực hiện. - + Install log posted to %1 @@ -319,124 +339,124 @@ Link copied to clipboard - + Calamares Initialization Failed Khởi tạo không thành công - + %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 không thể được cài đặt.Không thể tải tất cả các mô-đun đã định cấu hình. Đây là vấn đề với cách phân phối sử dụng. - + <br/>The following modules could not be loaded: <br/> Không thể tải các mô-đun sau: - + Continue with setup? Tiếp tục thiết lập? - + Continue with installation? Tiếp tục cài đặt? - + 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> Chương trình thiết lập %1 sắp thực hiện các thay đổi đối với đĩa của bạn để thiết lập %2. <br/> <strong> Bạn sẽ không thể hoàn tác các thay đổi này. </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> Trình cài đặt %1 sắp thực hiện các thay đổi đối với đĩa của bạn để cài đặt %2. <br/> <strong> Bạn sẽ không thể hoàn tác các thay đổi này. </strong> - + &Set up now &Thiết lập ngay - + &Install now &Cài đặt ngay - + Go &back &Quay lại - + &Set up &Thiết lập - + &Install &Cài đặt - + Setup is complete. Close the setup program. Thiết lập hoàn tất. Đóng chương trình cài đặt. - + The installation is complete. Close the installer. Quá trình cài đặt hoàn tất. Đóng trình cài đặt. - + Cancel setup without changing the system. Hủy thiết lập mà không thay đổi hệ thống. - + Cancel installation without changing the system. Hủy cài đặt mà không thay đổi hệ thống. - + &Next &Tiếp - + &Back &Quay lại - + &Done &Xong - + &Cancel &Hủy - + Cancel setup? Hủy thiết lập? - + Cancel installation? Hủy cài đặt? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Bạn có thực sự muốn hủy quá trình thiết lập hiện tại không? Chương trình thiết lập sẽ thoát và tất cả các thay đổi sẽ bị mất. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Bạn có thực sự muốn hủy quá trình cài đặt hiện tại không? @@ -469,12 +489,12 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< CalamaresWindow - + %1 Setup Program %1 Thiết lập chương trình - + %1 Installer %1 cài đặt hệ điều hành @@ -482,7 +502,7 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< CheckerContainer - + Gathering system information... Thu thập thông tin hệ thống ... @@ -730,22 +750,32 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Định dạng ngôn ngữ của số và ngày tháng sẽ được chuyển thành %1. - + Network Installation. (Disabled: Incorrect configuration) Cài đặt mạng. (Tắt: Sai cấu hình) - + Network Installation. (Disabled: Received invalid groups data) Cài đặt mạng. (Tắt: Nhận được dữ liệu nhóm bị sai) - - Network Installation. (Disabled: internal error) - Cài đặt mạng. (Tắt: Lỗi nội bộ) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Chọn phân vùng - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Cài đặt mạng. (Tắt: Không thể lấy được danh sách gói ứng dụng, kiểm tra kết nối mạng) @@ -840,42 +870,42 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Mật khẩu nhập lại không khớp! - + Setup Failed Thiết lập không thành công - + Installation Failed Cài đặt thất bại - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Thiết lập xong - + Installation Complete Cài đặt xong - + The setup of %1 is complete. Thiết lập %1 đã xong. - + The installation of %1 is complete. Cài đặt của %1 đã xong. @@ -1472,72 +1502,72 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< GeneralRequirements - + has at least %1 GiB available drive space có ít nhất %1 GiB dung lượng ổ đĩa khả dụng - + There is not enough drive space. At least %1 GiB is required. Không có đủ dung lượng ổ đĩa. Ít nhất %1 GiB là bắt buộc. - + has at least %1 GiB working memory có ít nhất %1 GiB bộ nhớ làm việc - + The system does not have enough working memory. At least %1 GiB is required. Hệ thống không có đủ bộ nhớ hoạt động. Ít nhất %1 GiB là bắt buộc. - + is plugged in to a power source được cắm vào nguồn điện - + The system is not plugged in to a power source. Hệ thống chưa được cắm vào nguồn điện. - + is connected to the Internet được kết nối với Internet - + The system is not connected to the Internet. Hệ thống không được kết nối với Internet. - + is running the installer as an administrator (root) đang chạy trình cài đặt với tư cách quản trị viên (root) - + The setup program is not running with administrator rights. Chương trình thiết lập không chạy với quyền quản trị viên. - + The installer is not running with administrator rights. Trình cài đặt không chạy với quyền quản trị viên. - + has a screen large enough to show the whole installer có màn hình đủ lớn để hiển thị toàn bộ trình cài đặt - + The screen is too small to display the setup program. Màn hình quá nhỏ để hiển thị chương trình cài đặt. - + The screen is too small to display the installer. Màn hình quá nhỏ để hiển thị trình cài đặt. @@ -1605,7 +1635,7 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Vui lòng cài đặt KDE Konsole rồi thử lại! - + Executing script: &nbsp;<code>%1</code> Đang thực thi kịch bản: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< NetInstallViewStep - - + Package selection Chọn phân vùng - + Office software Phần mềm văn phòng - + Office package Gói văn phòng - + Browser software Phần mềm trình duyệt - + Browser package Gói trình duyệt - + Web browser Trình duyệt web - + Kernel Lõi - + Services Dịch vụ - + Login Đăng nhập - + Desktop Màn hình chính - + Applications Ứng dụng - + Communication Cộng đồng - + Development Phát triển - + Office Văn phòng - + Multimedia Đa phương tiện - + Internet Mạng Internet - + Theming Chủ đề - + Gaming Trò chơi - + Utilities Tiện ích @@ -3693,12 +3722,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small> Nếu nhiều người cùng sử dụng máy tính này, bạn có thể tạo nhiều tài khoản sau khi thiết lập. </small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small> Nếu nhiều người cùng sử dụng máy tính này, bạn có thể tạo nhiều tài khoản sau khi cài đặt. </small> @@ -3706,7 +3735,7 @@ Output: UsersQmlViewStep - + Users Người dùng @@ -4123,102 +4152,102 @@ Output: Hãy cho Vigo biết tên đầy đủ của bạn? - + Your Full Name Tên đầy đủ - + What name do you want to use to log in? Bạn muốn dùng tên nào để đăng nhập máy tính? - + Login Name Tên đăng nhập - + If more than one person will use this computer, you can create multiple accounts after installation. Tạo nhiều tài khoản sau khi cài đặt nếu có nhiều người dùng chung. - + What is the name of this computer? Tên của máy tính này là? - + Computer Name Tên máy tính - + This name will be used if you make the computer visible to others on a network. Tên này sẽ hiển thị khi bạn kết nối vào một mạng. - + Choose a password to keep your account safe. Chọn mật khẩu để giữ máy tính an toàn. - + Password Mật khẩu - + Repeat Password Lặp lại mật khẩu - + 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. Nhập lại mật khẩu hai lần để kiểm tra. Một mật khẩu tốt phải có ít nhất 8 ký tự và bao gồm chữ, số, ký hiệu đặc biệt. Nên được thay đổi thường xuyên. - + Validate passwords quality Xác thực chất lượng mật khẩu - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Khi tích chọn, bạn có thể chọn mật khẩu yếu. - + Log in automatically without asking for the password Tự động đăng nhập không hỏi mật khẩu - + Reuse user password as root password Dùng lại mật khẩu người dùng như mật khẩu quản trị - + Use the same password for the administrator account. Dùng cùng một mật khẩu cho tài khoản quản trị. - + Choose a root password to keep your account safe. Chọn mật khẩu quản trị để giữ máy tính an toàn. - + Root Password Mật khẩu quản trị - + Repeat Root Password Lặp lại mật khẩu quản trị - + Enter the same password twice, so that it can be checked for typing errors. Nhập lại mật khẩu hai lần để kiểm tra. diff --git a/lang/calamares_zh.ts b/lang/calamares_zh.ts index 3b29572d73..f910b6faac 100644 --- a/lang/calamares_zh.ts +++ b/lang/calamares_zh.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -284,13 +304,13 @@ - + &Yes - + &No @@ -300,17 +320,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -319,123 +339,123 @@ Link copied to clipboard - + 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. - + <br/>The following modules could not be loaded: - + Continue with setup? - + 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 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 - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + 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 install process? The installer will quit and all changes will be lost. @@ -467,12 +487,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -480,7 +500,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -728,22 +748,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -838,42 +868,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1470,72 +1500,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + 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 installer. @@ -1603,7 +1633,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1873,98 +1903,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3683,12 +3712,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 installation.</small> @@ -3696,7 +3725,7 @@ Output: UsersQmlViewStep - + Users @@ -4080,102 +4109,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + 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. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts index d8d256e1cf..a285512e7b 100644 --- a/lang/calamares_zh_CN.ts +++ b/lang/calamares_zh_CN.ts @@ -103,22 +103,42 @@ 接口： - - Tools - 工具 + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet 重载样式表 - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree 树形控件 - + Debug information 调试信息 @@ -285,13 +305,13 @@ - + &Yes &是 - + &No &否 @@ -301,17 +321,17 @@ &关闭 - + Install Log Paste URL 安装日志粘贴 URL - + The upload was unsuccessful. No web-paste was done. 上传失败，未完成网页粘贴。 - + Install log posted to %1 @@ -320,124 +340,124 @@ Link copied to clipboard - + Calamares Initialization Failed Calamares初始化失败 - + %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无法安装。 Calamares无法加载所有已配置的模块。这个问题是发行版配置Calamares不当导致的。 - + <br/>The following modules could not be loaded: <br/>无法加载以下模块： - + Continue with setup? 要继续安装吗？ - + 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> 为了安装%2, %1 安装程序即将对磁盘进行更改。<br/><strong>这些更改无法撤销。</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 安装程序将在您的磁盘上做出变更以安装 %2。<br/><strong>您将无法复原这些变更。</strong> - + &Set up now 现在安装(&S) - + &Install now 现在安装 (&I) - + Go &back 返回 (&B) - + &Set up 安装(&S) - + &Install 安装(&I) - + Setup is complete. Close the setup program. 安装完成。关闭安装程序。 - + The installation is complete. Close the installer. 安装已完成。请关闭安装程序。 - + Cancel setup without changing the system. 取消安装，保持系统不变。 - + Cancel installation without changing the system. 取消安装，并不做任何更改。 - + &Next 下一步(&N) - + &Back 后退(&B) - + &Done &完成 - + &Cancel 取消(&C) - + Cancel setup? 取消安装？ - + 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 install process? The installer will quit and all changes will be lost. 确定要取消当前的安装吗？ @@ -470,12 +490,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 安装程序 - + %1 Installer %1 安装程序 @@ -483,7 +503,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... 正在收集系统信息 ... @@ -731,22 +751,32 @@ The installer will quit and all changes will be lost. 数字和日期地域将设置为 %1。 - + Network Installation. (Disabled: Incorrect configuration) 网络安装。（禁用：错误的设置） - + Network Installation. (Disabled: Received invalid groups data) 联网安装。（已禁用：收到无效组数据） - - Network Installation. (Disabled: internal error) - 网络安装。（已禁用：内部错误） + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + 软件包选择 - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) 网络安装。（已禁用：无法获取软件包列表，请检查网络连接） @@ -843,42 +873,42 @@ The installer will quit and all changes will be lost. 密码不匹配！ - + Setup Failed 安装失败 - + Installation Failed 安装失败 - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete 安装完成 - + Installation Complete 安装完成 - + The setup of %1 is complete. %1 安装完成。 - + The installation of %1 is complete. %1 的安装操作已完成。 @@ -1476,72 +1506,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space 有至少 %1 GB 可用磁盘空间 - + There is not enough drive space. At least %1 GiB is required. 没有足够的磁盘空间。至少需要 %1 GB。 - + has at least %1 GiB working memory 至少 %1 GB 可用内存 - + The system does not have enough working memory. At least %1 GiB is required. 系统没有足够的内存。至少需要 %1 GB。 - + is plugged in to a power source 已连接到电源 - + The system is not plugged in to a power source. 系统未连接到电源。 - + is connected to the Internet 已连接到互联网 - + The system is not connected to the Internet. 系统未连接到互联网。 - + is running the installer as an administrator (root) 正以管理员(root)权限运行安装器 - + The setup program is not running with administrator rights. 安装器未以管理员权限运行 - + The installer is not running with administrator rights. 安装器未以管理员权限运行 - + 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 installer. 屏幕不能完整显示安装器。 @@ -1609,7 +1639,7 @@ The installer will quit and all changes will be lost. 请安装 KDE Konsole 后重试！ - + Executing script: &nbsp;<code>%1</code> 正在运行脚本：&nbsp;<code>%1</code> @@ -1881,98 +1911,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection 软件包选择 - + Office software 办公软件 - + Office package 办公软件包 - + Browser software 浏览器软件 - + Browser package 浏览器安装包 - + Web browser 网页浏览器 - + Kernel 内核 - + Services 服务 - + Login 登录 - + Desktop 桌面 - + Applications 应用程序 - + Communication 通讯 - + Development 开发 - + Office 办公 - + Multimedia 多媒体 - + Internet 互联网 - + Theming 主题化 - + Gaming 游戏 - + Utilities 实用工具 @@ -3699,12 +3728,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>如果有多人要使用此计算机，您可以在安装后创建多个账户。</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>如果有多人要使用此计算机，您可以在安装后创建多个账户。</small> @@ -3712,7 +3741,7 @@ Output: UsersQmlViewStep - + Users 用户 @@ -4131,102 +4160,102 @@ Output: 您的姓名？ - + Your Full Name 全名 - + What name do you want to use to log in? 您想要使用的登录用户名是？ - + Login Name 登录名 - + If more than one person will use this computer, you can create multiple accounts after installation. 如果有多人要使用此计算机，您可以在安装后创建多个账户。 - + What is the name of this computer? 计算机名称为？ - + Computer Name 计算机名称 - + This name will be used if you make the computer visible to others on a network. 将计算机设置为对其他网络上计算机可见时将使用此名称。 - + Choose a password to keep your account safe. 选择一个密码来保证您的账户安全。 - + Password 密码 - + Repeat Password 重复密码 - + 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. 输入相同密码两次，以检查输入错误。好的密码包含字母，数字，标点的组合，应当至少为 8 个字符长，并且应按一定周期更换。 - + Validate passwords quality 验证密码质量 - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. 若选中此项，密码强度检测会开启，你将不被允许使用弱密码。 - + Log in automatically without asking for the password 不询问密码自动登录 - + Reuse user password as root password 重用用户密码作为 root 密码 - + Use the same password for the administrator account. 为管理员帐号使用同样的密码。 - + Choose a root password to keep your account safe. 选择一个 root 密码来保证您的账户安全。 - + Root Password Root 密码 - + Repeat Root Password 重复 Root 密码 - + Enter the same password twice, so that it can be checked for typing errors. 输入相同密码两次，以检查输入错误。 diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts index 9753874569..c0f0c73c8a 100644 --- a/lang/calamares_zh_TW.ts +++ b/lang/calamares_zh_TW.ts @@ -102,22 +102,42 @@ 介面： - - Tools - 工具 + + Crashes Calamares, so that Dr. Konqui can look at it. + - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet 重新載入樣式表 - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree 小工具樹 - + Debug information 除錯資訊 @@ -284,13 +304,13 @@ - + &Yes 是(&Y) - + &No 否(&N) @@ -300,17 +320,17 @@ 關閉(&C) - + Install Log Paste URL 安裝紀錄檔張貼 URL - + The upload was unsuccessful. No web-paste was done. 上傳不成功。並未完成網路張貼。 - + Install log posted to %1 @@ -323,124 +343,124 @@ Link copied to clipboard 連結已複製到剪貼簿 - + Calamares Initialization Failed Calamares 初始化失敗 - + %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 無法安裝。Calamares 無法載入所有已設定的模組。散佈版使用 Calamares 的方式有問題。 - + <br/>The following modules could not be loaded: <br/>以下的模組無法載入： - + Continue with setup? 繼續安裝？ - + 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> %1 設定程式將在您的磁碟上做出變更以設定 %2。<br/><strong>您將無法復原這些變更。</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 安裝程式將在您的磁碟上做出變更以安裝 %2。<br/><strong>您將無法復原這些變更。</strong> - + &Set up now 馬上進行設定 (&S) - + &Install now 現在安裝 (&I) - + Go &back 上一步 (&B) - + &Set up 設定 (&S) - + &Install 安裝(&I) - + Setup is complete. Close the setup program. 設定完成。關閉設定程式。 - + The installation is complete. Close the installer. 安裝完成。關閉安裝程式。 - + Cancel setup without changing the system. 取消安裝，不更改系統。 - + Cancel installation without changing the system. 不變更系統並取消安裝。 - + &Next 下一步 (&N) - + &Back 返回 (&B) - + &Done 完成(&D) - + &Cancel 取消(&C) - + Cancel setup? 取消設定？ - + 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 install process? The installer will quit and all changes will be lost. 您真的想要取消目前的安裝程序嗎？ @@ -473,12 +493,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 設定程式 - + %1 Installer %1 安裝程式 @@ -486,7 +506,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... 收集系統資訊中... @@ -734,22 +754,32 @@ The installer will quit and all changes will be lost. 數字與日期語系會設定為%1。 - + Network Installation. (Disabled: Incorrect configuration) 網路安裝。（已停用：設定不正確） - + Network Installation. (Disabled: Received invalid groups data) 網路安裝。（已停用：收到無效的群組資料） - - Network Installation. (Disabled: internal error) - 網路安裝。（已停用：內部錯誤） + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + 軟體包選擇 - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) 網路安裝。（已停用：無法擷取軟體包清單，請檢查您的網路連線） @@ -844,42 +874,42 @@ The installer will quit and all changes will be lost. 密碼不符！ - + Setup Failed 設定失敗 - + Installation Failed 安裝失敗 - + The setup of %1 did not complete successfully. %1 的設定並未成功完成。 - + The installation of %1 did not complete successfully. %1 的安裝並未成功完成。 - + Setup Complete 設定完成 - + Installation Complete 安裝完成 - + The setup of %1 is complete. %1 的設定完成。 - + The installation of %1 is complete. %1 的安裝已完成。 @@ -1476,72 +1506,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space 有至少 %1 GiB 的可用磁碟空間 - + There is not enough drive space. At least %1 GiB is required. 沒有足夠的磁碟空間。至少需要 %1 GiB。 - + has at least %1 GiB working memory 有至少 %1 GiB 的可用記憶體 - + The system does not have enough working memory. At least %1 GiB is required. 系統沒有足夠的記憶體。至少需要 %1 GiB。 - + is plugged in to a power source 已插入外接電源 - + The system is not plugged in to a power source. 系統未插入外接電源。 - + is connected to the Internet 已連上網際網路 - + The system is not connected to the Internet. 系統未連上網際網路 - + is running the installer as an administrator (root) 以管理員 (root) 權限執行安裝程式 - + The setup program is not running with administrator rights. 設定程式並未以管理員權限執行。 - + The installer is not running with administrator rights. 安裝程式並未以管理員權限執行。 - + 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 installer. 螢幕太小了，沒辦法顯示安裝程式。 @@ -1609,7 +1639,7 @@ The installer will quit and all changes will be lost. 請安裝 KDE Konsole 並再試一次！ - + Executing script: &nbsp;<code>%1</code> 正在執行指令稿：&nbsp;<code>%1</code> @@ -1881,98 +1911,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection 軟體包選擇 - + Office software 辦公軟體 - + Office package 辦公套件 - + Browser software 瀏覽器軟體 - + Browser package 瀏覽器套件 - + Web browser 網頁瀏覽器 - + Kernel 內核 - + Services 服務 - + Login 登入 - + Desktop 桌面 - + Applications 應用程式 - + Communication 通訊 - + Development 開發 - + Office 辦公 - + Multimedia 多媒體 - + Internet 網際網路 - + Theming 主題 - + Gaming 遊戲 - + Utilities 實用工具 @@ -3697,12 +3726,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>如果將會有多於一人使用這臺電腦，您可以在安裝後設定多個帳號。</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>如果將會有多於一人使用這臺電腦，您可以在安裝後設定多個帳號。</small> @@ -3710,7 +3739,7 @@ Output: UsersQmlViewStep - + Users 使用者 @@ -4130,102 +4159,102 @@ Output: 該如何稱呼您？ - + Your Full Name 您的全名 - + What name do you want to use to log in? 您想使用何種登入名稱？ - + Login Name 登入名稱 - + If more than one person will use this computer, you can create multiple accounts after installation. 若有多於一個人使用此電腦，您可以在安裝後建立多個帳號。 - + What is the name of this computer? 這部電腦的名字是？ - + Computer Name 電腦名稱 - + This name will be used if you make the computer visible to others on a network. 若您將此電腦設定為讓網路上的其他電腦可見時將會使用此名稱。 - + Choose a password to keep your account safe. 輸入密碼以確保帳號的安全性。 - + Password 密碼 - + Repeat Password 確認密碼 - + 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. 輸入同一個密碼兩次，以檢查輸入錯誤。一個好的密碼包含了字母、數字及標點符號的組合、至少八個字母長，且按一固定週期更換。 - + Validate passwords quality 驗證密碼品質 - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. 當此勾選框被勾選，密碼強度檢查即完成，您也無法再使用弱密碼。 - + Log in automatically without asking for the password 自動登入，無需輸入密碼 - + Reuse user password as root password 重用使用者密碼為 root 密碼 - + Use the same password for the administrator account. 為管理員帳號使用同樣的密碼。 - + Choose a root password to keep your account safe. 選擇 root 密碼來維護您的帳號安全。 - + Root Password Root 密碼 - + Repeat Root Password 確認 Root 密碼 - + Enter the same password twice, so that it can be checked for typing errors. 輸入同樣的密碼兩次，這樣可以檢查輸入錯誤。 From 9230bd1842ea9ad9e6c23b463249cd9efcc41daf Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Fri, 2 Apr 2021 16:32:15 +0200 Subject: [PATCH 310/318] i18n: [desktop] Automatic merge of Transifex translations --- calamares.desktop | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/calamares.desktop b/calamares.desktop index 1f25c1f109..53f32bdcca 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -179,10 +179,10 @@ Name[sq]=Instalo Sistemin Icon[sq]=calamares GenericName[sq]=Instalues Sistemi Comment[sq]=Calamares — Instalues Sistemi -Name[fi_FI]=Asenna Järjestelmä +Name[fi_FI]=Asenna järjestelmä Icon[fi_FI]=calamares -GenericName[fi_FI]=Järjestelmän Asennusohjelma -Comment[fi_FI]=Calamares — Järjestelmän Asentaja +GenericName[fi_FI]=Järjestelmän asennusohjelma +Comment[fi_FI]=Calamares — Järjestelmän asentaja Name[sr@latin]=Instaliraj sistem Name[sr]=Инсталирај систем Icon[sr]=calamares From 3444546159d4d6c0ccdd5baa268a32fda40a02b3 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Fri, 2 Apr 2021 16:32:15 +0200 Subject: [PATCH 311/318] i18n: [python] Automatic merge of Transifex translations --- lang/python.pot | 14 +++++----- lang/python/ar/LC_MESSAGES/python.po | 14 +++++----- lang/python/as/LC_MESSAGES/python.po | 14 +++++----- lang/python/ast/LC_MESSAGES/python.po | 14 +++++----- lang/python/az/LC_MESSAGES/python.po | 14 +++++----- lang/python/az_AZ/LC_MESSAGES/python.po | 14 +++++----- lang/python/be/LC_MESSAGES/python.po | 14 +++++----- lang/python/bg/LC_MESSAGES/python.po | 14 +++++----- lang/python/bn/LC_MESSAGES/python.po | 14 +++++----- lang/python/ca/LC_MESSAGES/python.po | 14 +++++----- lang/python/ca@valencia/LC_MESSAGES/python.po | 14 +++++----- lang/python/cs_CZ/LC_MESSAGES/python.po | 14 +++++----- lang/python/da/LC_MESSAGES/python.po | 14 +++++----- lang/python/de/LC_MESSAGES/python.po | 16 ++++++------ lang/python/el/LC_MESSAGES/python.po | 14 +++++----- lang/python/en_GB/LC_MESSAGES/python.po | 14 +++++----- lang/python/eo/LC_MESSAGES/python.po | 14 +++++----- lang/python/es/LC_MESSAGES/python.po | 14 +++++----- lang/python/es_MX/LC_MESSAGES/python.po | 14 +++++----- lang/python/es_PR/LC_MESSAGES/python.po | 14 +++++----- lang/python/et/LC_MESSAGES/python.po | 14 +++++----- lang/python/eu/LC_MESSAGES/python.po | 14 +++++----- lang/python/fa/LC_MESSAGES/python.po | 14 +++++----- lang/python/fi_FI/LC_MESSAGES/python.po | 26 +++++++++---------- lang/python/fr/LC_MESSAGES/python.po | 14 +++++----- lang/python/fr_CH/LC_MESSAGES/python.po | 14 +++++----- lang/python/fur/LC_MESSAGES/python.po | 14 +++++----- lang/python/gl/LC_MESSAGES/python.po | 14 +++++----- lang/python/gu/LC_MESSAGES/python.po | 14 +++++----- lang/python/he/LC_MESSAGES/python.po | 16 ++++++------ lang/python/hi/LC_MESSAGES/python.po | 14 +++++----- lang/python/hr/LC_MESSAGES/python.po | 14 +++++----- lang/python/hu/LC_MESSAGES/python.po | 14 +++++----- lang/python/id/LC_MESSAGES/python.po | 14 +++++----- lang/python/id_ID/LC_MESSAGES/python.po | 14 +++++----- lang/python/ie/LC_MESSAGES/python.po | 14 +++++----- lang/python/is/LC_MESSAGES/python.po | 14 +++++----- lang/python/it_IT/LC_MESSAGES/python.po | 14 +++++----- lang/python/ja/LC_MESSAGES/python.po | 14 +++++----- lang/python/kk/LC_MESSAGES/python.po | 14 +++++----- lang/python/kn/LC_MESSAGES/python.po | 14 +++++----- lang/python/ko/LC_MESSAGES/python.po | 18 ++++++------- lang/python/lo/LC_MESSAGES/python.po | 14 +++++----- lang/python/lt/LC_MESSAGES/python.po | 14 +++++----- lang/python/lv/LC_MESSAGES/python.po | 14 +++++----- lang/python/mk/LC_MESSAGES/python.po | 14 +++++----- lang/python/ml/LC_MESSAGES/python.po | 14 +++++----- lang/python/mr/LC_MESSAGES/python.po | 14 +++++----- lang/python/nb/LC_MESSAGES/python.po | 14 +++++----- lang/python/ne/LC_MESSAGES/python.po | 14 +++++----- lang/python/ne_NP/LC_MESSAGES/python.po | 14 +++++----- lang/python/nl/LC_MESSAGES/python.po | 14 +++++----- lang/python/pl/LC_MESSAGES/python.po | 14 +++++----- lang/python/pt_BR/LC_MESSAGES/python.po | 14 +++++----- lang/python/pt_PT/LC_MESSAGES/python.po | 14 +++++----- lang/python/ro/LC_MESSAGES/python.po | 14 +++++----- lang/python/ru/LC_MESSAGES/python.po | 14 +++++----- lang/python/si/LC_MESSAGES/python.po | 14 +++++----- lang/python/sk/LC_MESSAGES/python.po | 14 +++++----- lang/python/sl/LC_MESSAGES/python.po | 14 +++++----- lang/python/sq/LC_MESSAGES/python.po | 14 +++++----- lang/python/sr/LC_MESSAGES/python.po | 14 +++++----- lang/python/sr@latin/LC_MESSAGES/python.po | 14 +++++----- lang/python/sv/LC_MESSAGES/python.po | 14 +++++----- lang/python/te/LC_MESSAGES/python.po | 14 +++++----- lang/python/tg/LC_MESSAGES/python.po | 14 +++++----- lang/python/th/LC_MESSAGES/python.po | 14 +++++----- lang/python/tr_TR/LC_MESSAGES/python.po | 14 +++++----- lang/python/uk/LC_MESSAGES/python.po | 14 +++++----- lang/python/ur/LC_MESSAGES/python.po | 14 +++++----- lang/python/uz/LC_MESSAGES/python.po | 14 +++++----- lang/python/vi/LC_MESSAGES/python.po | 14 +++++----- lang/python/zh/LC_MESSAGES/python.po | 14 +++++----- lang/python/zh_CN/LC_MESSAGES/python.po | 14 +++++----- lang/python/zh_TW/LC_MESSAGES/python.po | 14 +++++----- 75 files changed, 535 insertions(+), 535 deletions(-) diff --git a/lang/python.pot b/lang/python.pot index 1345aeb3fc..7b88670663 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,22 +26,22 @@ msgstr "Configure GRUB." msgid "Mounting partitions." msgstr "Mounting partitions." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Configuration Error" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "No partitions are defined for 
{!s}
to use." @@ -213,7 +213,7 @@ msgstr "Configuring mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "No root mount point is given for 
{!s}
to use." diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po index a161e69e1f..e6dbf1b966 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: aboodilankaboot, 2019\n" "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n" @@ -30,22 +30,22 @@ msgstr "" msgid "Mounting partitions." msgstr "جاري تركيب الأقسام" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "خطأ في الضبط" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/as/LC_MESSAGES/python.po b/lang/python/as/LC_MESSAGES/python.po index 9c4a1172c1..234569f18e 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Deep Jyoti Choudhury , 2020\n" "Language-Team: Assamese (https://www.transifex.com/calamares/teams/20061/as/)\n" @@ -29,22 +29,22 @@ msgstr "GRUB কনফিগাৰ কৰক।" msgid "Mounting partitions." msgstr "বিভাজন মাউন্ট্ কৰা।" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "কনফিগাৰেচন ত্ৰুটি" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।" @@ -213,7 +213,7 @@ msgstr "mkinitcpio কনফিগাৰ কৰি আছে।" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "ব্যৱহাৰৰ বাবে 
{!s}
ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।" diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po index ecc658fd0c..61bd860db2 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: enolp , 2020\n" "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -212,7 +212,7 @@ msgstr "Configurando mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po index 9e51b86ace..c0f992eedd 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Xəyyam Qocayev , 2020\n" "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n" @@ -29,22 +29,22 @@ msgstr "GRUB tənzimləmələri" msgid "Mounting partitions." msgstr "Disk bölmələri qoşulur." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Tənzimləmə xətası" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
istifadə etmək üçün bölmələr təyin edilməyib" @@ -220,7 +220,7 @@ msgstr "mkinitcpio tənzimlənir." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po index e261162ead..a62ed8b68e 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Xəyyam Qocayev , 2020\n" "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n" @@ -29,22 +29,22 @@ msgstr "GRUB tənzimləmələri" msgid "Mounting partitions." msgstr "Disk bölmələri qoşulur." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Tənzimləmə xətası" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
istifadə etmək üçün bölmələr təyin edilməyib" @@ -220,7 +220,7 @@ msgstr "mkinitcpio tənzimlənir." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po index 834db9fedb..f6c46cf059 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Źmicier Turok , 2020\n" "Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n" @@ -29,22 +29,22 @@ msgstr "Наладзіць GRUB." msgid "Mounting partitions." msgstr "Мантаванне раздзелаў." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Памылка канфігурацыі" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Раздзелы для 
{!s}
не вызначаныя." @@ -215,7 +215,7 @@ msgstr "Наладка mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Каранёвы пункт мантавання для
{!s}
не пададзены." diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po index fa64c358b6..de59004dac 100644 --- a/lang/python/bg/LC_MESSAGES/python.po +++ b/lang/python/bg/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Georgi Georgiev (Жоро) , 2020\n" "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/bn/LC_MESSAGES/python.po b/lang/python/bn/LC_MESSAGES/python.po index 9c50ff4ddf..934f294582 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 508a8b0ef95404aa3dc5178f0ccada5e_017b8a4 , 2020\n" "Language-Team: Bengali (https://www.transifex.com/calamares/teams/20061/bn/)\n" @@ -29,22 +29,22 @@ msgstr "কনফিগার করুন জিআরইউবি।" msgid "Mounting partitions." msgstr "মাউন্ট করছে পার্টিশনগুলো।" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "কনফিগারেশন ত্রুটি" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
{!এস}
ব্যবহার করার জন্য।" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po index c119de08f6..87643308e3 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Davidmp , 2020\n" "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n" @@ -29,22 +29,22 @@ msgstr "Configura el GRUB." msgid "Mounting partitions." msgstr "Es munten les particions." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Error de configuració" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "No s'han definit particions perquè les usi 
{!s}
." @@ -218,7 +218,7 @@ msgstr "Es configura mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ca@valencia/LC_MESSAGES/python.po b/lang/python/ca@valencia/LC_MESSAGES/python.po index 65b88c1b86..042a7b6a5f 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Raul , 2021\n" "Language-Team: Catalan (Valencian) (https://www.transifex.com/calamares/teams/20061/ca@valencia/)\n" @@ -29,22 +29,22 @@ msgstr "Configura el GRUB" msgid "Mounting partitions." msgstr "S'estan muntant les particions." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "S'ha produït un error en la configuració." -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "No s'han definit particions perquè les use 
{!s}
." @@ -220,7 +220,7 @@ msgstr "S'està configurant mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po index 127e4e82f5..18d8327c09 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Pavel Borecki , 2020\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n" @@ -31,22 +31,22 @@ msgstr "Nastavování zavaděče GRUB." msgid "Mounting partitions." msgstr "Připojování oddílů." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Chyba nastavení" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Pro 
{!s}
nejsou zadány žádné oddíly." @@ -220,7 +220,7 @@ msgstr "Nastavování mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Pro 
{!s}
není zadán žádný přípojný bod." diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po index 42997f18fa..7da9d8ca6c 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: scootergrisen, 2020\n" "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n" @@ -30,22 +30,22 @@ msgstr "Konfigurer GRUB." msgid "Mounting partitions." msgstr "Monterer partitioner." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Fejl ved konfiguration" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Der er ikke angivet nogle partitioner som 
{!s}
kan bruge." @@ -218,7 +218,7 @@ msgstr "Konfigurerer mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po index 725c69d2df..8603688714 100644 --- a/lang/python/de/LC_MESSAGES/python.po +++ b/lang/python/de/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # Adriaan de Groot , 2020 -# Christian Spaan, 2020 +# Gustav Gyges, 2020 # Andreas Eitel , 2020 # #, fuzzy @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Andreas Eitel , 2020\n" "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n" @@ -31,22 +31,22 @@ msgstr "GRUB konfigurieren." msgid "Mounting partitions." msgstr "Hänge Partitionen ein." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Konfigurationsfehler" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Für 
{!s}
sind keine zu verwendenden Partitionen definiert." @@ -222,7 +222,7 @@ msgstr "Konfiguriere mkinitcpio. " #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po index 89a4bec841..1d29a1ae10 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Efstathios Iosifidis , 2017\n" "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po index 25e68de3a1..618f1c1c7a 100644 --- a/lang/python/en_GB/LC_MESSAGES/python.po +++ b/lang/python/en_GB/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Jason Collins , 2018\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po index 71d1598512..278f61970b 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kurt Ankh Phoenix , 2018\n" "Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po index bd8470f0c0..02345b5e70 100644 --- a/lang/python/es/LC_MESSAGES/python.po +++ b/lang/python/es/LC_MESSAGES/python.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Pier Jose Gotta Perez , 2020\n" "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n" @@ -34,22 +34,22 @@ msgstr "Configure GRUB - menú de arranque multisistema -" msgid "Mounting partitions." msgstr "Montando particiones" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Error de configuración" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "No hay definidas particiones en 1{!s}1 para usar." @@ -227,7 +227,7 @@ msgstr "Configurando mkinitcpio - sistema de arranque básico -." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po index 10cb57b525..37171cb0ec 100644 --- a/lang/python/es_MX/LC_MESSAGES/python.po +++ b/lang/python/es_MX/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Logan 8192 , 2018\n" "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n" @@ -30,22 +30,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po index 3906ff2a15..a78dbcabad 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po index dd11cd504b..cc010ec734 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Madis Otenurm, 2019\n" "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po index a8a763cddc..87f335bb69 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Ander Elortondo, 2019\n" "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po index d8eaa23635..14b5d0b5f3 100644 --- a/lang/python/fa/LC_MESSAGES/python.po +++ b/lang/python/fa/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: alireza jamshidi , 2020\n" "Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n" @@ -30,22 +30,22 @@ msgstr "در حال پیکربندی گراب." msgid "Mounting partitions." msgstr "در حال سوار کردن افرازها." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "خطای پیکربندی" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "هیچ افرازی برای استفادهٔ 
{!s}
تعریف نشده." @@ -214,7 +214,7 @@ msgstr "پیکربندی mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ 
{!s}
داده نشده." diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po index 9f4a671f8c..1526d5b45a 100644 --- a/lang/python/fi_FI/LC_MESSAGES/python.po +++ b/lang/python/fi_FI/LC_MESSAGES/python.po @@ -4,16 +4,16 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Kimmo Kujansuu , 2020 +# Kimmo Kujansuu , 2021 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Kimmo Kujansuu , 2020\n" +"Last-Translator: Kimmo Kujansuu , 2021\n" "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,22 +29,22 @@ msgstr "Määritä GRUB." msgid "Mounting partitions." msgstr "Yhdistä osiot." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Määritysvirhe" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Ei ole määritetty käyttämään osioita 
{!s}
." @@ -84,8 +84,8 @@ msgid "" "Unknown systemd commands {command!s} and " "{suffix!s} for unit {name!s}." msgstr "" -"Tuntematon systemd-komennot {command!s} ja " -"{suffix!s} yksikölle {name!s}." +"Tuntematon systemd komento {command!s} ja " +"{suffix!s} laite {name!s}." #: src/modules/umount/main.py:31 msgid "Unmount file systems." @@ -215,7 +215,7 @@ msgstr "Määritetään mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -346,12 +346,12 @@ msgstr "Fstab kirjoittaminen." #: src/modules/dummypython/main.py:35 msgid "Dummy python job." -msgstr "Harjoitus python-työ." +msgstr "Harjoitus python job." #: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93 #: src/modules/dummypython/main.py:94 msgid "Dummy python step {}" -msgstr "Harjoitus python-vaihe {}" +msgstr "Harjoitus python vaihe {}" #: src/modules/localecfg/main.py:30 msgid "Configuring locales." diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po index 6a3db6c8bc..568181c5e2 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Arnaud Ferraris , 2019\n" "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n" @@ -37,22 +37,22 @@ msgstr "Configuration du GRUB." msgid "Mounting partitions." msgstr "Montage des partitions." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Erreur de configuration" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" "Aucune partition n'est définie pour être utilisée par 
{!s}
." @@ -226,7 +226,7 @@ msgstr "Configuration de mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/fr_CH/LC_MESSAGES/python.po b/lang/python/fr_CH/LC_MESSAGES/python.po index 938df68cdc..219e71fd06 100644 --- a/lang/python/fr_CH/LC_MESSAGES/python.po +++ b/lang/python/fr_CH/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: French (Switzerland) (https://www.transifex.com/calamares/teams/20061/fr_CH/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/fur/LC_MESSAGES/python.po b/lang/python/fur/LC_MESSAGES/python.po index c47de86ab5..44eb8b50ed 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Fabio Tomat , 2020\n" "Language-Team: Friulian (https://www.transifex.com/calamares/teams/20061/fur/)\n" @@ -29,22 +29,22 @@ msgstr "Configure GRUB." msgid "Mounting partitions." msgstr "Montaç des partizions." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Erôr di configurazion" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "No je stade definide nissune partizion di doprâ par 
{!s}
." @@ -219,7 +219,7 @@ msgstr "Daûr a configurâ di mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po index 6fd93ff6ea..dd1abe7a53 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Xosé, 2018\n" "Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po index ac7503bf98..588606614f 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po index 2d56896b1a..21cdc6a561 100644 --- a/lang/python/he/LC_MESSAGES/python.po +++ b/lang/python/he/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # Eli Shleifer , 2017 -# Omeritzics Games , 2020 +# Omer I.S. , 2020 # Yaron Shahrabani , 2020 # #, fuzzy @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Yaron Shahrabani , 2020\n" "Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n" @@ -31,22 +31,22 @@ msgstr "הגדרת GRUB." msgid "Mounting partitions." msgstr "מחיצות מעוגנות." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "שגיאת הגדרות" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "לא הוגדרו מחיצות לשימוש של 
{!s}
." @@ -216,7 +216,7 @@ msgstr "mkinitcpio מותקן." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "לא סופקה נקודת עגינת שורש לשימוש של 
{!s}
." diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po index 17548934d3..719a123432 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Panwar108 , 2020\n" "Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n" @@ -29,22 +29,22 @@ msgstr "GRUB विन्यस्त करना।" msgid "Mounting partitions." msgstr "विभाजन माउंट करना।" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "विन्यास त्रुटि" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।" @@ -214,7 +214,7 @@ msgstr "mkinitcpio को विन्यस्त करना।" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po index 20a9c53bde..0ccbd948c3 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Lovro Kudelić , 2020\n" "Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n" @@ -29,22 +29,22 @@ msgstr "Konfigurirajte GRUB." msgid "Mounting partitions." msgstr "Montiranje particija." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Greška konfiguracije" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nema definiranih particija za 
{!s}
korištenje." @@ -217,7 +217,7 @@ msgstr "Konfiguriranje mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po index a4a8ec01fb..1a4034f14b 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Lajos Pasztor , 2019\n" "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n" @@ -32,22 +32,22 @@ msgstr "GRUB konfigurálása." msgid "Mounting partitions." msgstr "Partíciók csatolása." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Konfigurációs hiba" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nincsenek partíciók meghatározva a 
{!s}
használatához." @@ -219,7 +219,7 @@ msgstr "mkinitcpio konfigurálása." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Nincs root csatolási pont megadva a 
{!s}
használatához." diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po index c07ac963cd..5ba45ae051 100644 --- a/lang/python/id/LC_MESSAGES/python.po +++ b/lang/python/id/LC_MESSAGES/python.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Drajat Hasan , 2021\n" "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n" @@ -32,22 +32,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Kesalahan Konfigurasi" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -212,7 +212,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/id_ID/LC_MESSAGES/python.po b/lang/python/id_ID/LC_MESSAGES/python.po index d13214e2c5..1cbcd75199 100644 --- a/lang/python/id_ID/LC_MESSAGES/python.po +++ b/lang/python/id_ID/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Indonesian (Indonesia) (https://www.transifex.com/calamares/teams/20061/id_ID/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ie/LC_MESSAGES/python.po b/lang/python/ie/LC_MESSAGES/python.po index a12ad39053..eb96deb152 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Caarmi, 2020\n" "Language-Team: Interlingue (https://www.transifex.com/calamares/teams/20061/ie/)\n" @@ -29,22 +29,22 @@ msgstr "Configurante GRUB." msgid "Mounting partitions." msgstr "Montente partitiones." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Errore de configuration" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Null partition es definit por usa de 
{!s}
." @@ -211,7 +211,7 @@ msgstr "Configurante mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po index 27baf76572..8a57cabf5f 100644 --- a/lang/python/is/LC_MESSAGES/python.po +++ b/lang/python/is/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kristján Magnússon, 2018\n" "Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po index 0fd943b0d5..1933817ba5 100644 --- a/lang/python/it_IT/LC_MESSAGES/python.po +++ b/lang/python/it_IT/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Saverio , 2020\n" "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n" @@ -31,22 +31,22 @@ msgstr "Configura GRUB." msgid "Mounting partitions." msgstr "Montaggio partizioni." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Errore di Configurazione" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nessuna partizione definita per l'uso con 
{!s}
." @@ -221,7 +221,7 @@ msgstr "Configurazione di mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Nessun punto di mount root è dato in l'uso per 
{!s}
" diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po index bed2831d91..fb22addaf9 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: UTUMI Hirosi , 2020\n" "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n" @@ -31,22 +31,22 @@ msgstr "GRUBを設定にします。" msgid "Mounting partitions." msgstr "パーティションのマウント。" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "コンフィグレーションエラー" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
に使用するパーティションが定義されていません。" @@ -214,7 +214,7 @@ msgstr "mkinitcpioを設定しています。" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr " 
{!s}
を使用するのにルートマウントポイントが与えられていません。" diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po index c9dfa28756..64d0eae02f 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po index 031fb8b703..86580ad77b 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Kannada (https://www.transifex.com/calamares/teams/20061/kn/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po index 66dab263f7..528ae5e3b0 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 , 2020 +# Bruce Lee , 2020 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: JungHee Lee , 2020\n" +"Last-Translator: Bruce Lee , 2020\n" "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,22 +30,22 @@ msgstr "GRUB 구성" msgid "Mounting partitions." msgstr "파티션 마운트 중." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "구성 오류" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "사용할 
{!s}
에 대해 정의된 파티션이 없음." @@ -214,7 +214,7 @@ msgstr "mkinitcpio 구성 중." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "
{!s}
에서 사용할 루트 마운트 지점이 제공되지 않음." diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po index 806ae45326..fdbc1b6ba8 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po index 2414ce45c3..69e5ad171f 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Moo, 2020\n" "Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n" @@ -30,22 +30,22 @@ msgstr "Konfigūruoti GRUB." msgid "Mounting partitions." msgstr "Prijungiami skaidiniai." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Konfigūracijos klaida" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nėra apibrėžta jokių skaidinių, skirtų 
{!s}
naudojimui." @@ -218,7 +218,7 @@ msgstr "Konfigūruojama mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/lv/LC_MESSAGES/python.po b/lang/python/lv/LC_MESSAGES/python.po index 4244d3f241..0c28a383c4 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Latvian (https://www.transifex.com/calamares/teams/20061/lv/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po index 719bec2e04..44307a32b5 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Martin Ristovski , 2018\n" "Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ml/LC_MESSAGES/python.po b/lang/python/ml/LC_MESSAGES/python.po index 869a934c9f..546d72695e 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Balasankar C , 2019\n" "Language-Team: Malayalam (https://www.transifex.com/calamares/teams/20061/ml/)\n" @@ -30,22 +30,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "ക്രമീകരണത്തിൽ പിഴവ്" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po index 496df5d1fb..21677bf5c6 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po index fd1c4d9fb8..153a01d9a4 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\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://www.transifex.com/calamares/teams/20061/nb/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ne/LC_MESSAGES/python.po b/lang/python/ne/LC_MESSAGES/python.po index 3cc33bd071..ef9c472e96 100644 --- a/lang/python/ne/LC_MESSAGES/python.po +++ b/lang/python/ne/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Nepali (https://www.transifex.com/calamares/teams/20061/ne/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po index eabefb956a..7a80aa9b9d 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Nepali (Nepal) (https://www.transifex.com/calamares/teams/20061/ne_NP/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po index 75e43b7bef..69cd3c7dd3 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Adriaan de Groot , 2020\n" "Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n" @@ -30,22 +30,22 @@ msgstr "GRUB instellen." msgid "Mounting partitions." msgstr "Partities mounten." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Configuratiefout" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Geen partities gedefinieerd voor 
{!s}
om te gebruiken." @@ -223,7 +223,7 @@ msgstr "Instellen van mkinitcpio" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po index f6e8c43637..1b899113fd 100644 --- a/lang/python/pl/LC_MESSAGES/python.po +++ b/lang/python/pl/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Piotr Strębski , 2020\n" "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n" @@ -31,22 +31,22 @@ msgstr "Konfiguracja GRUB." msgid "Mounting partitions." msgstr "Montowanie partycji." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Błąd konfiguracji" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -217,7 +217,7 @@ msgstr "Konfigurowanie mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po index 894c1defd4..6803c6287e 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Guilherme, 2020\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n" @@ -30,22 +30,22 @@ msgstr "Configurar GRUB." msgid "Mounting partitions." msgstr "Montando partições." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Erro de Configuração." -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Sem partições definidas para uso por 
{!s}
." @@ -219,7 +219,7 @@ msgstr "Configurando mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po index 6998406929..e3298f22cc 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Hugo Carvalho , 2020\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n" @@ -31,22 +31,22 @@ msgstr "Configurar o GRUB." msgid "Mounting partitions." msgstr "A montar partições." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Erro de configuração" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nenhuma partição está definida para 
{!s}
usar." @@ -222,7 +222,7 @@ msgstr "A configurar o mkintcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Nenhum ponto de montagem root é fornecido para 
{!s}
usar." diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po index 962e340df9..efafa2872b 100644 --- a/lang/python/ro/LC_MESSAGES/python.po +++ b/lang/python/ro/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Sebastian Brici , 2018\n" "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n" @@ -30,22 +30,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po index 39d136eca5..e6ce31f074 100644 --- a/lang/python/ru/LC_MESSAGES/python.po +++ b/lang/python/ru/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: ZIzA, 2020\n" "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n" @@ -30,22 +30,22 @@ msgstr "Настройте GRUB." msgid "Mounting partitions." msgstr "Монтирование разделов." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Ошибка конфигурации" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Не определены разделы для использования 
{!S}
." @@ -211,7 +211,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/si/LC_MESSAGES/python.po b/lang/python/si/LC_MESSAGES/python.po index 2cddc8df4d..a92013b920 100644 --- a/lang/python/si/LC_MESSAGES/python.po +++ b/lang/python/si/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Sinhala (https://www.transifex.com/calamares/teams/20061/si/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po index df3e12fb73..a9f0e12e14 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Dušan Kazik , 2020\n" "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n" @@ -29,22 +29,22 @@ msgstr "Konfigurácia zavádzača GRUB." msgid "Mounting partitions." msgstr "Pripájanie oddielov." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Chyba konfigurácie" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nie sú určené žiadne oddiely na použitie pre 
{!s}
." @@ -213,7 +213,7 @@ msgstr "Konfigurácia mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Nie je zadaný žiadny bod pripojenia na použitie pre 
{!s}
." diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po index c9e2d93fd7..e58838407d 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po index dce2a61161..a0303533e3 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Besnik Bleta , 2020\n" "Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n" @@ -29,22 +29,22 @@ msgstr "Formësoni GRUB-in." msgid "Mounting partitions." msgstr "Po montohen pjesë." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Gabim Formësimi" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "S’ka pjesë të përkufizuara për 
{!s}
për t’u përdorur." @@ -218,7 +218,7 @@ msgstr "Po formësohet mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po index 80deb2340c..f4b5652bff 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Slobodan Simić , 2020\n" "Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n" @@ -29,22 +29,22 @@ msgstr "Подеси ГРУБ" msgid "Mounting partitions." msgstr "Монтирање партиција." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Грешка поставе" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po index af221bf28e..5daee27b29 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po index 26193da007..83330e1bfa 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Luna Jernberg , 2020\n" "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n" @@ -31,22 +31,22 @@ msgstr "Konfigurera GRUB." msgid "Mounting partitions." msgstr "Monterar partitioner." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Konfigurationsfel" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Inga partitioner är definerade för 
{!s}
att använda." @@ -219,7 +219,7 @@ msgstr "Konfigurerar mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/te/LC_MESSAGES/python.po b/lang/python/te/LC_MESSAGES/python.po index fbeb6e9f62..3f334d59dd 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Telugu (https://www.transifex.com/calamares/teams/20061/te/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/tg/LC_MESSAGES/python.po b/lang/python/tg/LC_MESSAGES/python.po index fd7e50aa0e..0cf6d80f78 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Victor Ibragimov , 2020\n" "Language-Team: Tajik (https://www.transifex.com/calamares/teams/20061/tg/)\n" @@ -29,22 +29,22 @@ msgstr "Танзимоти GRUB." msgid "Mounting partitions." msgstr "Васлкунии қисмҳои диск." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Хатои танзимкунӣ" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Ягон қисми диск барои истифодаи 
{!s}
муайян карда нашуд." @@ -219,7 +219,7 @@ msgstr "Танзимкунии mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Нуқтаи васли реша (root) барои истифодаи 
{!s}
дода нашуд." diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po index 62d6347888..876a1f1a5f 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po index 1cd7b3ca47..a576509654 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Demiray Muhterem , 2020\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n" @@ -30,22 +30,22 @@ msgstr "GRUB'u yapılandır." msgid "Mounting partitions." msgstr "Disk bölümlemeleri bağlanıyor." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Yapılandırma Hatası" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
kullanması için hiçbir bölüm tanımlanmadı." @@ -218,7 +218,7 @@ msgstr "Mkinitcpio yapılandırılıyor." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "
{!s}
kullanması için kök bağlama noktası verilmedi." diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po index e925155626..d4cf0b6f84 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Yuri Chornoivan , 2020\n" "Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n" @@ -31,22 +31,22 @@ msgstr "Налаштовування GRUB." msgid "Mounting partitions." msgstr "Монтування розділів." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Помилка налаштовування" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Не визначено розділів для використання 
{!s}
." @@ -224,7 +224,7 @@ msgstr "Налаштовуємо mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po index 73fb106cbf..fa1c761785 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po index cdb117a1ff..a1a9fe88dc 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po index 727c12ae56..7f4fd3b67b 100644 --- a/lang/python/vi/LC_MESSAGES/python.po +++ b/lang/python/vi/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: T. Tran , 2020\n" "Language-Team: Vietnamese (https://www.transifex.com/calamares/teams/20061/vi/)\n" @@ -29,22 +29,22 @@ msgstr "Cấu hình GRUB" msgid "Mounting partitions." msgstr "Đang gắn kết các phân vùng." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Lỗi cấu hình" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Không có phân vùng nào được định nghĩa cho 
{!s}
để dùng." @@ -215,7 +215,7 @@ msgstr "Đang cấu hình mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Không có điểm kết nối gốc cho 
{!s}
để dùng." diff --git a/lang/python/zh/LC_MESSAGES/python.po b/lang/python/zh/LC_MESSAGES/python.po index 797480febb..0ff1233a20 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Chinese (https://www.transifex.com/calamares/teams/20061/zh/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po index bd8cd6074c..ac6d2d50c6 100644 --- a/lang/python/zh_CN/LC_MESSAGES/python.po +++ b/lang/python/zh_CN/LC_MESSAGES/python.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 玉堂白鹤 , 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n" @@ -33,22 +33,22 @@ msgstr "配置 GRUB." msgid "Mounting partitions." msgstr "挂载分区。" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "配置错误" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "没有分配分区给 
{!s}
。" @@ -215,7 +215,7 @@ msgstr "配置 mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr " 未设置 
{!s}
要使用的根挂载点。" diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po index e59cb57003..254d0e1ec8 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: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 黃柏諺 , 2020\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n" @@ -30,22 +30,22 @@ msgstr "設定 GRUB。" msgid "Mounting partitions." msgstr "正在掛載分割區。" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "設定錯誤" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "沒有分割區被定義為 
{!s}
以供使用。" @@ -212,7 +212,7 @@ msgstr "正在設定 mkinitcpio。" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "沒有給定的根掛載點 
{!s}
以供使用。" From adb9f37ccac51be7896724b75f148e33ec04f73d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 12 Apr 2021 17:21:33 +0200 Subject: [PATCH 312/318] [locale] Set *locale* GS key when needed The code path for setting the locale / language automatically emits currentLanguageStatusChanged(), but the code that updates GS connects to currentLanguageCodeChaged(). This was altered in the 3.2.28 release cycle. Since then, automcatic locale selection wasn't setting *locale* in GS, so that a click-through kind of locale selection would not set it; then the packages module has no *locale* setting for localization packages. The combination of status and code signals (machine- and human- readable) is ok. Introduce a setter to the language that does the necessary signalling, so that setting the language automatically also DTRT. FIXES #1671 --- src/modules/locale/Config.cpp | 18 +++++++++++++----- src/modules/locale/Config.h | 2 ++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp index 1417e5b89a..854d65eef9 100644 --- a/src/modules/locale/Config.cpp +++ b/src/modules/locale/Config.cpp @@ -259,8 +259,7 @@ Config::setCurrentLocation( const CalamaresUtils::Locale::TimeZoneData* location auto newLocale = automaticLocaleConfiguration(); if ( !m_selectedLocaleConfiguration.explicit_lang ) { - m_selectedLocaleConfiguration.setLanguage( newLocale.language() ); - emit currentLanguageStatusChanged( currentLanguageStatus() ); + setLanguage( newLocale.language() ); } if ( !m_selectedLocaleConfiguration.explicit_lc ) { @@ -302,11 +301,20 @@ Config::localeConfiguration() const void Config::setLanguageExplicitly( const QString& language ) { - m_selectedLocaleConfiguration.setLanguage( language ); m_selectedLocaleConfiguration.explicit_lang = true; + setLanguage( language ); +} + +void +Config::setLanguage( const QString& language ) +{ + if ( language != m_selectedLocaleConfiguration.language() ) + { + m_selectedLocaleConfiguration.setLanguage( language ); - emit currentLanguageStatusChanged( currentLanguageStatus() ); - emit currentLanguageCodeChanged( currentLanguageCode() ); + emit currentLanguageStatusChanged( currentLanguageStatus() ); + emit currentLanguageCodeChanged( currentLanguageCode() ); + } } void diff --git a/src/modules/locale/Config.h b/src/modules/locale/Config.h index 4383f6bb06..bcdaf0bbfe 100644 --- a/src/modules/locale/Config.h +++ b/src/modules/locale/Config.h @@ -95,6 +95,8 @@ class Config : public QObject } public Q_SLOTS: + /// Set the language, but do not mark it as user-choice + void setLanguage( const QString& language ); /// Set a language by user-choice, overriding future location changes void setLanguageExplicitly( const QString& language ); /// Set LC (formats) by user-choice, overriding future location changes From 2b8309eb04f62d9064a10bec78c542ce596b06b4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 13 Apr 2021 16:01:07 +0200 Subject: [PATCH 313/318] [users] Add tests for autologin settings - four possibilities for old and new keys - 6e is the check for not-actually-set, to track defaults --- src/modules/users/Tests.cpp | 40 ++++++++++++++++++++++ src/modules/users/tests/6a-issue-1672.conf | 7 ++++ src/modules/users/tests/6b-issue-1672.conf | 7 ++++ src/modules/users/tests/6c-issue-1672.conf | 7 ++++ src/modules/users/tests/6d-issue-1672.conf | 7 ++++ src/modules/users/tests/6e-issue-1672.conf | 7 ++++ 6 files changed, 75 insertions(+) create mode 100644 src/modules/users/tests/6a-issue-1672.conf create mode 100644 src/modules/users/tests/6b-issue-1672.conf create mode 100644 src/modules/users/tests/6c-issue-1672.conf create mode 100644 src/modules/users/tests/6d-issue-1672.conf create mode 100644 src/modules/users/tests/6e-issue-1672.conf diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp index 4106cd7855..acb0c9d6de 100644 --- a/src/modules/users/Tests.cpp +++ b/src/modules/users/Tests.cpp @@ -44,6 +44,9 @@ private Q_SLOTS: void testHostActions(); void testPasswordChecks(); void testUserPassword(); + + void testAutoLogin_data(); + void testAutoLogin(); }; UserTests::UserTests() {} @@ -339,6 +342,43 @@ UserTests::testUserPassword() } } +void +UserTests::testAutoLogin_data() +{ + QTest::addColumn< QString >( "filename" ); + QTest::addColumn< bool >( "autoLoginIsSet" ); + QTest::addColumn< QString >( "autoLoginGroupName" ); + + QTest::newRow( "old, old" ) << "tests/6a-issue-1672.conf" << true << "derp"; + QTest::newRow( "old, new" ) << "tests/6b-issue-1672.conf" << true << "derp"; + QTest::newRow( "new, old" ) << "tests/6c-issue-1672.conf" << true << "derp"; + QTest::newRow( "new, new" ) << "tests/6d-issue-1672.conf" << true << "derp"; + QTest::newRow( "default" ) << "tests/6e-issue-1672.conf" << false << QString(); +} + +void +UserTests::testAutoLogin() +{ + QFETCH( QString, filename ); + QFETCH( bool, autoLoginIsSet ); + QFETCH( QString, autoLoginGroupName ); + + // BUILD_AS_TEST is the source-directory path + QFile fi( QString( "%1/%2" ).arg( BUILD_AS_TEST, filename ) ); + QVERIFY( fi.exists() ); + + bool ok = false; + const auto map = CalamaresUtils::loadYaml( fi, &ok ); + QVERIFY( ok ); + QVERIFY( map.count() > 0 ); + + Config c; + c.setConfigurationMap( map ); + + QCOMPARE( c.doAutoLogin(), autoLoginIsSet ); + QCOMPARE( c.autoLoginGroup(), autoLoginGroupName ); +} + QTEST_GUILESS_MAIN( UserTests ) diff --git a/src/modules/users/tests/6a-issue-1672.conf b/src/modules/users/tests/6a-issue-1672.conf new file mode 100644 index 0000000000..b8ba24266d --- /dev/null +++ b/src/modules/users/tests/6a-issue-1672.conf @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +autologinGroup: derp +doAutologin: true + diff --git a/src/modules/users/tests/6b-issue-1672.conf b/src/modules/users/tests/6b-issue-1672.conf new file mode 100644 index 0000000000..a54e71e010 --- /dev/null +++ b/src/modules/users/tests/6b-issue-1672.conf @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +autologinGroup: derp +doAutoLogin: true + diff --git a/src/modules/users/tests/6c-issue-1672.conf b/src/modules/users/tests/6c-issue-1672.conf new file mode 100644 index 0000000000..5d12bd71e3 --- /dev/null +++ b/src/modules/users/tests/6c-issue-1672.conf @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +autoLoginGroup: derp +doAutologin: true + diff --git a/src/modules/users/tests/6d-issue-1672.conf b/src/modules/users/tests/6d-issue-1672.conf new file mode 100644 index 0000000000..80976bf64d --- /dev/null +++ b/src/modules/users/tests/6d-issue-1672.conf @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +autoLoginGroup: derp +doAutoLogin: true + diff --git a/src/modules/users/tests/6e-issue-1672.conf b/src/modules/users/tests/6e-issue-1672.conf new file mode 100644 index 0000000000..df299b4801 --- /dev/null +++ b/src/modules/users/tests/6e-issue-1672.conf @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +doautologin: true +autologingroup: wheel + From 3f1d12ccd85c3df6734f05a6220dc871040c6836 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 13 Apr 2021 15:08:13 +0200 Subject: [PATCH 314/318] [users] One more capitalization fix for autologin FIXES #1672 --- src/modules/users/Config.cpp | 41 ++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp index 2954b03813..6560d06ac3 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp @@ -803,6 +803,29 @@ addPasswordCheck( const QString& key, const QVariant& value, PasswordCheckList& return true; } +/** @brief Returns a value of either key from the map + * + * Takes a function (e.g. getBool, or getString) and two keys, + * returning the value in the map of the one that is there (or @p defaultArg) + */ +template < typename T, typename U > +T +either( T ( *f )( const QVariantMap&, const QString&, U ), + const QVariantMap& configurationMap, + const QString& oldKey, + const QString& newKey, + U defaultArg ) +{ + if ( configurationMap.contains( oldKey ) ) + { + return f( configurationMap, oldKey, defaultArg ); + } + else + { + return f( configurationMap, newKey, defaultArg ); + } +} + void Config::setConfigurationMap( const QVariantMap& configurationMap ) { @@ -814,7 +837,8 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) // Now it might be explicitly set to empty, which is ok setUserShell( shell ); - setAutoLoginGroup( CalamaresUtils::getString( configurationMap, "autoLoginGroup" ) ); + setAutoLoginGroup( either< QString, const QString& >( + CalamaresUtils::getString, configurationMap, "autologinGroup", "autoLoginGroup", QString() ) ); setSudoersGroup( CalamaresUtils::getString( configurationMap, "sudoersGroup" ) ); m_hostNameActions = getHostNameActions( configurationMap ); @@ -823,16 +847,11 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) // Renaming of Autologin -> AutoLogin in 4ffa79d4cf also affected // configuration keys, which was not intended. Accept both. - const auto oldKey = QStringLiteral( "doAutologin" ); - const auto newKey = QStringLiteral( "doAutoLogin" ); - if ( configurationMap.contains( oldKey ) ) - { - m_doAutoLogin = CalamaresUtils::getBool( configurationMap, oldKey, false ); - } - else - { - m_doAutoLogin = CalamaresUtils::getBool( configurationMap, newKey, false ); - } + m_doAutoLogin = either( CalamaresUtils::getBool, + configurationMap, + QStringLiteral( "doAutologin" ), + QStringLiteral( "doAutoLogin" ), + false ); m_writeRootPassword = CalamaresUtils::getBool( configurationMap, "setRootPassword", true ); Calamares::JobQueue::instance()->globalStorage()->insert( "setRootPassword", m_writeRootPassword ); From 5241e25ae8acb57541ba4f92e91fda2ba22efad5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 13 Apr 2021 16:20:46 +0200 Subject: [PATCH 315/318] Changes: pre-release housekeeping --- CHANGES | 9 +++++++++ CMakeLists.txt | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index fb9f13d6bb..eafa05dc68 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,15 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. +# 3.2.39.3 (2021-04-14) # + +A minor bugfix tweak release. Since this contains yet **another** +autologin-related fix, and there is nothing large enough to justify +a 3.2.40 release yet, add it to the growing tail of 3.2.39. (Reported +by Joe Kamprad, #1672). Also fixes a regression from 3.2.28 in +localized packages (e.g. *package-LOCALE* did not work). + + # 3.2.39.2 (2021-04-02) # This is **another** hotfix release for issues around autologin .. diff --git a/CMakeLists.txt b/CMakeLists.txt index 92ea86845a..db775389cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.39.2 + VERSION 3.2.39.3 LANGUAGES C CXX ) From c7b9c11e94ac0132db2245f1685c771329568735 Mon Sep 17 00:00:00 2001 From: hayao Date: Sun, 23 May 2021 22:23:53 +0900 Subject: [PATCH 316/318] New tty config --- data/final-process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/final-process b/data/final-process index 66e1bcbf61..fa5292a511 100644 --- a/data/final-process +++ b/data/final-process @@ -41,7 +41,7 @@ remove /etc/systemd/journald.conf.d/volatile-storage.conf remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf remove /etc/udev/rules.d/81-dhcpcd.rules -remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d} +remove /etc/systemd/system/getty@.service.d if [[ -f /etc/systemd/journald.conf ]]; then sed -i 's/Storage=volatile/#Storage=auto/' /etc/systemd/journald.conf From 91824c63816e0c5c5c5de22058e8dfa43b93131c Mon Sep 17 00:00:00 2001 From: hayao Date: Sun, 23 May 2021 22:42:53 +0900 Subject: [PATCH 317/318] New calamares desktop file --- calamares.desktop | 52 ++++++++++++++++++++++---------------------- calamares.desktop.in | 3 +-- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/calamares.desktop b/calamares.desktop index 73dcbc123d..60cb637eb9 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Type=Application Version=1.0 -Name=Install Alter Linux -GenericName=Alter Linux Installer -Keywords=calamares;alter;linux;installer; +Name=Install System +GenericName=System Installer +Keywords=calamares;system;installer; TryExec=calamares -Comment=Alter Linux Installer - by Calamares -Exec=sh -c "pkexec calamares" +Exec=sh -c "sudo -E calamares" +Comment=Calamares — System Installer Icon=calamares Terminal=false StartupNotify=true @@ -41,22 +41,22 @@ Name[ca]=Instal·la el sistema Icon[ca]=calamares GenericName[ca]=Instal·lador de sistema Comment[ca]=Calamares — Instal·lador de sistema -Name[da]=Installér AlterLinux +Name[da]=Installér system Icon[da]=calamares -GenericName[da]=AlterLinuxinstallationsprogram -Comment[da]=Calamares — AlterLinuxinstallationsprogram -Name[de]=AlterLinux installieren +GenericName[da]=Systeminstallationsprogram +Comment[da]=Calamares — Systeminstallationsprogram +Name[de]=System installieren Icon[de]=calamares -GenericName[de]=Installation des BetriebsAlterLinuxs -Comment[de]=Calamares - Installation des BetriebsAlterLinuxs +GenericName[de]=Installation des Betriebssystems +Comment[de]=Calamares - Installation des Betriebssystems Name[el]=Εγκατάσταση συστήματος Icon[el]=calamares GenericName[el]=Εγκατάσταση συστήματος Comment[el]=Calamares — Εγκατάσταση συστήματος -Name[en_GB]=Install AlterLinux +Name[en_GB]=Install System Icon[en_GB]=calamares -GenericName[en_GB]=AlterLinux Installer -Comment[en_GB]=Calamares — AlterLinux Installer +GenericName[en_GB]=System Installer +Comment[en_GB]=Calamares — System Installer Name[es]=Instalar Sistema Icon[es]=calamares GenericName[es]=Instalador del Sistema @@ -118,10 +118,10 @@ Name[cs_CZ]=Nainstalovat systém Icon[cs_CZ]=calamares GenericName[cs_CZ]=Instalátor systému Comment[cs_CZ]=Calamares – instalátor operačních systémů -Name[ja]=AlterLinuxをインストール +Name[ja]=システムをインストール Icon[ja]=calamares -GenericName[ja]=AlterLinuxインストーラー -Comment[ja]=Calamares — AlterLinuxインストーラー +GenericName[ja]=システムインストーラー +Comment[ja]=Calamares — システムインストーラー Name[ko]=시스템 설치 Icon[ko]=깔라마레스 GenericName[ko]=시스템 설치 관리자 @@ -142,10 +142,10 @@ Name[ml]=സിസ്റ്റം ഇൻസ്റ്റാൾ ചെയ്യു Icon[ml]=കലാമാരേസ് GenericName[ml]=സിസ്റ്റം ഇൻസ്റ്റാളർ Comment[ml]=കലാമാരേസ് - സിസ്റ്റം ഇൻസ്റ്റാളർ -Name[nb]=Installer AlterLinux +Name[nb]=Installer System Icon[nb]=calamares -GenericName[nb]=AlterLinuxinstallatør -Comment[nb]=Calamares-AlterLinuxinstallatør +GenericName[nb]=Systeminstallatør +Comment[nb]=Calamares-systeminstallatør Name[nl]=Installeer systeem Icon[nl]=calamares GenericName[nl]=Installatieprogramma @@ -156,8 +156,8 @@ GenericName[az_AZ]=Sistem quraşdırcısı Comment[az_AZ]=Calamares — Sistem Quraşdırıcısı Name[pl]=Zainstaluj system Icon[pl]=calamares -GenericName[pl]=Instalator AlterLinux -Comment[pl]=Calamares — Instalator AlterLinux +GenericName[pl]=Instalator systemu +Comment[pl]=Calamares — Instalator systemu Name[pt_BR]=Sistema de Instalação Icon[pt_BR]=calamares GenericName[pt_BR]=Instalador de Sistema @@ -188,10 +188,10 @@ Name[sr]=Инсталирај систем Icon[sr]=calamares GenericName[sr]=Инсталатер система Comment[sr]=Каламарес — инсталатер система -Name[sv]=Installera AlterLinux +Name[sv]=Installera system Icon[sv]=calamares -GenericName[sv]=Alter Linux installerare -Comment[sv]=Calamares — Alter Linux installerare +GenericName[sv]=Systeminstallerare +Comment[sv]=Calamares — Systeminstallerare Name[tg]=Насбкунии низом Icon[tg]=calamares GenericName[tg]=Насбкунандаи низомӣ @@ -236,4 +236,4 @@ Comment[pt_PT]=Calamares - Instalador de Sistema Name[tr_TR]=Sistemi Yükle Icon[tr_TR]=calamares GenericName[tr_TR]=Sistem Yükleyici -Comment[tr_TR]=Calamares — Sistem Yükleyici +Comment[tr_TR]=Calamares — Sistem Yükleyici \ No newline at end of file diff --git a/calamares.desktop.in b/calamares.desktop.in index ed1d4def86..3f969853b3 100644 --- a/calamares.desktop.in +++ b/calamares.desktop.in @@ -5,11 +5,10 @@ Name=Install System GenericName=System Installer Keywords=calamares;system;installer; TryExec=calamares -Exec=sh -c "pkexec calamares" +Exec=sh -c "sudo -E calamares" Comment=Calamares — System Installer Icon=calamares Terminal=false StartupNotify=true Categories=Qt;System; X-AppStream-Ignore=true - From fa75b065e7fb67fc5673b170db72410cc8276f45 Mon Sep 17 00:00:00 2001 From: hayao Date: Sun, 23 May 2021 22:46:23 +0900 Subject: [PATCH 318/318] Latest final-process (from share module) --- data/calamares.desktop | 92 ++++++++++++++++++++++++++++-------------- data/final-process | 67 ++++++++++++++++++------------ 2 files changed, 103 insertions(+), 56 deletions(-) diff --git a/data/calamares.desktop b/data/calamares.desktop index ca84b5be38..60cb637eb9 100644 --- a/data/calamares.desktop +++ b/data/calamares.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Type=Application Version=1.0 -Name=Install Alter Linux -GenericName=Alter Linux Installer -Keywords=calamares;alter;linux;installer; +Name=Install System +GenericName=System Installer +Keywords=calamares;system;installer; TryExec=calamares -Exec=pkexec /usr/bin/calamares -Comment=Alter Linux Installer - by Calamares +Exec=sh -c "sudo -E calamares" +Comment=Calamares — System Installer Icon=calamares Terminal=false StartupNotify=true @@ -21,6 +21,10 @@ Name[as]=চিছটেম ইনস্তল কৰক Icon[as]=কেলামাৰেচ GenericName[as]=চিছটেম ইনস্তলাৰ Comment[as]=কেলামাৰেচ — চিছটেম​ ইনস্তলাৰ +Name[az]=Sistemi Quraşdırmaq +Icon[az]=calamares +GenericName[az]=Sistem Quraşdırıcısı +Comment[az]=Calamares Sistem Quraşdırıcısı Name[be]=Усталяваць сістэму Icon[be]=calamares GenericName[be]=Усталёўшчык сістэмы @@ -29,26 +33,30 @@ Name[bg]=Инсталирай системата Icon[bg]=calamares GenericName[bg]=Системен Инсталатор Comment[bg]=Calamares — Системен Инсталатор +Name[bn]=সিস্টেম ইনস্টল করুন +Icon[bn]=ক্যালামারেস +GenericName[bn]=সিস্টেম ইনস্টলার +Comment[bn]=ক্যালামারেস - সিস্টেম ইনস্টলার Name[ca]=Instal·la el sistema Icon[ca]=calamares GenericName[ca]=Instal·lador de sistema Comment[ca]=Calamares — Instal·lador de sistema -Name[da]=Installér AlterLinux +Name[da]=Installér system Icon[da]=calamares -GenericName[da]=AlterLinuxinstallationsprogram -Comment[da]=Calamares — AlterLinuxinstallationsprogram -Name[de]=AlterLinux installieren +GenericName[da]=Systeminstallationsprogram +Comment[da]=Calamares — Systeminstallationsprogram +Name[de]=System installieren Icon[de]=calamares -GenericName[de]=Installation des BetriebsAlterLinuxs -Comment[de]=Calamares - Installation des BetriebsAlterLinuxs +GenericName[de]=Installation des Betriebssystems +Comment[de]=Calamares - Installation des Betriebssystems Name[el]=Εγκατάσταση συστήματος Icon[el]=calamares GenericName[el]=Εγκατάσταση συστήματος Comment[el]=Calamares — Εγκατάσταση συστήματος -Name[en_GB]=Install AlterLinux +Name[en_GB]=Install System Icon[en_GB]=calamares -GenericName[en_GB]=AlterLinux Installer -Comment[en_GB]=Calamares — AlterLinux Installer +GenericName[en_GB]=System Installer +Comment[en_GB]=Calamares — System Installer Name[es]=Instalar Sistema Icon[es]=calamares GenericName[es]=Instalador del Sistema @@ -61,11 +69,19 @@ Name[eu]=Sistema instalatu Icon[eu]=calamares GenericName[eu]=Sistema instalatzailea Comment[eu]=Calamares - sistema instalatzailea +Name[fa]=نصب سامانه +Icon[fa]=کالامارس +GenericName[fa]=نصب‌کنندهٔ سامانه +Comment[fa]=کالامارس — نصب‌کنندهٔ سامانه Name[es_PR]=Instalar el sistema Name[fr]=Installer le système Icon[fr]=calamares GenericName[fr]=Installateur système Comment[fr]=Calamares - Installateur système +Name[fur]=Instale il sisteme +Icon[fur]=calamares +GenericName[fur]=Program di instalazion dal sisteme +Comment[fur]=Calamares — Program di instalazion dal sisteme Name[gl]=Instalación do Sistema Icon[gl]=calamares GenericName[gl]=Instalador de sistemas @@ -82,6 +98,10 @@ Name[hr]=Instaliraj sustav Icon[hr]=calamares GenericName[hr]=Instalacija sustava Comment[hr]=Calamares — Instalacija sustava +Name[ie]=Installar li sistema +Icon[ie]=calamares +GenericName[ie]=Installator del sistema +Comment[ie]=Calamares — Installator del sistema Name[hu]=Rendszer telepítése Icon[hu]=calamares GenericName[hu]=Rendszertelepítő @@ -98,10 +118,10 @@ Name[cs_CZ]=Nainstalovat systém Icon[cs_CZ]=calamares GenericName[cs_CZ]=Instalátor systému Comment[cs_CZ]=Calamares – instalátor operačních systémů -Name[ja]=AlterLinuxをインストール +Name[ja]=システムをインストール Icon[ja]=calamares -GenericName[ja]=AlterLinuxインストーラー -Comment[ja]=Calamares — AlterLinuxインストーラー +GenericName[ja]=システムインストーラー +Comment[ja]=Calamares — システムインストーラー Name[ko]=시스템 설치 Icon[ko]=깔라마레스 GenericName[ko]=시스템 설치 관리자 @@ -122,18 +142,22 @@ Name[ml]=സിസ്റ്റം ഇൻസ്റ്റാൾ ചെയ്യു Icon[ml]=കലാമാരേസ് GenericName[ml]=സിസ്റ്റം ഇൻസ്റ്റാളർ Comment[ml]=കലാമാരേസ് - സിസ്റ്റം ഇൻസ്റ്റാളർ -Name[nb]=Installer AlterLinux +Name[nb]=Installer System Icon[nb]=calamares -GenericName[nb]=AlterLinuxinstallatør -Comment[nb]=Calamares-AlterLinuxinstallatør +GenericName[nb]=Systeminstallatør +Comment[nb]=Calamares-systeminstallatør Name[nl]=Installeer systeem Icon[nl]=calamares GenericName[nl]=Installatieprogramma Comment[nl]=Calamares — Installatieprogramma -Name[pl]=Zainstaluj AlterLinux +Name[az_AZ]=Sistemi quraşdırmaq +Icon[az_AZ]=calamares +GenericName[az_AZ]=Sistem quraşdırcısı +Comment[az_AZ]=Calamares — Sistem Quraşdırıcısı +Name[pl]=Zainstaluj system Icon[pl]=calamares -GenericName[pl]=Instalator AlterLinux -Comment[pl]=Calamares — Instalator AlterLinux +GenericName[pl]=Instalator systemu +Comment[pl]=Calamares — Instalator systemu Name[pt_BR]=Sistema de Instalação Icon[pt_BR]=calamares GenericName[pt_BR]=Instalador de Sistema @@ -155,24 +179,32 @@ Name[sq]=Instalo Sistemin Icon[sq]=calamares GenericName[sq]=Instalues Sistemi Comment[sq]=Calamares — Instalues Sistemi -Name[fi_FI]=Asenna Järjestelmä +Name[fi_FI]=Asenna järjestelmä Icon[fi_FI]=calamares -GenericName[fi_FI]=Järjestelmän Asennusohjelma -Comment[fi_FI]=Calamares — Järjestelmän Asentaja +GenericName[fi_FI]=Järjestelmän asennusohjelma +Comment[fi_FI]=Calamares — Järjestelmän asentaja Name[sr@latin]=Instaliraj sistem Name[sr]=Инсталирај систем Icon[sr]=calamares GenericName[sr]=Инсталатер система Comment[sr]=Каламарес — инсталатер система -Name[sv]=Installera AlterLinux +Name[sv]=Installera system Icon[sv]=calamares -GenericName[sv]=AlterLinuxinstallerare -Comment[sv]=Calamares — AlterLinuxinstallerare +GenericName[sv]=Systeminstallerare +Comment[sv]=Calamares — Systeminstallerare +Name[tg]=Насбкунии низом +Icon[tg]=calamares +GenericName[tg]=Насбкунандаи низомӣ +Comment[tg]=Calamares — Насбкунандаи низомӣ Name[th]=ติดตั้งระบบ Name[uk]=Встановити Систему Icon[uk]=calamares GenericName[uk]=Встановлювач системи Comment[uk]=Calamares - Встановлювач системи +Name[vi]=Cài đặt hệ thống +Icon[vi]=calamares +GenericName[vi]=Bộ cài đặt hệ thống +Comment[vi]=Calamares — Bộ cài đặt hệ thống Name[zh_CN]=安装系统 Icon[zh_CN]=calamares GenericName[zh_CN]=系统安装程序 @@ -204,4 +236,4 @@ Comment[pt_PT]=Calamares - Instalador de Sistema Name[tr_TR]=Sistemi Yükle Icon[tr_TR]=calamares GenericName[tr_TR]=Sistem Yükleyici -Comment[tr_TR]=Calamares — Sistem Yükleyici +Comment[tr_TR]=Calamares — Sistem Yükleyici \ No newline at end of file diff --git a/data/final-process b/data/final-process index fa5292a511..5ef897bd71 100644 --- a/data/final-process +++ b/data/final-process @@ -1,16 +1,12 @@ #!/usr/bin/env bash +set -e + +script_path="$( cd -P "$( dirname "$(readlink -f "${0}")" )" && pwd )" +script_name="$(basename "$(realpath "${0}")")" + function remove () { - local list - local file - list=($(echo "$@")) - for file in "${list[@]}"; do - if [[ -f ${file} ]]; then - rm -f "${file}" - elif [[ -d ${file} ]]; then - rm -rf "${file}" - fi - done + rm -rf "${@}" } while getopts 'u:' arg; do @@ -19,35 +15,54 @@ while getopts 'u:' arg; do esac done +function remove_user_file(){ + remove "/etc/skel/${@}" + remove "/home/${user}/${@}" +} + + remove /etc/skel/Desktop -remove /etc/skel/.config/gtk-3.0/bookmarks -remove /home/${user}/Desktop/calamares.desktop -remove /root/Desktop/calamares.desktop -remove /home/${user}/.config/gtk-3.0/bookmarks remove /usr/share/calamares/ +remove_user_file "Desktop/calamares.desktop" +remove_user_file ".config/gtk-3.0/bookmarks" + + remove /etc/polkit-1/rules.d/01-nopasswork.rules # Delete unnecessary files of archiso. -# See the following site for details. -# https://wiki.archlinux.jp/index.php/Archiso#Chroot_.E3.81.A8.E3.83.99.E3.83.BC.E3.82.B9.E3.82.B7.E3.82.B9.E3.83.86.E3.83.A0.E3.81.AE.E8.A8.AD.E5.AE.9A - -remove /etc/systemd/system/getty@tty1.service.d/autologin.conf remove /root/.automated_script.sh remove /etc/mkinitcpio-archiso.conf remove /etc/initcpio +# Delete systemd files remove /etc/systemd/journald.conf.d/volatile-storage.conf -remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf - -remove /etc/udev/rules.d/81-dhcpcd.rules remove /etc/systemd/system/getty@.service.d +remove /etc/systemd/system/alteriso-reflector.service -if [[ -f /etc/systemd/journald.conf ]]; then - sed -i 's/Storage=volatile/#Storage=auto/' /etc/systemd/journald.conf -fi - -# Disabled auto login +# Disabled auto login for LightDM if [[ -f "/etc/lightdm/lightdm.conf" ]]; then sed -i "s/^autologin/#autologin/g" "/etc/lightdm/lightdm.conf" fi +remove "/etc/lightdm/lightdm.conf.d/02-autologin-"* + +# Disabled auto login for GDM +if [[ -f "/etc/gdm/custom.conf" ]]; then + sed -i "s/Automatic*/#Automatic/g" "/etc/gdm/custom.conf" +fi + +# Remove dconf for live environment +remove "/etc/dconf/db/local.d/02-disable-lock" +remove "/etc/dconf/db/local.d/02-live-"* + +# Update system datebase +if type dconf > /dev/null 2>&1 ; then + dconf update +fi + +# 追加のスクリプトを実行 +if [[ -d "${script_path}/${script_name}.d/" ]]; then + for extra_script in "${script_path}/${script_name}.d/"*; do + bash -c "${extra_script} ${user}" + done +fi