From f8db15adc49c13fb6cf89cabb1ce5f3a4c255d15 Mon Sep 17 00:00:00 2001 From: Vitor Lopes Date: Sun, 21 Jun 2020 17:24:29 +0100 Subject: [PATCH 01/30] add pamac support --- src/modules/packages/main.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index 3e29d72e1..6d81f9fe4 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -309,6 +309,24 @@ class PMPacman(PackageManager): def update_system(self): check_target_env_call(["pacman", "-Su", "--noconfirm"]) + + +class PMPamac(PackageManager): + backend = "pamac" + + def install(self, pkgs, from_local=False): + pamac_flags = "install" + + check_target_env_call([backend, pamac_flags + pkgs) + + def remove(self, pkgs): + check_target_env_call([backend, "remove"] + pkgs) + + def update_db(self): + check_target_env_call([backend, "update"]) + + def update_system(self): + check_target_env_call([backend, "upgrade"]) class PMPortage(PackageManager): From 75bba349bed99b1b65cad8079c4c22afd185060f Mon Sep 17 00:00:00 2001 From: Vitor Lopes Date: Sun, 21 Jun 2020 18:03:21 +0100 Subject: [PATCH 02/30] Update main.py --- src/modules/packages/main.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index 6d81f9fe4..633cb3a0f 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -313,20 +313,31 @@ class PMPacman(PackageManager): class PMPamac(PackageManager): backend = "pamac" + + def check_db_lock(self, lock="/var/lib/pacman/db.lck"): + # In case some error or crash, the database will be locked, + # resulting in remaining packages not being installed. + import os + if os.path.exists(lock): + check_target_env_call(["rm", lock) def install(self, pkgs, from_local=False): + self.check_db_lock() pamac_flags = "install" - check_target_env_call([backend, pamac_flags + pkgs) + check_target_env_call([backend, pamac_flags, "--no-confirm"] + pkgs) def remove(self, pkgs): - check_target_env_call([backend, "remove"] + pkgs) + self.check_db_lock() + check_target_env_call([backend, "remove", "--no-confirm"] + pkgs) def update_db(self): - check_target_env_call([backend, "update"]) + self.check_db_lock() + check_target_env_call([backend, "update", "--no-confirm"]) def update_system(self): - check_target_env_call([backend, "upgrade"]) + self.check_db_lock() + check_target_env_call([backend, "upgrade", "--no-confirm"]) class PMPortage(PackageManager): From 5bb49e252d1f15555befa7aba6724744e5488cce Mon Sep 17 00:00:00 2001 From: Vitor Lopes Date: Sun, 21 Jun 2020 18:28:17 +0100 Subject: [PATCH 03/30] Update main.py --- src/modules/packages/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index 633cb3a0f..1f4cef986 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -319,7 +319,7 @@ class PMPamac(PackageManager): # resulting in remaining packages not being installed. import os if os.path.exists(lock): - check_target_env_call(["rm", lock) + check_target_env_call(["rm", lock]) def install(self, pkgs, from_local=False): self.check_db_lock() From ddfd12019772929f8641645cd8368079263b30c8 Mon Sep 17 00:00:00 2001 From: Vitor Lopes Date: Sun, 21 Jun 2020 23:43:31 +0100 Subject: [PATCH 04/30] add missing self --- src/modules/packages/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index 1f4cef986..f2fd135a4 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -325,19 +325,19 @@ class PMPamac(PackageManager): self.check_db_lock() pamac_flags = "install" - check_target_env_call([backend, pamac_flags, "--no-confirm"] + pkgs) + check_target_env_call([self.backend, pamac_flags, "--no-confirm"] + pkgs) def remove(self, pkgs): self.check_db_lock() - check_target_env_call([backend, "remove", "--no-confirm"] + pkgs) + check_target_env_call([self.backend, "remove", "--no-confirm"] + pkgs) def update_db(self): self.check_db_lock() - check_target_env_call([backend, "update", "--no-confirm"]) + check_target_env_call([self.backend, "update", "--no-confirm"]) def update_system(self): self.check_db_lock() - check_target_env_call([backend, "upgrade", "--no-confirm"]) + check_target_env_call([self.backend, "upgrade", "--no-confirm"]) class PMPortage(PackageManager): From 976150bc1e86ce0f033771bbd52e945910aaa4a9 Mon Sep 17 00:00:00 2001 From: Vitor Lopes Date: Mon, 22 Jun 2020 00:12:02 +0100 Subject: [PATCH 05/30] simplify install code --- src/modules/packages/main.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index f2fd135a4..b2000ab14 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -322,10 +322,8 @@ class PMPamac(PackageManager): check_target_env_call(["rm", lock]) def install(self, pkgs, from_local=False): - self.check_db_lock() - pamac_flags = "install" - - check_target_env_call([self.backend, pamac_flags, "--no-confirm"] + pkgs) + self.check_db_lock() + check_target_env_call([self.backend, "install", "--no-confirm"] + pkgs) def remove(self, pkgs): self.check_db_lock() From d78cbfc6446a5934abf9017b3f9929a739700afb Mon Sep 17 00:00:00 2001 From: Vitor Lopes Date: Sun, 5 Jul 2020 08:18:38 +0100 Subject: [PATCH 06/30] update example configurations and schema --- src/modules/packages/packages.conf | 1 + src/modules/packages/packages.schema.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/src/modules/packages/packages.conf b/src/modules/packages/packages.conf index bcf313972..738117ea4 100644 --- a/src/modules/packages/packages.conf +++ b/src/modules/packages/packages.conf @@ -11,6 +11,7 @@ # - urpmi - Mandriva package manager # - yum - Yum RPM frontend # - zypp - Zypp RPM frontend +# - pamac - Manjaro package manager # # Not actually a package manager, but suitable for testing: # - dummy - Dummy manager, only logs diff --git a/src/modules/packages/packages.schema.yaml b/src/modules/packages/packages.schema.yaml index 40f82bb35..cdb2fefdf 100644 --- a/src/modules/packages/packages.schema.yaml +++ b/src/modules/packages/packages.schema.yaml @@ -17,6 +17,7 @@ properties: - urpmi - yum - zypp + - pamac - dummy update_db: { type: boolean, default: true } From e29462bc05c08a18d37dd4addcf0be189eef0103 Mon Sep 17 00:00:00 2001 From: Vitor Lopes Date: Sun, 5 Jul 2020 08:35:52 +0100 Subject: [PATCH 07/30] [pamac] rework db_lock --- src/modules/packages/main.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index b2000ab14..b1a94697e 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -309,32 +309,30 @@ class PMPacman(PackageManager): def update_system(self): check_target_env_call(["pacman", "-Su", "--noconfirm"]) - - + + class PMPamac(PackageManager): backend = "pamac" - - def check_db_lock(self, lock="/var/lib/pacman/db.lck"): + + def del_db_lock(self, lock="/var/lib/pacman/db.lck"): # In case some error or crash, the database will be locked, # resulting in remaining packages not being installed. - import os - if os.path.exists(lock): - check_target_env_call(["rm", lock]) + check_target_env_call(["rm", "-f", lock]) def install(self, pkgs, from_local=False): - self.check_db_lock() + self.del_db_lock() check_target_env_call([self.backend, "install", "--no-confirm"] + pkgs) def remove(self, pkgs): - self.check_db_lock() + self.del_db_lock() check_target_env_call([self.backend, "remove", "--no-confirm"] + pkgs) def update_db(self): - self.check_db_lock() + self.del_db_lock() check_target_env_call([self.backend, "update", "--no-confirm"]) def update_system(self): - self.check_db_lock() + self.del_db_lock() check_target_env_call([self.backend, "upgrade", "--no-confirm"]) From c16866fb885f98d047f208b916e14833733e293d Mon Sep 17 00:00:00 2001 From: Vitor Lopes Date: Sun, 5 Jul 2020 08:37:28 +0100 Subject: [PATCH 08/30] pep8 302 --- src/modules/packages/main.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index b1a94697e..4f746dccc 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -178,6 +178,7 @@ class PMPackageKit(PackageManager): def update_system(self): check_target_env_call(["pkcon", "-py", "update"]) + class PMZypp(PackageManager): backend = "zypp" @@ -198,6 +199,7 @@ class PMZypp(PackageManager): # Doesn't need to update the system explicitly pass + class PMYum(PackageManager): backend = "yum" @@ -215,6 +217,7 @@ class PMYum(PackageManager): def update_system(self): check_target_env_call(["yum", "-y", "upgrade"]) + class PMDnf(PackageManager): backend = "dnf" @@ -274,6 +277,7 @@ class PMApt(PackageManager): # Doesn't need to update the system explicitly pass + class PMXbps(PackageManager): backend = "xbps" @@ -289,6 +293,7 @@ class PMXbps(PackageManager): def update_system(self): check_target_env_call(["xbps", "-Suy"]) + class PMPacman(PackageManager): backend = "pacman" From 43ebcf8b616d408dec01b704d362a6533eab8bef Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Jul 2020 13:48:07 +0200 Subject: [PATCH 09/30] [packages] Keep package-manager list alphabetized --- src/modules/packages/packages.conf | 2 +- src/modules/packages/packages.schema.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/packages/packages.conf b/src/modules/packages/packages.conf index 738117ea4..df477e6e9 100644 --- a/src/modules/packages/packages.conf +++ b/src/modules/packages/packages.conf @@ -7,11 +7,11 @@ # - entropy - Sabayon package manager # - packagekit - PackageKit CLI tool # - pacman - Pacman +# - pamac - Manjaro package manager # - portage - Gentoo package manager # - urpmi - Mandriva package manager # - yum - Yum RPM frontend # - zypp - Zypp RPM frontend -# - pamac - Manjaro package manager # # Not actually a package manager, but suitable for testing: # - dummy - Dummy manager, only logs diff --git a/src/modules/packages/packages.schema.yaml b/src/modules/packages/packages.schema.yaml index cdb2fefdf..ea0addd10 100644 --- a/src/modules/packages/packages.schema.yaml +++ b/src/modules/packages/packages.schema.yaml @@ -13,11 +13,11 @@ properties: - entropy - packagekit - pacman + - pamac - portage - urpmi - yum - zypp - - pamac - dummy update_db: { type: boolean, default: true } From 14fbfa72d34fc7294e17fb6891858aaf9593906b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Jul 2020 13:48:21 +0200 Subject: [PATCH 10/30] Changes: new contributions --- CHANGES | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 49e020363..594fd844c 100644 --- a/CHANGES +++ b/CHANGES @@ -6,13 +6,18 @@ website will have to do for older versions. # 3.2.27 (unreleased) # This release contains contributions from (alphabetically by first name): - - No external contributors yet + - Gaël PORTAY + - Vitor Lopes (new! welcome!) ## Core ## - - No core changes yet + - QML modules with no surrounding navigation -- this is basically a + special case for full-screen Calamares -- now have margins suitable + for full-screen use. + - PythonQt modules are increasingly on the way out. ## Modules ## - - No module changes yet + - The Manjaro package manager *pamac* has been added to those supported by + the *packages* module. # 3.2.26.1 (2020-06-23) # From 37ce49b00167a662f4b29e0154ca7945b0cbf8b4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Jul 2020 14:11:16 +0200 Subject: [PATCH 11/30] CMake: stop overwriting branding settings in the build dir - Only copy over branding files if they are newer Typically I have KDevelop open while working on Calamares; if I am editing settings in `branding.desc` in the build directory, then every time KDevelop runs CMake in the background, my changes (for testing branding things!) would be overwritten. Don't do that. For normal builds with a clean build directory, this doesn't change anything since the target is missing; changing a file in the source directory **will** copy it over the build directory version. --- CMakeModules/CalamaresAddBrandingSubdirectory.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeModules/CalamaresAddBrandingSubdirectory.cmake b/CMakeModules/CalamaresAddBrandingSubdirectory.cmake index 9283b48a7..70fcd9279 100644 --- a/CMakeModules/CalamaresAddBrandingSubdirectory.cmake +++ b/CMakeModules/CalamaresAddBrandingSubdirectory.cmake @@ -70,7 +70,11 @@ function( calamares_add_branding NAME ) foreach( BRANDING_COMPONENT_FILE ${BRANDING_COMPONENT_FILES} ) set( _subpath ${_brand_dir}/${BRANDING_COMPONENT_FILE} ) if( NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_subpath} ) - configure_file( ${_subpath} ${_subpath} COPYONLY ) + set( _src ${CMAKE_CURRENT_SOURCE_DIR}/${_subpath} ) + set( _dst ${CMAKE_CURRENT_BINARY_DIR}/${_subpath} ) + if( ${_src} IS_NEWER_THAN ${_dst} ) + configure_file( ${_src} ${_dst} COPYONLY ) + endif() install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_subpath} DESTINATION ${BRANDING_COMPONENT_DESTINATION}/${_subdir}/ ) From 67aa34c4a45cabf223e2f358a474f3a282d45a56 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Jul 2020 14:13:49 +0200 Subject: [PATCH 12/30] [calamares] Center the progress texts --- src/calamares/calamares-sidebar.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/calamares/calamares-sidebar.qml b/src/calamares/calamares-sidebar.qml index 183a9acb2..ee75c22c8 100644 --- a/src/calamares/calamares-sidebar.qml +++ b/src/calamares/calamares-sidebar.qml @@ -35,6 +35,7 @@ Rectangle { Text { anchors.verticalCenter: parent.verticalCenter; + anchors.horizontalCenter: parent.horizontalCenter; x: parent.x + 12; color: Branding.styleString( index == ViewManager.currentStepIndex ? Branding.SidebarTextSelect : Branding.SidebarText ); text: display; From 631923abf8c06289139895dbae96b07a547b550e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Jul 2020 15:12:50 +0200 Subject: [PATCH 13/30] [libcalamares] Console-logging follows -D flag exactly - Don't always log LOGEXTRA and below. --- src/libcalamares/utils/Logger.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp index 494b88659..f4ff6af3c 100644 --- a/src/libcalamares/utils/Logger.cpp +++ b/src/libcalamares/utils/Logger.cpp @@ -1,5 +1,5 @@ /* === This file is part of Calamares - === - * + * * SPDX-FileCopyrightText: 2010-2011 Christian Muehlhaeuser * SPDX-FileCopyrightText: 2014 Teo Mrnjavac * SPDX-FileCopyrightText: 2017 Adriaan de Groot @@ -95,7 +95,7 @@ log( const char* msg, unsigned int debugLevel ) logfile.flush(); } - if ( debugLevel <= LOGEXTRA || debugLevel < s_threshold ) + if ( logLevelEnabled(debugLevel) ) { QMutexLocker lock( &s_mutex ); From 3565b6806af4c578945322e44336adf3cce8e3f0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Jul 2020 15:25:25 +0200 Subject: [PATCH 14/30] [libcalamares] Massage the logger output - continuations, for the console, no longer print the date + level, which makes things easier to visually group and read. - the file log is mostly unchanged, except it contains more spaces now. --- src/libcalamares/utils/Logger.cpp | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp index f4ff6af3c..72885d53f 100644 --- a/src/libcalamares/utils/Logger.cpp +++ b/src/libcalamares/utils/Logger.cpp @@ -50,7 +50,7 @@ static unsigned int s_threshold = static QMutex s_mutex; static const char s_Continuation[] = "\n "; -static const char s_SubEntry[] = " .. "; +static const char s_SubEntry[] = " .. "; namespace Logger @@ -79,7 +79,7 @@ logLevel() } static void -log( const char* msg, unsigned int debugLevel ) +log( const char* msg, unsigned int debugLevel, bool withTime = true ) { if ( true ) { @@ -95,13 +95,15 @@ log( const char* msg, unsigned int debugLevel ) logfile.flush(); } - if ( logLevelEnabled(debugLevel) ) + if ( logLevelEnabled( debugLevel ) ) { QMutexLocker lock( &s_mutex ); - - std::cout << QTime::currentTime().toString().toUtf8().data() << " [" - << QString::number( debugLevel ).toUtf8().data() << "]: " << msg << std::endl; - std::cout.flush(); + if ( withTime ) + { + std::cout << QTime::currentTime().toString().toUtf8().data() << " [" + << QString::number( debugLevel ).toUtf8().data() << "]: "; + } + std::cout << msg << std::endl; } } @@ -199,12 +201,15 @@ CDebug::CDebug( unsigned int debugLevel, const char* func ) CDebug::~CDebug() { - if ( m_funcinfo ) + if ( logLevelEnabled( m_debugLevel ) ) { - m_msg.prepend( s_Continuation ); // Prepending, so back-to-front - m_msg.prepend( m_funcinfo ); + if ( m_funcinfo ) + { + m_msg.prepend( s_Continuation ); // Prepending, so back-to-front + m_msg.prepend( m_funcinfo ); + } + log( m_msg.toUtf8().data(), m_debugLevel, m_funcinfo ); } - log( m_msg.toUtf8().data(), m_debugLevel ); } constexpr FuncSuppressor::FuncSuppressor( const char s[] ) From 2b2a69631fb73ed6585f0f8696e85c8f5e79ff0b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Jul 2020 15:29:13 +0200 Subject: [PATCH 15/30] [libcalamaresui] Suggestions for better naming of enum values --- src/libcalamaresui/Branding.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index e84e23680..764845fec 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -83,7 +83,9 @@ public: SidebarBackground, SidebarText, SidebarTextSelect, - SidebarTextHighlight + SidebarTextSelected = SidebarTextSelect, // TODO:3.3:Remove SidebarTextSelect + SidebarTextHighlight, + SidebarBackgroundSelected = SidebarTextHighlight // TODO:3.3:Remove SidebarTextHighlight }; Q_ENUM( StyleEntry ) From a78c3683679fef38658a04f2a489ad9635867495 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Jul 2020 16:11:18 +0200 Subject: [PATCH 16/30] [calamares] Tweak default QML sidebar - make the rectangles slightly larger - align text to center of the rectangle - make the rectangle fill out the column; without this, the width would collapse back to 0 after a change in the model, which would draw 0-width rectangles. FIXES #1453 --- src/calamares/calamares-sidebar.qml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/calamares/calamares-sidebar.qml b/src/calamares/calamares-sidebar.qml index ee75c22c8..85d1d506d 100644 --- a/src/calamares/calamares-sidebar.qml +++ b/src/calamares/calamares-sidebar.qml @@ -7,6 +7,7 @@ import QtQuick.Layouts 1.3 Rectangle { id: sideBar; color: Branding.styleString( Branding.SidebarBackground ); + anchors.fill: parent; ColumnLayout { anchors.fill: parent; @@ -27,17 +28,17 @@ Rectangle { Repeater { model: ViewManager Rectangle { - Layout.leftMargin: 12; - width: parent.width - 24; + Layout.leftMargin: 6; + Layout.rightMargin: 6; + Layout.fillWidth: true; height: 35; radius: 6; - color: Branding.styleString( index == ViewManager.currentStepIndex ? Branding.SidebarTextHighlight : Branding.SidebarBackground ); + color: Branding.styleString( index == ViewManager.currentStepIndex ? Branding.SidebarBackgroundSelected : Branding.SidebarBackground ); Text { anchors.verticalCenter: parent.verticalCenter; anchors.horizontalCenter: parent.horizontalCenter; - x: parent.x + 12; - color: Branding.styleString( index == ViewManager.currentStepIndex ? Branding.SidebarTextSelect : Branding.SidebarText ); + color: Branding.styleString( index == ViewManager.currentStepIndex ? Branding.SidebarTextSelected : Branding.SidebarText ); text: display; } } From 948c078e1a11d86d7f06aa2ba8968cd4869c3c85 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Jul 2020 23:03:12 +0200 Subject: [PATCH 17/30] [partition] winnow floppy drives - don't list floppy drives FIXES #1393 --- src/modules/partition/core/DeviceList.cpp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index 944940d9a..1eb7d26eb 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -92,6 +92,19 @@ isIso9660( const Device* device ) return false; } +static inline bool +isZRam( const Device* device ) +{ + const QString path = device->deviceNode(); + return path.startswith( "/dev/zram" ); +} + +static inline bool +isFloppyDrive( const Device* device ) +{ + const QString path = device->deviceNode(); + return path.startswith( "/dev/fd" ) || path.startswith( "/dev/floppy" ); +} static inline QDebug& operator<<( QDebug& s, QList< Device* >::iterator& it ) @@ -138,11 +151,16 @@ getDevices( DeviceType which, qint64 minimumSize ) cDebug() << Logger::SubEntry << "Skipping nullptr device"; it = erase( devices, it ); } - else if ( ( *it )->deviceNode().startsWith( "/dev/zram" ) ) + else if ( isZRam( *it ) ) { cDebug() << Logger::SubEntry << "Removing zram" << it; it = erase( devices, it ); } + else if ( isFloppyDrive( ( *it ) ) ) + { + cDebug() << Logger::SubEntry << "Removing floppy disk" << it; + it = erase( devices, it ); + } else if ( writableOnly && hasRootPartition( *it ) ) { cDebug() << Logger::SubEntry << "Removing device with root filesystem (/) on it" << it; From 313531bc4b7954c070f842c3ea223838151ed221 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Jul 2020 23:04:39 +0200 Subject: [PATCH 18/30] [partition] Remove unused parameter - there are no consumers for checking-the-capacity-of-the-drive This parameter was introduced in 3cd18fd285 as "preparatory work" but never completed. The architecture of the PartitionCoreModule makes it very difficult to get the necessary parameters to the right place, and it would probably be better to put a SortFilterProxyModel in front of a partitioning model anyway. Since the display code can already filter on size, just drop this one. --- src/modules/partition/core/DeviceList.cpp | 7 +------ src/modules/partition/core/DeviceList.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index 1eb7d26eb..72786d5a5 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -125,7 +125,7 @@ erase( DeviceList& l, DeviceList::iterator& it ) } QList< Device* > -getDevices( DeviceType which, qint64 minimumSize ) +getDevices( DeviceType which ) { bool writableOnly = ( which == DeviceType::WritableOnly ); @@ -171,11 +171,6 @@ getDevices( DeviceType which, qint64 minimumSize ) cDebug() << Logger::SubEntry << "Removing device with iso9660 filesystem (probably a CD) on it" << it; it = erase( devices, it ); } - else if ( ( minimumSize >= 0 ) && !( ( *it )->capacity() > minimumSize ) ) - { - cDebug() << Logger::SubEntry << "Removing too-small" << it; - it = erase( devices, it ); - } else { ++it; diff --git a/src/modules/partition/core/DeviceList.h b/src/modules/partition/core/DeviceList.h index 6823d6951..51c71feeb 100644 --- a/src/modules/partition/core/DeviceList.h +++ b/src/modules/partition/core/DeviceList.h @@ -45,7 +45,7 @@ enum class DeviceType * greater than @p minimumSize will be returned. * @return a list of Devices meeting this criterium. */ -QList< Device* > getDevices( DeviceType which = DeviceType::All, qint64 minimumSize = -1 ); +QList< Device* > getDevices( DeviceType which = DeviceType::All ); } // namespace PartUtils From 7f1a59f02b207269916a5975b1672655fd371b59 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Jul 2020 23:46:51 +0200 Subject: [PATCH 19/30] [partition] Fix typo --- src/modules/partition/core/DeviceList.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index 72786d5a5..041801b9e 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -96,14 +96,14 @@ static inline bool isZRam( const Device* device ) { const QString path = device->deviceNode(); - return path.startswith( "/dev/zram" ); + return path.startsWith( "/dev/zram" ); } static inline bool isFloppyDrive( const Device* device ) { const QString path = device->deviceNode(); - return path.startswith( "/dev/fd" ) || path.startswith( "/dev/floppy" ); + return path.startsWith( "/dev/fd" ) || path.startsWith( "/dev/floppy" ); } static inline QDebug& From 240c703549c7f073590dc45783154c80f73903d4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 8 Jul 2020 11:12:27 +0200 Subject: [PATCH 20/30] [partition] Don't leak the PM core object --- src/modules/partition/gui/PartitionViewStep.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index a583a4b96..b0142a82a 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -122,6 +122,7 @@ PartitionViewStep::~PartitionViewStep() { m_manualPartitionPage->deleteLater(); } + delete m_core; } From a91edfef89b9323a1be8da99bb69dd985cb99379 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 8 Jul 2020 13:34:38 +0200 Subject: [PATCH 21/30] [netinstall] auto-resize the columns - previously, the first column (name) was sized to show the names **that were visible at startup**, which fails when there are long names hidden in groups that are not expanded immediately. - change the columns to resize according to the contents; this makes the descriptions jump to the right as the name column gets wider. FIXES #1448 --- src/modules/netinstall/NetInstallPage.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/netinstall/NetInstallPage.cpp b/src/modules/netinstall/NetInstallPage.cpp index 80689e6d2..0d8dc5960 100644 --- a/src/modules/netinstall/NetInstallPage.cpp +++ b/src/modules/netinstall/NetInstallPage.cpp @@ -40,6 +40,7 @@ NetInstallPage::NetInstallPage( Config* c, QWidget* parent ) , ui( new Ui::Page_NetInst ) { ui->setupUi( this ); + ui->groupswidget->header()->setSectionResizeMode( QHeaderView::ResizeToContents ); ui->groupswidget->setModel( c->model() ); connect( c, &Config::statusChanged, this, &NetInstallPage::setStatus ); connect( c, &Config::statusReady, this, &NetInstallPage::expandGroups ); @@ -88,8 +89,6 @@ NetInstallPage::expandGroups() ui->groupswidget->setExpanded( index, true ); } } - // Make sure all the group names are visible - ui->groupswidget->resizeColumnToContents(0); } void From da1cc7c3a56102a06b2484ea958bb4419467fbac Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 9 Jul 2020 08:45:41 +0200 Subject: [PATCH 22/30] [libcalamaresui] Don't clear the map when inserting strings - the documentation doesn't say the map is cleared, and the one place this function is used doesn't need that either. - make type of config explicit --- src/libcalamaresui/Branding.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index a5909fd61..cf66097c9 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -132,9 +132,7 @@ loadStrings( QMap< QString, QString >& map, throw YAML::Exception( YAML::Mark(), std::string( "Branding configuration is not a map: " ) + key ); } - const auto& config = CalamaresUtils::yamlMapToVariant( doc[ key ] ); - - map.clear(); + const QVariantMap config = CalamaresUtils::yamlMapToVariant( doc[ key ] ); for ( auto it = config.constBegin(); it != config.constEnd(); ++it ) { map.insert( it.key(), transform( it.value().toString() ) ); From a58d59d86c86f9e0a58e2e98094d01bc2178b3aa Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 9 Jul 2020 10:45:28 +0200 Subject: [PATCH 23/30] [libcalamares] Minor documentation on Yaml.* --- src/libcalamares/utils/Yaml.cpp | 6 ++---- src/libcalamares/utils/Yaml.h | 14 ++++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/libcalamares/utils/Yaml.cpp b/src/libcalamares/utils/Yaml.cpp index 0c7b6787f..af73e2825 100644 --- a/src/libcalamares/utils/Yaml.cpp +++ b/src/libcalamares/utils/Yaml.cpp @@ -1,7 +1,8 @@ /* === This file is part of Calamares - === - * + * * SPDX-FileCopyrightText: 2014 Teo Mrnjavac * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later * * * Calamares is free software: you can redistribute it and/or modify @@ -17,8 +18,6 @@ * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . * - * SPDX-License-Identifier: GPL-3.0-or-later - * License-Filename: LICENSE * */ #include "Yaml.h" @@ -125,7 +124,6 @@ yamlToStringList( const YAML::Node& listNode ) return l; } - void explainYamlException( const YAML::Exception& e, const QByteArray& yamlData, const char* label ) { diff --git a/src/libcalamares/utils/Yaml.h b/src/libcalamares/utils/Yaml.h index c14639447..0f9631fa2 100644 --- a/src/libcalamares/utils/Yaml.h +++ b/src/libcalamares/utils/Yaml.h @@ -1,7 +1,8 @@ /* === This file is part of Calamares - === - * + * * SPDX-FileCopyrightText: 2014 Teo Mrnjavac * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later * * * Calamares is free software: you can redistribute it and/or modify @@ -17,11 +18,16 @@ * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . * - * SPDX-License-Identifier: GPL-3.0-or-later - * License-Filename: LICENSE * */ +/* + * YAML conversions and YAML convenience header. + * + * Includes the system YAMLCPP headers without warnings (by switching off + * the expected warnings) and provides a handful of methods for + * converting between YAML and QVariant. + */ #ifndef UTILS_YAML_H #define UTILS_YAML_H @@ -50,7 +56,7 @@ class QFileInfo; #pragma clang diagnostic pop #endif -/// @brief Appends all te elements of @p node to the string list @p v +/// @brief Appends all the elements of @p node to the string list @p v void operator>>( const YAML::Node& node, QStringList& v ); namespace CalamaresUtils From e1f4224bedc5db2dc03be985f60417e27ab789e1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 9 Jul 2020 11:28:09 +0200 Subject: [PATCH 24/30] [libcalamaresui] Fix slideshowAPI loading In 022045ae05 a regression was introduced: if no *slideshowAPI* is specified in the branding file, Calamares refuses to start, with a YAML failure. Before the refactoring, we had `YAML::Node doc` and looked up the *slideshowAPI* in it with `doc["slideshowAPI"]`. After the refactoring, we had `const YAML::Node& doc`. The `const` makes all the difference: - subscripting a non-existent key in a mutable Node silently returns a Null node (and possibly inserts the key); - subscripting a non-existent key in a const Node returns an invalid or undefined node. Calling IsNull() or IsScalar() on a Null node works: the functions return a bool. Calling them on an invalid node throws an exception. So in the **const** case, this code can throws an exception that it doesn't in the non-const case: `doc[ "slideshowAPI" ].IsScalar()` - Massage the code to check for validity before checking for scalar - Add a `get()` that produces more useful exception types when looking up an invalid key - Use `get()` to lookup the slideshow node just once. --- src/libcalamaresui/Branding.cpp | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index cf66097c9..4cfe7ea40 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -367,7 +367,7 @@ Branding::WindowDimension::isValid() const } -/// @brief Guard against cases where the @p key doesn't exist in @p doc +/// @brief Get a string (empty is @p key doesn't exist) from @p key in @p doc static inline QString getString( const YAML::Node& doc, const char* key ) { @@ -378,6 +378,18 @@ getString( const YAML::Node& doc, const char* key ) return QString(); } +/// @brief Get a node (throws if @p key doesn't exist) from @p key in @p doc +static inline YAML::Node +get( const YAML::Node& doc, const char* key ) +{ + auto r = doc[ key ]; + if ( !r.IsDefined() ) + { + throw YAML::KeyNotFound( YAML::Mark::null_mark(), std::string( key ) ); + } + return r; +} + static inline void flavorAndSide( const YAML::Node& doc, const char* key, Branding::PanelFlavor& flavor, Branding::PanelSide& side ) { @@ -514,10 +526,11 @@ Branding::initSlideshowSettings( const YAML::Node& doc ) { QDir componentDir( componentDirectory() ); - if ( doc[ "slideshow" ].IsSequence() ) + auto slideshow = get( doc, "slideshow" ); + if ( slideshow.IsSequence() ) { QStringList slideShowPictures; - doc[ "slideshow" ] >> slideShowPictures; + slideshow >> slideShowPictures; for ( int i = 0; i < slideShowPictures.count(); ++i ) { QString pathString = slideShowPictures[ i ]; @@ -535,9 +548,9 @@ Branding::initSlideshowSettings( const YAML::Node& doc ) m_slideshowAPI = -1; } #ifdef WITH_QML - else if ( doc[ "slideshow" ].IsScalar() ) + else if ( slideshow.IsScalar() ) { - QString slideshowPath = QString::fromStdString( doc[ "slideshow" ].as< std::string >() ); + QString slideshowPath = QString::fromStdString( slideshow.as< std::string >() ); QFileInfo slideshowFi( componentDir.absoluteFilePath( slideshowPath ) ); if ( !slideshowFi.exists() || !slideshowFi.fileName().toLower().endsWith( ".qml" ) ) bail( m_descriptorPath, @@ -546,7 +559,9 @@ Branding::initSlideshowSettings( const YAML::Node& doc ) m_slideshowPath = slideshowFi.absoluteFilePath(); // API choice is relevant for QML slideshow - int api = doc[ "slideshowAPI" ].IsScalar() ? doc[ "slideshowAPI" ].as< int >() : -1; + // TODO:3.3: use get(), make slideshowAPI required + int api + = ( doc[ "slideshowAPI" ] && doc[ "slideshowAPI" ].IsScalar() ) ? doc[ "slideshowAPI" ].as< int >() : -1; if ( ( api < 1 ) || ( api > 2 ) ) { cWarning() << "Invalid or missing *slideshowAPI* in branding file."; @@ -555,7 +570,7 @@ Branding::initSlideshowSettings( const YAML::Node& doc ) m_slideshowAPI = api; } #else - else if ( doc[ "slideshow" ].IsScalar() ) + else if ( slideshow.IsScalar() ) { cWarning() << "Invalid *slideshow* setting, must be list of images."; } From cfb0bebe0edcaa4acbf51f83e2b969c9392e5566 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Jul 2020 16:27:27 +0200 Subject: [PATCH 25/30] Changes: pre-release housekeeping --- CHANGES | 4 +++- CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 594fd844c..12b7c36e1 100644 --- a/CHANGES +++ b/CHANGES @@ -3,7 +3,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.27 (unreleased) # +# 3.2.27 (2020-07-11) # This release contains contributions from (alphabetically by first name): - Gaël PORTAY @@ -18,6 +18,8 @@ This release contains contributions from (alphabetically by first name): ## Modules ## - The Manjaro package manager *pamac* has been added to those supported by the *packages* module. + - The *netinstall* module has had some minor UI tweaks. + - Partitioning now tries harder to avoid floppy drives. # 3.2.26.1 (2020-06-23) # diff --git a/CMakeLists.txt b/CMakeLists.txt index b653f0996..7e049ca97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.26.1 + VERSION 3.2.27 LANGUAGES C CXX ) set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development From 97bdb9b4f7014fafa4a7a9b171c68c9aff49614a Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sat, 11 Jul 2020 16:29:35 +0200 Subject: [PATCH 26/30] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_az.ts | 58 +++++++++++++++--------------- lang/calamares_az_AZ.ts | 58 +++++++++++++++--------------- lang/calamares_bn.ts | 2 +- lang/calamares_da.ts | 10 +++--- lang/calamares_de.ts | 14 ++++---- lang/calamares_fi_FI.ts | 22 +++++++----- lang/calamares_lt.ts | 12 +++---- lang/calamares_pt_BR.ts | 79 ++++++++++++++++++++++------------------- lang/calamares_sv.ts | 4 +-- 9 files changed, 136 insertions(+), 123 deletions(-) diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts index c4ab24305..bfc079749 100644 --- a/lang/calamares_az.ts +++ b/lang/calamares_az.ts @@ -24,7 +24,7 @@ Master Boot Record of %1 - %1 Əsas ön yükləyici qurmaq + %1 əsas Ön yükləyici qurmaq @@ -132,7 +132,7 @@ Job failed (%1) - Tapşırığı yerinə yetirmək mümkün olmadı (%1) + (%1) Tapşırığı yerinə yetirmək mümkün olmadı @@ -199,7 +199,7 @@ Main script file %1 for python job %2 is not readable. - %1 Əsas əmrlər faylı %2 python işləri üçün açıla bilmir. + %1 əsas əmrlər faylı %2 python işləri üçün açıla bilmir. @@ -311,7 +311,7 @@ %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. + %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. @@ -433,22 +433,22 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Unknown exception type - Naməlum istisna halı + Naməlum istisna hal unparseable Python error - görünməmiş python xətası + görünməmiş Python xətası unparseable Python traceback - görünməmiş python izi + görünməmiş Python izi Unfetchable Python error. - Oxunmayan python xətası. + Oxunmayan Python xətası. @@ -530,7 +530,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. Having a GPT partition table and <strong>fat32 512Mb /boot partition is a must for UEFI installs</strong>, either use an existing without formatting or create one. - <strong>Əli ilə bölmək</strong><br/>Siz disk sahəsini özünüz bölə və ölçülərini təyin edə bilərsiniz. GPT disk bölmələri cədvəli və <strong>fat32 512Mb /boot bölməsi UEFI sistemi üçün vacibdir.</strong>ya da mövcud bir bölmə varsa onu istifadə edin, və ya başqa birini yaradın. + <strong>Əl ilə bölmək</strong><br/>Siz disk sahəsini özünüz bölə və ölçülərini təyin edə bilərsiniz. GPT disk bölmələri cədvəli və <strong>fat32 512Mb /boot bölməsi UEFI sistemi üçün vacibdir</strong>, ya da mövcud bir bölmə varsa onu istifadə edin, və ya başqa birini yaradın. @@ -583,7 +583,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - <strong>Diski təmizləmək</strong><br/> <font color="red">Silmək</font> hal-hazırda seçilmiş diskdəki bütün verilənləri siləcəkdir. + <strong>Diski təmizləmək</strong><br/> <font color="red">Silmək</font>seçimi hal-hazırda, seçilmiş diskdəki bütün verilənləri siləcəkdir. @@ -694,7 +694,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. - Əmr quraşdırı mühitində icra olunur və kök qovluğa yolu bilinməlidir, lakin rootMountPoint aşkar edilmədi. + Əmr, quraşdırı mühitində icra olunur və kök qovluğa yolu bilinməlidir, lakin rootMountPoint - KökQoşulmaNöqtəsi - aşkar edilmədi. @@ -772,7 +772,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. This program will ask you some questions and set up %2 on your computer. - Bu proqram sizə bəi suallar verəcək və %2 sizin komputerinizə qurmağa kömək edəcək. + Bu proqram sizə bəzi suallar verəcək və %2 əməliyyat sistemini sizin komputerinizə qurmağa kömək edəcək. @@ -914,7 +914,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Creating a new partition table will delete all existing data on the disk. - Bölmələr Cədvəli yaratmaq bütün diskdə olan məlumatların hamısını siləcək. + Bölmələr Cədvəli yaratmaq, bütün diskdə olan məlumatların hamısını siləcək. @@ -1203,7 +1203,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Form - Forma + Format @@ -1223,7 +1223,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Please enter the same passphrase in both boxes. - Lütfən hər iki sahəyə eyni şifrəni daxil edin. + Lütfən, hər iki sahəyə eyni şifrəni daxil edin. @@ -1279,17 +1279,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. <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 sizin kopyuterə qurulacaqdır.<br/>Siz indi yeni sisteminizi başlada bilərsiniz. + <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ğladığınız zaman sisteminiz dərhal yenidən başladılacaqdır.</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 sizin 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. + <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. @@ -1299,12 +1299,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. <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 sizin kompyuterinizə quraşdırıla bilmədi.<br/>Baş vermiş xəta: %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 sizin kompyuterinizə quraşdırıla bilmədi.<br/>Baş vermiş xəta: %2. + <h1>Quraşdırılma alınmadı</h1><br/>%1 kompyuterinizə quraşdırıla bilmədi.<br/>Baş vermiş xəta: %2. @@ -1332,7 +1332,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. The installation of %1 is complete. - %1in quraşdırılması başa çatdı. + %1-n quraşdırılması başa çatdı. @@ -1340,7 +1340,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Format partition %1 (file system: %2, size: %3 MiB) on %4. - %4-də %1 bölməsini format etmək (fayl sistemi: %2, ölçüsü: %3 MB). + %4 üzərində %1 bölməsini format etmək (fayl sistemi: %2, ölçüsü: %3 MB). @@ -1368,7 +1368,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. 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. + Kifayət qədər disk sahəsi yoxdur. Ən azı %1 QB tələb olunur. @@ -1403,7 +1403,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. is running the installer as an administrator (root) - quraşdırıcı adminstrator (root) imtiyazları ilə başladılması + quraşdırıcını adminstrator (root) imtiyazları ilə başladılması @@ -1428,7 +1428,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. The screen is too small to display the installer. - Bu quarşdırıcını göstəmək üçün ekran çox kiçikdir. + Bu quarşdırıcını göstərmək üçün ekran çox kiçikdir. @@ -1680,7 +1680,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Zone: - Zona: + Saat qurşağı: @@ -3845,7 +3845,7 @@ Output: Layouts - Qatları + Qatlar @@ -3866,7 +3866,7 @@ Output: Test your keyboard - klaviaturanızı yoxlayın + Klaviaturanızı yoxlayın @@ -3879,7 +3879,7 @@ Output: Numbers and dates locale set to %1 - Yerli saylvə tarix formatlarını %1 qurmaq + Yerli say və tarix formatlarını %1 qurmaq diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts index f329495fc..3368ce761 100644 --- a/lang/calamares_az_AZ.ts +++ b/lang/calamares_az_AZ.ts @@ -24,7 +24,7 @@ Master Boot Record of %1 - %1 Əsas ön yükləyici qurmaq + %1 əsas Ön yükləyici qurmaq @@ -132,7 +132,7 @@ Job failed (%1) - Tapşırığı yerinə yetirmək mümkün olmadı (%1) + (%1) Tapşırığı yerinə yetirmək mümkün olmadı @@ -199,7 +199,7 @@ Main script file %1 for python job %2 is not readable. - %1 Əsas əmrlər faylı %2 python işləri üçün açıla bilmir. + %1 əsas əmrlər faylı %2 python işləri üçün açıla bilmir. @@ -311,7 +311,7 @@ %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. + %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. @@ -433,22 +433,22 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Unknown exception type - Naməlum istisna halı + Naməlum istisna hal unparseable Python error - görünməmiş python xətası + görünməmiş Python xətası unparseable Python traceback - görünməmiş python izi + görünməmiş Python izi Unfetchable Python error. - Oxunmayan python xətası. + Oxunmayan Python xətası. @@ -530,7 +530,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. Having a GPT partition table and <strong>fat32 512Mb /boot partition is a must for UEFI installs</strong>, either use an existing without formatting or create one. - <strong>Əli ilə bölmək</strong><br/>Siz disk sahəsini özünüz bölə və ölçülərini təyin edə bilərsiniz. GPT disk bölmələri cədvəli və <strong>fat32 512Mb /boot bölməsi UEFI sistemi üçün vacibdir.</strong>ya da mövcud bir bölmə varsa onu istifadə edin, və ya başqa birini yaradın. + <strong>Əl ilə bölmək</strong><br/>Siz disk sahəsini özünüz bölə və ölçülərini təyin edə bilərsiniz. GPT disk bölmələri cədvəli və <strong>fat32 512Mb /boot bölməsi UEFI sistemi üçün vacibdir</strong>, ya da mövcud bir bölmə varsa onu istifadə edin, və ya başqa birini yaradın. @@ -583,7 +583,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - <strong>Diski təmizləmək</strong><br/> <font color="red">Silmək</font> hal-hazırda seçilmiş diskdəki bütün verilənləri siləcəkdir. + <strong>Diski təmizləmək</strong><br/> <font color="red">Silmək</font>seçimi hal-hazırda, seçilmiş diskdəki bütün verilənləri siləcəkdir. @@ -694,7 +694,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. - Əmr quraşdırı mühitində icra olunur və kök qovluğa yolu bilinməlidir, lakin rootMountPoint aşkar edilmədi. + Əmr, quraşdırı mühitində icra olunur və kök qovluğa yolu bilinməlidir, lakin rootMountPoint - KökQoşulmaNöqtəsi - aşkar edilmədi. @@ -772,7 +772,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. This program will ask you some questions and set up %2 on your computer. - Bu proqram sizə bəi suallar verəcək və %2 sizin komputerinizə qurmağa kömək edəcək. + Bu proqram sizə bəzi suallar verəcək və %2 əməliyyat sistemini sizin komputerinizə qurmağa kömək edəcək. @@ -914,7 +914,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Creating a new partition table will delete all existing data on the disk. - Bölmələr Cədvəli yaratmaq bütün diskdə olan məlumatların hamısını siləcək. + Bölmələr Cədvəli yaratmaq, bütün diskdə olan məlumatların hamısını siləcək. @@ -1203,7 +1203,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Form - Forma + Format @@ -1223,7 +1223,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Please enter the same passphrase in both boxes. - Lütfən hər iki sahəyə eyni şifrəni daxil edin. + Lütfən, hər iki sahəyə eyni şifrəni daxil edin. @@ -1279,17 +1279,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. <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 sizin kopyuterə qurulacaqdır.<br/>Siz indi yeni sisteminizi başlada bilərsiniz. + <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ğladığınız zaman sisteminiz dərhal yenidən başladılacaqdır.</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 sizin 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. + <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. @@ -1299,12 +1299,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. <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 sizin kompyuterinizə quraşdırıla bilmədi.<br/>Baş vermiş xəta: %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 sizin kompyuterinizə quraşdırıla bilmədi.<br/>Baş vermiş xəta: %2. + <h1>Quraşdırılma alınmadı</h1><br/>%1 kompyuterinizə quraşdırıla bilmədi.<br/>Baş vermiş xəta: %2. @@ -1332,7 +1332,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. The installation of %1 is complete. - %1in quraşdırılması başa çatdı. + %1-n quraşdırılması başa çatdı. @@ -1340,7 +1340,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Format partition %1 (file system: %2, size: %3 MiB) on %4. - %4-də %1 bölməsini format etmək (fayl sistemi: %2, ölçüsü: %3 MB). + %4 üzərində %1 bölməsini format etmək (fayl sistemi: %2, ölçüsü: %3 MB). @@ -1368,7 +1368,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. 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. + Kifayət qədər disk sahəsi yoxdur. Ən azı %1 QB tələb olunur. @@ -1403,7 +1403,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. is running the installer as an administrator (root) - quraşdırıcı adminstrator (root) imtiyazları ilə başladılması + quraşdırıcını adminstrator (root) imtiyazları ilə başladılması @@ -1428,7 +1428,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. The screen is too small to display the installer. - Bu quarşdırıcını göstəmək üçün ekran çox kiçikdir. + Bu quarşdırıcını göstərmək üçün ekran çox kiçikdir. @@ -1680,7 +1680,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Zone: - Zona: + Saat qurşağı: @@ -3845,7 +3845,7 @@ Output: Layouts - Qatları + Qatlar @@ -3866,7 +3866,7 @@ Output: Test your keyboard - klaviaturanızı yoxlayın + Klaviaturanızı yoxlayın @@ -3879,7 +3879,7 @@ Output: Numbers and dates locale set to %1 - Yerli saylvə tarix formatlarını %1 qurmaq + Yerli say və tarix formatlarını %1 qurmaq diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts index afb7f16ee..bd1c887c2 100644 --- a/lang/calamares_bn.ts +++ b/lang/calamares_bn.ts @@ -1763,7 +1763,7 @@ The installer will quit and all changes will be lost. Configuration Error - + কনফিগারেশন ত্রুটি diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index 76995d9d6..e9b9ed1d0 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -1781,7 +1781,9 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.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. - + Vælg venligst din foretrukne placering på kortet, så installationsprogrammet kan foreslå lokalitets- + og tidszoneindstillinger til dig. Du kan finjustere de foreslåede indstillinger nedenfor. Søg på kortet ved ved at trække + for at flytte og brug knapperne +/- for at zoome ind/ud eller brug muserulning til at zoome. @@ -1932,7 +1934,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. To be able to select a timezone, make sure you are connected to the internet. Restart the installer after connecting. You can fine-tune Language and Locale settings below. - + For at kunne vælge en tidszone skal du sørge for at der er forbindelse til internettet. Genstart installationsprogrammet efter forbindelsen er blevet oprettet. Du kan finjustere sprog- og lokalitetsindstillinger nedenfor. @@ -3503,7 +3505,7 @@ setting 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. - + Sporing hjælper %1 med at se hvor ofte den installeres, hvilken hardware den installeres på og hvilke programmer der bruges. Klik på hjælpeikonet ved siden af hvert område for at se hvad der sendes. @@ -3518,7 +3520,7 @@ setting By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. - + Vælges dette sender du regelmæssigt information om din <b>bruger</b>installation, hardware, programmer og programmernes anvendelsesmønstre, til %1. diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index b59fe4f38..9098ab48c 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -777,17 +777,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Willkommen bei Calamares, dem Installationsprogramm für %1</h1> <h1>Welcome to %1 setup</h1> - + <h1>Willkommen zur Installation von %1</h1> <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Willkommen bei Calamares, dem Installationsprogramm für %1</h1> @@ -1927,7 +1927,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Timezone: %1 - + Zeitzone: %1 @@ -3866,17 +3866,17 @@ Liberating Software. System language set to %1 - + Systemsprache eingestellt auf %1 Numbers and dates locale set to %1 - + Zahlen- und Datumsformat eingestellt auf %1 Change - + Ändern diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index e3e1baf4a..ec44e74f7 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -1782,7 +1782,9 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.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. - + Valitse sijainti kartalla, jotta asentaja voi ehdottaa paikalliset ja aikavyöhykeen asetukset. + Voit hienosäätää alla olevia asetuksia. Etsi kartalta vetämällä ja suurenna/pienennä +/- -painikkeella tai käytä +hiiren vieritystä skaalaamiseen. @@ -1933,7 +1935,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. To be able to select a timezone, make sure you are connected to the internet. Restart the installer after connecting. You can fine-tune Language and Locale settings below. - + Jos haluat valita aikavyöhykkeen niin varmista, että olet yhteydessä Internetiin. Käynnistä asennusohjelma uudelleen yhteyden muodostamisen jälkeen. Voit hienosäätää alla olevia kieli- ja kieliasetuksia. @@ -3493,7 +3495,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. <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>Napsauta tätä <span style=" font-weight:600;">jos et halua lähettää mitään</span> tietoja asennuksesta.</p></body></html> @@ -3503,22 +3505,22 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. 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. - + Seuranta auttaa %1 näkemään, kuinka usein se asennetaan, mihin laitteistoon se on asennettu ja mihin sovelluksiin sitä käytetään. Jos haluat nähdä, mitä lähetetään, napsauta kunkin alueen vieressä olevaa ohjekuvaketta. 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. - + Valitsemalla tämän lähetät tietoja asennuksesta ja laitteistosta. Nämä tiedot lähetetään vain </b>kerran</b> asennuksen päätyttyä. By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + Valitsemalla tämän lähetät määräajoin tietoja <b>koneesi</b> asennuksesta, laitteistosta ja sovelluksista, %1:lle. By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. - + Valitsemalla tämän lähetät säännöllisesti tietoja <b>käyttäjän</b> asennuksesta, laitteistosta, sovelluksista ja sovellusten käyttötavoista %1:lle. @@ -3807,13 +3809,15 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. <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>Kielet</h1> </br> + Järjestelmän sijaintiasetukset vaikuttaa joidenkin komentorivin käyttöliittymän elementtien kieliin ja merkistöihin. Nykyinen asetus on <strong>%1</strong>. <h1>Locales</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>Sijainti</h1> </br> + Järjestelmän sijaintiasetukset vaikuttaa joidenkin komentorivin käyttöliittymän elementtien kieliin ja merkistöihin. Nykyinen asetus on <strong>%1</strong>. diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index aa51d8669..261317f2c 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -781,22 +781,22 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. <h1>Welcome to the Calamares setup program for %1</h1> - + </h1>Jus sveikina Calamares sąrankos programa, skirta %1 sistemai.</h1> <h1>Welcome to %1 setup</h1> - + <h1>Jus sveikina %1 sąranka</h1> <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Jus sveikina Calamares diegimo programa, skirta %1 sistemai</h1> <h1>Welcome to the %1 installer</h1> - + <h1>Jus sveikina %1 diegimo programa</h1> @@ -3870,7 +3870,7 @@ Išvestis: System language set to %1 - + Sistemos kalba nustatyta į %1 @@ -3880,7 +3880,7 @@ Išvestis: Change - + Keisti diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index ab98dc800..f65ecd0ee 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -230,7 +230,7 @@ Requirements checking for module <i>%1</i> is complete. - A verificação de requerimentos para o módulo <i>%1</i> está completa. + A verificação de requisitos para o módulo <i>%1</i> está completa. @@ -251,7 +251,7 @@ System-requirements checking is complete. - Verificação de requerimentos do sistema completa. + Verificação de requisitos do sistema completa. @@ -722,7 +722,7 @@ O instalador será fechado e todas as alterações serão perdidas. The numbers and dates locale will be set to %1. - O local dos números e datas será definido como %1. + A localidade dos números e datas será definida como %1. @@ -752,7 +752,7 @@ O instalador será fechado e todas as alterações serão perdidas. This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - Este computador não satisfaz os requerimentos mínimos para configurar %1.<br/>A configuração não pode continuar. <a href="#details">Detalhes...</a> + Este computador não satisfaz os requisitos mínimos para configurar %1.<br/>A configuração não pode continuar. <a href="#details">Detalhes...</a> @@ -762,7 +762,7 @@ O instalador será fechado e todas as alterações serão perdidas. This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - Este computador não satisfaz alguns dos requerimentos recomendados para configurar %1.<br/>A configuração pode continuar, mas algumas funções podem ser desativadas. + Este computador não satisfaz alguns dos requisitos recomendados para configurar %1.<br/>A configuração pode continuar, mas alguns recursos podem ser desativados. @@ -777,22 +777,22 @@ O instalador será fechado e todas as alterações serão perdidas. <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Bem-vindo ao programa de configuração Calamares para %1</h1> <h1>Welcome to %1 setup</h1> - + <h1>Bem-vindo à configuração de %1</h1> <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Bem-vindo ao instalador Calamares para %1</h1> <h1>Welcome to the %1 installer</h1> - + <h1>Bem-vindo ao instalador de %1</h1> @@ -1546,7 +1546,7 @@ O instalador será fechado 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 configuração de localidade do sistema afeta a linguagem e o conjunto de caracteres para algumas linhas de comando e elementos da interface do usuário.<br/>A configuração atual é <strong>%1</strong>. + A configuração de localidade do sistema afeta o idioma e o conjunto de caracteres para algumas linhas de comando e elementos da interface do usuário.<br/>A configuração atual é <strong>%1</strong>. @@ -1696,7 +1696,7 @@ O instalador será fechado e todas as alterações serão perdidas. The numbers and dates locale will be set to %1. - O local dos números e datas será definido como %1. + A localidade dos números e datas será definida como %1. @@ -1781,7 +1781,9 @@ O instalador será fechado 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 seu local preferido no mapa para que o instalador possa sugerir as configurações de localidade + e fuso horário para você. Você pode ajustar as configurações sugeridas abaixo. Procure no mapa arrastando + para mover e usando os botões +/- para aumentar/diminuir ou use a rolagem do mouse para dar zoom. @@ -1927,12 +1929,12 @@ O instalador será fechado e todas as alterações serão perdidas. Timezone: %1 - + Fuso horário: %1 To be able to select a timezone, make sure you are connected to the internet. Restart the installer after connecting. You can fine-tune Language and Locale settings below. - + Para poder selecionar o fuso horário, tenha certeza que você está conectado à internet. Reinicie o instalador após conectar. Você pode ajustar as configurações de Idioma e Localidade abaixo. @@ -2837,7 +2839,8 @@ Saída: <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> @@ -2948,13 +2951,15 @@ Saída: <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 %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 %1.<br/> + A configuração pode continuar, mas alguns recursos podem ser desativados.</p> @@ -3094,7 +3099,7 @@ Saída: This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - Este computador não satisfaz os requerimentos mínimos para configurar %1.<br/>A configuração não pode continuar. <a href="#details">Detalhes...</a> + Este computador não satisfaz os requisitos mínimos para configurar %1.<br/>A configuração não pode continuar. <a href="#details">Detalhes...</a> @@ -3104,7 +3109,7 @@ Saída: This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - Este computador não satisfaz alguns dos requerimentos recomendados para configurar %1.<br/>A configuração pode continuar, mas algumas funções podem ser desativadas. + Este computador não satisfaz alguns dos requisitos recomendados para configurar %1.<br/>A configuração pode continuar, mas alguns recursos podem ser desativados. @@ -3420,28 +3425,28 @@ Saída: KDE user feedback - + Feedback de usuário KDE Configuring KDE user feedback. - + Configurando feedback de usuário KDE. Error in KDE user feedback configuration. - + Erro na configuração do feedback de usuário KDE. Could not configure KDE user feedback correctly, script error %1. - + Não foi possível configurar o feedback de usuário 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 usuário KDE corretamente, erro do Calamares %1. @@ -3488,7 +3493,7 @@ Saída: <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;">nenhum tipo de informação</span> sobre sua instalação.</p></body></html> @@ -3498,22 +3503,22 @@ Saída: 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 rastreamento ajuda %1 a ver quão frequentemente ele é instalado, em qual hardware ele é instalado e quais aplicações são usadas. 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 você enviará informações sobre sua instalação e hardware. Essa 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 você 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 você enviará periodicamente informações sobre a instalação do seu <b>usuário</b>, hardware, aplicações e padrões de uso das aplicações para %1. @@ -3657,7 +3662,7 @@ Saída: Select application and system language - Selecione a aplicação e a linguagem do sistema + Selecione o idioma do sistema e das aplicações @@ -3722,7 +3727,7 @@ Saída: <h1>Welcome to the %1 installer.</h1> - <h1>Bem-vindo ao instalador %1 .</h1> + <h1>Bem-vindo ao instalador %1.</h1> @@ -3802,13 +3807,15 @@ Saída: <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 configuração de localidade do sistema afeta o idioma e o conjunto de caracteres para algumas linhas de comando e elementos da interface do usuário. A configuração atual é <strong>%1</strong>. <h1>Locales</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>Localidades</h1> </br> + A configuração de localidade do sistema afeta o idioma e o conjunto de caracteres para algumas linhas de comando e elementos da interface do usuário. A configuração atual é <strong>%1</strong>. @@ -3866,17 +3873,17 @@ Saída: System language set to %1 - + Idioma do sistema definido como %1 Numbers and dates locale set to %1 - + A localidade de números e datas foi definida para %1 Change - + Modificar diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index 408f67634..7d51e3b82 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -1926,7 +1926,7 @@ Alla ändringar kommer att gå förlorade. Timezone: %1 - + Tidszon: %1 @@ -3875,7 +3875,7 @@ Utdata: Change - + Ändra From f5ada5e9ef26505cfd5375028da091974b01803e Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sat, 11 Jul 2020 16:29:35 +0200 Subject: [PATCH 27/30] i18n: [desktop] Automatic merge of Transifex translations --- calamares.desktop | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/calamares.desktop b/calamares.desktop index c385e3c91..78c943ddb 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -33,6 +33,10 @@ 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 From 92a27a2c2d4afabb2fe8afabe10248e4c6c4db28 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sat, 11 Jul 2020 16:29:36 +0200 Subject: [PATCH 28/30] i18n: [python] Automatic merge of Transifex translations --- lang/python/bn/LC_MESSAGES/python.mo | Bin 380 -> 2333 bytes lang/python/bn/LC_MESSAGES/python.po | 29 ++++++++++++++++----------- lang/python/de/LC_MESSAGES/python.mo | Bin 8223 -> 8228 bytes lang/python/de/LC_MESSAGES/python.po | 8 ++++---- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/lang/python/bn/LC_MESSAGES/python.mo b/lang/python/bn/LC_MESSAGES/python.mo index b067dcf7187f1142e0012d7560c7ca481e0009bb..7faa09a2c0131e9cb69fb3bba3dd92224ad746b5 100644 GIT binary patch literal 2333 zcmb7ETW{P%7#*PHvOtlz2#Jd{=~FA}wRe*xo6SW^LJ|Tbjnbq%p=#D1Zwy|0WzRN= zR*M8eR0t3+jVdluRFOJS8d21TUL=(M10QuVH7RU4QS zQ1*TZOP#^WXTlloYqDEib9Wm88wVCfzFQE2H6o!IET(qNrJCsLJ z7*T0MJ3+e%k0P05K>(X(=y>irjd^t0vpJaz1J`S`BPP5spi|PXcgE?=;_?JMGaF8| z5GVJJ$u#qP@QIMNgBG(tqF$3VI6d9zo+i_t?|VUmwp-MNmG+H`WG-w6LSD33Bs|HB z!};*gma>Rbhr6E4#YH9~t%#3xRO0eU@x{DIE(jR{p$-Iex@0+MN(#lANe08R5-5$e z#!lDlbkAuc^-Q98J+P^(Q(E=J%HQgU5-vpHhujv%tYci{Q4HlZx-dTZ?)c0Uy*Raa zVfOrdVUf4ONEmZ*!*h&@b|W^H!Wu0soHrKvWl#DTZ!y7Zv}~0I4XbKcL$qYo`Ul>y z@GHE>Vqq*rEQoz3!l*_oR+Uxj7I%j#1J(dz{f=EJ4OU&twwc2!{1U>{t89RdI54U> zLxY2?jz8Bbm9g)y4wc-h&C2!4r6J3z^jl-+KwXwhL8Fak8B3fsYjlDK4d#3F%!&}L zxMrHGtE)vJg?KJsE81bx#I&&{S`(WBF0om*tT#($JuuG}=4R)n4r)>=S_KS^-~n=3 zZy{O1*M!;fnHLOWSXmTvF}l1oZB!5JB$dk}V=BPhqD?hgt$U&;vqtMdVZq0w`o?q^ zHRBo$T521QmWQc+96b}zzEN5_J6yXUwm(5UnkF|@Ot@`fv!!UVON7DEM!NlFnq0?I z0?W?)@?0ODuPOiAFzKc@wulml$a`tBkK0|P1G2G4Feu+jlO0@as0*-M(N_EFUT${a zNt6MeZmPtt;Yi=7$sO%~RNwI)2&af-ijq|pBrgs`exYSJ>A&`J=YoC()#|X{*v~N z8fZEBy-2D8_#WrYJEl|^RPf0@!0TTck;he2sYU&tA<5KGlgiKj;Ss=rI)%`q?}y^d b-(Tpvj|2UY&|<$;4Um)gUxu%v-u1r#1vW$E delta 69 zcmbO$^oPmfo)F7a1|VPrVi_P-0b*t#)&XJ=umEBwprj>`2C0F8$=8_DCNE>Y2LKuE B2!8+o diff --git a/lang/python/bn/LC_MESSAGES/python.po b/lang/python/bn/LC_MESSAGES/python.po index 529799daf..ee7b2e059 100644 --- a/lang/python/bn/LC_MESSAGES/python.po +++ b/lang/python/bn/LC_MESSAGES/python.po @@ -3,6 +3,9 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +# Translators: +# 508a8b0ef95404aa3dc5178f0ccada5e_017b8a4 , 2020 +# #, fuzzy msgid "" msgstr "" @@ -10,6 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-18 15:42+0200\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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,11 +23,11 @@ msgstr "" #: src/modules/grubcfg/main.py:37 msgid "Configure GRUB." -msgstr "" +msgstr "কনফিগার করুন জিআরইউবি।" #: src/modules/mount/main.py:38 msgid "Mounting partitions." -msgstr "" +msgstr "মাউন্ট করছে পার্টিশনগুলো।" #: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:205 #: src/modules/initcpiocfg/main.py:209 @@ -35,28 +39,29 @@ msgstr "" #: src/modules/fstab/main.py:338 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 msgid "Configuration Error" -msgstr "" +msgstr "কনফিগারেশন ত্রুটি" #: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:174 #: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79 #: src/modules/fstab/main.py:333 msgid "No partitions are defined for 
{!s}
to use." -msgstr "" +msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
{!এস}
ব্যবহার করার জন্য।" #: src/modules/services-systemd/main.py:35 msgid "Configure systemd services" -msgstr "" +msgstr "কনফিগার করুন সিস্টেমডি সেবাগুলি" #: src/modules/services-systemd/main.py:68 #: src/modules/services-openrc/main.py:102 msgid "Cannot modify service" -msgstr "" +msgstr "সেবা পরিবর্তন করতে পারে না" #: src/modules/services-systemd/main.py:69 msgid "" "systemctl {arg!s} call in chroot returned error code {num!s}." msgstr "" +"সিস্টেমসিটিএল {এআরজি!এস}সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।" #: src/modules/services-systemd/main.py:72 #: src/modules/services-systemd/main.py:76 @@ -83,27 +88,27 @@ msgstr "" #: src/modules/umount/main.py:40 msgid "Unmount file systems." -msgstr "" +msgstr "আনমাউন্ট ফাইল সিস্টেমগুলি করুন।" #: src/modules/unpackfs/main.py:44 msgid "Filling up filesystems." -msgstr "" +msgstr "ফাইলসিস্টেমগুলিপূরণ করছে।" #: src/modules/unpackfs/main.py:257 msgid "rsync failed with error code {}." -msgstr "" +msgstr "ত্রুটি কোড সহ আরসিঙ্ক ব্যর্থ হয়েছে {}।" #: src/modules/unpackfs/main.py:302 msgid "Unpacking image {}/{}, file {}/{}" -msgstr "" +msgstr "চিত্র আনপ্যাক করছে {} / {}, ফাইল {} / {}" #: src/modules/unpackfs/main.py:317 msgid "Starting to unpack {}" -msgstr "" +msgstr "আনপ্যাক করা শুরু করছে {}" #: src/modules/unpackfs/main.py:326 src/modules/unpackfs/main.py:448 msgid "Failed to unpack image \"{}\"" -msgstr "" +msgstr "চিত্র আনপ্যাক করতে ব্যর্থ হয়েছে \"{}\"" #: src/modules/unpackfs/main.py:415 msgid "No mount point for root partition" diff --git a/lang/python/de/LC_MESSAGES/python.mo b/lang/python/de/LC_MESSAGES/python.mo index 64f71d6aaa9ce142ed1d17db48427716ecd97787..beb4ce7b3d137615d5b5238fb0ea631315b6e1ab 100644 GIT binary patch delta 653 zcmYk(zb`{k6u|LALz{ z*u)k*zzMvb^_t$2TOG)Yjz-?85-@B5L7B7{*7OMR$hZ?4+}d zx?l(Oz#BC16SW{G4K;}mTQP)fXrU(F#$~)iE!f9(%wYf{xKr>QHJ_jB(fP3iodlgL z)C5K|@2V46jxn4;8~u2T`nI|3W=XfR$+WF#G-;S|W6DmY(uRLY39gv&-juzReX4Xg coVGC$i&?9t8BNEn?1yKrwCvx&ZlL+)7xN}pkN^Mx delta 648 zcmXZZJuCxp7{~F)OLUTYt!lj-2_i~Rl8S~aDkK(k6GNq^Ep-ygdNFpe(3LL4NOX{t z!OJcYiP<3WGFWZm``1e@_xbPGKA7 zFobvL!?HS&F!tN-;w1UT&QdSZMV>|-O&r2=9L6^cpvNWF|Aj@D2+v9esUgSc#Y@{q zY$AVQ4>}q|{OCsxiF0a33mfqWTkr~1p%<(|r@OdcLz5hETOxfd&bXjDenC~}*WT#m zZK^RpG8~z~0bD{giGA$F0`}tvQcD^=#Rdm(oNSZ!>QKSKUk7e)c^nh diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po index 25e2e98d3..107847889 100644 --- a/lang/python/de/LC_MESSAGES/python.po +++ b/lang/python/de/LC_MESSAGES/python.po @@ -4,9 +4,9 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Adriaan de Groot , 2019 # Christian Spaan, 2020 # Andreas Eitel , 2020 +# Adriaan de Groot , 2020 # #, fuzzy msgid "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-18 15:42+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Andreas Eitel , 2020\n" +"Last-Translator: Adriaan de Groot , 2020\n" "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -105,7 +105,7 @@ msgstr "rsync fehlgeschlagen mit Fehlercode {}." #: src/modules/unpackfs/main.py:302 msgid "Unpacking image {}/{}, file {}/{}" -msgstr "Bild Entpacken {}/{}, Datei {}/{}" +msgstr "Abbilddatei Entpacken {}/{}, Datei {}/{}" #: src/modules/unpackfs/main.py:317 msgid "Starting to unpack {}" @@ -113,7 +113,7 @@ msgstr "Beginn des Entpackens {}" #: src/modules/unpackfs/main.py:326 src/modules/unpackfs/main.py:448 msgid "Failed to unpack image \"{}\"" -msgstr "Entpacken des Image \"{}\" fehlgeschlagen" +msgstr "Entpacken der Abbilddatei \"{}\" fehlgeschlagen" #: src/modules/unpackfs/main.py:415 msgid "No mount point for root partition" From 724b92ee603fd745a47e329c2c5da5752e515507 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Jul 2020 16:35:54 +0200 Subject: [PATCH 29/30] [partition] Drop documentation of vanished parameter --- src/modules/partition/core/DeviceList.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/modules/partition/core/DeviceList.h b/src/modules/partition/core/DeviceList.h index 51c71feeb..306d90739 100644 --- a/src/modules/partition/core/DeviceList.h +++ b/src/modules/partition/core/DeviceList.h @@ -40,9 +40,6 @@ enum class DeviceType * the system, filtering out those that do not meet a criterium. * If set to WritableOnly, only devices which can be overwritten * safely are returned (e.g. RO-media are ignored, as are mounted partitions). - * @param minimumSize Can be used to filter devices based on their - * size (in bytes). If non-negative, only devices with a size - * greater than @p minimumSize will be returned. * @return a list of Devices meeting this criterium. */ QList< Device* > getDevices( DeviceType which = DeviceType::All ); From 4e4ffde604773975c8fd10d957b1f8f77603b190 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Jul 2020 17:00:36 +0200 Subject: [PATCH 30/30] Changes: post-release housekeeping --- CHANGES | 12 ++++++++++++ CMakeLists.txt | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 12b7c36e1..d7510976a 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,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.28 (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.27 (2020-07-11) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e049ca97..fb3ccf699 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,10 +46,10 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.27 + VERSION 3.2.28 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 #