From 417eeedd9f05c23c4817a904b243dc3d655a4c13 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 11 Oct 2018 06:35:45 -0400 Subject: [PATCH 01/12] [partition] Calamares is spaced-out enough without extra's --- src/modules/partition/gui/ChoicePage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index cc7819778..63bc9ea43 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -249,7 +249,7 @@ ChoicePage::setupChoices() // Fill up swap options // .. TODO: only if enabled in the config - m_eraseSwapChoices = createCombo( { SwapChoice::NoSwap, SwapChoice::SmallSwap, SwapChoice:: FullSwap } ); + m_eraseSwapChoices = createCombo( { SwapChoice::NoSwap, SwapChoice::SmallSwap, SwapChoice::FullSwap } ); m_eraseButton->addOptionsComboBox( m_eraseSwapChoices ); #if 0 From 463b1441a58c5189b70702ab96721c57dcf50e87 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 6 Nov 2018 05:54:45 -0500 Subject: [PATCH 02/12] [partition] Be more verbose about default file-system settings - Log the type that is configured - Document that this is a delicate setting, case-sensitive and dependent on KPMCore. --- src/modules/partition/gui/PartitionViewStep.cpp | 2 ++ src/modules/partition/partition.conf | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index bfd52b35e..0fdc4480b 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -574,6 +574,8 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) QString defaultFS = CalamaresUtils::getString( configurationMap, "defaultFileSystemType" ); if ( defaultFS.isEmpty() ) defaultFS = QStringLiteral( "ext4" ); + else + cDebug() << "Partition-module setting *defaultFileSystemType*" << defaultFS; if ( FileSystem::typeForName( defaultFS ) == FileSystem::Unknown ) { cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << defaultFS << ") using ext4."; diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf index 70d0ea17f..229ffc32c 100644 --- a/src/modules/partition/partition.conf +++ b/src/modules/partition/partition.conf @@ -53,6 +53,8 @@ alwaysShowPartitionLabels: true # # Suggested values: ext2, ext3, ext4, reiser, xfs, jfs, btrfs # If nothing is specified, Calamares defaults to "ext4". +# +# Names are case-sensitive and defined by KPMCore. defaultFileSystemType: "ext4" # Show/hide LUKS related functionality in automated partitioning modes. From 97c9e5bdcd95166efbcc9a22045adc57b375394f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 6 Nov 2018 06:22:02 -0500 Subject: [PATCH 03/12] [partition] Debug-log available file-system types --- src/modules/partition/gui/PartitionViewStep.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 0fdc4480b..0152f8bec 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -580,6 +580,18 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << defaultFS << ") using ext4."; defaultFS = QStringLiteral( "ext4" ); +#ifdef DEBUG_FILESYSTEMS + // This bit is for distro's debugging their settings, and shows + // all the strings that KPMCore is matching against for FS type. + { + Logger::CLog d( Logger::LOGDEBUG ); + using TR = Logger::DebugRow< int, QString >; + const auto fstypes = FileSystem::types(); + d << "Available types (" << fstypes.count() << ')'; + for ( FileSystem::Type t : fstypes ) + d << TR( static_cast( t ), FileSystem::nameForType( t ) ); + } +#endif } gs->insert( "defaultFileSystemType", defaultFS ); From 9816b6951f5dc8cdcf2971e27a6e89c01363ccfc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 6 Nov 2018 06:36:51 -0500 Subject: [PATCH 04/12] CMake: add debugging flags to compile in debug mode --- CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fb88420b..c4458c133 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,6 +46,7 @@ option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) option( WITH_PYTHONQT "Enable next generation Python modules API (experimental, requires PythonQt)." ON ) option( WITH_KF5Crash "Enable crash reporting with KCrash." ON ) + ### USE_* # # By convention, when there are multiple modules that implement similar @@ -77,6 +78,7 @@ set( CALAMARES_VERSION_MINOR 2 ) set( CALAMARES_VERSION_PATCH 3 ) set( CALAMARES_VERSION_RC 1 ) + ### Transifex (languages) info # # complete = 100% translated, @@ -142,6 +144,11 @@ set( CMAKE_CXX_STANDARD_REQUIRED ON ) set( CMAKE_C_STANDARD 99 ) set( CMAKE_C_STANDARD_REQUIRED ON ) +# Debugging flags +set( CMAKE_CXX_FLAGS_DEBUG + "-DDEBUG_TIMEZONES -DDEBUG_FILESYSTEMS" + ) + set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" ) if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) message( STATUS "Found Clang ${CMAKE_CXX_COMPILER_VERSION}, setting up Clang-specific compiler flags." ) @@ -175,7 +182,7 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) set( SUPPRESS_3RDPARTY_WARNINGS "-Wno-everything" ) set( SUPPRESS_BOOST_WARNINGS " -Wno-zero-as-null-pointer-constant -Wno-disabled-macro-expansion" ) - set( CMAKE_CXX_FLAGS_DEBUG "-g" ) + set( CMAKE_CXX_FLAGS_DEBUG "-g ${CMAKE_CXX_FLAGS_DEBUG}" ) set( CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG" ) set( CMAKE_CXX_FLAGS_RELEASE "-O4 -DNDEBUG" ) set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" ) From 33540749b244cb741c3e890771b2363e5a6d5f99 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 6 Nov 2018 06:37:55 -0500 Subject: [PATCH 05/12] CI: switch to debug builds --- ci/travis-config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/travis-config.sh b/ci/travis-config.sh index 85e6a9790..260c4b78c 100644 --- a/ci/travis-config.sh +++ b/ci/travis-config.sh @@ -5,6 +5,7 @@ # This file is sourced by travis.sh, and exports the variables # to the environment. CMAKE_ARGS="\ + -DCMAKE_BUILD_TYPE=Debug \ -DWEBVIEW_FORCE_WEBKIT=1 \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DWITH_PYTHONQT=OFF" From b798c27bc43454f083b77c6cd312208be7c4de46 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 3 Dec 2018 16:28:40 +0100 Subject: [PATCH 06/12] [partition] Be more verbose while looking for fstab entries --- src/modules/partition/core/PartUtils.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 7dddec414..3ac17067b 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -177,6 +177,9 @@ lookForFstabEntries( const QString& partitionPath ) mountOptions.append( "noload" ); } + cDebug() << "Checking device" << partitionPath + << "for fstab (fs=" << r.getOutput() << ')'; + FstabEntryList fstabEntries; QTemporaryDir mountsDir; mountsDir.setAutoRemove( false ); @@ -185,6 +188,9 @@ lookForFstabEntries( const QString& partitionPath ) if ( !exit ) // if all is well { QFile fstabFile( mountsDir.path() + "/etc/fstab" ); + + cDebug() << " .. reading" << fstabFile.fileName(); + if ( fstabFile.open( QIODevice::ReadOnly | QIODevice::Text ) ) { const QStringList fstabLines = QString::fromLocal8Bit( fstabFile.readAll() ) @@ -193,12 +199,18 @@ lookForFstabEntries( const QString& partitionPath ) for ( const QString& rawLine : fstabLines ) fstabEntries.append( FstabEntry::fromEtcFstab( rawLine ) ); fstabFile.close(); + cDebug() << " .. got" << fstabEntries.count() << "lines."; std::remove_if( fstabEntries.begin(), fstabEntries.end(), [](const FstabEntry& x) { return !x.isValid(); } ); + cDebug() << " .. got" << fstabEntries.count() << "fstab entries."; } + else + cWarning() << "Could not read fstab from mounted fs"; if ( QProcess::execute( "umount", { "-R", mountsDir.path() } ) ) cWarning() << "Could not unmount" << mountsDir.path(); } + else + cWarning() << "Could not mount existing fs"; return fstabEntries; } From 14c72824f030982363be7b076acb2b0fb1fc707e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 3 Dec 2018 16:42:40 +0100 Subject: [PATCH 07/12] [partition] Be chatty when deciding a partition isn't resizable --- src/modules/partition/core/PartUtils.cpp | 27 +++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 3ac17067b..d61064041 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -80,26 +80,47 @@ bool canBeResized( Partition* candidate ) { if ( !candidate ) + { + cDebug() << "Partition* is NULL"; return false; + } + cDebug() << "Checking if" << candidate->partitionPath() << "can be resized."; if ( !candidate->fileSystem().supportGrow() || !candidate->fileSystem().supportShrink() ) + { + cDebug() << " .. filesystem" << candidate->fileSystem().name() + << "does not support resize."; return false; + } if ( KPMHelpers::isPartitionFreeSpace( candidate ) ) + { + cDebug() << " .. partition is free space"; return false; + } if ( candidate->isMounted() ) + { + cDebug() << " .. partition is mounted"; return false; + } if ( candidate->roles().has( PartitionRole::Primary ) ) { PartitionTable* table = dynamic_cast< PartitionTable* >( candidate->parent() ); if ( !table ) + { + cDebug() << " .. no partition table found"; return false; + } if ( table->numPrimaries() >= table->maxPrimaries() ) + { + cDebug() << " .. partition table already has" + << table->maxPrimaries() << "primary partitions."; return false; + } } bool ok = false; @@ -136,11 +157,10 @@ bool canBeResized( PartitionCoreModule* core, const QString& partitionPath ) { //FIXME: check for max partitions count on DOS MBR - cDebug() << "checking if" << partitionPath << "can be resized."; + cDebug() << "Checking if" << partitionPath << "can be resized."; QString partitionWithOs = partitionPath; if ( partitionWithOs.startsWith( "/dev/" ) ) { - cDebug() << partitionWithOs << "seems like a good path"; DeviceModel* dm = core->deviceModel(); for ( int i = 0; i < dm->rowCount(); ++i ) { @@ -148,10 +168,11 @@ canBeResized( PartitionCoreModule* core, const QString& partitionPath ) Partition* candidate = KPMHelpers::findPartitionByPath( { dev }, partitionWithOs ); if ( candidate ) { - cDebug() << "found Partition* for" << partitionWithOs; + cDebug() << " .. found Partition* for" << partitionWithOs; return canBeResized( candidate ); } } + cDebug() << " .. no Partition* found for" << partitionWithOs; } cDebug() << "Partition" << partitionWithOs << "CANNOT BE RESIZED FOR AUTOINSTALL."; From a0766a6895658f33b8bd9c0a710f9cf0bad0a71f Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 3 Dec 2018 21:09:29 +0100 Subject: [PATCH 08/12] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_de.ts | 2 +- lang/calamares_ru.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index dde1796be..ea9421a7b 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -2746,7 +2746,7 @@ Ausgabe: Physical Extent Size: - + Größe der Körpergröße: diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts index 18740e526..6862e400d 100644 --- a/lang/calamares_ru.ts +++ b/lang/calamares_ru.ts @@ -821,7 +821,7 @@ The installer will quit and all changes will be lost. %1 - (%2) - + %1 - (%2) @@ -1724,7 +1724,7 @@ The installer will quit and all changes will be lost. New Volume Group - + Новая группа томов From e485f057d52279b1eb95a911629f27e3856c6d3a Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 3 Dec 2018 21:09:29 +0100 Subject: [PATCH 09/12] i18n: [desktop] Automatic merge of Transifex translations --- calamares.desktop | 158 +++++++++++++++++++++++----------------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/calamares.desktop b/calamares.desktop index ca766ec81..b4c3a2693 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -14,168 +14,168 @@ Categories=Qt;System; X-AppStream-Ignore=true Name[ar]=نظام التثبيت -Comment[be]=Calamares — усталёўшчык сістэмы -Icon[be]=calamares Name[be]=Усталяваць сістэму +Icon[be]=calamares GenericName[be]=Усталёўшчык сістэмы -Comment[bg]=Calamares — Системен Инсталатор -Icon[bg]=calamares +Comment[be]=Calamares — усталёўшчык сістэмы Name[bg]=Инсталирай системата +Icon[bg]=calamares GenericName[bg]=Системен Инсталатор -Comment[ca]=Calamares — Instal·lador de sistema -Icon[ca]=calamares +Comment[bg]=Calamares — Системен Инсталатор Name[ca]=Instal·la el sistema +Icon[ca]=calamares GenericName[ca]=Instal·lador de sistema -Comment[da]=Calamares — Systeminstallationsprogram -Icon[da]=calamares +Comment[ca]=Calamares — Instal·lador de sistema Name[da]=Installér system +Icon[da]=calamares GenericName[da]=Systeminstallationsprogram -Comment[de]=Calamares - Installation des Betriebssystems -Icon[de]=calamares +Comment[da]=Calamares — Systeminstallationsprogram Name[de]=System installieren +Icon[de]=calamares GenericName[de]=Installation des Betriebssystems -Comment[el]=Calamares — Εγκατάσταση συστήματος -Icon[el]=calamares +Comment[de]=Calamares - Installation des Betriebssystems Name[el]=Εγκατάσταση συστήματος +Icon[el]=calamares GenericName[el]=Εγκατάσταση συστήματος -Comment[en_GB]=Calamares — System Installer -Icon[en_GB]=calamares +Comment[el]=Calamares — Εγκατάσταση συστήματος Name[en_GB]=Install System +Icon[en_GB]=calamares GenericName[en_GB]=System Installer -Comment[es]=Calamares — Instalador del Sistema -Icon[es]=calamares +Comment[en_GB]=Calamares — System Installer Name[es]=Instalar Sistema +Icon[es]=calamares GenericName[es]=Instalador del Sistema -Comment[et]=Calamares — süsteemipaigaldaja -Icon[et]=calamares +Comment[es]=Calamares — Instalador del Sistema Name[et]=Paigalda süsteem +Icon[et]=calamares GenericName[et]=Süsteemipaigaldaja +Comment[et]=Calamares — süsteemipaigaldaja Name[eu]=Sistema instalatu Name[es_PR]=Instalar el sistema -Comment[fr]=Calamares - Installateur système -Icon[fr]=calamares Name[fr]=Installer le système +Icon[fr]=calamares GenericName[fr]=Installateur système -Comment[gl]=Calamares — Instalador de sistemas -Icon[gl]=calamares +Comment[fr]=Calamares - Installateur système Name[gl]=Instalación do Sistema +Icon[gl]=calamares GenericName[gl]=Instalador de sistemas -Comment[he]=Calamares - אשף התקנה -Icon[he]=calamares +Comment[gl]=Calamares — Instalador de sistemas Name[he]=התקנת מערכת +Icon[he]=calamares GenericName[he]=אשף התקנה -Comment[hi]=Calamares — सिस्टम इंस्टॉलर -Icon[hi]=calamares +Comment[he]=Calamares - אשף התקנה Name[hi]=सिस्टम इंस्टॉल करें +Icon[hi]=calamares GenericName[hi]=सिस्टम इंस्टॉलर -Comment[hr]=Calamares — Instalacija sustava -Icon[hr]=calamares +Comment[hi]=Calamares — सिस्टम इंस्टॉलर Name[hr]=Instaliraj sustav +Icon[hr]=calamares GenericName[hr]=Instalacija sustava -Comment[hu]=Calamares – Rendszertelepítő -Icon[hu]=calamares +Comment[hr]=Calamares — Instalacija sustava Name[hu]=Rendszer telepítése +Icon[hu]=calamares GenericName[hu]=Rendszertelepítő -Comment[id]=Calamares — Pemasang Sistem -Icon[id]=calamares +Comment[hu]=Calamares – Rendszertelepítő Name[id]=Instal Sistem +Icon[id]=calamares GenericName[id]=Pemasang -Comment[is]=Calamares — Kerfis uppsetning -Icon[is]=calamares +Comment[id]=Calamares — Pemasang Sistem Name[is]=Setja upp kerfið +Icon[is]=calamares GenericName[is]=Kerfis uppsetning -Comment[cs_CZ]=Calamares – instalátor operačních systémů -Icon[cs_CZ]=calamares +Comment[is]=Calamares — Kerfis uppsetning Name[cs_CZ]=Nainstalovat +Icon[cs_CZ]=calamares GenericName[cs_CZ]=Instalátor systému -Comment[ja]=Calamares — システムインストーラー -Icon[ja]=calamares +Comment[cs_CZ]=Calamares – instalátor operačních systémů Name[ja]=システムをインストール +Icon[ja]=calamares GenericName[ja]=システムインストーラー -Comment[ko]=깔라마레스 — 시스템 설치 관리자 -Icon[ko]=깔라마레스 +Comment[ja]=Calamares — システムインストーラー Name[ko]=시스템 설치 +Icon[ko]=깔라마레스 GenericName[ko]=시스템 설치 관리자 -Comment[lt]=Calamares — Sistemos diegimo programa -Icon[lt]=calamares +Comment[ko]=깔라마레스 — 시스템 설치 관리자 Name[lt]=Įdiegti Sistemą +Icon[lt]=calamares GenericName[lt]=Sistemos diegimas į kompiuterį -Comment[it_IT]=Calamares — Programma d'installazione del sistema -Icon[it_IT]=calamares +Comment[lt]=Calamares — Sistemos diegimo programa Name[it_IT]=Installa il sistema +Icon[it_IT]=calamares GenericName[it_IT]=Programma d'installazione del sistema -Comment[nb]=Calamares-systeminstallatør -Icon[nb]=calamares +Comment[it_IT]=Calamares — Programma d'installazione del sistema Name[nb]=Installer System +Icon[nb]=calamares GenericName[nb]=Systeminstallatør -Comment[nl]=Calamares — Installatieprogramma -Icon[nl]=calamares +Comment[nb]=Calamares-systeminstallatør Name[nl]=Installeer systeem +Icon[nl]=calamares GenericName[nl]=Installatieprogramma -Comment[pl]=Calamares — Instalator systemu -Icon[pl]=calamares +Comment[nl]=Calamares — Installatieprogramma Name[pl]=Zainstaluj system +Icon[pl]=calamares GenericName[pl]=Instalator systemu -Comment[pt_BR]=Calamares — Instalador de Sistema -Icon[pt_BR]=calamares +Comment[pl]=Calamares — Instalator systemu Name[pt_BR]=Sistema de Instalação +Icon[pt_BR]=calamares GenericName[pt_BR]=Instalador de Sistema -Comment[ro]=Calamares — Instalator de sistem -Icon[ro]=calamares +Comment[pt_BR]=Calamares — Instalador de Sistema Name[ro]=Instalează sistemul +Icon[ro]=calamares GenericName[ro]=Instalator de sistem -Comment[ru]=Calamares - Установщик системы -Icon[ru]=calamares +Comment[ro]=Calamares — Instalator de sistem Name[ru]=Установить систему +Icon[ru]=calamares GenericName[ru]=Установщик системы -Comment[sk]=Calamares — Inštalátor systému -Icon[sk]=calamares +Comment[ru]=Calamares - Установщик системы Name[sk]=Inštalovať systém +Icon[sk]=calamares GenericName[sk]=Inštalátor systému +Comment[sk]=Calamares — Inštalátor systému Name[sl]=Namesti sistem -Comment[sq]=Calamares — Instalues Sistemi -Icon[sq]=calamares Name[sq]=Instalo Sistemin +Icon[sq]=calamares GenericName[sq]=Instalues Sistemi -Comment[fi_FI]=Calamares — Järjestelmän Asentaja -Icon[fi_FI]=calamares +Comment[sq]=Calamares — Instalues Sistemi 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 Name[sr@latin]=Instaliraj sistem Name[sr]=Инсталирај систем -Comment[sv]=Calamares — Systeminstallerare -Icon[sv]=calamares Name[sv]=Installera system +Icon[sv]=calamares GenericName[sv]=Systeminstallerare +Comment[sv]=Calamares — Systeminstallerare Name[th]=ติดตั้งระบบ -Comment[uk]=Calamares - Встановлювач системи Name[uk]=Встановити Систему GenericName[uk]=Встановлювач системи -Comment[zh_CN]=Calamares — 系统安装程序 -Icon[zh_CN]=calamares +Comment[uk]=Calamares - Встановлювач системи Name[zh_CN]=安装系统 +Icon[zh_CN]=calamares GenericName[zh_CN]=系统安装程序 -Comment[zh_TW]=Calamares ── 系統安裝程式 -Icon[zh_TW]=calamares +Comment[zh_CN]=Calamares — 系统安装程序 Name[zh_TW]=安裝系統 +Icon[zh_TW]=calamares GenericName[zh_TW]=系統安裝程式 -Comment[ast]=Calamares — Instalador del sistema -Icon[ast]=calamares +Comment[zh_TW]=Calamares ── 系統安裝程式 Name[ast]=Instalar sistema +Icon[ast]=calamares GenericName[ast]=Instalador del sistema -Comment[eo]=Calamares — Sistema Instalilo -Icon[eo]=calamares +Comment[ast]=Calamares — Instalador del sistema Name[eo]=Instali Sistemo +Icon[eo]=calamares GenericName[eo]=Sistema Instalilo -Comment[es_MX]=Calamares - Instalador del sistema -Icon[es_MX]=calamares +Comment[eo]=Calamares — Sistema Instalilo Name[es_MX]=Instalar el Sistema +Icon[es_MX]=calamares GenericName[es_MX]=Instalador del sistema -Comment[pt_PT]=Calamares - Instalador de Sistema -Icon[pt_PT]=calamares +Comment[es_MX]=Calamares - Instalador del sistema Name[pt_PT]=Instalar Sistema +Icon[pt_PT]=calamares GenericName[pt_PT]=Instalador de Sistema -Comment[tr_TR]=Calamares — Sistem Yükleyici -Icon[tr_TR]=calamares +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 From 6ac872e7240dbe64411171865d2074b3b6ca4861 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 3 Dec 2018 21:09:30 +0100 Subject: [PATCH 10/12] i18n: [dummypythonqt] Automatic merge of Transifex translations --- .../lang/fr/LC_MESSAGES/dummypythonqt.mo | Bin 972 -> 977 bytes .../lang/fr/LC_MESSAGES/dummypythonqt.po | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo index 45d8fc355cbf8ecdbff4d714acd3680e51a8a761..c309c24d636d241917cb95391d0ede31cff84c73 100644 GIT binary patch delta 76 zcmX@Zevy4bi0LXu28IM67Ghvv;AUoEFb2|cK$-_g2LWkGARP~+#esAskhTZX6E}AD SF|rjD<(K5=ZI)o#!UzDK`wVvg delta 71 zcmcb}eujNQi0M*B28IM67GhvvU}I)rFb2|+K$-_g`vPf6ARPsy#esAQkhTZXJsUgw N7#Y(y%Q9_Y1OQxF3K;+Z diff --git a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po index 082109871..fe75d0c55 100644 --- a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ # # Translators: # Paul Combal , 2017 -# Aestan , 2018 +# Aestan , 2018 # #, fuzzy msgid "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-05 11:34-0400\n" "PO-Revision-Date: 2016-12-16 12:18+0000\n" -"Last-Translator: Aestan , 2018\n" +"Last-Translator: Aestan , 2018\n" "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From dc92415ae0724321049863d7ac5ec42f7ae7350c Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 3 Dec 2018 21:09:30 +0100 Subject: [PATCH 11/12] i18n: [python] Automatic merge of Transifex translations --- lang/python/fr/LC_MESSAGES/python.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po index c1c4af1ef..d869f977d 100644 --- a/lang/python/fr/LC_MESSAGES/python.po +++ b/lang/python/fr/LC_MESSAGES/python.po @@ -6,7 +6,7 @@ # Translators: # Paul Combal , 2017 # Abdallah B , 2017 -# Aestan , 2018 +# Aestan , 2018 # Jeremy Gourmel , 2018 # #, fuzzy From b8595a1323b7826744b99ad6d2e94f682bd16794 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 3 Dec 2018 21:44:29 +0100 Subject: [PATCH 12/12] CMake: relax debugging flags again --- CMakeLists.txt | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4458c133..faaab2283 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,9 +145,24 @@ set( CMAKE_C_STANDARD 99 ) set( CMAKE_C_STANDARD_REQUIRED ON ) # Debugging flags -set( CMAKE_CXX_FLAGS_DEBUG - "-DDEBUG_TIMEZONES -DDEBUG_FILESYSTEMS" - ) +# +# Possible debugging flags are: +# - DEBUG_TIMEZONES draws latitude and longitude lines on the timezone +# widget and enables chatty debug logging, for dealing with the timezone +# location database. +# - DEBUG_FILESYSTEMS does extra logging and checking when looking at +# partition configuration. Lists known KPMCore FS types. +# +# The flags listed here are enabled in Debug builds. By default, none +# are **actually** listed, because they're for such specific scenarios. +set( _enable_debug_flags + # DEBUG_TIMEZONES + # DEBUG_FILESYSTEMS +) +# Add those flags to the CXX flags in a suitable format. +foreach( _edf ${_enable_debug_flags} ) + string( APPEND CMAKE_CXX_FLAGS_DEBUG " -D${_edf}" ) +endforeach() set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" ) if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )