From 795256cba5e446ad64a749ef77e77709c13c290d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 19 Jun 2022 16:00:41 +0200 Subject: [PATCH 01/26] Changes: release-related housekeeping --- CHANGES-3.2 | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index b897c1b35..548b925a8 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -10,16 +10,26 @@ website will have to do for older versions. > Note that the 3.2 series is now in LTS / bug-fix-only mode. -# 3.2.60 (unreleased) # +# 3.2.60 (2022-06-19) # -This release contains contributions from (alphabetically by first name): - - No external contributors yet +This is the first community-maintainence release of Calamares 3.2. +Somewhat ironically, all the commits in the branch come from +Adriaan de Groot -- the community is working in the 3.3 (*calamares*) +branch. ## Core ## - - No core changes yet + - No core changes ## Modules ## - - No module changes yet + - *fstab* now warns when the mount options are empty (which is non- + sensical, and indicates that the configuration is bad). + - *locale* does a better job of preserving Catalan (Valencia) + across modules; previously it dropped the *Valencia* + after the locale module unless you specifically re-selected + `ca@valencia` in the locale module. (Reported by Lliurex) + - *welcome* now has text labels on the special buttons (nominally, + this is part of the core, but the *About* button was always on the + welcome page). # 3.2.59 (2022-05-29) # From 6dbf9de06ee6821c34e042ab17a534bb51370e9b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 19 Jun 2022 16:01:34 +0200 Subject: [PATCH 02/26] Changes: post-release housekeeping --- CHANGES-3.2 | 14 +++++++++++++- CMakeLists.txt | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index 548b925a8..3e5cc3db1 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -10,7 +10,19 @@ website will have to do for older versions. > Note that the 3.2 series is now in LTS / bug-fix-only mode. -# 3.2.60 (2022-06-19) # +# 3.2.61 (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.60 (2022-06-19) # This is the first community-maintainence release of Calamares 3.2. Somewhat ironically, all the commits in the branch come from diff --git a/CMakeLists.txt b/CMakeLists.txt index 80a8170bd..4782e11fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.60 + VERSION 3.2.61 LANGUAGES C CXX ) From f7a7ad9943b8634a74eae391857bd8b66fbc23bd Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 19 Jul 2022 18:05:24 +0200 Subject: [PATCH 03/26] [locale] Add test for language-mapping Adds specific data from KDE neon and expected mappings. The test fails right now because the mapping is incorrect. --- src/modules/locale/Tests.cpp | 89 ++++++ src/modules/locale/tests/locale-data-neon | 318 ++++++++++++++++++++++ 2 files changed, 407 insertions(+) create mode 100644 src/modules/locale/tests/locale-data-neon diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp index 23f9b5b3e..db5751177 100644 --- a/src/modules/locale/Tests.cpp +++ b/src/modules/locale/Tests.cpp @@ -11,7 +11,9 @@ #include "LocaleConfiguration.h" #include "timezonewidget/TimeZoneImage.h" +#include "Settings.h" #include "locale/TimeZone.h" +#include "locale/TranslationsModel.h" #include "utils/Logger.h" #include @@ -43,6 +45,15 @@ private Q_SLOTS: void testLanguageDetection_data(); void testLanguageDetection(); void testLanguageDetectionValencia(); + + // Check realistic language mapping for issue 2008 + void testKDENeonLanguageData(); + void testLanguageMapping_data(); + void testLanguageMapping(); + +private: + QStringList m_KDEneonLocales; + QStringList m_FreeBSDLocales; }; QTEST_MAIN( LocaleTests ) @@ -55,6 +66,12 @@ LocaleTests::~LocaleTests() {} void LocaleTests::initTestCase() { + Logger::setupLogLevel( Logger::LOGDEBUG ); + const auto* settings = Calamares::Settings::instance(); + if ( !settings ) + { + (void)new Calamares::Settings( true ); + } } void @@ -353,6 +370,78 @@ LocaleTests::testLanguageDetectionValencia() } } +static QStringList +splitTestFileIntoLines( const QString& filename ) +{ + // BUILD_AS_TEST is the source-directory path + const QFileInfo fi( QString( "%1/tests/%2" ).arg( BUILD_AS_TEST, filename ) ); + const QString path = fi.absoluteFilePath(); + QFile testData( path ); + if ( testData.open( QIODevice::ReadOnly ) ) + { + return QString::fromUtf8( testData.readAll() ).split( '\n', Qt::SkipEmptyParts ); + } + return QStringList {}; +} + +void +LocaleTests::testKDENeonLanguageData() +{ + const QStringList neonLocales = splitTestFileIntoLines( QStringLiteral( "locale-data-neon" ) ); + cDebug() << "Loaded KDE neon locales test data" << neonLocales.front() << "to" << neonLocales.back(); + QCOMPARE( neonLocales.length(), 318 ); // wc -l tells me 318 lines + + m_KDEneonLocales = neonLocales; +} + +void +LocaleTests::testLanguageMapping_data() +{ + QTest::addColumn< QString >( "selectedLanguage" ); + QTest::addColumn< QString >( "KDEneonLanguage" ); + + // Tired of writing QString or QStringLiteral all the time. + auto l = []( const char* p ) { return QString::fromUtf8( p ); }; + + // The KDEneon columns include the .UTF-8 from the source data + // + // Each column shows how a language -- which can be selected from the + // welcome page, and is inserted into GS as the language key that + // Calamares knows -- should be mapped to a supported system locale. + // + // All the mappings are for ".. in NL", which can trigger minor variation + // if there are languages with a _NL variant (e.g. nl_NL and nl_BE). + + // clang-format off + QTest::newRow( "en " ) << l( "en" ) << l( "en_US.UTF-8" ); + QTest::newRow( "en_GB" ) << l( "en_GB" ) << l( "en_GB.UTF-8" ); + QTest::newRow( "ca " ) << l( "ca" ) << l( "ca_ES.UTF-8" ); + QTest::newRow( "ca@vl" ) << l( "ca@valencia" ) << l( "ca_ES@valencia" ); + QTest::newRow( "sr " ) << l( "sr" ) << l( "sr_RS" ); + QTest::newRow( "sr@lt" ) << l( "sr@latin" ) << l( "sr_RS@latin" ); + QTest::newRow( "pt_PT" ) << l( "pt_PT" ) << l( "pt_PT.UTF-8" ); + QTest::newRow( "pt_BR" ) << l( "pt_BR" ) << l( "pt_BR.UTF-8" ); + QTest::newRow( "nl " ) << l( "nl" ) << l( "nl_NL.UTF-8" ); + QTest::newRow( "zh_TW" ) << l( "zh_TW" ) << l( "zh_TW.UTF-8" ); + // clang-format on +} + + +void +LocaleTests::testLanguageMapping() +{ + QVERIFY( !m_KDEneonLocales.isEmpty() ); + + QFETCH( QString, selectedLanguage ); + QFETCH( QString, KDEneonLanguage ); + + QVERIFY( Calamares::Locale::availableLanguages().contains( selectedLanguage ) ); + + const auto r = LocaleConfiguration::fromLanguageAndLocation( + ( selectedLanguage ), m_KDEneonLocales, QStringLiteral( "NL" ) ); + QCOMPARE( r.language(), KDEneonLanguage ); +} + #include "utils/moc-warnings.h" diff --git a/src/modules/locale/tests/locale-data-neon b/src/modules/locale/tests/locale-data-neon new file mode 100644 index 000000000..0f0254d01 --- /dev/null +++ b/src/modules/locale/tests/locale-data-neon @@ -0,0 +1,318 @@ +aa_DJ.UTF-8 +aa_ER +aa_ER@saaho +aa_ET +af_ZA.UTF-8 +agr_PE +ak_GH +am_ET +an_ES.UTF-8 +anp_IN +ar_AE.UTF-8 +ar_BH.UTF-8 +ar_DZ.UTF-8 +ar_EG.UTF-8 +ar_IN +ar_IQ.UTF-8 +ar_JO.UTF-8 +ar_KW.UTF-8 +ar_LB.UTF-8 +ar_LY.UTF-8 +ar_MA.UTF-8 +ar_OM.UTF-8 +ar_QA.UTF-8 +ar_SA.UTF-8 +ar_SD.UTF-8 +ar_SS +ar_SY.UTF-8 +ar_TN.UTF-8 +ar_YE.UTF-8 +ayc_PE +az_AZ +az_IR +as_IN +ast_ES.UTF-8 +be_BY.UTF-8 +be_BY@latin +bem_ZM +ber_DZ +ber_MA +bg_BG.UTF-8 +bhb_IN.UTF-8 +bho_IN +bho_NP +bi_VU +bn_BD +bn_IN +bo_CN +bo_IN +br_FR.UTF-8 +brx_IN +bs_BA.UTF-8 +byn_ER +ca_AD.UTF-8 +ca_ES.UTF-8 +ca_ES@valencia +ca_FR.UTF-8 +ca_IT.UTF-8 +ce_RU +ckb_IQ +chr_US +cmn_TW +crh_UA +cs_CZ.UTF-8 +csb_PL +cv_RU +cy_GB.UTF-8 +da_DK.UTF-8 +de_AT.UTF-8 +de_BE.UTF-8 +de_CH.UTF-8 +de_DE.UTF-8 +de_IT.UTF-8 +de_LI.UTF-8 +de_LU.UTF-8 +doi_IN +dsb_DE +dv_MV +dz_BT +el_GR.UTF-8 +el_CY.UTF-8 +en_AG +en_AU.UTF-8 +en_BW.UTF-8 +en_CA.UTF-8 +en_DK.UTF-8 +en_GB.UTF-8 +en_HK.UTF-8 +en_IE.UTF-8 +en_IL +en_IN +en_NG +en_NZ.UTF-8 +en_PH.UTF-8 +en_SC.UTF-8 +en_SG.UTF-8 +en_US.UTF-8 +en_ZA.UTF-8 +en_ZM +en_ZW.UTF-8 +eo +eo_US.UTF-8 +es_AR.UTF-8 +es_BO.UTF-8 +es_CL.UTF-8 +es_CO.UTF-8 +es_CR.UTF-8 +es_CU +es_DO.UTF-8 +es_EC.UTF-8 +es_ES.UTF-8 +es_GT.UTF-8 +es_HN.UTF-8 +es_MX.UTF-8 +es_NI.UTF-8 +es_PA.UTF-8 +es_PE.UTF-8 +es_PR.UTF-8 +es_PY.UTF-8 +es_SV.UTF-8 +es_US.UTF-8 +es_UY.UTF-8 +es_VE.UTF-8 +et_EE.UTF-8 +eu_ES.UTF-8 +eu_FR.UTF-8 +fa_IR +ff_SN +fi_FI.UTF-8 +fil_PH +fo_FO.UTF-8 +fr_BE.UTF-8 +fr_CA.UTF-8 +fr_CH.UTF-8 +fr_FR.UTF-8 +fr_LU.UTF-8 +fur_IT +fy_NL +fy_DE +ga_IE.UTF-8 +gd_GB.UTF-8 +gez_ER +gez_ER@abegede +gez_ET +gez_ET@abegede +gl_ES.UTF-8 +gu_IN +gv_GB.UTF-8 +ha_NG +hak_TW +he_IL.UTF-8 +hi_IN +hif_FJ +hne_IN +hr_HR.UTF-8 +hsb_DE.UTF-8 +ht_HT +hu_HU.UTF-8 +hy_AM +ia_FR +id_ID.UTF-8 +ig_NG +ik_CA +is_IS.UTF-8 +it_CH.UTF-8 +it_IT.UTF-8 +iu_CA +ja_JP.UTF-8 +ka_GE.UTF-8 +kab_DZ +kk_KZ.UTF-8 +kl_GL.UTF-8 +km_KH +kn_IN +ko_KR.UTF-8 +kok_IN +ks_IN +ks_IN@devanagari +ku_TR.UTF-8 +kw_GB.UTF-8 +ky_KG +lb_LU +lg_UG.UTF-8 +li_BE +li_NL +lij_IT +ln_CD +lo_LA +lt_LT.UTF-8 +lv_LV.UTF-8 +lzh_TW +mag_IN +mai_IN +mai_NP +mfe_MU +mg_MG.UTF-8 +mhr_RU +mi_NZ.UTF-8 +miq_NI +mjw_IN +mk_MK.UTF-8 +ml_IN +mn_MN +mni_IN +mnw_MM +mr_IN +ms_MY.UTF-8 +mt_MT.UTF-8 +my_MM +nan_TW +nan_TW@latin +nb_NO.UTF-8 +nds_DE +nds_NL +ne_NP +nhn_MX +niu_NU +niu_NZ +nl_AW +nl_BE.UTF-8 +nl_NL.UTF-8 +nn_NO.UTF-8 +nr_ZA +nso_ZA +oc_FR.UTF-8 +om_ET +om_KE.UTF-8 +or_IN +os_RU +pa_IN +pa_PK +pap_AW +pap_CW +pl_PL.UTF-8 +ps_AF +pt_BR.UTF-8 +pt_PT.UTF-8 +quz_PE +raj_IN +ro_RO.UTF-8 +ru_RU.UTF-8 +ru_UA.UTF-8 +rw_RW +sa_IN +sah_RU +sat_IN +sc_IT +sd_IN +sd_IN@devanagari +sd_PK +se_NO +sgs_LT +shn_MM +shs_CA +si_LK +sid_ET +sk_SK.UTF-8 +sl_SI.UTF-8 +sm_WS +so_DJ.UTF-8 +so_ET +so_KE.UTF-8 +so_SO.UTF-8 +sq_AL.UTF-8 +sq_MK +sr_ME +sr_RS +sr_RS@latin +ss_ZA +st_ZA.UTF-8 +sv_FI.UTF-8 +sv_SE.UTF-8 +sw_KE +sw_TZ +szl_PL +ta_IN +ta_LK +tcy_IN.UTF-8 +te_IN +tg_TJ.UTF-8 +th_TH.UTF-8 +the_NP +ti_ER +ti_ET +tig_ER +tk_TM +tl_PH.UTF-8 +tn_ZA +to_TO +tpi_PG +tr_CY.UTF-8 +tr_TR.UTF-8 +ts_ZA +tt_RU +tt_RU@iqtelif +ug_CN +ug_CN@latin +uk_UA.UTF-8 +unm_US +ur_IN +ur_PK +uz_UZ.UTF-8 +uz_UZ@cyrillic +ve_ZA +vi_VN +wa_BE.UTF-8 +wae_CH +wal_ET +wo_SN +xh_ZA.UTF-8 +yi_US.UTF-8 +yo_NG +yue_HK +yuw_PG +zh_CN.UTF-8 +zh_HK.UTF-8 +zh_SG.UTF-8 +zh_TW.UTF-8 +zu_ZA.UTF-8 From 61a07f05ba08fab911bc3bf48975ab83979c5d6c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 19 Jul 2022 18:48:32 +0200 Subject: [PATCH 04/26] [locale] Add FreeBSD test data for locale-mapping --- src/modules/locale/Tests.cpp | 42 +++++++---- src/modules/locale/tests/locale-data-freebsd | 79 ++++++++++++++++++++ 2 files changed, 107 insertions(+), 14 deletions(-) create mode 100644 src/modules/locale/tests/locale-data-freebsd diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp index db5751177..534751c52 100644 --- a/src/modules/locale/Tests.cpp +++ b/src/modules/locale/Tests.cpp @@ -390,8 +390,12 @@ LocaleTests::testKDENeonLanguageData() const QStringList neonLocales = splitTestFileIntoLines( QStringLiteral( "locale-data-neon" ) ); cDebug() << "Loaded KDE neon locales test data" << neonLocales.front() << "to" << neonLocales.back(); QCOMPARE( neonLocales.length(), 318 ); // wc -l tells me 318 lines - m_KDEneonLocales = neonLocales; + + const QStringList bsdLocales = splitTestFileIntoLines( QStringLiteral( "locale-data-freebsd" ) ); + cDebug() << "Loaded FreeBSD locales test data" << bsdLocales.front() << "to" << bsdLocales.back(); + QCOMPARE( bsdLocales.length(), 79 ); + m_FreeBSDLocales = bsdLocales; } void @@ -399,13 +403,17 @@ LocaleTests::testLanguageMapping_data() { QTest::addColumn< QString >( "selectedLanguage" ); QTest::addColumn< QString >( "KDEneonLanguage" ); + QTest::addColumn< QString >( "FreeBSDLanguage" ); // Tired of writing QString or QStringLiteral all the time. auto l = []( const char* p ) { return QString::fromUtf8( p ); }; + auto u = [](){ return QString(); }; // The KDEneon columns include the .UTF-8 from the source data + // The FreeBSD columns may have u() to indicate "same as KDEneon", + // that's an empty string. // - // Each column shows how a language -- which can be selected from the + // Each row shows how a language -- which can be selected from the // welcome page, and is inserted into GS as the language key that // Calamares knows -- should be mapped to a supported system locale. // @@ -413,16 +421,16 @@ LocaleTests::testLanguageMapping_data() // if there are languages with a _NL variant (e.g. nl_NL and nl_BE). // clang-format off - QTest::newRow( "en " ) << l( "en" ) << l( "en_US.UTF-8" ); - QTest::newRow( "en_GB" ) << l( "en_GB" ) << l( "en_GB.UTF-8" ); - QTest::newRow( "ca " ) << l( "ca" ) << l( "ca_ES.UTF-8" ); - QTest::newRow( "ca@vl" ) << l( "ca@valencia" ) << l( "ca_ES@valencia" ); - QTest::newRow( "sr " ) << l( "sr" ) << l( "sr_RS" ); - QTest::newRow( "sr@lt" ) << l( "sr@latin" ) << l( "sr_RS@latin" ); - QTest::newRow( "pt_PT" ) << l( "pt_PT" ) << l( "pt_PT.UTF-8" ); - QTest::newRow( "pt_BR" ) << l( "pt_BR" ) << l( "pt_BR.UTF-8" ); - QTest::newRow( "nl " ) << l( "nl" ) << l( "nl_NL.UTF-8" ); - QTest::newRow( "zh_TW" ) << l( "zh_TW" ) << l( "zh_TW.UTF-8" ); + QTest::newRow( "en " ) << l( "en" ) << l( "en_US.UTF-8" ) << u(); + QTest::newRow( "en_GB" ) << l( "en_GB" ) << l( "en_GB.UTF-8" ) << u(); + QTest::newRow( "ca " ) << l( "ca" ) << l( "ca_ES.UTF-8" ) << u(); + QTest::newRow( "ca@vl" ) << l( "ca@valencia" ) << l( "ca_ES@valencia" ) << u(); + QTest::newRow( "sr " ) << l( "sr" ) << l( "sr_RS" ) << u(); + QTest::newRow( "sr@lt" ) << l( "sr@latin" ) << l( "sr_RS@latin" ) << u(); + QTest::newRow( "pt_PT" ) << l( "pt_PT" ) << l( "pt_PT.UTF-8" ) << u(); + QTest::newRow( "pt_BR" ) << l( "pt_BR" ) << l( "pt_BR.UTF-8" ) << u(); + QTest::newRow( "nl " ) << l( "nl" ) << l( "nl_NL.UTF-8" ) << u(); + QTest::newRow( "zh_TW" ) << l( "zh_TW" ) << l( "zh_TW.UTF-8" ) << u(); // clang-format on } @@ -431,15 +439,21 @@ void LocaleTests::testLanguageMapping() { QVERIFY( !m_KDEneonLocales.isEmpty() ); + QVERIFY( !m_FreeBSDLocales.isEmpty() ); QFETCH( QString, selectedLanguage ); QFETCH( QString, KDEneonLanguage ); + QFETCH( QString, FreeBSDLanguage ); QVERIFY( Calamares::Locale::availableLanguages().contains( selectedLanguage ) ); - const auto r = LocaleConfiguration::fromLanguageAndLocation( + const auto neon = LocaleConfiguration::fromLanguageAndLocation( ( selectedLanguage ), m_KDEneonLocales, QStringLiteral( "NL" ) ); - QCOMPARE( r.language(), KDEneonLanguage ); + QCOMPARE( neon.language(), KDEneonLanguage ); + + const auto bsd = LocaleConfiguration::fromLanguageAndLocation( + ( selectedLanguage ), m_FreeBSDLocales, QStringLiteral( "NL" ) ); + QCOMPARE( bsd.language(), FreeBSDLanguage.isEmpty() ? KDEneonLanguage : FreeBSDLanguage ); } diff --git a/src/modules/locale/tests/locale-data-freebsd b/src/modules/locale/tests/locale-data-freebsd new file mode 100644 index 000000000..281839a90 --- /dev/null +++ b/src/modules/locale/tests/locale-data-freebsd @@ -0,0 +1,79 @@ +C.UTF-8 +af_ZA.UTF-8 +am_ET.UTF-8 +ar_AE.UTF-8 +ar_EG.UTF-8 +ar_JO.UTF-8 +ar_MA.UTF-8 +ar_QA.UTF-8 +ar_SA.UTF-8 +be_BY.UTF-8 +bg_BG.UTF-8 +ca_AD.UTF-8 +ca_ES.UTF-8 +ca_FR.UTF-8 +ca_IT.UTF-8 +cs_CZ.UTF-8 +da_DK.UTF-8 +de_AT.UTF-8 +de_CH.UTF-8 +de_DE.UTF-8 +el_GR.UTF-8 +en_AU.UTF-8 +en_CA.UTF-8 +en_GB.UTF-8 +en_HK.UTF-8 +en_IE.UTF-8 +en_NZ.UTF-8 +en_PH.UTF-8 +en_SG.UTF-8 +en_US.UTF-8 +en_ZA.UTF-8 +es_AR.UTF-8 +es_CR.UTF-8 +es_ES.UTF-8 +es_MX.UTF-8 +et_EE.UTF-8 +eu_ES.UTF-8 +fi_FI.UTF-8 +fr_BE.UTF-8 +fr_CA.UTF-8 +fr_CH.UTF-8 +fr_FR.UTF-8 +ga_IE.UTF-8 +he_IL.UTF-8 +hi_IN.UTF-8 +hr_HR.UTF-8 +hu_HU.UTF-8 +hy_AM.UTF-8 +is_IS.UTF-8 +it_CH.UTF-8 +it_IT.UTF-8 +ja_JP.UTF-8 +kk_KZ.UTF-8 +ko_KR.UTF-8 +lt_LT.UTF-8 +lv_LV.UTF-8 +mn_MN.UTF-8 +nb_NO.UTF-8 +nl_BE.UTF-8 +nl_NL.UTF-8 +nn_NO.UTF-8 +pl_PL.UTF-8 +pt_BR.UTF-8 +pt_PT.UTF-8 +ro_RO.UTF-8 +ru_RU.UTF-8 +se_FI.UTF-8 +se_NO.UTF-8 +sk_SK.UTF-8 +sl_SI.UTF-8 +sr_RS.UTF-8 +sr_RS.UTF-8@latin +sv_FI.UTF-8 +sv_SE.UTF-8 +tr_TR.UTF-8 +uk_UA.UTF-8 +zh_CN.UTF-8 +zh_HK.UTF-8 +zh_TW.UTF-8 From 1e42e1562e55a3e1f8fb278abf7fda077dadf96a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 19 Jul 2022 18:56:50 +0200 Subject: [PATCH 05/26] [locale] Test KDE neon and FreeBSD separately, same data - wrangle the test framework so it hands the same data to two different collections of tests; do KDE neon and FreeBSD separately so it's clearer which lookups are being done (and a failure in one doesn't prevent the test of the other). --- src/modules/locale/Tests.cpp | 47 +++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp index 534751c52..1a6887dc1 100644 --- a/src/modules/locale/Tests.cpp +++ b/src/modules/locale/Tests.cpp @@ -27,6 +27,9 @@ public: LocaleTests(); ~LocaleTests() override; + // Implementation of data for MappingNeon and MappingFreeBSD + void MappingData(); + private Q_SLOTS: void initTestCase(); // Check the sample config file is processed correctly @@ -48,8 +51,10 @@ private Q_SLOTS: // Check realistic language mapping for issue 2008 void testKDENeonLanguageData(); - void testLanguageMapping_data(); - void testLanguageMapping(); + void testLanguageMappingNeon_data(); + void testLanguageMappingNeon(); + void testLanguageMappingFreeBSD_data(); + void testLanguageMappingFreeBSD(); private: QStringList m_KDEneonLocales; @@ -399,7 +404,7 @@ LocaleTests::testKDENeonLanguageData() } void -LocaleTests::testLanguageMapping_data() +LocaleTests::MappingData() { QTest::addColumn< QString >( "selectedLanguage" ); QTest::addColumn< QString >( "KDEneonLanguage" ); @@ -424,9 +429,11 @@ LocaleTests::testLanguageMapping_data() QTest::newRow( "en " ) << l( "en" ) << l( "en_US.UTF-8" ) << u(); QTest::newRow( "en_GB" ) << l( "en_GB" ) << l( "en_GB.UTF-8" ) << u(); QTest::newRow( "ca " ) << l( "ca" ) << l( "ca_ES.UTF-8" ) << u(); - QTest::newRow( "ca@vl" ) << l( "ca@valencia" ) << l( "ca_ES@valencia" ) << u(); - QTest::newRow( "sr " ) << l( "sr" ) << l( "sr_RS" ) << u(); - QTest::newRow( "sr@lt" ) << l( "sr@latin" ) << l( "sr_RS@latin" ) << u(); + // FreeBSD has no Valencian variant + QTest::newRow( "ca@vl" ) << l( "ca@valencia" ) << l( "ca_ES@valencia" ) << l( "ca_ES.UTF-8" ); + // FreeBSD has the UTF-8 marker before the @region part + QTest::newRow( "sr " ) << l( "sr" ) << l( "sr_RS" ) << l( "sr_RS.UTF-8" ); + QTest::newRow( "sr@lt" ) << l( "sr@latin" ) << l( "sr_RS@latin" ) << l( "sr_RS.UTF-8@latin" ); QTest::newRow( "pt_PT" ) << l( "pt_PT" ) << l( "pt_PT.UTF-8" ) << u(); QTest::newRow( "pt_BR" ) << l( "pt_BR" ) << l( "pt_BR.UTF-8" ) << u(); QTest::newRow( "nl " ) << l( "nl" ) << l( "nl_NL.UTF-8" ) << u(); @@ -435,11 +442,20 @@ LocaleTests::testLanguageMapping_data() } +void LocaleTests::testLanguageMappingNeon_data() +{ + MappingData(); +} + +void LocaleTests::testLanguageMappingFreeBSD_data() +{ + MappingData(); +} + void -LocaleTests::testLanguageMapping() +LocaleTests::testLanguageMappingNeon() { QVERIFY( !m_KDEneonLocales.isEmpty() ); - QVERIFY( !m_FreeBSDLocales.isEmpty() ); QFETCH( QString, selectedLanguage ); QFETCH( QString, KDEneonLanguage ); @@ -450,10 +466,23 @@ LocaleTests::testLanguageMapping() const auto neon = LocaleConfiguration::fromLanguageAndLocation( ( selectedLanguage ), m_KDEneonLocales, QStringLiteral( "NL" ) ); QCOMPARE( neon.language(), KDEneonLanguage ); +} + +void +LocaleTests::testLanguageMappingFreeBSD() +{ + QVERIFY( !m_FreeBSDLocales.isEmpty() ); + + QFETCH( QString, selectedLanguage ); + QFETCH( QString, KDEneonLanguage ); + QFETCH( QString, FreeBSDLanguage ); + + QVERIFY( Calamares::Locale::availableLanguages().contains( selectedLanguage ) ); const auto bsd = LocaleConfiguration::fromLanguageAndLocation( ( selectedLanguage ), m_FreeBSDLocales, QStringLiteral( "NL" ) ); - QCOMPARE( bsd.language(), FreeBSDLanguage.isEmpty() ? KDEneonLanguage : FreeBSDLanguage ); + const auto expected = FreeBSDLanguage.isEmpty() ? KDEneonLanguage : FreeBSDLanguage; + QCOMPARE( bsd.language(), expected ); } From 4b541b5b2916d88540a3f0b5bf0c7947d8187c40 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 19 Jul 2022 21:06:52 +0200 Subject: [PATCH 06/26] [locale] Fix test -- needs translation languages, old style --- src/modules/locale/Tests.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp index 1a6887dc1..69a6a9258 100644 --- a/src/modules/locale/Tests.cpp +++ b/src/modules/locale/Tests.cpp @@ -11,6 +11,7 @@ #include "LocaleConfiguration.h" #include "timezonewidget/TimeZoneImage.h" +#include "CalamaresVersion.h" #include "Settings.h" #include "locale/TimeZone.h" #include "locale/TranslationsModel.h" @@ -59,6 +60,7 @@ private Q_SLOTS: private: QStringList m_KDEneonLocales; QStringList m_FreeBSDLocales; + QStringList m_availableLanguages; }; QTEST_MAIN( LocaleTests ) @@ -77,6 +79,7 @@ LocaleTests::initTestCase() { (void)new Calamares::Settings( true ); } + m_availableLanguages = QString( CALAMARES_TRANSLATION_LANGUAGES ).split( ';' ); } void @@ -461,7 +464,7 @@ LocaleTests::testLanguageMappingNeon() QFETCH( QString, KDEneonLanguage ); QFETCH( QString, FreeBSDLanguage ); - QVERIFY( Calamares::Locale::availableLanguages().contains( selectedLanguage ) ); + QVERIFY( m_availableLanguages.contains( selectedLanguage ) ); const auto neon = LocaleConfiguration::fromLanguageAndLocation( ( selectedLanguage ), m_KDEneonLocales, QStringLiteral( "NL" ) ); @@ -477,7 +480,7 @@ LocaleTests::testLanguageMappingFreeBSD() QFETCH( QString, KDEneonLanguage ); QFETCH( QString, FreeBSDLanguage ); - QVERIFY( Calamares::Locale::availableLanguages().contains( selectedLanguage ) ); + QVERIFY( m_availableLanguages.contains( selectedLanguage ) ); const auto bsd = LocaleConfiguration::fromLanguageAndLocation( ( selectedLanguage ), m_FreeBSDLocales, QStringLiteral( "NL" ) ); From 6444b4205b3de505922baa209594c1095a18faa1 Mon Sep 17 00:00:00 2001 From: demmm Date: Wed, 20 Jul 2022 20:22:04 +0200 Subject: [PATCH 07/26] [luksopenswaphookcfg] fix for https://github.com/calamares/calamares/issues/1659 --- src/modules/luksopenswaphookcfg/LOSHJob.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.cpp b/src/modules/luksopenswaphookcfg/LOSHJob.cpp index 42f160460..39f8551e2 100644 --- a/src/modules/luksopenswaphookcfg/LOSHJob.cpp +++ b/src/modules/luksopenswaphookcfg/LOSHJob.cpp @@ -165,7 +165,7 @@ globalStoragePartitionInfo( Calamares::GlobalStorage* gs, LOSHInfo& info ) { CalamaresUtils::removeLeading( btrfsRootSubvolume, '/' ); info.keyfile_device_mount_options - = QStringLiteral( "keyfile_device_mount_options=--options=subvol=" ) + btrfsRootSubvolume; + = QStringLiteral( "--options=subvol=" ) + btrfsRootSubvolume; } } From 492dba2f63d3a98a9493b072cc6cb1ee0b66d0e4 Mon Sep 17 00:00:00 2001 From: demmm Date: Thu, 28 Jul 2022 17:50:05 +0200 Subject: [PATCH 08/26] [calamares] fix for https://github.com/calamares/calamares/issues/2030 adjust CalamaresWindow.cpp so About & Debug buttons pick needd translation for widget sidebar --- src/calamares/CalamaresWindow.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index c79e17d58..e00615bf2 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -145,8 +145,8 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug, CALAMARES_RETRANSLATE_FOR( aboutDialog, aboutDialog->setText( - QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "About" ) ); - aboutDialog->setToolTip( QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), + QCoreApplication::translate( "calamares-sidebar", "About" ) ); + aboutDialog->setToolTip( QCoreApplication::translate( "calamares-sidebar", "Show information about Calamares" ) ); ); extraButtons->addWidget( aboutDialog ); aboutDialog->setFlat( true ); @@ -161,9 +161,9 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug, CalamaresUtils::Bugs, CalamaresUtils::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) ); CALAMARES_RETRANSLATE_FOR( debugWindowBtn, debugWindowBtn->setText( QCoreApplication::translate( - CalamaresWindow::staticMetaObject.className(), "Debug" ) ); + "calamares-sidebar", "Debug" ) ); debugWindowBtn->setToolTip( QCoreApplication::translate( - CalamaresWindow::staticMetaObject.className(), "Show debug information" ) ); ); + "calamares-sidebar", "Show debug information" ) ); ); extraButtons->addWidget( debugWindowBtn ); debugWindowBtn->setFlat( true ); debugWindowBtn->setCheckable( true ); From 667f14cad70a7bbf1ef9e35cb1c924761793a922 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sun, 31 Jul 2022 15:17:17 +0200 Subject: [PATCH 09/26] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_de.ts | 18 +++++++-------- lang/calamares_es.ts | 10 ++++----- lang/calamares_pt_PT.ts | 50 ++++++++++++++++++++--------------------- lang/calamares_sq.ts | 12 +++++----- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index a6b385bd3..6d985f51d 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -6,18 +6,18 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + <h1>%1</h1><br/><strong>%2<br/> für %3</strong><br/><br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + Danke an <a href="https://calamares.io/team/">das Calamares Team</a> und das <a href="https://www.transifex.com/calamares/calamares/">Calamares Übersetzer Team</a>.<br/><br/><a href="https://calamares.io/">Die Calamares</a> Entwicklung wird gesponsored von <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Copyright %1-%2 %3 &lt;%4&gt;<br/> @@ -1454,12 +1454,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Passphrase for existing partition - + Passwort für existierende Partition Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. - + Partition %1 konnte mit diesem Passwort nicht entschlüsselt werden.<br/><br/>Editieren Sie die Partition erneut und geben Sie das korrekte Passwort an oder löschen Sie diese und erstellen Sie eine neue verschlüsselte Partition. @@ -2883,17 +2883,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Unsafe partition actions are enabled. - + Unsichere Partitionierungsaktionen sind aktiviert. Partitioning is configured to <b>always</b> fail. - + Partitionierung ist so eingestellt, dass sie <b>immer</b> fehlschlägt. No partitions will be changed. - + Keine Partitionen werden verändert. @@ -2953,7 +2953,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Eine Partitionstabelle vom Typ GPT ist die beste Option für alle Systeme. Dieses Installationsprogramm unterstützt solch ein Setup auch für BIOS-Systeme.<br/><br/>Um eine GPT-Partition für BIOS-Systeme zu konfigurieren, (wenn nicht bereits geschehen) gehen Sie zurück und setzen Sie die Partitionstabelle auf GPT, als nächstes erstellen Sie eine 8 MB große unformattierte Partition mit der <strong>%2</strong> Markierung aktiviert.<br/><br/>Eine unformattierte 8 MB Partition ist nötig, um %1 auf einem BIOS-System mit GPT zu starten. diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts index 60959b887..074e4e876 100644 --- a/lang/calamares_es.ts +++ b/lang/calamares_es.ts @@ -6,18 +6,18 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + <h1>%1</h1><br/><strong>%2<br/>para %3</strong><br/><br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + Gracias al <a href="https://calamares.io/team/">equipo de Calamares</a> y al <a href="https://www.transifex.com/calamares/calamares/">equipo de traductores de Calamares</a>. <br/><br/>El desarrollo de <a href="https://calamares.io/">Calamares</a> está patrocinado por <br/><a href="http://www.blue-systems.com/">Blue Systems</a>- Liberador de Software. Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Copyright %1-%2 %3 &lt;%4&gt;<br/> @@ -1455,12 +1455,12 @@ El instalador se cerrará y todos tus cambios se perderán. Passphrase for existing partition - + Frase de contraseña para la partición existente Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. - + La partición %1 no se pudo descifrar con la frase de contraseña proporcionada. Edite la partición nuevamente y proporcione la frase de contraseña correcta o elimine y cree una nueva partición cifrada. diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index 7556313b9..d302a92e6 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -451,7 +451,7 @@ Ligação copiada para a área de transferência &Done - &Feito + &Concluído @@ -524,7 +524,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Set filesystem label on %1. - A definir a identificação do sistema de ficheiros em %1 + A definir a identificação do sistema de ficheiros em %1. @@ -603,7 +603,7 @@ O instalador será encerrado e todas as alterações serão perdidas. An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Nenhuma partição de sistema EFI foi encontrada neste sistema. Por favor volte atrás e use o particionamento manual para configurar %1. + Nenhuma partição de sistema EFI foi encontrada neste sistema. Volte atrás e use o particionamento manual para configurar %1. @@ -705,7 +705,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Successfully unmounted %1. - % 1 desmontado com sucesso. + %1 desmontado com sucesso. @@ -715,17 +715,17 @@ O instalador será encerrado e todas as alterações serão perdidas. Successfully cleared swap %1. - Swap % 1 limpa com sucesso. + Swap %1 limpa com sucesso. Successfully closed mapper device %1. - Dispositivo mapeador % 1 fechado com sucesso. + Dispositivo mapeador %1 fechado com sucesso. Successfully disabled volume group %1. - Grupo de volume % 1 desativado com sucesso. + Grupo de volume %1 desativado com sucesso. @@ -980,7 +980,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Please pick a product from the list. The selected product will be installed. - Por favor, escolha um produto da lista. O produto selecionado será instalado. + Escolha um produto da lista. O produto selecionado será instalado. @@ -1046,7 +1046,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Primar&y - Principal + Pri&mária @@ -1106,7 +1106,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Mountpoint already in use. Please select another one. - Ponto de montagem já em uso. Por favor selecione outro. + Ponto de montagem já em uso. Selecione outro. @@ -1341,7 +1341,7 @@ O instalador será encerrado e todas as alterações serão perdidas. <br><br>This partition table type is only advisable on older systems which start from a <strong>BIOS</strong> boot environment. GPT is recommended in most other cases.<br><br><strong>Warning:</strong> the MBR partition table is an obsolete MS-DOS era standard.<br>Only 4 <em>primary</em> partitions may be created, and of those 4, one can be an <em>extended</em> partition, which may in turn contain many <em>logical</em> partitions. - <br><br>Este tipo de tabela de partições é aconselhável apenas em sistemas mais antigos que iniciam a partir de um ambiente de arranque <strong>BIOS</strong>. GPT é recomendado na maior parte dos outros casos.<br><br><strong>Aviso:</strong> A tabela de partições MBR é um standard obsoleto da era MS-DOS.<br>Apenas 4 partições <em>primárias</em> podem ser criadas, e dessa 4, apenas uma pode ser partição <em>estendida</em>, que por sua vez podem ser tornadas em várias partições <em>lógicas</em>. + <br><br>Este tipo de tabela de partições é aconselhável apenas em sistemas mais antigos que iniciam a partir de um ambiente de arranque <strong>BIOS</strong>. GPT é recomendado na maior parte dos outros casos.<br><br><strong>Aviso:</strong> A tabela de partições MBR é um padrão obsoleto da era MS-DOS.<br>Apenas 4 partições <em>primárias</em> podem ser criadas, e dessas 4, apenas uma pode ser partição <em>estendida</em>, que por sua vez podem ser tornadas em várias partições <em>lógicas</em>. @@ -1494,7 +1494,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Please enter the same passphrase in both boxes. - Por favor insira a mesma frase-passe em ambas as caixas. + Introduza a mesma frase-passe em ambas as caixas. @@ -1593,7 +1593,7 @@ O instalador será encerrado e todas as alterações serão perdidas. <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - <h1>Tudo feito</h1><br/>%1 foi instalado no seu computador.<br/>Pode agora reiniciar para o seu novo sistema, ou continuar a usar o %2 ambiente Live. + <h1>Tudo concluído</h1><br/>%1 foi instalado no seu computador.<br/>Pode agora reiniciar para o seu novo sistema, ou continuar a usar o %2 ambiente Live. @@ -1789,7 +1789,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Please install KDE Konsole and try again! - Por favor instale a consola KDE e tente novamente! + Instale o Konsole do KDE e tente novamente! @@ -2585,7 +2585,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Please pick a product from the list. The selected product will be installed. - Por favor, escolha um produto da lista. O produto selecionado será instalado. + Escolha um produto da lista. O produto selecionado será instalado. @@ -2875,7 +2875,7 @@ O instalador será encerrado e todas as alterações serão perdidas. The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead. - A tabela de partições em %1 já tem %2 partições primárias, e não podem ser adicionadas mais. Em vez disso, por favor remova uma partição primária e adicione uma partição estendida. + A tabela de partições em %1 já tem %2 partições primárias, e não podem ser adicionadas mais. Em vez disso, remova uma partição primária e adicione uma partição estendida. @@ -3015,7 +3015,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. - Por favor escolha a aparência para o Ambiente de Trabalho KDE Plasma. Pode também saltar este passo e configurar a aparência uma vez instalado o sistema. Ao clicar numa seleção de aparência irá ter uma pré-visualização ao vivo dessa aparência. + Escolha a aparência para o Ambiente de trabalho KDE Plasma. Pode também saltar este passo e configurar a aparência uma vez instalado o sistema. Ao clicar numa seleção de aparência irá ter uma pré-visualização ao vivo dessa aparência. @@ -3248,12 +3248,12 @@ Saída de Dados: %1 cannot be installed on empty space. Please select an existing partition. - %1 não pode ser instalado no espaço vazio. Por favor selecione uma partição existente. + %1 não pode ser instalado no espaço vazio. Selecione uma partição existente. %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - %1 não pode ser instalado numa partição estendida. Por favor selecione uma partição primária ou lógica existente. + %1 não pode ser instalado numa partição estendida. Selecione uma partição primária ou lógica existente. @@ -3278,12 +3278,12 @@ Saída de Dados: <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - <strong>%4</strong><br/><br/>A partição %1 é demasiado pequena para %2. Por favor selecione uma partição com pelo menos %3 GiB de capacidade. + <strong>%4</strong><br/><br/>A partição %1 é demasiado pequena para %2. Selecione uma partição com pelo menos %3 GiB de capacidade. <strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - <strong>%2</strong><br/><br/>Uma partição de sistema EFI não pode ser encontrada em nenhum sítio neste sistema. Por favor volte atrás e use o particionamento manual para instalar %1. + <strong>%2</strong><br/><br/>Uma partição de sistema EFI não pode ser encontrada em nenhum sítio neste sistema. Volte atrás e use o particionamento manual para instalar %1. @@ -3444,7 +3444,7 @@ Saída de Dados: For best results, please ensure that this computer: - Para melhores resultados, por favor certifique-se que este computador: + Para melhores resultados, certifique-se que este computador: @@ -3877,7 +3877,7 @@ Saída de Dados: Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - O rastreio ajuda %1 a ver quão frequentemente ele é instalado, em qual hardware ele é instalado e quais aplicações são utilizadas. Para ver o que será enviado, por favor, clique no ícone de ajuda próximo a cada área. + O rastreio ajuda %1 a ver quão frequentemente ele é instalado, em qual hardware ele é instalado e quais aplicações são utilizadas. Para ver o que será enviado, clique no ícone de ajuda próximo a cada área. @@ -4113,7 +4113,7 @@ Saída de Dados: Failed to create zpool on - Falha ao criar zpool on + Falha ao criar zpool em @@ -4144,7 +4144,7 @@ Saída de Dados: The output was: - O resultado foi: + O resultado foi: diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts index 1c8ac3f47..bb15b168b 100644 --- a/lang/calamares_sq.ts +++ b/lang/calamares_sq.ts @@ -6,18 +6,18 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + <h1>%1</h1><br/><strong>%2<br/> për %3</strong><br/><br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + Falënderime për <a href="https://calamares.io/team/">ekipin Calamares</a> dhe <a href="https://www.transifex.com/calamares/calamares/">ekpin e përkthyesve të Calamares-it</a>.<br/><br/>Zhvillimi i <a href="https://calamares.io/">Calamares-it</a> sponsorizohet nga <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Të drejt kopjimi %1-%2 %3 &lt;%4&gt;<br/> @@ -1453,12 +1453,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Passphrase for existing partition - + Frazëkalim për pjesë ekzistuese Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. - + Pjesa %1 s’u fshehtëzua dot me frazëkalimin e dhënë.<br/><br/>Përpunojeni sërish pjesën dhe jepni frazëkalimin e saktë, ose fshijeni dhe krijoni një pjesë të re të fshehtëzuar. @@ -4144,7 +4144,7 @@ Përfundim: Debug - + Diagnostikojeni From 92524044a82b375735affbeaa84b5c02b79c11a5 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sun, 31 Jul 2022 15:17:17 +0200 Subject: [PATCH 10/26] i18n: [desktop] Automatic merge of Transifex translations --- calamares.desktop | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/calamares.desktop b/calamares.desktop index 9a1416e16..97ad28de8 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -229,6 +229,10 @@ Name[uk]=Встановити Систему Icon[uk]=calamares GenericName[uk]=Встановлювач системи Comment[uk]=Calamares - Встановлювач системи +Name[uz]=O'rnatish +Icon[uz]=calamares +GenericName[uz]=Sistema o'rnatuvchisi +Comment[uz]=Calamares — Sistema o'rnatuvchisi Name[vi]=Cài đặt hệ thống Icon[vi]=calamares GenericName[vi]=Bộ cài đặt hệ thống From 57814c247fc014220f582264e078babb67863976 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sun, 31 Jul 2022 15:17:18 +0200 Subject: [PATCH 11/26] i18n: [python] Automatic merge of Transifex translations --- lang/python/es/LC_MESSAGES/python.po | 4 ++-- lang/python/es_MX/LC_MESSAGES/python.po | 4 ++-- lang/python/fr/LC_MESSAGES/python.po | 2 +- lang/python/it_IT/LC_MESSAGES/python.po | 4 ++-- lang/python/pt_BR/LC_MESSAGES/python.po | 6 +++--- lang/python/pt_PT/LC_MESSAGES/python.po | 4 ++-- lang/python/si/LC_MESSAGES/python.po | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po index c29588f9b..827f5147c 100644 --- a/lang/python/es/LC_MESSAGES/python.po +++ b/lang/python/es/LC_MESSAGES/python.po @@ -4,12 +4,12 @@ # FIRST AUTHOR , YEAR. # # Translators: +# strel, 2017 # Guido Grasso , 2018 # Adolfo Jayme-Barrientos, 2019 # Miguel Mayol , 2020 # Pier Jose Gotta Perez , 2020 # Swyter , 2022 -# strel, 2022 # #, fuzzy msgid "" @@ -18,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-05-29 16:17+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: strel, 2022\n" +"Last-Translator: Swyter , 2022\n" "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po index f67f07e39..dcd1faadd 100644 --- a/lang/python/es_MX/LC_MESSAGES/python.po +++ b/lang/python/es_MX/LC_MESSAGES/python.po @@ -4,9 +4,9 @@ # FIRST AUTHOR , YEAR. # # Translators: +# guillermo pacheco , 2018 # a1a9b52a3f40dff112eca965c254c602_089360e , 2018 # Erland Huaman , 2021 -# guillermo pacheco , 2022 # #, fuzzy msgid "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-05-29 16:17+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: guillermo pacheco , 2022\n" +"Last-Translator: Erland Huaman , 2021\n" "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po index 0bc8c1e1b..8c23c301f 100644 --- a/lang/python/fr/LC_MESSAGES/python.po +++ b/lang/python/fr/LC_MESSAGES/python.po @@ -6,12 +6,12 @@ # Translators: # Paul Combal , 2017 # Abdellah B , 2017 +# Aestan , 2018 # Aurnytoraink , 2018 # a270031086f2a0d3514bc0cb507b48f6, 2019 # Seboss666 , 2019 # Florian B , 2019 # Arnaud Ferraris , 2019 -# Aestan , 2022 # roxfr , 2022 # #, fuzzy diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po index b5187ea77..0b7e82b22 100644 --- a/lang/python/it_IT/LC_MESSAGES/python.po +++ b/lang/python/it_IT/LC_MESSAGES/python.po @@ -6,9 +6,9 @@ # Translators: # Pierfrancesco Passerini , 2019 # Pietro F. Fontana, 2020 +# Saverio , 2020 # Giuseppe Pignataro , 2021 # Vincenzo Reale , 2022 -# Saverio , 2022 # #, fuzzy msgid "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-05-29 16:17+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Saverio , 2022\n" +"Last-Translator: Vincenzo Reale , 2022\n" "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po index 122da0e9b..f7570e4d5 100644 --- a/lang/python/pt_BR/LC_MESSAGES/python.po +++ b/lang/python/pt_BR/LC_MESSAGES/python.po @@ -4,8 +4,8 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Guilherme Marçal Silva, 2022 -# André Marcelo Alvarenga , 2022 +# André Marcelo Alvarenga , 2020 +# Guilherme MS, 2022 # #, fuzzy msgid "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-05-29 16:17+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: André Marcelo Alvarenga , 2022\n" +"Last-Translator: Guilherme MS, 2022\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po index 1a4dd86c8..13c84efd7 100644 --- a/lang/python/pt_PT/LC_MESSAGES/python.po +++ b/lang/python/pt_PT/LC_MESSAGES/python.po @@ -5,8 +5,8 @@ # # Translators: # Nuno Amorim , 2018 +# Ricardo Simões , 2020 # Hugo Carvalho , 2022 -# Ricardo Simões , 2022 # #, fuzzy msgid "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-05-29 16:17+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Ricardo Simões , 2022\n" +"Last-Translator: Hugo Carvalho , 2022\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/si/LC_MESSAGES/python.po b/lang/python/si/LC_MESSAGES/python.po index 267e23597..781752170 100644 --- a/lang/python/si/LC_MESSAGES/python.po +++ b/lang/python/si/LC_MESSAGES/python.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# හෙළබස, 2021 +# හෙළබස සමූහය, 2021 # Sandaruwan Samaraweera, 2022 # #, fuzzy From 33961ff6f404789d123437c688a7a88e2c966d7e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 7 Aug 2022 14:43:06 +0200 Subject: [PATCH 12/26] [bootloader] Repair Python 3.3 compatibility Argument *text* is an addition in 3.7, while the Calamares 3.2 branch supports Python 3.3 and later. Use the 'backwards compatibility' name of the parameter, *universal_newlines*. FIXES #2033 --- src/modules/bootloader/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index fb8e19ac2..d7f4a716c 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -454,7 +454,7 @@ def efi_boot_next(): """ boot_mgr = libcalamares.job.configuration["efiBootMgr"] boot_entry = None - efi_bootvars = subprocess.check_output([boot_mgr], text=True) + efi_bootvars = subprocess.check_output([boot_mgr], universal_newlines=True) for line in efi_bootvars.split('\n'): if not line: continue From f2121197ff214a432ff7d41442adfe6e2bef1d00 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 7 Aug 2022 14:56:19 +0200 Subject: [PATCH 13/26] Changes: document 3.2.61 work so far --- CHANGES-3.2 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index 3e5cc3db1..d15a22d68 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -12,14 +12,23 @@ website will have to do for older versions. # 3.2.61 (unreleased) # +This is the second community-maintainence release of Calamares 3.2. +It corrects a handful of bugs foud in the stable release. There +are also translation updates. + This release contains contributions from (alphabetically by first name): - - No external contributors yet + - Adriaan de Groot + - Anke Boersma ## Core ## - - No core changes yet + - The "About" and "Debug" buttons in a QWidgets-based panel were no + longer translated. This has been fixed (by re-using translations + of the same buttons from the QML module. #2030 (Thanks Anke) ## Modules ## - - No module changes yet + - *bootloader* Python code slipped in that was incompatible with + the minimum required Python version. #2033 (Thanks Adriaan) + - *luksopenswaphookcfg* Remove duplicate options. #1659 (Thanks Anke) # 3.2.60 (2022-06-19) # From 83344e0d8974f56a7b0a6e5e781d56e653e3d5fc Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 9 Aug 2022 10:26:43 +0200 Subject: [PATCH 14/26] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_ar.ts | 28 +- lang/calamares_as.ts | 28 +- lang/calamares_ast.ts | 28 +- lang/calamares_az.ts | 28 +- lang/calamares_az_AZ.ts | 28 +- lang/calamares_be.ts | 28 +- lang/calamares_bg.ts | 911 ++++++++++++++++++---------------- lang/calamares_bn.ts | 28 +- lang/calamares_ca.ts | 28 +- lang/calamares_ca@valencia.ts | 28 +- lang/calamares_cs_CZ.ts | 28 +- lang/calamares_da.ts | 28 +- lang/calamares_de.ts | 28 +- lang/calamares_el.ts | 28 +- lang/calamares_en.ts | 28 +- lang/calamares_en_GB.ts | 28 +- lang/calamares_eo.ts | 28 +- lang/calamares_es.ts | 28 +- lang/calamares_es_MX.ts | 28 +- lang/calamares_es_PR.ts | 28 +- lang/calamares_et.ts | 28 +- lang/calamares_eu.ts | 28 +- lang/calamares_fa.ts | 28 +- lang/calamares_fi_FI.ts | 28 +- lang/calamares_fr.ts | 28 +- lang/calamares_fur.ts | 28 +- lang/calamares_gl.ts | 28 +- lang/calamares_gu.ts | 28 +- lang/calamares_he.ts | 28 +- lang/calamares_hi.ts | 28 +- lang/calamares_hr.ts | 28 +- lang/calamares_hu.ts | 28 +- lang/calamares_id.ts | 28 +- lang/calamares_ie.ts | 28 +- lang/calamares_is.ts | 28 +- lang/calamares_it_IT.ts | 28 +- lang/calamares_ja-Hira.ts | 28 +- lang/calamares_ja.ts | 28 +- lang/calamares_kk.ts | 28 +- lang/calamares_kn.ts | 28 +- lang/calamares_ko.ts | 28 +- lang/calamares_lo.ts | 28 +- lang/calamares_lt.ts | 28 +- lang/calamares_lv.ts | 28 +- lang/calamares_mk.ts | 28 +- lang/calamares_ml.ts | 28 +- lang/calamares_mr.ts | 28 +- lang/calamares_nb.ts | 28 +- lang/calamares_ne_NP.ts | 28 +- lang/calamares_nl.ts | 28 +- lang/calamares_oc.ts | 28 +- lang/calamares_pl.ts | 28 +- lang/calamares_pt_BR.ts | 28 +- lang/calamares_pt_PT.ts | 38 +- lang/calamares_ro.ts | 28 +- lang/calamares_ru.ts | 28 +- lang/calamares_si.ts | 28 +- lang/calamares_sk.ts | 28 +- lang/calamares_sl.ts | 28 +- lang/calamares_sq.ts | 28 +- lang/calamares_sr.ts | 28 +- lang/calamares_sr@latin.ts | 28 +- lang/calamares_sv.ts | 28 +- lang/calamares_ta_IN.ts | 28 +- lang/calamares_te.ts | 28 +- lang/calamares_tg.ts | 29 +- lang/calamares_th.ts | 28 +- lang/calamares_tr_TR.ts | 28 +- lang/calamares_uk.ts | 28 +- lang/calamares_ur.ts | 28 +- lang/calamares_uz.ts | 28 +- lang/calamares_vi.ts | 28 +- lang/calamares_zh.ts | 28 +- lang/calamares_zh_CN.ts | 28 +- lang/calamares_zh_HK.ts | 28 +- lang/calamares_zh_TW.ts | 28 +- 76 files changed, 1987 insertions(+), 1035 deletions(-) diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts index dddf401e6..089084a93 100644 --- a/lang/calamares_ar.ts +++ b/lang/calamares_ar.ts @@ -511,12 +511,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 المثبت @@ -785,27 +785,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> اضبط طراز لوحة المفتاتيح ليكون %1.<br/> - + Set keyboard layout to %1/%2. اضبط تخطيط لوحة المفاتيح إلى %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3140,7 +3140,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4172,14 +4172,26 @@ Output: calamares-sidebar + About + Debug التدقيق + + + Show information about Calamares + + + + + Show debug information + أظهر معلومات التّنقيح + finishedq diff --git a/lang/calamares_as.ts b/lang/calamares_as.ts index 522894af4..1f9bfcff5 100644 --- a/lang/calamares_as.ts +++ b/lang/calamares_as.ts @@ -503,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 চেত্ আপ প্ৰোগ্ৰেম - + %1 Installer %1 ইনস্তলাৰ @@ -777,27 +777,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> কিবোৰ্ডৰ মডেল %1ত চেট্ কৰক।<br/> - + Set keyboard layout to %1/%2. কিবোৰ্ডৰ লেআউট %1/%2 চেট্ কৰক। - + Set timezone to %1/%2. সময় অঞ্চলৰ সিদ্ধান্ত কৰক %`1%2 - + The system language will be set to %1. চিছটেমৰ ভাষা %1লৈ সলনি কৰা হ'ব। - + The numbers and dates locale will be set to %1. সংখ্যা আৰু তাৰিখ স্থানীয় %1লৈ সলনি কৰা হ'ব। @@ -3101,7 +3101,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4134,14 +4134,26 @@ Output: calamares-sidebar + About সম্পর্কে + Debug + + + Show information about Calamares + + + + + Show debug information + দিবাগ তথ্য দেখাওক + finishedq diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts index 86ced11f3..a3f4496c6 100644 --- a/lang/calamares_ast.ts +++ b/lang/calamares_ast.ts @@ -503,12 +503,12 @@ L'instalador va colar y van perdese tolos cambeos. CalamaresWindow - + %1 Setup Program Programa de configuración de %1 - + %1 Installer Instalador de %1 @@ -777,27 +777,27 @@ L'instalador va colar y van perdese tolos cambeos. Config - + Set keyboard model to %1.<br/> Va afitase'l modelu del tecláu a %1.<br/> - + Set keyboard layout to %1/%2. Va afitase la distrubución del tecláu a %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. La llingua del sistema va afitase a %1. - + The numbers and dates locale will be set to %1. La númberación y data van afitase en %1. @@ -3099,7 +3099,7 @@ Salida: QObject - + %1 (%2) %1 (%2) @@ -4134,14 +4134,26 @@ Salida: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + Amosar la depuración + finishedq diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts index 45e5d6c90..7ac53da2e 100644 --- a/lang/calamares_az.ts +++ b/lang/calamares_az.ts @@ -507,12 +507,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CalamaresWindow - + %1 Setup Program %1 Quraşdırıcı proqram - + %1 Installer %1 Quraşdırıcı @@ -781,27 +781,27 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Config - + Set keyboard model to %1.<br/> Klaviatura modelini %1 olaraq təyin etmək.<br/> - + Set keyboard layout to %1/%2. Klaviatura qatını %1/%2 olaraq təyin etmək. - + Set timezone to %1/%2. Saat quraşağını təyin etmək %1/%2 - + The system language will be set to %1. Sistem dili %1 təyin ediləcək. - + The numbers and dates locale will be set to %1. Yerli say və tarix formatı %1 təyin olunacaq. @@ -3106,7 +3106,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4141,14 +4141,26 @@ Output: calamares-sidebar + About Haqqında + Debug Sazlama + + + Show information about Calamares + Calamares haqqında məlumatlar göstərilsin + + + + Show debug information + Sazlama məlumatlarını göstərmək + finishedq diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts index 7949ea4a8..68df091b1 100644 --- a/lang/calamares_az_AZ.ts +++ b/lang/calamares_az_AZ.ts @@ -507,12 +507,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CalamaresWindow - + %1 Setup Program %1 Quraşdırıcı proqram - + %1 Installer %1 Quraşdırıcı @@ -781,27 +781,27 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Config - + Set keyboard model to %1.<br/> Klaviatura modelini %1 olaraq təyin etmək.<br/> - + Set keyboard layout to %1/%2. Klaviatura qatını %1/%2 olaraq təyin etmək. - + Set timezone to %1/%2. Saat quraşağını təyin etmək %1/%2 - + The system language will be set to %1. Sistem dili %1 təyin ediləcək. - + The numbers and dates locale will be set to %1. Yerli say və tarix formatı %1 təyin olunacaq. @@ -3106,7 +3106,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4141,14 +4141,26 @@ Output: calamares-sidebar + About Haqqında + Debug Sazlama + + + Show information about Calamares + Calamares haqqında məlumatlar göstərilsin + + + + Show debug information + Sazlama məlumatlarını göstərmək + finishedq diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts index 6eaa90eca..3df0147cb 100644 --- a/lang/calamares_be.ts +++ b/lang/calamares_be.ts @@ -505,12 +505,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Праграма ўсталёўкі %1 - + %1 Installer Праграма ўсталёўкі %1 @@ -779,27 +779,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Вызначыць мадэль клавіятуры %1.<br/> - + Set keyboard layout to %1/%2. Вызначыць раскладку клавіятуры %1/%2. - + Set timezone to %1/%2. Вызначыць часавы пояс %1/%2. - + The system language will be set to %1. Сістэмнай мовай будзе зроблена %1. - + The numbers and dates locale will be set to %1. Рэгіянальным фарматам лічбаў і датаў будзе %1. @@ -3121,7 +3121,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4156,14 +4156,26 @@ Output: calamares-sidebar + About Пра праграму + Debug + + + Show information about Calamares + + + + + Show debug information + Паказаць адладачную інфармацыю + finishedq diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts index a3a4804c5..0b48e3e6a 100644 --- a/lang/calamares_bg.ts +++ b/lang/calamares_bg.ts @@ -6,18 +6,18 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + <h1> %1</h1><br/><strong>%2<br/> за %3</strong><br/><br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + Благодарности на <a href="https://calamares.io/team/"> екипа на Calamares </a> и на <a href="https://www.transifex.com/calamares/calamares/"> преводачите на Calamares </a>.<br/><br/><a href="https://calamares.io/">Calamares</a> е спонсориран от <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Copyright %1-%2 %3 &lt;%4&gt;<br/> @@ -25,7 +25,7 @@ Manage auto-mount settings - + Управление на настройките за автоматично монтиране @@ -123,37 +123,37 @@ Crashes Calamares, so that Dr. Konqui can look at it. - + Предизвиква срива на Calamares, за да може Dr.Konqui да го анализира. Reloads the stylesheet from the branding directory. - + Презарежда стиловата таблица от директорията за брандиране. Uploads the session log to the configured pastebin. - + Качете дневника на сесията в конфигурирания pastebin. Send Session Log - + Изпращане на дневника на сесията Reload Stylesheet - + Презареждане на таблицата със стилове Displays the tree of widget names in the log (for stylesheet debugging). - + Показва в йерархичен вид имената на уиджети в дневника (за отстраняване на грешки в таблицата със стилове). Widget Tree - + Структура на уиджети @@ -166,7 +166,7 @@ Set up - + Настройване @@ -184,7 +184,7 @@ Programmed job failure was explicitly requested. - + Изрично е поискан отказ на програмираната задача. @@ -208,12 +208,12 @@ Run command '%1' in target system. - + Изпълнение на команда "%1" в целевата система. Run command '%1'. - + Изпълняване на команда '%1'. @@ -259,17 +259,17 @@ Loading ... - + Зареждане... QML Step <i>%1</i>. - + QML Стъпка <i>%1</i>. Loading failed. - + Неуспешно зареждане. @@ -277,28 +277,28 @@ Requirements checking for module <i>%1</i> is complete. - + Проверката на изискванията на модул <i>%1</i> е завършена. Waiting for %n module(s). - - - + + Изчакване на %n модул. + Изчакване на %n модули. (%n second(s)) - - - + + (%n секунда) + (%n секунди) System-requirements checking is complete. - + Проверката на системните изисквания е завършена. @@ -306,7 +306,7 @@ Setup Failed - + Настройването е неуспешно @@ -336,12 +336,12 @@ Install Log Paste URL - + Инсталиране на дневник Вмъкване на URL адрес The upload was unsuccessful. No web-paste was done. - + Качването беше неуспешно. Не беше направено поставяне в мрежата. @@ -350,7 +350,11 @@ %1 Link copied to clipboard - + Дневникът на инсталирането е публикуван в + +%1 + +Връзката е копирана в клипборда @@ -375,12 +379,12 @@ Link copied to clipboard Continue with installation? - + Да се продължи ли инсталирането? The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + Програмата за настройване на %1 е на път да направи промени на вашия диск, за да инсталира %2. <br/><strong> Няма да можете да отмените тези промени.</strong> @@ -390,7 +394,7 @@ Link copied to clipboard &Set up now - + & Настройване сега @@ -405,7 +409,7 @@ Link copied to clipboard &Set up - + &Настройване @@ -415,7 +419,7 @@ Link copied to clipboard Setup is complete. Close the setup program. - + Настройката е завършена. Затворете програмата за настройка. @@ -425,7 +429,7 @@ Link copied to clipboard Cancel setup without changing the system. - + Отмяна на настройването без промяна на системата. @@ -455,7 +459,7 @@ Link copied to clipboard Cancel setup? - + Отмяна на настройването? @@ -466,7 +470,8 @@ Link copied to clipboard Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Наистина ли искате да анулирате текущия процес на настройване? +Инсталирането ще се отмени и всички промени ще бъдат загубени. @@ -502,12 +507,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 програма за настройка - + %1 Installer %1 Инсталатор @@ -517,12 +522,12 @@ The installer will quit and all changes will be lost. Set filesystem label on %1. - + Задаване на етикета на файловата система на %1. Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>. - + Задаване на етикет на файлова система <strong>%1 </strong> в дял <strong>%2 </strong>. @@ -581,7 +586,7 @@ The installer will quit and all changes will be lost. %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + %1 ще бъде намален до %2MiB и ще бъде създаден нов %3MiB дял за %4. @@ -655,42 +660,42 @@ The installer will quit and all changes will be lost. This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + Това устройство за съхранение вече има операционна система върху него, но таблицатас дялове <strong>%1 </strong> е различна от необходимата <strong>%2 </strong>.<br/> This storage device has one of its partitions <strong>mounted</strong>. - + Това устройство за съхранение има <strong> монтиран </strong> дял. This storage device is a part of an <strong>inactive RAID</strong> device. - + Това устройство за съхранение е част от <strong> неактивно RAID </strong> устройство. No Swap - + Без swap Reuse Swap - + Повторно използване на swap Swap (no Hibernate) - + Swap (без Хибернация) Swap (with Hibernate) - + Swap (с Хибернация) Swap to file - + Swap във файл @@ -698,27 +703,27 @@ The installer will quit and all changes will be lost. Successfully unmounted %1. - + Успешно демонтиране на %1. Successfully disabled swap %1. - + Успешно деактивиране на swap %1. Successfully cleared swap %1. - + Успешно изчистване на swap %1. Successfully closed mapper device %1. - + Успешно затваряне на mapper устройство %1. Successfully disabled volume group %1. - + Успешно деактивиране на група дялове %1. @@ -776,34 +781,34 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Постави модел на клавиатурата на %1.<br/> - + Set keyboard layout to %1/%2. Постави оформлението на клавиатурата на %1/%2. - + Set timezone to %1/%2. - + Задаване на часовата зона на %1/%2. - + The system language will be set to %1. Системният език ще бъде %1. - + The numbers and dates locale will be set to %1. Форматът на цифрите и датата ще бъде %1. Network Installation. (Disabled: Incorrect configuration) - + Мрежова инсталация. (Деактивирано: Неправилна конфигурация) @@ -813,12 +818,12 @@ The installer will quit and all changes will be lost. Network Installation. (Disabled: Internal error) - + Мрежова инсталация. (Деактивирано: Вътрешна грешка) Network Installation. (Disabled: No package list) - + Мрежова инсталация. (Деактивирано: няма списък с пакети) @@ -833,7 +838,7 @@ The installer will quit and all changes will be lost. This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + Този компютър не отговаря на минималните изисквания за настройване на %1.<br/> Настройката не може да продължи. <a href="#details"> Подробности...</a> @@ -844,7 +849,7 @@ The installer will quit and all changes will be lost. This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + Този ​​компютър не удовлетворява някои от препоръчителните изисквания занастройването на %1. <br/> Настройката може да продължи, но някои функции могат да бъдат деактивирани. @@ -859,22 +864,22 @@ The installer will quit and all changes will be lost. <h1>Welcome to the Calamares setup program for %1</h1> - + <h1> Добре дошли в програмата за настройване на Calamares за %1 </h1> <h1>Welcome to %1 setup</h1> - + <h1> Добре дошли в %1 настройка </h1> <h1>Welcome to the Calamares installer for %1</h1> - + <h1> Добре дошли в инсталатора на Calamares за %1 </h1> <h1>Welcome to the %1 installer</h1> - + <h1> Добре дошли в инсталатора %1 </h1> @@ -884,17 +889,17 @@ The installer will quit and all changes will be lost. '%1' is not allowed as username. - + "%1" не е разрешено като потребителско име. Your username must start with a lowercase letter or underscore. - + Вашето потребителско име трябва да започне с малки букви или долна черта. Only lowercase letters, numbers, underscore and hyphen are allowed. - + Разрешени са само малки букви, цифри, долна черта и тире. @@ -909,12 +914,12 @@ The installer will quit and all changes will be lost. '%1' is not allowed as hostname. - + "%1" не е разрешено като име на хост. Only letters, numbers, underscore and hyphen are allowed. - + Разрешени са само букви, цифри, долна черта и тире. @@ -924,12 +929,12 @@ The installer will quit and all changes will be lost. OK! - + OK! Setup Failed - + Настройването е неуспешно @@ -939,17 +944,17 @@ The installer will quit and all changes will be lost. The setup of %1 did not complete successfully. - + Настройката на %1 не завърши успешно. The installation of %1 did not complete successfully. - + Инсталирането на %1 не завърши успешно. Setup Complete - + Настройването завърши. @@ -959,7 +964,7 @@ The installer will quit and all changes will be lost. The setup of %1 is complete. - + Настройката на %1 е пълна. @@ -969,27 +974,27 @@ The installer will quit and all changes will be lost. Package Selection - + Избор на пакети Please pick a product from the list. The selected product will be installed. - + Моля, изберете продукт от списъка. Избраният продукт ще бъде инсталиран. Packages - + Пакети Install option: <strong>%1</strong> - + Опция за инсталиране: <strong>%1</strong> None - + Без @@ -999,7 +1004,7 @@ The installer will quit and all changes will be lost. This is an overview of what will happen once you start the setup procedure. - + Това е преглед на това, което ще се случи, след като започнете процедурата за настройване. @@ -1040,7 +1045,7 @@ The installer will quit and all changes will be lost. Primar&y - + &Основен @@ -1070,12 +1075,12 @@ The installer will quit and all changes will be lost. Label for the filesystem - + Етикет на файловата система FS Label: - + Етикет на ФС: @@ -1105,7 +1110,7 @@ The installer will quit and all changes will be lost. Mountpoint must start with a <tt>/</tt>. - + Точката на монтиране трябва да започва с <tt>/</tt>. @@ -1113,32 +1118,32 @@ The installer will quit and all changes will be lost. Create new %1MiB partition on %3 (%2) with entries %4. - + Създаване на нов %1МiB дял на %3 ( %2) с записи %4. Create new %1MiB partition on %3 (%2). - + Създаване на нов %1mib дял на %3 ( %2). Create new %2MiB partition on %4 (%3) with file system %1. - + Създаване на нов %2mib дял на %4 ( %3) с файлова система %1. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Създаване на нов <strong>%1MiB </strong> дял на <strong>%3 </strong> (%2) сзаписи <em>%4 </em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Създаване на нов <strong>%1MiB </strong> дял на <strong>%3 </strong> (%2). Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Създаване на нов <strong>%2Mib </strong> дял на <strong>%4 </strong> (%3) сфайлова система <strong>%1 </strong>. @@ -1218,23 +1223,23 @@ The installer will quit and all changes will be lost. Preserving home directory - + Запазване на домашната директория Creating user %1 - + Създаване на потребител %1 Configuring user %1 - + Конфигуриране на потребител %1 Setting file permissions - + Задаване на разрешения за файлове @@ -1242,7 +1247,7 @@ The installer will quit and all changes will be lost. Create Volume Group - + Създаване на група дялове @@ -1250,22 +1255,22 @@ The installer will quit and all changes will be lost. Create new volume group named %1. - + Създаване на нова група дялове с име %1. Create new volume group named <strong>%1</strong>. - + Създаване на нова група дялове с име <strong>%1 </strong>. Creating new volume group named %1. - + Създаване на нова група дялове с име %1. The installer failed to create a volume group named '%1'. - + Инсталаторът не успя да създаде група дялове с име „%1 “. @@ -1274,17 +1279,17 @@ The installer will quit and all changes will be lost. Deactivate volume group named %1. - + Деактивиране на група дялове с име %1. Deactivate volume group named <strong>%1</strong>. - + Деактивиране на група дялове с име <strong>%1 </strong>. The installer failed to deactivate a volume group named %1. - + Инсталаторът не успя да деактивира група дялове с име %1. @@ -1355,7 +1360,7 @@ The installer will quit and all changes will be lost. %1 - (%2) device[name] - (device-node[name]) - + %1 - (%2) @@ -1394,7 +1399,7 @@ The installer will quit and all changes will be lost. Con&tent: - + &Съдържание: @@ -1439,22 +1444,22 @@ The installer will quit and all changes will be lost. Label for the filesystem - + Етикет на файловата система FS Label: - + Етикет на ФС: Passphrase for existing partition - + Пасфраза за съществуващ дял Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. - + Дял %1 не може да бъде декриптиран с дадената парола. <br/><br/> Редактирайтеотново дялът и дайте правилната парола или го изтрийте и създайте нов криптиран дял. @@ -1472,7 +1477,7 @@ The installer will quit and all changes will be lost. Your system does not seem to support encryption well enough to encrypt the entire system. You may enable encryption, but performance may suffer. - + Изглежда, че вашата система е слаба за криптиране на цялата система. Може да активирате криптирането, но производителността може да спадне . @@ -1496,12 +1501,12 @@ The installer will quit and all changes will be lost. Details: - + Подробности: Would you like to paste the install log to the web? - + Искате ли да поставите дневника за инсталиране в мрежата? @@ -1514,7 +1519,7 @@ The installer will quit and all changes will be lost. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Инсталиране на %1 на <strong> нов </strong> %2 системен дял с функции <em> %3 </em> @@ -1524,27 +1529,27 @@ The installer will quit and all changes will be lost. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Настройване на <strong> нов </strong> %2 дял с монтиране на точка <strong> %1 </strong> и характеристики <em>%3 </em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Настройване на <strong> нов </strong> %2 дял с монтиране на точка <strong> %1 </strong>%3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Инсталиране на %2 на %3 системен дял <strong> %1 </strong> с функции <em> %4 </em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Настройване на %3 дял <strong>%1 </strong> с точка на монтиране <strong>%2 </strong>и функции <em>%4 </em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Настройване на %3 дял <strong>%1 </strong> с точка на монтиране <strong>%2 </strong>%4. @@ -1577,12 +1582,12 @@ The installer will quit and all changes will be lost. <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <h1> Всичко е готово.</h1><br/>%1 е инсталиран на вашия компютър. <br/> Сега може дазапочнете да използвате новата си система. <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <html><head/><body><p> Когато това поле бъде отметнато, вашата система ще се рестартираведнага , когато щракнете върху <span style="font-style:italic;"> Готово </span>или затворите програмата за инсталиране.</p></ody></html> @@ -1592,12 +1597,12 @@ The installer will quit and all changes will be lost. <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <html><head/><body><p> Когато това поле бъде отметнато, вашата система ще се рестартираведнага, когато щракнете върху <span style="font-style:italic;">Готово </span>или затворете инсталатора.</p></ody></html> <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1> Инсталирането е неуспешно </h1><br/>%1 не е инсталиран на вашия компютър. <br/>Съобщението за грешка беше: %2. @@ -1610,7 +1615,7 @@ The installer will quit and all changes will be lost. Finish - Завърши + Завършване @@ -1626,12 +1631,12 @@ The installer will quit and all changes will be lost. Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Форматиране на дял %1 (файлова система: %2, размер: %3 MiB) на %4. Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Форматиране на <strong>%3MiB </strong> дял <strong>%1 </strong> с файлова система<strong>%2 </strong>. @@ -1655,22 +1660,22 @@ The installer will quit and all changes will be lost. has at least %1 GiB available drive space - + има поне %1 GiB свободно място на диска There is not enough drive space. At least %1 GiB is required. - + Няма достатъчно място на диска. Необходими са най-малко %1 GiB. has at least %1 GiB working memory - + има поне %1 GiB работна памет The system does not have enough working memory. At least %1 GiB is required. - + Системата няма достатъчно работна памет. Необходими са поне %1 GIB. @@ -1695,12 +1700,12 @@ The installer will quit and all changes will be lost. is running the installer as an administrator (root) - + изпълнява инсталатора като администратор (root) The setup program is not running with administrator rights. - + Програмата за настройване не се изпълнява с права на администратор. @@ -1710,12 +1715,12 @@ The installer will quit and all changes will be lost. has a screen large enough to show the whole installer - + Има екран, достатъчно голям, за да покаже целия прозорец на инсталатора. The screen is too small to display the setup program. - + Екранът е твърде малък, за да се покаже програмата за инсталиране. @@ -1728,7 +1733,7 @@ The installer will quit and all changes will be lost. Collecting information about your machine. - + Събиране на информация за вашата машина. @@ -1739,22 +1744,22 @@ The installer will quit and all changes will be lost. OEM Batch Identifier - + OEM -партиден идентификатор Could not create directories <code>%1</code>. - + Неуспех при създаването на директории <code>%1 </code>. Could not open file <code>%1</code>. - + Грешка при отваряне на файла <code>%1</code>. Could not write to file <code>%1</code>. - + Не може да се извърши запис във файл <code>%1</code>. @@ -1762,7 +1767,7 @@ The installer will quit and all changes will be lost. Creating initramfs with mkinitcpio. - + Създаване на initramfs с mkinitcpio. @@ -1770,7 +1775,7 @@ The installer will quit and all changes will be lost. Creating initramfs. - + Създаване на initramfs. @@ -1843,22 +1848,22 @@ The installer will quit and all changes will be lost. Configuring encrypted swap. - + Конфигуриране на криптиран swap. No target system available. - + Няма налична целева система. No rootMountPoint is set. - + Не е зададен RootMountpoint. No configFilePath is set. - + Не е зададен configFilePath. @@ -1871,7 +1876,7 @@ The installer will quit and all changes will be lost. <h1>License Agreement</h1> - + <h1>Лицензно споразумение</h1> @@ -1881,27 +1886,27 @@ The installer will quit and all changes will be lost. Please review the End User License Agreements (EULAs). - + Моля, прегледайте лицензионните споразумения за краен потребител (EULAS). This setup procedure will install proprietary software that is subject to licensing terms. - + Тази процедура за настройка ще инсталира патентован софтуер, който подлежи налицензионни условия. If you do not agree with the terms, the setup procedure cannot continue. - + Ако не сте съгласни с условията, процедурата за инсталиране не може да продължи. This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience. - + С цел да се осигурят допълнителни функции и да се подобри работата на потребителя, процедурата може да инсталира софтуер, който е обект на лицензионни условия. If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead. - + Ако не сте съгласни с условията, патентованият софтуер няма да бъде инсталиран и вместо него ще бъдат използвани алтернативи с отворен код. @@ -1917,7 +1922,7 @@ The installer will quit and all changes will be lost. URL: %1 - + URL: %1 @@ -1954,22 +1959,22 @@ The installer will quit and all changes will be lost. File: %1 - + Файл: %1 Hide license text - + Скриване на текста на лиценза Show the license text - + Показване на текста на лиценза Open license agreement in browser. - + Отваряне на лицензионното споразумение в браузъра. @@ -2004,7 +2009,7 @@ The installer will quit and all changes will be lost. Quit - + Изход @@ -2020,35 +2025,35 @@ The installer will quit and all changes will be lost. Configuring LUKS key file. - + Конфигуриране на ключов файл LUKS. No partitions are defined. - + Няма зададени дялове. Encrypted rootfs setup error - + Грешка при настройване на криптирана rootfs Root partition %1 is LUKS but no passphrase has been set. - + Root дял %1 е LUKS, но не е зададена парола. Could not create LUKS key file for root partition %1. - + Не можа да се създаде ключов файл LUKS за root дял %1. Could not configure LUKS key file on partition %1. - + Неуспешно конфигуриране на ключов файл на LUKS на дял %1. @@ -2056,17 +2061,17 @@ The installer will quit and all changes will be lost. Generate machine-id. - Генерирай machine-id. + Генериране на machine-id. Configuration Error - + Грешка в конфигурацията No root mount point is set for MachineId. - + Не е зададена точка за монтиране на root за MachineID. @@ -2074,14 +2079,16 @@ The installer will quit and all changes will be lost. Timezone: %1 - + Часова зона: %1 Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. - + Моля, изберете предпочитаното от вас местоположение на картата, за да може инсталаторът да предложи съответните регионални настройки + и настройките на часовия пояс. Можете да направите точна корекция на предложените настройки по-долу. Премествайте картата с влачене + и с помощта на бутоните +/- или колелцето на мишката променяйте мащаба, за да намерите местоположението. @@ -2094,104 +2101,104 @@ The installer will quit and all changes will be lost. Office software - + Офис софтуер Office package - + Офис пакет Browser software - + Софтуер за браузър Browser package - + Пакет на браузър Web browser - + Уеб браузър Kernel label for netinstall module, Linux kernel - + Ядро Services label for netinstall module, system services - + Услуги Login label for netinstall module, choose login manager - + Вход Desktop label for netinstall module, choose desktop environment - + Работен плот Communication label for netinstall module - + Комуникация Development label for netinstall module - + Разработка Office label for netinstall module - + Офис Multimedia label for netinstall module - + Мултимедия Internet label for netinstall module - + Интернет Theming label for netinstall module - + Стилове и теми Gaming label for netinstall module - + Игри Utilities label for netinstall module - + Помощни програми Applications - + Приложения @@ -2199,7 +2206,7 @@ The installer will quit and all changes will be lost. Notes - + Бележки @@ -2207,17 +2214,17 @@ The installer will quit and all changes will be lost. Ba&tch: - + Ba&tch: <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> - + <html><head/><body><p>Въведете batch идентификатор тук. Той ще се съхранява в целевата система</p></body></html> <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html> - + <html><head/><body><h1>OEM Конфигурация</h1><p>Calamares ще използва OEM настройки при конфигуриране на целевата система</p></body></html> @@ -2225,12 +2232,12 @@ The installer will quit and all changes will be lost. OEM Configuration - + OEM конфигурация Set the OEM Batch Identifier to <code>%1</code>. - + Задаване на идентификатора на OEM Batch на <code>%1 </code>. @@ -2238,29 +2245,29 @@ The installer will quit and all changes will be lost. Select your preferred Region, or use the default settings. - + Изберете предпочитания от вас регион или използвайте настройките по подразбиране. Timezone: %1 - + Часова зона: %1 Select your preferred Zone within your Region. - + Изберете предпочитаната от вас зона във вашия регион. Zones - + Зони You can fine-tune Language and Locale settings below. - + Можете да прецизирате настройките за езика и регионалните формати по-долу. @@ -2338,9 +2345,9 @@ The installer will quit and all changes will be lost. The password contains fewer than %n lowercase letters - - - + + Паролата съдържа по -малко от %n малки букви + Паролата съдържа по -малко от %n малки букви @@ -2376,70 +2383,70 @@ The installer will quit and all changes will be lost. The password contains fewer than %n digits - - - + + Паролата съдържа по -малко от %n цифри + Паролата съдържа по -малко от %n цифри The password contains fewer than %n uppercase letters - - - + + Паролата съдържа по -малко от %n главни букви + Паролата съдържа по -малко от %n главни букви The password contains fewer than %n non-alphanumeric characters - - - + + Паролата съдържа по-малко от %n небуквени и нецифрови знаци + Паролата съдържа по-малко от %n небуквени и нецифрови знаци The password is shorter than %n characters - - - + + Паролата е по -къса от %n знака + Паролата е по -къса от %n знака The password is a rotated version of the previous one - + Паролата е обърната версия на предишната The password contains fewer than %n character classes - - - + + Паролата съдържа по -малко от %n класове символи + Паролата съдържа по -малко от %n класове символи The password contains more than %n same characters consecutively - - - + + Паролата съдържа повече от %n еднакви знака последователно + Паролата съдържа повече от %n еднакви знака последователно The password contains more than %n characters of the same class consecutively - - - + + Паролата съдържа повече от %n знака от един и същи клас последователно + Паролата съдържа повече от %n знака от един и същи клас последователно The password contains monotonic sequence longer than %n characters - - - + + Паролата съдържа монотонната последователност по -дълга от %n знаци + Паролата съдържа монотонната последователност по -дълга от %n знаци @@ -2535,7 +2542,7 @@ The installer will quit and all changes will be lost. Password is empty - + Паролата е празна @@ -2548,7 +2555,7 @@ The installer will quit and all changes will be lost. Product Name - + Продуктово име @@ -2558,17 +2565,17 @@ The installer will quit and all changes will be lost. Long Product Description - + Подробно описание на продукта Package Selection - + Избор на пакети Please pick a product from the list. The selected product will be installed. - + Моля, изберете продукт от списъка. Избраният продукт ще бъде инсталиран. @@ -2617,7 +2624,7 @@ The installer will quit and all changes will be lost. Your Full Name - + Вашето пълно име @@ -2627,7 +2634,7 @@ The installer will quit and all changes will be lost. login - + вход @@ -2642,7 +2649,7 @@ The installer will quit and all changes will be lost. Computer Name - + Име на компютър: @@ -2659,23 +2666,23 @@ The installer will quit and all changes will be lost. Password - + Парола Repeat Password - + Повтаряне на паролата When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Когато това поле е маркирано, се извършва проверка на силата на паролата и няма да можете да използвате слаба парола. Require strong passwords. - + Изискване на силни пароли. @@ -2770,7 +2777,7 @@ The installer will quit and all changes will be lost. File System Label - + Етикет на файловата система @@ -2823,27 +2830,27 @@ The installer will quit and all changes will be lost. New Volume Group - + Нова група LVM дялове Resize Volume Group - + Преоразмеряване на група дялове Deactivate Volume Group - + Деактивиране на група дялове Remove Volume Group - + Премахване на група дялове I&nstall boot loader on: - + И& нсталиране на програма за начално зареждане на: @@ -2876,17 +2883,17 @@ The installer will quit and all changes will be lost. Unsafe partition actions are enabled. - + Активирани са опасни действия с дялове. Partitioning is configured to <b>always</b> fail. - + Разделянето на дялове е конфигурирано така, че <b>винаги</b> да е неуспешно. No partitions will be changed. - + Дяловете няма да бъдат променени. @@ -2906,47 +2913,47 @@ The installer will quit and all changes will be lost. EFI system partition configured incorrectly - + Системният дял EFI е конфигуриран неправилно An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + За стартирането на %1 е необходим системен дял EFI.<br/><br/>За да конфигурирате EFI системен дял, върнете се назад и изберете или създайте подходяща файлова система. The filesystem must be mounted on <strong>%1</strong>. - + Файловата система трябва да бъде монтирана на <strong>%1 </strong>. The filesystem must have type FAT32. - + Файловата система трябва да бъде от тип FAT32. The filesystem must be at least %1 MiB in size. - + Файловата система трябва да е с размер поне %1 MiB. The filesystem must have flag <strong>%1</strong> set. - + Файловата система трябва да има флаг <strong>%1 </strong>. You can continue without setting up an EFI system partition but your system may fail to start. - + Можете да продължите, без да настроите EFI системен дял, но вашата системаможе да не успее да се стартира. Option to use GPT on BIOS - + Опция за използване на GPT на BIOS A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Таблица с дялове на GPT е най -добрият вариант за всички системи. Този инсталаторподдържа такава настройка и за BIOS системи. <br/><br/> За конфигуриране на GPT таблица с дяловете в BIOS (ако вече не сте го направили), върнете се назад и задайте таблица на дяловете на GPT, след което създайте 8 MB неформатиран дял сактивиран <strong>%2 </strong> флаг. <br/><br/> Необходим е 8 MB дял за стартиране на %1 на BIOS система с GPT. @@ -2956,17 +2963,17 @@ The installer will quit and all changes will be lost. A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + Отделен дял за начално зареждане беше създаден заедно с криптиран root дял, но не беше криптиран. <br/><br/>При този вид настройка има проблеми със сигурността, тъй като важни системни файлове се съхраняват на некриптиран дял.<br/> Можете да продължите, ако желаете, но отключването на файловата система ще се случи по -късно по време на стартиране на системата. <br/> За да криптирате дялът заначално зареждане, върнете се назад и го създайте отново, избирайки<strong> Криптиране </strong> в прозореца за създаване на дяла. has at least one disk device available. - + има поне едно дисково устройство. There are no partitions to install on. - + Няма дялове, върху които да се извърши инсталирането. @@ -2974,13 +2981,13 @@ The installer will quit and all changes will be lost. Plasma Look-and-Feel Job - + Оформление и външен вид в стил Plasma Could not select KDE Plasma Look-and-Feel package - + Неуспех при избиране на пакет с оформление на външен вид на Plasma KDE @@ -2993,12 +3000,12 @@ The installer will quit and all changes will be lost. Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. - + Моля, изберете оформление на външен вид на работния плот на KDE Plasma. Можете също да пропуснете тази стъпка и да я конфигурирате, след като системата е настроена. Щракването върху това поле ще ви даде предварителен изглед на това оформление. Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. - + Моля, изберете оформление на външен вид на работния плот на KDE Plasma. Можете също да пропуснете тази стъпка и да я конфигурирате, след като системата е инсталирана. Щракването върху това поле ще ви даде предварителен изглед на това оформление. @@ -3006,7 +3013,7 @@ The installer will quit and all changes will be lost. Look-and-Feel - + Външен вид @@ -3014,17 +3021,17 @@ The installer will quit and all changes will be lost. Saving files for later ... - + Запазване на файловете за по -късно... No files configured to save for later. - + Няма конфигурирани файлове за запазване за по -късно. Not all of the configured files could be preserved. - + Не всички конфигурирани файлове могат да бъдат запазени. @@ -3033,7 +3040,8 @@ The installer will quit and all changes will be lost. There was no output from the command. - + +Няма резултат от командата. @@ -3047,27 +3055,27 @@ Output: External command crashed. - + Външната команда се срина. Command <i>%1</i> crashed. - + Командата <i>%1 </i> се срина. External command failed to start. - + Външната команда не успя да се стратира. Command <i>%1</i> failed to start. - + Команда <i>%1 </i> не успя да се стартира. Internal error when starting command. - + Вътрешна грешка при стартиране на команда. @@ -3077,28 +3085,28 @@ Output: External command failed to finish. - + Външната команда не успя да завърши. Command <i>%1</i> failed to finish in %2 seconds. - + Командата <i> %1 </i> не успя да завърши за %2 секунди. External command finished with errors. - + Външната команда завърши с грешки. Command <i>%1</i> finished with exit code %2. - + Командата <i> %1 </i> завърши с изходен код %2. QObject - + %1 (%2) %1 (%2) @@ -3134,38 +3142,38 @@ Output: File not found - + Файлът не е намерен Path <pre>%1</pre> must be an absolute path. - + Пътят <pre>%1 </pre> трябва да бъде абсолютен път. Directory not found - + Директорията не е намерена Could not create new random file <pre>%1</pre>. - + Неуспех при създаването на нов случаен файл <pre>%1 </pre>. No product - + Няма продукт No description provided. - + Не е предоставено описание. (no mount point) - + (без точка на монтиране) @@ -3179,7 +3187,8 @@ Output: <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> Setup can continue, but some features might be disabled.</p> - + <p> Този компютър не удовлетворява някои от препоръчителните изисквания занастройване на %1. <br/> + Инсталирането може да продължи, но някои функции могат да бъдат деактивирани.</p> @@ -3187,7 +3196,7 @@ Output: Remove live user from target system - + Премахване на потребители на Live средата от целевата система @@ -3196,17 +3205,17 @@ Output: Remove Volume Group named %1. - + Премахване на група дялове %1. Remove Volume Group named <strong>%1</strong>. - + Премахване на група дялове <strong>%1</strong>. The installer failed to remove a volume group named '%1'. - + Инсталаторът не успя да премахне група дялове с име '%1'. @@ -3290,13 +3299,15 @@ Output: <p>This computer does not satisfy the minimum requirements for installing %1.<br/> Installation cannot continue.</p> - + <p>Този компютър не отговаря на минималните изисквания за инсталирането на %1.<br/> +Инсталацията не може да продължи.</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> Този компютър не удовлетворява някои от препоръчителните изисквания занастройване на %1. <br/> + Инсталирането може да продължи, но някои функции могат да бъдат деактивирани.</p> @@ -3304,27 +3315,27 @@ Output: Resize Filesystem Job - + Оразмеряване на файловата система Invalid configuration - + Невалидна конфигурация The file-system resize job has an invalid configuration and will not run. - + Работата за преоразмеряване на файловата система има невалидна конфигурация и няма да се изпълни. KPMCore not Available - + KPMCore не е наличен Calamares cannot start KPMCore for the file-system resize job. - + Calamares не може да започне KPMCore за преоразмеряването на файловата система. @@ -3333,39 +3344,39 @@ Output: Resize Failed - + Преоразмеряването е неуспешно The filesystem %1 could not be found in this system, and cannot be resized. - + Файловата система %1 не може да бъде намерена на този диск и не може да бъде преоразмерена. The device %1 could not be found in this system, and cannot be resized. - + Устройството %1 не може да бъде намерено в тази система и не може да бъде преоразмерено. The filesystem %1 cannot be resized. - + Файловата система %1 не може да бъде преоразмерена. The device %1 cannot be resized. - + Устройството %1 не може да бъде преоразмерено. The filesystem %1 must be resized, but cannot. - + Файловата система %1 трябва да бъде преоразмерена, но действието не може се извърши. The device %1 must be resized, but cannot - + Устройството %1 трябва да бъде преоразмерено, но действието не може се извърши @@ -3378,12 +3389,12 @@ Output: Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. - + Преоразмеряване на <strong>%2MiB </strong> дял <strong>%1 </strong> до<strong>%3MiB </strong>. Resizing %2MiB partition %1 to %3MiB. - + Преоразмеряване на %2MiB дял %1 до %3MiB. @@ -3396,7 +3407,7 @@ Output: Resize Volume Group - + Преоразмеряване на група дялове @@ -3405,17 +3416,17 @@ Output: Resize volume group named %1 from %2 to %3. - + Преоразмеряване на група дялове %1 от %2 на %3. Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>. - + Преоразмеряване на група дялове <strong>%1</strong> от<strong>%2</strong> на<strong>%3</strong>. The installer failed to resize a volume group named '%1'. - + Инсталаторът не успя да преоразмери група дялове "%1". @@ -3514,7 +3525,7 @@ Output: Set flags on %1MiB %2 partition. - + Задаване на флагове на %1MiB %2 дял. @@ -3529,7 +3540,7 @@ Output: Clear flags on %1MiB <strong>%2</strong> partition. - + Изчистване на флагове на %1MiB <strong> %2 </strong> дял. @@ -3544,7 +3555,7 @@ Output: Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Задаване на флаг на %1MiB <strong>%2</strong> дял като <strong>%3</strong>. @@ -3559,7 +3570,7 @@ Output: Clearing flags on %1MiB <strong>%2</strong> partition. - + Изчистване на флагове на %1MiB <strong> %2 </strong> дял. @@ -3574,7 +3585,7 @@ Output: Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Задаване на флагове <strong>%3 </strong> на %1MiB <strong>%2 </strong> дял. @@ -3612,12 +3623,12 @@ Output: Cannot disable root account. - + Не може да деактивира root акаунтът. passwd terminated with error code %1. - + passwd е прекратен с код за грешка %1. @@ -3673,18 +3684,18 @@ Output: Preparing groups. - + Подготовка на групите. Could not create groups in target system - + Неуспех при създаването на групи в целевата система These groups are missing in the target system: %1 - + Тези групи липсват в целевата система: %1 @@ -3692,7 +3703,7 @@ Output: Configure <pre>sudo</pre> users. - + Конфигуриране на <pre> sudo </pre> потребители. @@ -3710,7 +3721,7 @@ Output: Shell Processes Job - + Процесна обработка от обвивката @@ -3755,22 +3766,22 @@ Output: Installation feedback - + Обратна връзка за инсталирането Sending installation feedback. - + Изпращане на обратна връзка за инсталирането. Internal error in install-tracking. - + Вътрешна грешка при проследяване на инсталирането. HTTP request timed out. - + Времето на HTTP заявката изтече. @@ -3778,28 +3789,28 @@ Output: KDE user feedback - + Потребителска обратна връзка за KDE Configuring KDE user feedback. - + Конфигуриране на потребителска обратна връзка. Error in KDE user feedback configuration. - + Грешка в конфигурацията за потребителска обратна връзка за KDE. Could not configure KDE user feedback correctly, script error %1. - + Неуспех при конфигурирането на потребителска обратна връзка за KDE, грешка в скрипта %1. Could not configure KDE user feedback correctly, Calamares error %1. - + Неуспех при конфигурирането на потребителска обратна връзка за KDE, грешка на Calamares %1. @@ -3807,28 +3818,28 @@ Output: Machine feedback - + Машинна обратна връзка Configuring machine feedback. - + Конфигуриране на машинна обратна връзка. Error in machine feedback configuration. - + Грешка в конфигурацията на машинната обратна връзка. Could not configure machine feedback correctly, script error %1. - + Неуспешно конфигуриране на машинна обратна връзка, грешка в скрипта %1. Could not configure machine feedback correctly, Calamares error %1. - + Неуспех при конфигурирането на машинна обратна връзка, грешка на Calamares %1. @@ -3846,32 +3857,32 @@ Output: <html><head/><body><p>Click here to send <span style=" font-weight:600;">no information at all</span> about your installation.</p></body></html> - + <html><head/><body><p> Щракнете тук, за да изпратите <span style = " font-weight: 600; ">изключване на всякаква информация </span> за вашата инсталация.</p></ody></html> <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> - + <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;"> Щракнете тук за повече информация за обратна връзка от потребителите </span></a></p></body></html> Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + Проследяването помага на %1 да види колко често се инсталира, на какъв хардуер се инсталиран и кои приложения се използват. За да видите какво ще бъде изпратено,моля, щракнете върху иконата за помощ. 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. - + Като изберете това, ще изпратите информация за вашата инсталация ихардуер. Тази информация ще бъде изпратена само <b> веднъж </b> след завършване на инсталацията. By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + Като изберете това, периодично ще изпращате информация за вашата<b> машинна </b> инсталация, хардуер и приложения до %1. By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. - + Като изберете това, периодично ще изпращате информация за вашата <b> потребителска</b> инсталация, хардуер, приложения и модели на използване на приложенията до %1. @@ -3887,17 +3898,17 @@ Output: Unmount file systems. - Демонтирай файловите системи. + Демонтиране на файловите системи. No target system available. - + Няма налична целева система. No rootMountPoint is set. - + Не е зададен RootMountpoint. @@ -3905,12 +3916,12 @@ Output: <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>Ако повече от един човек ще използва този компютър, можете да създадетемножество акаунти след настройването.</small> <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> - + <small>Ако повече от един човек ще използва този компютър, можете да създадетемножество акаунти след инсталирането.</small> @@ -3935,7 +3946,7 @@ Output: Key Column header for key/value - + Клавиш @@ -3949,27 +3960,27 @@ Output: Create Volume Group - + Създаване на група дялове List of Physical Volumes - + Списък на физическите дялове Volume Group Name: - + Име на група на дял: Volume Group Type: - + Вид на група на дял: Physical Extent Size: - + Размер на физически диапазон: @@ -3979,12 +3990,12 @@ Output: Total Size: - + Общ размер: Used Size: - + Използван размер: @@ -3994,7 +4005,7 @@ Output: Quantity of LVs: - + Брой на логични дялове: @@ -4008,22 +4019,22 @@ Output: Select application and system language - + Избиране на език за приложенията и системата Open donations website - + Отваряне на уеб страницата за дарения &Donate - + &Дарение Open help and support website - + Отваряне на уеб страницата за помощ и поддръжка @@ -4033,7 +4044,7 @@ Output: Open issues and bug-tracking website - + Отваряне на уеб страницата за проблеми и проследяване на грешки @@ -4043,7 +4054,7 @@ Output: Open release notes website - + Отваряне на уеб страницата за бележки за изданието @@ -4058,7 +4069,7 @@ Output: About %1 setup - + Относно инсталирането на %1 @@ -4087,86 +4098,100 @@ Output: Create ZFS pools and datasets - + Създаване на ZFS пулове и набори от данни Failed to create zpool on - + Неуспешно създаване на zpool Configuration Error - + Грешка в конфигурацията No partitions are available for ZFS. - + Няма дялове за ZFS. Internal data missing - + Липсват вътрешни данни Failed to create zpool - + Неуспешно създаване на zpool Failed to create dataset - + Неуспешно създаване на набор от данни The output was: - + Резултатът беше: calamares-sidebar + About - + Относно + Debug Отстраняване на грешки + + + Show information about Calamares + Показване информация за Calamares + + + + Show debug information + Покажи информация за отстраняване на грешки + finishedq Installation Completed - + Инсталацията е завършена %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 е инсталиран на вашия компютър. <br/> + Сега можете да рестартирате новата си система или да продължите да използватеLive средата. Close Installer - + Затваряне на инсталатора Restart System - + Рестартиране на системата <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Пълен дневник на инсталацията е достъпен като installation.log в домашнатадиректория на Live системата. <br/> + Този ​​дневник се копира в /var/log/installation.log на целеватасистема.</p> @@ -4174,23 +4199,24 @@ Output: Installation Completed - + Инсталацията е завършена %1 has been installed on your computer.<br/> You may now restart your device. - + %1 е инсталиран на вашия компютър.<br/> +Сега можете да рестартирате устройството си. Close - + Затваряне Restart - + Рестартиране @@ -4199,18 +4225,20 @@ Output: <h1>Languages</h1> </br> The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>. - + <h1>Езици</h1></br> + Регионалните настройки на системата засягат езика и набора от символи за някои елементи на потребителския команден ред. Текущата настройка е <strong>%1</strong>. <h1>Locales</h1> </br> The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>. - + <h1>Регионални настройки</h1></br> + Регионалните настройки на системата определя формата на числата и датите. Текущата настройка е <strong>%1 </strong>. Back - + Назад @@ -4218,7 +4246,7 @@ Output: To activate keyboard preview, select a layout. - + За да активирате визуализацията на клавиатурата, изберете подредба. @@ -4228,7 +4256,7 @@ Output: Layouts - + Подредби @@ -4238,7 +4266,7 @@ Output: Variants - + Варианти @@ -4246,7 +4274,7 @@ Output: Change - + Промяна @@ -4255,7 +4283,8 @@ Output: <h3>%1</h3> <p>These are example release notes.</p> - + <h3>%1 </h3> + <p>Това са примерни бележки за издание.</p> @@ -4264,37 +4293,38 @@ Output: LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/> Default option. - + Libreoffice е мощен и безплатен офис пакет, използван от милиони хорапо целия свят. Той включва няколко приложения, които го правят най-универсалния безплатен офис пакет с отворен код на пазара.<br/> + Опция по подразбиране. LibreOffice - + LibreOffice If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives. - + Ако не искате да инсталирате офис пакет, просто изберете Без офис пакет.При необходимост винаги можете по-късно да добавите един (или повече) на вече инсталираната си система. No Office Suite - + Без офис пакет Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support. It will be just a desktop, file browser, package manager, text editor and simple web-browser. - + Създайте минимална инсталация на работната среда, премахнете всички допълнителни приложения и решете по-късно, какво бихте искали да добавите към вашата система. Примери за това, което няма да има на такава инсталация: няма да има офис приложения, медийни плеъри, програми за преглед на изображения или поддръжка на печат. Това ще бъде само работен плот с файлов мениджър, текстов редактор, прост уеб браузър и мениджър на пакети. Minimal Install - + Минимална инсталация Please select an option for your install, or use the default: LibreOffice included. - + Моля, изберете опция за вашата инсталация или използвайте по подразбиране: LibreOfficeвключен. @@ -4322,12 +4352,32 @@ Output: </ul> <p>The vertical scrollbar is adjustable, current width set to 10.</p> - + <h3>%1</h3> +<p>Това e примерен QML файл, показващ опции с форматиран текст и съдържание с бързо прелистване.</p> + +<p> QML с форматиран текст може да използва HTML етикети, съдържание с бързо прелистване е удачно за сензорни екрани.</p> + + <p><b> Това е текст с получер шрифт</b></p> + <p><i> Това е текст с курсивен шрифт</i></p> + <p><u> Това е подчертан текст </u></p> + <p><center> Този текст ще бъде подравнен в центъра.</center></p> + <p><s> Това е зачертаване </s></p> + + <p> Примерен код: +<code> ls -l/home </code></p> + + <p><b> Списъци:</b></p> + <ul> + <li> Intel CPU системи </li> + <li> AMD CPU системи </li> + </ul> + + <p> Вертикалната лента за превъртане е регулируема, актуалната ширина е зададена на 10.</p> Back - + Назад @@ -4335,7 +4385,7 @@ Output: Pick your user name and credentials to login and perform admin tasks - + Изберете потребителското си име и идентификационни данни, за да влезете системата и изпълнявайте администраторски задачи @@ -4345,7 +4395,7 @@ Output: Your Full Name - + Вашето пълно име @@ -4355,22 +4405,22 @@ Output: Login Name - + Име за вход If more than one person will use this computer, you can create multiple accounts after installation. - + Ако повече от един човек ще използва този компютър, можете да създадете множествоакаунти след инсталирането. Only lowercase letters, numbers, underscore and hyphen are allowed. - + Разрешени са само малки букви, цифри, долна черта и тире. root is not allowed as username. - + root не е разрешен като потребителско име. @@ -4380,17 +4430,17 @@ Output: Computer Name - + Име на компютър: This name will be used if you make the computer visible to others on a network. - + Това име ще бъде използвано, ако направите компютъра видим за другите в мрежата. localhost is not allowed as hostname. - + localhost не е разрешен като име на хост. @@ -4400,42 +4450,42 @@ Output: Password - + Парола Repeat Password - + Повтаряне на паролата Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Въведете една и съща парола два пъти, така че да може да бъде проверена за грешки във въвеждането.Добрата парола съдържа комбинация от букви, цифри и пунктуации. Трябва да е дълга поне осем знака и трябва да се променя периодично. Validate passwords quality - + Проверка на качеството на паролите When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Когато това поле е маркирано, се извършва проверка на силата на паролата и няма да можете да използвате слаба парола. Log in automatically without asking for the password - + Автоматично влизане без изискване за парола Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Само букви, цифри, долна черта и тире са разрешени, минимуми от двазнака. Reuse user password as root password - + Използване на потребителската парола и за парола на root @@ -4445,22 +4495,22 @@ Output: Choose a root password to keep your account safe. - + Изберете парола за root, за да запазите акаунта си сигурен. Root Password - + Парола за root Repeat Root Password - + Повторете паролата за root Enter the same password twice, so that it can be checked for typing errors. - + Въведете една и съща парола два пъти, така че да може да бъде проверена за грешки във въвеждането. @@ -4469,27 +4519,28 @@ Output: <h3>Welcome to the %1 <quote>%2</quote> installer</h3> <p>This program will ask you some questions and set up %1 on your computer.</p> - + <h3> Добре дошли в <quote> %2 </quote> инсталатор на %1</h3> +<p> Тази програма ще ви зададе някои въпроси и ще инсталира %1 навашият компютър.</p> Support - + Поддръжка Known issues - + Известни проблеми Release notes - + Бележки към изданието Donate - + Дарение diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts index 9f08c3813..b83c8c5fb 100644 --- a/lang/calamares_bn.ts +++ b/lang/calamares_bn.ts @@ -502,12 +502,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 ইনস্টল @@ -776,27 +776,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> %1-এ কীবোর্ড নকশা নির্ধারণ করুন। - + Set keyboard layout to %1/%2. %1/%2 এ কীবোর্ড বিন্যাস নির্ধারণ করুন। - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3095,7 +3095,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4127,14 +4127,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + ডিবাগ তথ্য দেখান + finishedq diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index a569aee90..93bccb44e 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -507,12 +507,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. CalamaresWindow - + %1 Setup Program Programa de configuració %1 - + %1 Installer Instal·lador de %1 @@ -781,27 +781,27 @@ L'instal·lador es tancarà i tots els canvis es perdran. Config - + Set keyboard model to %1.<br/> Establirà el model del teclat a %1.<br/> - + Set keyboard layout to %1/%2. Establirà la distribució del teclat a %1/%2. - + Set timezone to %1/%2. Estableix la zona horària a %1/%2. - + The system language will be set to %1. La llengua del sistema s'establirà a %1. - + The numbers and dates locale will be set to %1. Els números i les dates de la configuració local s'establiran a %1. @@ -3105,7 +3105,7 @@ Sortida: QObject - + %1 (%2) %1 (%2) @@ -4140,14 +4140,26 @@ La configuració pot continuar, però algunes característiques podrien estar in calamares-sidebar + About Quant a + Debug Depuració + + + Show information about Calamares + Mostra informació quant al Calamares. + + + + Show debug information + Informació de depuració + finishedq diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts index 890995de7..644dea648 100644 --- a/lang/calamares_ca@valencia.ts +++ b/lang/calamares_ca@valencia.ts @@ -503,12 +503,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. CalamaresWindow - + %1 Setup Program Programa de configuració %1 - + %1 Installer Instal·lador de %1 @@ -777,27 +777,27 @@ L'instal·lador es tancarà i tots els canvis es perdran. Config - + Set keyboard model to %1.<br/> Estableix el model de teclat en %1.<br/> - + Set keyboard layout to %1/%2. Estableix la distribució del teclat a %1/%2. - + Set timezone to %1/%2. Estableix el fus horari a %1/%2. - + The system language will be set to %1. La llengua del sistema s'establirà en %1. - + The numbers and dates locale will be set to %1. Els números i les dates de la configuració local s'establiran en %1. @@ -3101,7 +3101,7 @@ Eixida: QObject - + %1 (%2) %1 (%2) @@ -4136,14 +4136,26 @@ La configuració pot continuar, però és possible que algunes característiques calamares-sidebar + About Quant a + Debug + + + Show information about Calamares + + + + + Show debug information + Mostra la informació de depuració + finishedq diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts index 8e03b527a..e79afeb2a 100644 --- a/lang/calamares_cs_CZ.ts +++ b/lang/calamares_cs_CZ.ts @@ -511,12 +511,12 @@ Instalační program bude ukončen a všechny změny ztraceny. CalamaresWindow - + %1 Setup Program Instalátor %1 - + %1 Installer Instalátor %1 @@ -785,27 +785,27 @@ Instalační program bude ukončen a všechny změny ztraceny. Config - + Set keyboard model to %1.<br/> Nastavit model klávesnice na %1.<br/> - + Set keyboard layout to %1/%2. Nastavit rozvržení klávesnice na %1/%2. - + Set timezone to %1/%2. Nastavit časové pásmo na %1/%2. - + The system language will be set to %1. Jazyk systému bude nastaven na %1. - + The numbers and dates locale will be set to %1. Formát zobrazení čísel, data a času bude nastaven dle národního prostředí %1. @@ -3127,7 +3127,7 @@ Výstup: QObject - + %1 (%2) %1 (%2) @@ -4162,14 +4162,26 @@ Výstup: calamares-sidebar + About O projektu + Debug Ladění + + + Show information about Calamares + + + + + Show debug information + Zobrazit ladící informace + finishedq diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index 926fca66f..9507d992a 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -503,12 +503,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. CalamaresWindow - + %1 Setup Program %1-opsætningsprogram - + %1 Installer %1-installationsprogram @@ -777,27 +777,27 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Config - + Set keyboard model to %1.<br/> Indstil tastaturmodel til %1.<br/> - + Set keyboard layout to %1/%2. Indstil tastaturlayout til %1/%2. - + Set timezone to %1/%2. Indstil tidszone til %1/%2. - + The system language will be set to %1. Systemets sprog indstilles til %1. - + The numbers and dates locale will be set to %1. Lokalitet for tal og datoer indstilles til %1. @@ -3101,7 +3101,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4137,14 +4137,26 @@ setting calamares-sidebar + About Om + Debug Fejlfinde + + + Show information about Calamares + + + + + Show debug information + Vis fejlretningsinformation + finishedq diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index 6d985f51d..4e8969e55 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -507,12 +507,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. CalamaresWindow - + %1 Setup Program %1 Installationsprogramm - + %1 Installer %1 Installationsprogramm @@ -782,27 +782,27 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Config - + Set keyboard model to %1.<br/> Setze Tastaturmodell auf %1.<br/> - + Set keyboard layout to %1/%2. Setze Tastaturbelegung auf %1/%2. - + Set timezone to %1/%2. Setze Zeitzone auf %1%2. - + The system language will be set to %1. Die Systemsprache wird auf %1 eingestellt. - + The numbers and dates locale will be set to %1. Das Format für Zahlen und Datum wird auf %1 gesetzt. @@ -3106,7 +3106,7 @@ Ausgabe: QObject - + %1 (%2) %1 (%2) @@ -4141,14 +4141,26 @@ Ausgabe: calamares-sidebar + About Über + Debug Beheben von Fehlern + + + Show information about Calamares + + + + + Show debug information + Informationen zur Fehlersuche anzeigen + finishedq diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts index c3b08c5d8..ede86c365 100644 --- a/lang/calamares_el.ts +++ b/lang/calamares_el.ts @@ -502,12 +502,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer Εφαρμογή εγκατάστασης του %1 @@ -776,27 +776,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Ορισμός του μοντέλου πληκτρολογίου σε %1.<br/> - + Set keyboard layout to %1/%2. Ορισμός της διάταξης πληκτρολογίου σε %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. Η τοπική γλώσσα του συστήματος έχει οριστεί σε %1. - + The numbers and dates locale will be set to %1. @@ -3095,7 +3095,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4127,14 +4127,26 @@ Output: calamares-sidebar + About + Debug Debug + + + Show information about Calamares + + + + + Show debug information + Εμφάνιση πληροφοριών απασφαλμάτωσης + finishedq diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts index 11db39095..517b3a0ba 100644 --- a/lang/calamares_en.ts +++ b/lang/calamares_en.ts @@ -507,12 +507,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 Setup Program - + %1 Installer %1 Installer @@ -781,27 +781,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. Set keyboard layout to %1/%2. - + Set timezone to %1/%2. Set timezone to %1/%2. - + The system language will be set to %1. The system language will be set to %1. - + The numbers and dates locale will be set to %1. The numbers and dates locale will be set to %1. @@ -3105,7 +3105,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4140,14 +4140,26 @@ Output: calamares-sidebar + About About + Debug Debug + + + Show information about Calamares + Show information about Calamares + + + + Show debug information + Show debug information + finishedq diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts index bada0d3fd..a5e60bf7d 100644 --- a/lang/calamares_en_GB.ts +++ b/lang/calamares_en_GB.ts @@ -502,12 +502,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Installer @@ -776,27 +776,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. The system language will be set to %1. - + The numbers and dates locale will be set to %1. The numbers and dates locale will be set to %1. @@ -3098,7 +3098,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4130,14 +4130,26 @@ Output: calamares-sidebar + About + Debug Debug + + + Show information about Calamares + + + + + Show debug information + Show debug information + finishedq diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts index 5c8d8574b..24614e558 100644 --- a/lang/calamares_eo.ts +++ b/lang/calamares_eo.ts @@ -506,12 +506,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instalilo @@ -780,27 +780,27 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3099,7 +3099,7 @@ Output: QObject - + %1 (%2) %1(%2) @@ -4131,14 +4131,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts index 074e4e876..12a41e007 100644 --- a/lang/calamares_es.ts +++ b/lang/calamares_es.ts @@ -509,12 +509,12 @@ El instalador se cerrará y todos tus cambios se perderán. CalamaresWindow - + %1 Setup Program Programa de configuración de %1 - + %1 Installer Instalador de %1 @@ -783,27 +783,27 @@ El instalador se cerrará y todos tus cambios se perderán. Config - + Set keyboard model to %1.<br/> Establecer el modelo de teclado como %1.<br/> - + Set keyboard layout to %1/%2. Establecer la disposición de teclado a %1/%2. - + Set timezone to %1/%2. Configurar el huso horario a %1/%2 - + The system language will be set to %1. El idioma del sistema se establecerá a %1. - + The numbers and dates locale will be set to %1. El formato de números y fechas aparecerá en %1. @@ -3116,7 +3116,7 @@ Información de salida: QObject - + %1 (%2) %1 (%2) @@ -4151,14 +4151,26 @@ Información de salida: calamares-sidebar + About Acerca de + Debug Depurar + + + Show information about Calamares + Mostrar información acerca de Calamares + + + + Show debug information + Ver la información de depuración. + finishedq diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts index 0dd159f41..8dea78a99 100644 --- a/lang/calamares_es_MX.ts +++ b/lang/calamares_es_MX.ts @@ -505,12 +505,12 @@ El instalador terminará y se perderán todos los cambios. CalamaresWindow - + %1 Setup Program %1 Programa de instalación - + %1 Installer %1 Instalador @@ -780,27 +780,27 @@ El instalador terminará y se perderán todos los cambios. Config - + Set keyboard model to %1.<br/> Ajustar el modelo de teclado a %1.<br/> - + Set keyboard layout to %1/%2. Ajustar teclado a %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. El lenguaje del sistema será establecido a %1. - + The numbers and dates locale will be set to %1. Los números y datos locales serán establecidos a %1. @@ -3111,7 +3111,7 @@ Salida QObject - + %1 (%2) %1 (%2) @@ -4144,14 +4144,26 @@ Salida calamares-sidebar + About + Debug Depurar + + + Show information about Calamares + + + + + Show debug information + Mostrar información de depuración + finishedq diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts index 7114d184f..756b6d48b 100644 --- a/lang/calamares_es_PR.ts +++ b/lang/calamares_es_PR.ts @@ -503,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -777,27 +777,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3105,7 +3105,7 @@ Output: QObject - + %1 (%2) @@ -4137,14 +4137,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts index 8a510d374..aa2fda248 100644 --- a/lang/calamares_et.ts +++ b/lang/calamares_et.ts @@ -502,12 +502,12 @@ Paigaldaja sulgub ning kõik muutused kaovad. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 paigaldaja @@ -776,27 +776,27 @@ Paigaldaja sulgub ning kõik muutused kaovad. Config - + Set keyboard model to %1.<br/> Sea klaviatuurimudeliks %1.<br/> - + Set keyboard layout to %1/%2. Sea klaviatuuripaigutuseks %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. Süsteemikeeleks määratakse %1. - + The numbers and dates locale will be set to %1. Arvude ja kuupäevade lokaaliks seatakse %1. @@ -3098,7 +3098,7 @@ Väljund: QObject - + %1 (%2) %1 (%2) @@ -4130,14 +4130,26 @@ Väljund: calamares-sidebar + About + Debug Silu + + + Show information about Calamares + + + + + Show debug information + Kuva silumisteavet + finishedq diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts index f694415d4..50172c29e 100644 --- a/lang/calamares_eu.ts +++ b/lang/calamares_eu.ts @@ -502,12 +502,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instalatzailea @@ -776,27 +776,27 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Config - + Set keyboard model to %1.<br/> Ezarri teklatu mota %1ra.<br/> - + Set keyboard layout to %1/%2. Ezarri teklatu diseinua %1%2ra. - + Set timezone to %1/%2. - + The system language will be set to %1. %1 ezarriko da sistemako hizkuntza bezala. - + The numbers and dates locale will be set to %1. Zenbaki eta daten eskualdea %1-(e)ra ezarri da. @@ -3097,7 +3097,7 @@ Irteera: QObject - + %1 (%2) %1 (%2) @@ -4129,14 +4129,26 @@ Irteera: calamares-sidebar + About Honi buruz + Debug + + + Show information about Calamares + + + + + Show debug information + Erakutsi arazte informazioa + finishedq diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts index 3cb8b1b11..f1e5f4a7a 100644 --- a/lang/calamares_fa.ts +++ b/lang/calamares_fa.ts @@ -507,12 +507,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 برنامه راه‌اندازی - + %1 Installer نصب‌کنندهٔ %1 @@ -781,27 +781,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> تنظیم مدل صفحه‌کلید به %1.<br/> - + Set keyboard layout to %1/%2. تنظیم چینش صفحه‌کلید به %1/%2. - + Set timezone to %1/%2. منطقه زمانی را تنظیم کنید 1% - + The system language will be set to %1. زبان سامانه به %1 تنظیم خواهد شد. - + The numbers and dates locale will be set to %1. محلی و اعداد و تاریخ ها روی٪ 1 تنظیم می شوند. @@ -3100,7 +3100,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4135,14 +4135,26 @@ Output: calamares-sidebar + About درباره + Debug + + + Show information about Calamares + + + + + Show debug information + نمایش اطّلاعات اشکال‌زدایی + finishedq diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index 43a97f6ed..d10c823ae 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -507,12 +507,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. CalamaresWindow - + %1 Setup Program %1-asennusohjelma - + %1 Installer %1-asentaja @@ -781,27 +781,27 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Config - + Set keyboard model to %1.<br/> Aseta näppäimiston malli %1.<br/> - + Set keyboard layout to %1/%2. Aseta näppäimiston asetteluksi %1/%2. - + Set timezone to %1/%2. Aseta aikavyöhykkeeksi %1/%2. - + The system language will be set to %1. Järjestelmän kielen asetuksena on %1. - + The numbers and dates locale will be set to %1. Numerot ja päivämäärät, paikallinen asetus on %1. @@ -3106,7 +3106,7 @@ Ulostulo: QObject - + %1 (%2) %1 (%2) @@ -4141,14 +4141,26 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</ calamares-sidebar + About Tietoa + Debug Virheiden etsintä + + + Show information about Calamares + + + + + Show debug information + Näytä virheenkorjaustiedot + finishedq diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index 4b33133af..41a3633aa 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -509,12 +509,12 @@ L'installateur se fermera et les changements seront perdus. CalamaresWindow - + %1 Setup Program Programme de configuration de %1 - + %1 Installer Installateur %1 @@ -783,27 +783,27 @@ L'installateur se fermera et les changements seront perdus. Config - + Set keyboard model to %1.<br/> Configurer le modèle de clavier à %1.<br/> - + Set keyboard layout to %1/%2. Configurer la disposition clavier à %1/%2. - + Set timezone to %1/%2. Configurer timezone sur %1/%2. - + The system language will be set to %1. La langue du système sera réglée sur %1. - + The numbers and dates locale will be set to %1. Les nombres et les dates seront réglés sur %1. @@ -3117,7 +3117,7 @@ Sortie QObject - + %1 (%2) %1 (%2) @@ -4152,14 +4152,26 @@ Sortie calamares-sidebar + About À propos + Debug Débug + + + Show information about Calamares + + + + + Show debug information + Afficher les informations de dépannage + finishedq diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts index 8cb96ec32..12b64cd9e 100644 --- a/lang/calamares_fur.ts +++ b/lang/calamares_fur.ts @@ -503,12 +503,12 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< CalamaresWindow - + %1 Setup Program Program di configurazion di %1 - + %1 Installer Program di instalazion di %1 @@ -777,27 +777,27 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Config - + Set keyboard model to %1.<br/> Stabilî il model di tastiere a %1.<br/> - + Set keyboard layout to %1/%2. Stabilî la disposizion di tastiere a %1/%2. - + Set timezone to %1/%2. Stabilî il fûs orari a %1/%2. - + The system language will be set to %1. La lenghe dal sisteme e vignarà configurade a %1. - + The numbers and dates locale will be set to %1. La localizazion dai numars e des datis e vignarà configurade a %1. @@ -3101,7 +3101,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4136,14 +4136,26 @@ Output: calamares-sidebar + About Informazions + Debug + + + Show information about Calamares + + + + + Show debug information + Mostre informazions di debug + finishedq diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts index d3e9af666..8a34edda4 100644 --- a/lang/calamares_gl.ts +++ b/lang/calamares_gl.ts @@ -503,12 +503,12 @@ O instalador pecharase e perderanse todos os cambios. CalamaresWindow - + %1 Setup Program - + %1 Installer Instalador de %1 @@ -777,27 +777,27 @@ O instalador pecharase e perderanse todos os cambios. Config - + Set keyboard model to %1.<br/> Seleccionado modelo de teclado a %1.<br/> - + Set keyboard layout to %1/%2. Seleccionada a disposición do teclado a %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. A linguaxe do sistema será establecida a %1. - + The numbers and dates locale will be set to %1. A localización de números e datas será establecida a %1. @@ -3099,7 +3099,7 @@ Saída: QObject - + %1 (%2) %1 (%2) @@ -4131,14 +4131,26 @@ Saída: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + Mostrar informes de depuración + finishedq diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts index f793c18e9..4e85dd251 100644 --- a/lang/calamares_gu.ts +++ b/lang/calamares_gu.ts @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -775,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3094,7 +3094,7 @@ Output: QObject - + %1 (%2) @@ -4126,14 +4126,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index e0a741b5b..1706ba6be 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -511,12 +511,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program תכנית התקנת %1 - + %1 Installer אשף התקנת %1 @@ -785,27 +785,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> הגדרת דגם המקלדת בתור %1.<br/> - + Set keyboard layout to %1/%2. הגדרת פריסת לוח המקשים בתור %1/%2. - + Set timezone to %1/%2. הגדרת אזור הזמן לכדי %1/%2. - + The system language will be set to %1. שפת המערכת תוגדר להיות %1. - + The numbers and dates locale will be set to %1. תבנית של המספרים והתאריכים של המיקום יוגדרו להיות %1. @@ -3127,7 +3127,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4162,14 +4162,26 @@ Output: calamares-sidebar + About על אודות + Debug ניפוי שגיאות + + + Show information about Calamares + הצגת מידע על Calamares + + + + Show debug information + הצגת מידע ניפוי שגיאות + finishedq diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts index 2e61ae443..7d7dc9547 100644 --- a/lang/calamares_hi.ts +++ b/lang/calamares_hi.ts @@ -507,12 +507,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 सेटअप प्रोग्राम - + %1 Installer %1 इंस्टॉलर @@ -781,27 +781,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> कुंजीपटल का मॉडल %1 सेट करें।<br/> - + Set keyboard layout to %1/%2. कुंजीपटल का अभिन्यास %1/%2 सेट करें। - + Set timezone to %1/%2. समय क्षेत्र %1%2 सेट करें। - + The system language will be set to %1. सिस्टम भाषा %1 सेट की जाएगी। - + The numbers and dates locale will be set to %1. संख्या व दिनांक स्थानिकी %1 सेट की जाएगी। @@ -3105,7 +3105,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4140,14 +4140,26 @@ Output: calamares-sidebar + About बारे में + Debug + + + Show information about Calamares + + + + + Show debug information + डीबग संबंधी जानकारी दिखाएँ + finishedq diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts index 905f95d15..a2027b370 100644 --- a/lang/calamares_hr.ts +++ b/lang/calamares_hr.ts @@ -509,12 +509,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. CalamaresWindow - + %1 Setup Program %1 instalacijski program - + %1 Installer %1 Instalacijski program @@ -783,27 +783,27 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. Config - + Set keyboard model to %1.<br/> Postavi model tipkovnice na %1.<br/> - + Set keyboard layout to %1/%2. Postavi raspored tipkovnice na %1%2. - + Set timezone to %1/%2. Postavi vremesku zonu na %1%2. - + The system language will be set to %1. Jezik sustava će se postaviti na %1. - + The numbers and dates locale will be set to %1. Regionalne postavke brojeva i datuma će se postaviti na %1. @@ -3116,7 +3116,7 @@ Izlaz: QObject - + %1 (%2) %1 (%2) @@ -4151,14 +4151,26 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene calamares-sidebar + About O programu + Debug Uklanjanje grešaka + + + Show information about Calamares + Prikaži informacije o Calamares instalacijskom programu + + + + Show debug information + Prikaži debug informaciju + finishedq diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts index 835df7d78..e8afb0a88 100644 --- a/lang/calamares_hu.ts +++ b/lang/calamares_hu.ts @@ -503,12 +503,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. CalamaresWindow - + %1 Setup Program %1 Program telepítése - + %1 Installer %1 Telepítő @@ -777,27 +777,27 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. Config - + Set keyboard model to %1.<br/> Billentyűzet típus beállítása %1.<br/> - + Set keyboard layout to %1/%2. Billentyűzet kiosztás beállítása %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. A rendszer területi beállítása %1. - + The numbers and dates locale will be set to %1. A számok és dátumok területi beállítása %1. @@ -3100,7 +3100,7 @@ Kimenet: QObject - + %1 (%2) %1 (%2) @@ -4133,14 +4133,26 @@ Calamares hiba %1. calamares-sidebar + About + Debug Hibakeresés + + + Show information about Calamares + + + + + Show debug information + Hibakeresési információk mutatása + finishedq diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index 676de374e..a84f5b7e5 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -500,12 +500,12 @@ Instalasi akan ditutup dan semua perubahan akan hilang. CalamaresWindow - + %1 Setup Program - + %1 Installer Installer %1 @@ -774,27 +774,27 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Config - + Set keyboard model to %1.<br/> Setel model papan ketik ke %1.<br/> - + Set keyboard layout to %1/%2. Setel tata letak papan ketik ke %1/%2. - + Set timezone to %1/%2. Terapkan zona waktu ke %1/%2 - + The system language will be set to %1. Bahasa sistem akan disetel ke %1. - + The numbers and dates locale will be set to %1. Nomor dan tanggal lokal akan disetel ke %1. @@ -3088,7 +3088,7 @@ Keluaran: QObject - + %1 (%2) %1 (%2) @@ -4120,14 +4120,26 @@ Keluaran: calamares-sidebar + About + Debug Debug + + + Show information about Calamares + + + + + Show debug information + Tampilkan informasi debug + finishedq diff --git a/lang/calamares_ie.ts b/lang/calamares_ie.ts index b7d08ce7e..852f0ad36 100644 --- a/lang/calamares_ie.ts +++ b/lang/calamares_ie.ts @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Configiration de %1 - + %1 Installer Installator de %1 @@ -775,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3094,7 +3094,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4126,14 +4126,26 @@ Output: calamares-sidebar + About Pri + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts index 451cb1a04..52a5b40ae 100644 --- a/lang/calamares_is.ts +++ b/lang/calamares_is.ts @@ -502,12 +502,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 uppsetningarforrit @@ -776,27 +776,27 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. Tungumál kerfisins verður sett sem %1. - + The numbers and dates locale will be set to %1. @@ -3095,7 +3095,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4127,14 +4127,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + Birta villuleitarupplýsingar + finishedq diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts index f49e78b43..c5cd9cc59 100644 --- a/lang/calamares_it_IT.ts +++ b/lang/calamares_it_IT.ts @@ -504,12 +504,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse CalamaresWindow - + %1 Setup Program %1 Programma d'installazione - + %1 Installer %1 Programma di installazione @@ -778,27 +778,27 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Config - + Set keyboard model to %1.<br/> Impostare il modello di tastiera a %1.<br/> - + Set keyboard layout to %1/%2. Impostare il layout della tastiera a %1/%2. - + Set timezone to %1/%2. Imposta fuso orario a %1/%2. - + The system language will be set to %1. La lingua di sistema sarà impostata a %1. - + The numbers and dates locale will be set to %1. I numeri e le date locali saranno impostati a %1. @@ -3109,7 +3109,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4141,14 +4141,26 @@ Output: calamares-sidebar + About Informazioni su + Debug Debug + + + Show information about Calamares + + + + + Show debug information + Mostra le informazioni di debug + finishedq diff --git a/lang/calamares_ja-Hira.ts b/lang/calamares_ja-Hira.ts index 50326192b..ce85c817f 100644 --- a/lang/calamares_ja-Hira.ts +++ b/lang/calamares_ja-Hira.ts @@ -499,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -773,27 +773,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3083,7 +3083,7 @@ Output: QObject - + %1 (%2) @@ -4115,14 +4115,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index 21034d5f0..9a118eec4 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -505,12 +505,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 セットアッププログラム - + %1 Installer %1 インストーラー @@ -779,27 +779,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> キーボードのモデルを %1 に設定する。<br/> - + Set keyboard layout to %1/%2. キーボードのレイアウトを %1/%2 に設定する。 - + Set timezone to %1/%2. タイムゾーンを %1/%2 に設定する。 - + The system language will be set to %1. システムの言語を %1 に設定する。 - + The numbers and dates locale will be set to %1. 数値と日付のロケールを %1 に設定する。 @@ -3096,7 +3096,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4131,14 +4131,26 @@ Output: calamares-sidebar + About About + Debug デバッグ + + + Show information about Calamares + Calamares に関する情報を表示する + + + + Show debug information + デバッグ情報を表示 + finishedq diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts index 31382cb8e..c47c9f009 100644 --- a/lang/calamares_kk.ts +++ b/lang/calamares_kk.ts @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -775,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3094,7 +3094,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4126,14 +4126,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts index 0e2621e89..269f71600 100644 --- a/lang/calamares_kn.ts +++ b/lang/calamares_kn.ts @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -775,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3094,7 +3094,7 @@ Output: QObject - + %1 (%2) @@ -4126,14 +4126,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts index 1c341d941..a7dcb187d 100644 --- a/lang/calamares_ko.ts +++ b/lang/calamares_ko.ts @@ -505,12 +505,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 설치 프로그램 - + %1 Installer %1 설치 관리자 @@ -779,27 +779,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> 키보드 모델을 %1로 설정합니다.<br/> - + Set keyboard layout to %1/%2. 키보드 레이아웃을 %1/%2로 설정합니다. - + Set timezone to %1/%2. 표준시간대를 %1/%2로 설정합니다. - + The system language will be set to %1. 시스템 언어가 %1로 설정됩니다. - + The numbers and dates locale will be set to %1. 숫자와 날짜 로케일이 %1로 설정됩니다. @@ -3094,7 +3094,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4129,14 +4129,26 @@ Output: calamares-sidebar + About Calamares에 대하여 + Debug 디버그 + + + Show information about Calamares + + + + + Show debug information + 디버그 정보 보기 + finishedq diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts index f50a5a36f..ceb2b9096 100644 --- a/lang/calamares_lo.ts +++ b/lang/calamares_lo.ts @@ -499,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -773,27 +773,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3083,7 +3083,7 @@ Output: QObject - + %1 (%2) @@ -4115,14 +4115,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index b8f755783..194a73de4 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -511,12 +511,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. CalamaresWindow - + %1 Setup Program %1 sąrankos programa - + %1 Installer %1 diegimo programa @@ -785,27 +785,27 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Config - + Set keyboard model to %1.<br/> Nustatyti klaviatūros modelį kaip %1.<br/> - + Set keyboard layout to %1/%2. Nustatyti klaviatūros išdėstymą kaip %1/%2. - + Set timezone to %1/%2. Nustatyti laiko juostą į %1/%2. - + The system language will be set to %1. Sistemos kalba bus nustatyta į %1. - + The numbers and dates locale will be set to %1. Skaičių ir datų lokalė bus nustatyta į %1. @@ -3127,7 +3127,7 @@ Išvestis: QObject - + %1 (%2) %1 (%2) @@ -4162,14 +4162,26 @@ Išvestis: calamares-sidebar + About Apie + Debug Derinti + + + Show information about Calamares + + + + + Show debug information + Rodyti derinimo informaciją + finishedq diff --git a/lang/calamares_lv.ts b/lang/calamares_lv.ts index d228e56bf..56a9c1ab0 100644 --- a/lang/calamares_lv.ts +++ b/lang/calamares_lv.ts @@ -503,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -777,27 +777,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3105,7 +3105,7 @@ Output: QObject - + %1 (%2) @@ -4137,14 +4137,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts index 1b304f41b..76121421d 100644 --- a/lang/calamares_mk.ts +++ b/lang/calamares_mk.ts @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -775,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3094,7 +3094,7 @@ Output: QObject - + %1 (%2) @@ -4126,14 +4126,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts index cab3a0840..501140fac 100644 --- a/lang/calamares_ml.ts +++ b/lang/calamares_ml.ts @@ -503,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 സജ്ജീകരണപ്രയോഗം - + %1 Installer %1 ഇൻസ്റ്റാളർ @@ -777,27 +777,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> കീബോർഡ് മോഡൽ %1 എന്നതായി ക്രമീകരിക്കുക.<br/> - + Set keyboard layout to %1/%2. കീബോർഡ് വിന്യാസം %1%2 എന്നതായി ക്രമീകരിക്കുക. - + Set timezone to %1/%2. - + The system language will be set to %1. സിസ്റ്റം ഭാഷ %1 ആയി സജ്ജമാക്കും. - + The numbers and dates locale will be set to %1. സംഖ്യ & തീയതി രീതി %1 ആയി ക്രമീകരിക്കും. @@ -3099,7 +3099,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4131,14 +4131,26 @@ Output: calamares-sidebar + About വിവരം + Debug + + + Show information about Calamares + + + + + Show debug information + ഡീബഗ് വിവരങ്ങൾ കാണിക്കുക + finishedq diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts index fed837c18..eab2a46c4 100644 --- a/lang/calamares_mr.ts +++ b/lang/calamares_mr.ts @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 अधिष्ठापक @@ -775,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3094,7 +3094,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4126,14 +4126,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + दोषमार्जन माहिती दर्शवा + finishedq diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts index cf9f7cc20..2b9824063 100644 --- a/lang/calamares_nb.ts +++ b/lang/calamares_nb.ts @@ -502,12 +502,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Installasjonsprogram @@ -776,27 +776,27 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. Config - + Set keyboard model to %1.<br/> Sett tastaturmodell til %1.<br/> - + Set keyboard layout to %1/%2. Sett tastaturoppsett til %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3095,7 +3095,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4127,14 +4127,26 @@ Output: calamares-sidebar + About + Debug Debug + + + Show information about Calamares + + + + + Show debug information + Vis feilrettingsinformasjon + finishedq diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts index 8eb7baa10..20ee51993 100644 --- a/lang/calamares_ne_NP.ts +++ b/lang/calamares_ne_NP.ts @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -775,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3094,7 +3094,7 @@ Output: QObject - + %1 (%2) @@ -4126,14 +4126,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts index 0b3307ab1..4ae69991f 100644 --- a/lang/calamares_nl.ts +++ b/lang/calamares_nl.ts @@ -507,12 +507,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. CalamaresWindow - + %1 Setup Program %1 Voorbereidingsprogramma - + %1 Installer %1 Installatieprogramma @@ -781,27 +781,27 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Config - + Set keyboard model to %1.<br/> Instellen toetsenbord model naar %1.<br/> - + Set keyboard layout to %1/%2. Instellen toetsenbord lay-out naar %1/%2. - + Set timezone to %1/%2. Zet tijdzone naar %1/%2. - + The system language will be set to %1. De taal van het systeem zal worden ingesteld op %1. - + The numbers and dates locale will be set to %1. De getal- en datumnotatie worden ingesteld op %1. @@ -3103,7 +3103,7 @@ Uitvoer: QObject - + %1 (%2) %1 (%2) @@ -4136,14 +4136,26 @@ De installatie kan niet doorgaan. calamares-sidebar + About Over + Debug Fouten opsporen + + + Show information about Calamares + + + + + Show debug information + Toon debug informatie + finishedq diff --git a/lang/calamares_oc.ts b/lang/calamares_oc.ts index 9a931e4c2..6116b8076 100644 --- a/lang/calamares_oc.ts +++ b/lang/calamares_oc.ts @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Programa de configuracion %1 - + %1 Installer Installador de %1 @@ -775,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3094,7 +3094,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4126,14 +4126,26 @@ Output: calamares-sidebar + About A prepaus + Debug + + + Show information about Calamares + + + + + Show debug information + Afichar las informacions de desbugatge + finishedq diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts index 2441b16fc..3665dcea3 100644 --- a/lang/calamares_pl.ts +++ b/lang/calamares_pl.ts @@ -506,12 +506,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. CalamaresWindow - + %1 Setup Program - + %1 Installer Instalator %1 @@ -780,27 +780,27 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. Config - + Set keyboard model to %1.<br/> Ustaw model klawiatury na %1.<br/> - + Set keyboard layout to %1/%2. Ustaw model klawiatury na %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. Język systemu zostanie ustawiony na %1. - + The numbers and dates locale will be set to %1. Format liczb i daty zostanie ustawiony na %1. @@ -3120,7 +3120,7 @@ Wyjście: QObject - + %1 (%2) %1 (%2) @@ -4153,14 +4153,26 @@ i nie uruchomi się calamares-sidebar + About O nas + Debug Debug + + + Show information about Calamares + + + + + Show debug information + Pokaż informacje debugowania + finishedq diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index 14a8b197c..d737dff65 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -509,12 +509,12 @@ O instalador será fechado e todas as alterações serão perdidas. CalamaresWindow - + %1 Setup Program Programa de configuração %1 - + %1 Installer Instalador %1 @@ -783,27 +783,27 @@ O instalador será fechado e todas as alterações serão perdidas. Config - + Set keyboard model to %1.<br/> Definir o modelo de teclado para %1.<br/> - + Set keyboard layout to %1/%2. Definir o layout do teclado para %1/%2. - + Set timezone to %1/%2. Definir o fuso horário para %1/%2. - + The system language will be set to %1. O idioma do sistema será definido como %1. - + The numbers and dates locale will be set to %1. A localidade dos números e datas será definida como %1. @@ -3116,7 +3116,7 @@ Saída: QObject - + %1 (%2) %1 (%2) @@ -4151,14 +4151,26 @@ Saída: calamares-sidebar + About Sobre + Debug Depuração + + + Show information about Calamares + + + + + Show debug information + Exibir informações de depuração + finishedq diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index d302a92e6..5a111a014 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -509,12 +509,12 @@ O instalador será encerrado e todas as alterações serão perdidas. CalamaresWindow - + %1 Setup Program %1 Programa de Instalação - + %1 Installer %1 Instalador @@ -783,27 +783,27 @@ O instalador será encerrado e todas as alterações serão perdidas. Config - + Set keyboard model to %1.<br/> Definir o modelo do teclado para %1.<br/> - + Set keyboard layout to %1/%2. Definir esquema do teclado para %1/%2. - + Set timezone to %1/%2. Definir fuso horário para %1/%2. - + The system language will be set to %1. O idioma do sistema será definido para %1. - + The numbers and dates locale will be set to %1. Os números e datas locais serão definidos para %1. @@ -3116,7 +3116,7 @@ Saída de Dados: QObject - + %1 (%2) %1 (%2) @@ -3892,7 +3892,7 @@ Saída de Dados: By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. - Ao selecionar isto irá enviar periodicamente informações sobre a instalação do seu <b>utilizador</b>, hardware, aplicações e padrões de utilização das aplicações para %1. + Ao selecionar isto irá enviar periodicamente informações acerca da instalação do seu <b>utilizador</b>, hardware, aplicações e padrões de utilização das aplicações para %1. @@ -4079,7 +4079,7 @@ Saída de Dados: About %1 setup - Sobre a instalação de %1 + Acerca da instalação de %1 @@ -4151,27 +4151,39 @@ Saída de Dados: calamares-sidebar + About - Sobre + Acerca + Debug Depuração + + + Show information about Calamares + Mostrar informação acerca do Calamares + + + + Show debug information + Mostrar informação de depuração + finishedq Installation Completed - Instalação Concluída + Instalação concluída %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - %1 foi instalado no seu computador.<br/> + %1 foi instalado no computador.<br/> Pode agora reiniciar no seu novo sistema, ou continuar a utilizar o ambiente Live. diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts index a5d15bdf2..0e5542c5e 100644 --- a/lang/calamares_ro.ts +++ b/lang/calamares_ro.ts @@ -504,12 +504,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. CalamaresWindow - + %1 Setup Program - + %1 Installer Program de instalare %1 @@ -778,27 +778,27 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. Config - + Set keyboard model to %1.<br/> Setează modelul tastaturii la %1.<br/> - + Set keyboard layout to %1/%2. Setează aranjamentul de tastatură la %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. Limba sistemului va fi %1. - + The numbers and dates locale will be set to %1. Formatul numerelor și datelor calendaristice va fi %1. @@ -3112,7 +3112,7 @@ Output QObject - + %1 (%2) %1 (%2) @@ -4144,14 +4144,26 @@ Output calamares-sidebar + About + Debug Depanare + + + Show information about Calamares + + + + + Show debug information + Arată informația de depanare + finishedq diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts index a5b16898b..222f1cb84 100644 --- a/lang/calamares_ru.ts +++ b/lang/calamares_ru.ts @@ -510,12 +510,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Программа установки %1 - + %1 Installer Программа установки %1 @@ -784,27 +784,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Установить модель клавиатуры на %1.<br/> - + Set keyboard layout to %1/%2. Установить раскладку клавиатуры на %1/%2. - + Set timezone to %1/%2. Установить часовой пояс на %1/%2 - + The system language will be set to %1. Системным языком будет установлен %1. - + The numbers and dates locale will be set to %1. Региональным форматом чисел и дат будет установлен %1. @@ -3124,7 +3124,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4157,14 +4157,26 @@ Output: calamares-sidebar + About О Программе + Debug Отладка + + + Show information about Calamares + + + + + Show debug information + Показать отладочную информацию + finishedq diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts index 067afae9a..ca8646c6d 100644 --- a/lang/calamares_si.ts +++ b/lang/calamares_si.ts @@ -507,12 +507,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 සැකසුම් වැඩසටහන - + %1 Installer %1 ස්ථාපකය @@ -781,27 +781,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> යතුරුපුවරු ආකෘතිය %1 ලෙස සකසන්න. - + Set keyboard layout to %1/%2. යතුරුපුවරු පිරිසැලසුම %1/%2 ලෙස සකසන්න. - + Set timezone to %1/%2. වේලා කලාපය %1/%2 ලෙස සකසන්න. - + The system language will be set to %1. පද්ධති භාෂාව %1 ලෙස සැකසෙනු ඇත. - + The numbers and dates locale will be set to %1. අංක සහ දින පෙදෙසිය %1 ලෙස සකසනු ඇත. @@ -3105,7 +3105,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4140,14 +4140,26 @@ Output: calamares-sidebar + About ගැන + Debug + + + Show information about Calamares + + + + + Show debug information + දෝශ නිරාකරණ තොරතුරු පෙන්වන්න + finishedq diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts index c11b2b050..763fbf809 100644 --- a/lang/calamares_sk.ts +++ b/lang/calamares_sk.ts @@ -507,12 +507,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. CalamaresWindow - + %1 Setup Program Inštalačný program distribúcie %1 - + %1 Installer Inštalátor distribúcie %1 @@ -782,27 +782,27 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Config - + Set keyboard model to %1.<br/> Nastavenie modelu klávesnice na %1.<br/> - + Set keyboard layout to %1/%2. Nastavenie rozloženia klávesnice na %1/%2. - + Set timezone to %1/%2. Nastavenie časovej zóny na %1/%2. - + The system language will be set to %1. Jazyk systému bude nastavený na %1. - + The numbers and dates locale will be set to %1. Miestne nastavenie čísel a dátumov bude nastavené na %1. @@ -3123,7 +3123,7 @@ Výstup: QObject - + %1 (%2) %1 (%2) @@ -4158,14 +4158,26 @@ Výstup: calamares-sidebar + About O inštalátore + Debug Ladiť + + + Show information about Calamares + + + + + Show debug information + Zobraziť ladiace informácie + finishedq diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts index 3f4d2adb0..2bb4e31e8 100644 --- a/lang/calamares_sl.ts +++ b/lang/calamares_sl.ts @@ -506,12 +506,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Namestilnik @@ -780,27 +780,27 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. Config - + Set keyboard model to %1.<br/> Nastavi model tipkovnice na %1.<br/> - + Set keyboard layout to %1/%2. Nastavi razporeditev tipkovnice na %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3117,7 +3117,7 @@ Output: QObject - + %1 (%2) @@ -4149,14 +4149,26 @@ Output: calamares-sidebar + About + Debug Razhroščevanje + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts index bb15b168b..55d0da414 100644 --- a/lang/calamares_sq.ts +++ b/lang/calamares_sq.ts @@ -507,12 +507,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. CalamaresWindow - + %1 Setup Program Programi i Rregullimit të %1 - + %1 Installer Instalues %1 @@ -781,27 +781,27 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Config - + Set keyboard model to %1.<br/> Si model tastiere do të caktohet %1.<br/> - + Set keyboard layout to %1/%2. Si model tastiere do të caktohet %1%2. - + Set timezone to %1/%2. Si zonë kohore cakto %1/%2 - + The system language will be set to %1. Si gjuhë sistemi do të caktohet %1. - + The numbers and dates locale will be set to %1. Si vendore për numra dhe data do të vihet %1. @@ -3103,7 +3103,7 @@ Përfundim: QObject - + %1 (%2) %1 (%2) @@ -4138,14 +4138,26 @@ Përfundim: calamares-sidebar + About Mbi + Debug Diagnostikojeni + + + Show information about Calamares + + + + + Show debug information + Shfaq të dhëna diagnostikimi + finishedq diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts index f81e621f3..663b188cd 100644 --- a/lang/calamares_sr.ts +++ b/lang/calamares_sr.ts @@ -504,12 +504,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 инсталер @@ -778,27 +778,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. Системски језик биће постављен на %1 - + The numbers and dates locale will be set to %1. @@ -3106,7 +3106,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4138,14 +4138,26 @@ Output: calamares-sidebar + About + Debug Уклањање грешака + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts index d588941c1..7b4b8a780 100644 --- a/lang/calamares_sr@latin.ts +++ b/lang/calamares_sr@latin.ts @@ -504,12 +504,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instaler @@ -778,27 +778,27 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3106,7 +3106,7 @@ Output: QObject - + %1 (%2) @@ -4138,14 +4138,26 @@ Output: calamares-sidebar + About + Debug Otklanjanje greški + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index 181d2a5c0..0e4f3ea7f 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -506,12 +506,12 @@ Alla ändringar kommer att gå förlorade. CalamaresWindow - + %1 Setup Program %1 Installationsprogram - + %1 Installer %1-installationsprogram @@ -780,27 +780,27 @@ Alla ändringar kommer att gå förlorade. Config - + Set keyboard model to %1.<br/> Sätt tangenbordsmodell till %1.<br/> - + Set keyboard layout to %1/%2. Sätt tangentbordslayout till %1/%2. - + Set timezone to %1/%2. Sätt tidszon till %1/%2. - + The system language will be set to %1. Systemspråket kommer ändras till %1. - + The numbers and dates locale will be set to %1. Systemspråket för siffror och datum kommer sättas till %1. @@ -3105,7 +3105,7 @@ Utdata: QObject - + %1 (%2) %1 (%2) @@ -4140,14 +4140,26 @@ Installationen kan inte fortsätta.</p> calamares-sidebar + About Om + Debug Avlusning + + + Show information about Calamares + Visa information om Calamares + + + + Show debug information + Visa avlusningsinformation + finishedq diff --git a/lang/calamares_ta_IN.ts b/lang/calamares_ta_IN.ts index 0fd9c5d3d..1ea74c58e 100644 --- a/lang/calamares_ta_IN.ts +++ b/lang/calamares_ta_IN.ts @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -775,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3094,7 +3094,7 @@ Output: QObject - + %1 (%2) @@ -4126,14 +4126,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_te.ts b/lang/calamares_te.ts index 4b00ab355..bb227a101 100644 --- a/lang/calamares_te.ts +++ b/lang/calamares_te.ts @@ -503,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -777,27 +777,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3096,7 +3096,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4128,14 +4128,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts index 404053a43..c93509ffc 100644 --- a/lang/calamares_tg.ts +++ b/lang/calamares_tg.ts @@ -503,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Барномаи танзимкунии %1 - + %1 Installer Насбкунандаи %1 @@ -777,27 +777,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Намунаи клавиатура ба %1 танзим карда мешавад.<br/> - + Set keyboard layout to %1/%2. Тарҳбандии клавиатура ба %1 %1/%2 танзим карда мешавад. - + Set timezone to %1/%2. Минтақаи вақт ба %1/%2 танзим карда мешавад. - + The system language will be set to %1. Забони низом ба %1 танзим карда мешавад. - + The numbers and dates locale will be set to %1. Низоми рақамҳо ва санаҳо ба %1 танзим карда мешавад. @@ -3101,7 +3101,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4136,14 +4136,27 @@ Output: calamares-sidebar + About Дар бораи барнома + Debug + + + Show information about Calamares + + + + + Show debug information + Намоиши иттилооти +ислоҳи нуқсонҳо + finishedq diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts index 305b8b176..bec046505 100644 --- a/lang/calamares_th.ts +++ b/lang/calamares_th.ts @@ -500,12 +500,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer ตัวติดตั้ง %1 @@ -774,27 +774,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> ตั้งค่าโมเดลแป้นพิมพ์เป็น %1<br/> - + Set keyboard layout to %1/%2. ตั้งค่าแบบแป้นพิมพ์เป็น %1/%2 - + Set timezone to %1/%2. ตั้งค่าโซนเวลาเป็น %1/%2 - + The system language will be set to %1. ภาษาของระบบจะถูกตั้งค่าเป็น %1 - + The numbers and dates locale will be set to %1. ตำแหน่งที่ตั้งสำหรับหมายเลขและวันที่จะถูกตั้งค่าเป็น %1 @@ -3084,7 +3084,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4116,14 +4116,26 @@ Output: calamares-sidebar + About เกี่ยวกับ + Debug แก้ไขข้อบกพร่อง + + + Show information about Calamares + + + + + Show debug information + แสดงข้อมูลการดีบั๊ก + finishedq diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index 4024fa8c1..ffc75103a 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -507,12 +507,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. CalamaresWindow - + %1 Setup Program %1 Kurulum Uygulaması - + %1 Installer %1 Yükleniyor @@ -782,27 +782,27 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Config - + Set keyboard model to %1.<br/> %1 Klavye düzeni olarak seçildi.<br/> - + Set keyboard layout to %1/%2. Alt klavye türevi olarak %1/%2 seçildi. - + Set timezone to %1/%2. %1/%2 Zaman dilimi ayarla. - + The system language will be set to %1. Sistem dili %1 olarak ayarlanacak. - + The numbers and dates locale will be set to %1. Sayılar ve günler için sistem yereli %1 olarak ayarlanacak. @@ -3110,7 +3110,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4145,14 +4145,26 @@ Output: calamares-sidebar + About Hakkında + Debug Hata Ayıklama + + + Show information about Calamares + Calamares hakkında bilgilendirme göster + + + + Show debug information + Hata ayıklama bilgisini göster + finishedq diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts index fd6264aea..c28f68472 100644 --- a/lang/calamares_uk.ts +++ b/lang/calamares_uk.ts @@ -511,12 +511,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Програма для налаштовування %1 - + %1 Installer Засіб встановлення %1 @@ -785,27 +785,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Встановити модель клавіатури як %1.<br/> - + Set keyboard layout to %1/%2. Встановити розкладку клавіатури як %1/%2. - + Set timezone to %1/%2. Встановити часовий пояс %1/%2. - + The system language will be set to %1. Мову %1 буде встановлено як системну. - + The numbers and dates locale will be set to %1. %1 буде встановлено як локаль чисел та дат. @@ -3128,7 +3128,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4163,14 +4163,26 @@ Output: calamares-sidebar + About Про програму + Debug Діагностика + + + Show information about Calamares + Показати відомості щодо Calamares + + + + Show debug information + Показати діагностичну інформацію + finishedq diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts index d473add2a..38cb655d4 100644 --- a/lang/calamares_ur.ts +++ b/lang/calamares_ur.ts @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -775,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3094,7 +3094,7 @@ Output: QObject - + %1 (%2) @@ -4126,14 +4126,26 @@ Output: calamares-sidebar + About متعلق + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts index 6ee480111..24c680fa6 100644 --- a/lang/calamares_uz.ts +++ b/lang/calamares_uz.ts @@ -499,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -773,27 +773,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3083,7 +3083,7 @@ Output: QObject - + %1 (%2) @@ -4115,14 +4115,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts index ff92501fc..f57955156 100644 --- a/lang/calamares_vi.ts +++ b/lang/calamares_vi.ts @@ -501,12 +501,12 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< CalamaresWindow - + %1 Setup Program %1 Thiết lập chương trình - + %1 Installer %1 cài đặt hệ điều hành @@ -775,27 +775,27 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Config - + Set keyboard model to %1.<br/> Thiệt lập bàn phím kiểu %1.<br/> - + Set keyboard layout to %1/%2. Thiết lập bố cục bàn phím thành %1/%2. - + Set timezone to %1/%2. Thiết lập múi giờ sang %1/%2. - + The system language will be set to %1. Ngôn ngữ hệ thống sẽ được đặt thành %1. - + The numbers and dates locale will be set to %1. Định dạng ngôn ngữ của số và ngày tháng sẽ được chuyển thành %1. @@ -3090,7 +3090,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4125,14 +4125,26 @@ Output: calamares-sidebar + About Giới thiệu + Debug + + + Show information about Calamares + + + + + Show debug information + Hiện thông tin gỡ lỗi + finishedq diff --git a/lang/calamares_zh.ts b/lang/calamares_zh.ts index 71d060fd8..e4a2000bc 100644 --- a/lang/calamares_zh.ts +++ b/lang/calamares_zh.ts @@ -499,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -773,27 +773,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3083,7 +3083,7 @@ Output: QObject - + %1 (%2) @@ -4115,14 +4115,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts index f5b7a575d..bfc49b9ff 100644 --- a/lang/calamares_zh_CN.ts +++ b/lang/calamares_zh_CN.ts @@ -506,12 +506,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 安装程序 - + %1 Installer %1 安装程序 @@ -780,27 +780,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> 设置键盘型号为 %1。<br/> - + Set keyboard layout to %1/%2. 设置键盘布局为 %1/%2。 - + Set timezone to %1/%2. 将时区设置为 %1/%2 。 - + The system language will be set to %1. 系统语言将设置为 %1。 - + The numbers and dates locale will be set to %1. 数字和日期地域将设置为 %1。 @@ -3098,7 +3098,7 @@ Output: QObject - + %1 (%2) %1（%2） @@ -4133,14 +4133,26 @@ Output: calamares-sidebar + About 关于 + Debug 调试 + + + Show information about Calamares + + + + + Show debug information + 显示调试信息 + finishedq diff --git a/lang/calamares_zh_HK.ts b/lang/calamares_zh_HK.ts index 57e63b419..dde08307f 100644 --- a/lang/calamares_zh_HK.ts +++ b/lang/calamares_zh_HK.ts @@ -499,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -773,27 +773,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -3083,7 +3083,7 @@ Output: QObject - + %1 (%2) @@ -4115,14 +4115,26 @@ Output: calamares-sidebar + About + Debug + + + Show information about Calamares + + + + + Show debug information + + finishedq diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts index e6d8a27f4..9658a8155 100644 --- a/lang/calamares_zh_TW.ts +++ b/lang/calamares_zh_TW.ts @@ -505,12 +505,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 設定程式 - + %1 Installer %1 安裝程式 @@ -779,27 +779,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> 設定鍵盤型號為 %1 。<br/> - + Set keyboard layout to %1/%2. 設定鍵盤佈局為 %1/%2 。 - + Set timezone to %1/%2. 設定時區為 %1/%2。 - + The system language will be set to %1. 系統語言會設定為%1。 - + The numbers and dates locale will be set to %1. 數字與日期語系會設定為%1。 @@ -3094,7 +3094,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -4129,14 +4129,26 @@ Output: calamares-sidebar + About 關於 + Debug Debug + + + Show information about Calamares + 顯示關於 Calamares 的資訊 + + + + Show debug information + 顯示除錯資訊 + finishedq From 5fd6d72566fda4cffbdf3f5efa9c233144c6ff43 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 9 Aug 2022 10:26:43 +0200 Subject: [PATCH 15/26] i18n: [python] Automatic merge of Transifex translations --- lang/python/bg/LC_MESSAGES/python.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po index 1816f8f38..cbb10c023 100644 --- a/lang/python/bg/LC_MESSAGES/python.po +++ b/lang/python/bg/LC_MESSAGES/python.po @@ -5,6 +5,7 @@ # # Translators: # Georgi Georgiev (Жоро) , 2022 +# Mincho Kondarev, 2022 # #, fuzzy msgid "" @@ -13,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-05-29 16:17+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Georgi Georgiev (Жоро) , 2022\n" +"Last-Translator: Mincho Kondarev, 2022\n" "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,7 +54,7 @@ msgstr "" #: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428 #: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105 msgid "Configuration Error" -msgstr "" +msgstr "Грешка в конфигурацията" #: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236 #: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86 From ffae2a9041d03baabe1d64487e52213600a2f9a9 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 23 Aug 2022 11:43:38 +0200 Subject: [PATCH 16/26] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_bg.ts | 2 +- lang/calamares_de.ts | 2 +- lang/calamares_ko.ts | 4 +-- lang/calamares_lt.ts | 2 +- lang/calamares_pl.ts | 79 +++++++++++++++++++++-------------------- lang/calamares_pt_BR.ts | 2 +- lang/calamares_sq.ts | 2 +- 7 files changed, 47 insertions(+), 46 deletions(-) diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts index 0b48e3e6a..2c54c87b1 100644 --- a/lang/calamares_bg.ts +++ b/lang/calamares_bg.ts @@ -123,7 +123,7 @@ Crashes Calamares, so that Dr. Konqui can look at it. - Предизвиква срива на Calamares, за да може Dr.Konqui да го анализира. + Предизвиква срив на Calamares, за да може Dr.Konqui да го анализира. diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index 4e8969e55..376a68089 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -4154,7 +4154,7 @@ Ausgabe: Show information about Calamares - + Informationen über Calamares anzeigen diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts index a7dcb187d..4b88a51e5 100644 --- a/lang/calamares_ko.ts +++ b/lang/calamares_ko.ts @@ -4142,12 +4142,12 @@ Output: Show information about Calamares - + Calamares에 대한 정보 표시하기 Show debug information - 디버그 정보 보기 + 디버그 정보 표시하기 diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index 194a73de4..74a2e2bfa 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -4175,7 +4175,7 @@ Išvestis: Show information about Calamares - + Rodyti informaciją apie Calamares diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts index 3665dcea3..4b28f08a1 100644 --- a/lang/calamares_pl.ts +++ b/lang/calamares_pl.ts @@ -179,12 +179,12 @@ Job failed (%1) - + Zadanie nie powiodło się (%1) Programmed job failure was explicitly requested. - + Wyraźnie zażądano zaprogramowanej awarii zadania. @@ -200,7 +200,7 @@ Example job (%1) - + Przykładowe zadanie (%1) @@ -292,17 +292,17 @@ (%n second(s)) - - - - - + + (%n sekunda) + (%n sekundy) + (%n sekund) + (%n sekund) System-requirements checking is complete. - + Sprawdzanie wymagań systemowych zostało zakończone. @@ -384,7 +384,7 @@ Link copied to clipboard The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + Program instalacyjny %1 dokona zmian na dysku, aby skonfigurować %2.<br/><strong>Nie będzie można cofnąć tych zmian.</strong> @@ -394,7 +394,7 @@ Link copied to clipboard &Set up now - + U&staw teraz @@ -409,7 +409,7 @@ Link copied to clipboard &Set up - + U&staw @@ -419,7 +419,7 @@ Link copied to clipboard Setup is complete. Close the setup program. - + Konfiguracja jest zakończona. Zamknij program instalacyjny. @@ -429,7 +429,7 @@ Link copied to clipboard Cancel setup without changing the system. - + Anuluj konfigurację bez zmiany w systemie. @@ -470,7 +470,8 @@ Link copied to clipboard Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Czy naprawdę chcesz anulować bieżący proces konfiguracji? +Program instalacyjny zostanie zamknięty, a wszystkie zmiany zostaną utracone. @@ -508,7 +509,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. %1 Setup Program - + %1 Program instalacyjny @@ -1245,7 +1246,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. Create Volume Group - + Utwórz grupę woluminów @@ -1580,12 +1581,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <h1>Wszystko gotowe.</h1><br/>%1 został skonfigurowany na twoim komputerze.<br/>Możesz teraz zacząć używać swojego nowego systemu. <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>Gdy to pole jest zaznaczone, system będzie uruchamiany ponownie natychmiast po kliknięciu na <span style="font-style:italic;">Ukończone</span> lub zamknięciu programu instalacyjnego.</p></body></html> @@ -1595,12 +1596,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <html><head/><body><p>Gdy to pole jest zaznaczone, system będzie uruchamiany ponownie natychmiast po kliknięciu na <span style="font-style:italic;">Ukończone</span> lub zamknięciu programu instalacyjnego.</p></body></html> <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Instalacja nie powiodła się</h1><br/>%1 nie został zainstalowany na twoim komputerze.<br/>Komunikat o błędzie: %2. @@ -1663,12 +1664,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. There is not enough drive space. At least %1 GiB is required. - + Nie ma wystarczającej ilości miejsca na dysku. Wymagane jest przynajmniej %1 GiB. has at least %1 GiB working memory - + ma przynajmniej %1 GiB pamięci roboczej @@ -1703,7 +1704,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. The setup program is not running with administrator rights. - + Program instalacyjny nie jest uruchomiony z prawami administratora. @@ -1718,7 +1719,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. The screen is too small to display the setup program. - + Ekran jest zbyt mały, aby wyświetlić program konfiguracyjny. @@ -1747,17 +1748,17 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. Could not create directories <code>%1</code>. - + Nie można utworzyć katalogów <code>%1</code>. Could not open file <code>%1</code>. - + Nie można otworzyć pliku <code>%1</code>. Could not write to file <code>%1</code>. - + Nie można zapisać do pliku <code>%1</code>. @@ -1962,7 +1963,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. Hide license text - + Ukryj tekst licencji @@ -2210,12 +2211,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. Ba&tch: - + Par&tia: <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> - + <html><head/><body><p>Wprowadź tutaj identyfikator partii. Zostanie on zapisany w systemie docelowym.</p></body></html> @@ -2569,7 +2570,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. Product Name - + Nazwa produktu @@ -2982,7 +2983,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. has at least one disk device available. - + jest dostępne co najmniej jedno urządzenie dyskowe. @@ -3014,7 +3015,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. - + Proszę wybrać wygląd i styl dla pulpitu KDE Plazma. Możesz również pominąć ten krok i skonfigurować je po zainstalowaniu systemu. Kliknięcie na wybranym wyglądzie i stylu spowoduje wyświetlenie ich podglądu na żywo. @@ -3177,7 +3178,7 @@ Wyjście: No product - + Brak produktu @@ -3928,12 +3929,12 @@ i nie uruchomi się <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>Jeśli z tego komputera będzie korzystać więcej niż jedna osoba, po skonfigurowaniu można utworzyć wiele kont.</small> <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> - + <small>Jeśli z tego komputera będzie korzystać więcej niż jedna osoba, po instalacji można utworzyć wiele kont.</small> @@ -3972,7 +3973,7 @@ i nie uruchomi się Create Volume Group - + Utwórz grupę woluminów @@ -4081,7 +4082,7 @@ i nie uruchomi się About %1 setup - + Informacje o konfiguracji %1 diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index d737dff65..3f4773eb6 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -4164,7 +4164,7 @@ Saída: Show information about Calamares - + Mostrar informações sobre o Calamares diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts index 55d0da414..191b19b04 100644 --- a/lang/calamares_sq.ts +++ b/lang/calamares_sq.ts @@ -4151,7 +4151,7 @@ Përfundim: Show information about Calamares - + Shfaq hollësi mbi Calamares From ca94ca4594010e0c55206346f2e1dc6648304a49 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 23 Aug 2022 11:43:39 +0200 Subject: [PATCH 17/26] i18n: [python] Automatic merge of Transifex translations --- lang/python/bg/LC_MESSAGES/python.po | 4 ++-- lang/python/en_GB/LC_MESSAGES/python.po | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po index cbb10c023..8270caab6 100644 --- a/lang/python/bg/LC_MESSAGES/python.po +++ b/lang/python/bg/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # Georgi Georgiev (Жоро) , 2022 -# Mincho Kondarev, 2022 +# mkkDr2010, 2022 # #, fuzzy msgid "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-05-29 16:17+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Mincho Kondarev, 2022\n" +"Last-Translator: mkkDr2010, 2022\n" "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po index 911555c2c..5a261c1f9 100644 --- a/lang/python/en_GB/LC_MESSAGES/python.po +++ b/lang/python/en_GB/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # Jason Collins , 2018 -# Karthik Balan, 2021 +# Karthik Arasappan, 2021 # #, fuzzy msgid "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-05-29 16:17+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Karthik Balan, 2021\n" +"Last-Translator: Karthik Arasappan, 2021\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From 733e4d64e1c6aef0f196c7091171b587f1fc887b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Aug 2022 11:48:14 +0200 Subject: [PATCH 18/26] CI: check translations against detached branches To avoid git complaining about duplicate worktrees, detach the temporary trees. To avoid python modules translations changing order (depending on how find traverses the tree), sort the filenames before extraction. (cherry picked from commit c3f366ce9e6b133712ef393b34d13990090823fd) --- ci/txcheck.sh | 2 +- ci/txpush.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/txcheck.sh b/ci/txcheck.sh index cedae6682..78b7f00b1 100755 --- a/ci/txcheck.sh +++ b/ci/txcheck.sh @@ -120,7 +120,7 @@ tx_sum() WORKTREE_NAME="$1" WORKTREE_TAG="$2" - git worktree add $WORKTREE_NAME $WORKTREE_TAG > /dev/null 2>&1 || { echo "! Could not create worktree." ; exit 1 ; } + git worktree add -d $WORKTREE_NAME $WORKTREE_TAG > /dev/null 2>&1 || { echo "! Could not create worktree." ; exit 1 ; } ( cd $WORKTREE_NAME && sh "$CURDIR"/ci/txpush.sh --no-tx ) > /dev/null 2>&1 || { echo "! Could not re-create translations." ; exit 1 ; } # Remove linenumbers from .ts (XML) and .pot diff --git a/ci/txpush.sh b/ci/txpush.sh index ac806a2fa..1a0a7249b 100755 --- a/ci/txpush.sh +++ b/ci/txpush.sh @@ -124,8 +124,8 @@ tx push --source --no-interactive -r calamares.fdo PYGETTEXT="xgettext --keyword=_n:1,2 -L python" SHARED_PYTHON="" -for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do - FILES=$(find "$MODULE_DIR" -name "*.py" -a -type f) +for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d | sort) ; do + FILES=$(find "$MODULE_DIR" -name "*.py" -a -type f | sort) if test -n "$FILES" ; then MODULE_NAME=$(basename ${MODULE_DIR}) if [ -d ${MODULE_DIR}/lang ]; then From 57374a327131d33809a695e0112327c0c779dffa Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Aug 2022 12:32:42 +0200 Subject: [PATCH 19/26] CMake: blanket-apply gersemi --- src/CMakeLists.txt | 24 +-- src/calamares/CMakeLists.txt | 65 +++--- src/libcalamares/CMakeLists.txt | 203 +++++++++++------- src/libcalamaresui/CMakeLists.txt | 69 +++--- src/modules/CMakeLists.txt | 35 +-- src/modules/contextualprocess/CMakeLists.txt | 2 +- src/modules/dracutlukscfg/CMakeLists.txt | 2 +- src/modules/dummycpp/CMakeLists.txt | 2 +- src/modules/finished/CMakeLists.txt | 6 +- src/modules/finishedq/CMakeLists.txt | 12 +- src/modules/fsresizer/CMakeLists.txt | 19 +- src/modules/hostinfo/CMakeLists.txt | 6 +- src/modules/initcpio/CMakeLists.txt | 2 +- src/modules/initramfs/CMakeLists.txt | 2 +- .../interactiveterminal/CMakeLists.txt | 16 +- src/modules/keyboard/CMakeLists.txt | 2 +- src/modules/keyboardq/CMakeLists.txt | 8 +- src/modules/license/CMakeLists.txt | 4 +- src/modules/locale/CMakeLists.txt | 10 +- src/modules/localeq/CMakeLists.txt | 22 +- .../luksopenswaphookcfg/CMakeLists.txt | 2 +- src/modules/machineid/CMakeLists.txt | 2 +- src/modules/netinstall/CMakeLists.txt | 3 +- src/modules/notesqml/CMakeLists.txt | 4 +- src/modules/oemid/CMakeLists.txt | 2 +- src/modules/packagechooser/CMakeLists.txt | 43 ++-- src/modules/packagechooserq/CMakeLists.txt | 49 +++-- src/modules/partition/CMakeLists.txt | 55 ++--- src/modules/partition/tests/CMakeLists.txt | 5 +- src/modules/plasmalnf/CMakeLists.txt | 28 ++- src/modules/preservefiles/CMakeLists.txt | 2 +- src/modules/removeuser/CMakeLists.txt | 2 +- src/modules/shellprocess/CMakeLists.txt | 2 +- src/modules/summary/CMakeLists.txt | 4 +- src/modules/summaryq/CMakeLists.txt | 8 +- src/modules/tracking/CMakeLists.txt | 2 +- src/modules/umount/CMakeLists.txt | 2 +- src/modules/users/CMakeLists.txt | 38 ++-- src/modules/usersq/CMakeLists.txt | 38 ++-- src/modules/webview/CMakeLists.txt | 61 +++--- src/modules/welcome/CMakeLists.txt | 18 +- src/modules/welcomeq/CMakeLists.txt | 29 ++- src/modules/zfs/CMakeLists.txt | 3 +- src/qml/calamares/CMakeLists.txt | 49 +++-- 44 files changed, 534 insertions(+), 428 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5ce5349fb..b1a536f91 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,26 +3,26 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -include( CalamaresAddBrandingSubdirectory ) -include( CalamaresAddLibrary ) -include( CalamaresAddModuleSubdirectory ) -include( CalamaresAddPlugin ) -include( CalamaresAddTest ) -include( CalamaresAddTranslations ) +include(CalamaresAddBrandingSubdirectory) +include(CalamaresAddLibrary) +include(CalamaresAddModuleSubdirectory) +include(CalamaresAddPlugin) +include(CalamaresAddTest) +include(CalamaresAddTranslations) # library -add_subdirectory( libcalamares ) +add_subdirectory(libcalamares) -add_subdirectory( libcalamaresui ) +add_subdirectory(libcalamaresui) # all things qml -add_subdirectory( qml/calamares ) +add_subdirectory(qml/calamares) # application -add_subdirectory( calamares ) +add_subdirectory(calamares) # plugins -add_subdirectory( modules ) +add_subdirectory(modules) # branding components -add_subdirectory( branding ) +add_subdirectory(branding) diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt index d06a53d83..577b16105 100644 --- a/src/calamares/CMakeLists.txt +++ b/src/calamares/CMakeLists.txt @@ -4,27 +4,25 @@ # SPDX-License-Identifier: BSD-2-Clause # -set( calamaresSources +set(calamaresSources main.cpp CalamaresApplication.cpp CalamaresWindow.cpp - DebugWindow.cpp VariantModel.cpp - progresstree/ProgressTreeDelegate.cpp progresstree/ProgressTreeView.cpp ) -if( NOT WITH_KF5DBus ) - set( kdsagSources +if(NOT WITH_KF5DBus) + set(kdsagSources ${CMAKE_SOURCE_DIR}/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp ${CMAKE_SOURCE_DIR}/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp ${CMAKE_SOURCE_DIR}/3rdparty/kdsingleapplicationguard/kdtoolsglobal.cpp ${CMAKE_SOURCE_DIR}/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp ) mark_thirdparty_code( ${kdsagSources} ) - list( APPEND calamaresSources ${kdsagSources} ) + list(APPEND calamaresSources ${kdsagSources}) endif() include_directories( @@ -42,22 +40,22 @@ include_directories( # The calamares-i18n.cxx file -- full path in CALAMARES_TRANSLATIONS_SOURCE -- # is created as a target in the lang/ directory. This is compiled to a # library (it's just the result of a QRC compile). -add_executable( calamares_bin ${calamaresSources} calamares.qrc ) -target_include_directories( calamares_bin PRIVATE ${CMAKE_SOURCE_DIR} ) -set_target_properties(calamares_bin - PROPERTIES - ENABLE_EXPORTS TRUE - RUNTIME_OUTPUT_NAME calamares +add_executable(calamares_bin ${calamaresSources} calamares.qrc) +target_include_directories(calamares_bin PRIVATE ${CMAKE_SOURCE_DIR}) +set_target_properties( + calamares_bin + PROPERTIES ENABLE_EXPORTS TRUE RUNTIME_OUTPUT_NAME calamares ) calamares_automoc( calamares_bin ) calamares_autouic( calamares_bin ) calamares_autorcc( calamares_bin ) -if( kdsagSources ) - set_source_files_properties( ${kdsagSources} PROPERTIES AUTOMOC OFF ) +if(kdsagSources) + set_source_files_properties(${kdsagSources} PROPERTIES AUTOMOC OFF) endif() -target_link_libraries( calamares_bin +target_link_libraries( + calamares_bin PRIVATE calamares calamaresui @@ -66,21 +64,25 @@ target_link_libraries( calamares_bin Qt5::Widgets KF5::CoreAddons ) -if( WITH_KF5Crash ) - target_link_libraries( calamares_bin PRIVATE KF5::Crash ) - target_compile_definitions( calamares_bin PRIVATE WITH_KF5Crash ) +if(WITH_KF5Crash) + target_link_libraries(calamares_bin PRIVATE KF5::Crash) + target_compile_definitions(calamares_bin PRIVATE WITH_KF5Crash) endif() -if( WITH_KF5DBus ) - target_link_libraries( calamares_bin PRIVATE KF5::DBusAddons ) - target_compile_definitions( calamares_bin PRIVATE WITH_KF5DBus ) +if(WITH_KF5DBus) + target_link_libraries(calamares_bin PRIVATE KF5::DBusAddons) + target_compile_definitions(calamares_bin PRIVATE WITH_KF5DBus) endif() -install( TARGETS calamares_bin - BUNDLE DESTINATION . - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +install( + TARGETS calamares_bin + BUNDLE + DESTINATION . + RUNTIME + DESTINATION ${CMAKE_INSTALL_BINDIR} ) -install( FILES ${CMAKE_SOURCE_DIR}/data/images/squid.svg +install( + FILES ${CMAKE_SOURCE_DIR}/data/images/squid.svg RENAME calamares.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps ) @@ -88,11 +90,14 @@ install( FILES ${CMAKE_SOURCE_DIR}/data/images/squid.svg ### TESTS # # -if( BUILD_TESTING ) +if(BUILD_TESTING) # Don't install, these are just for enable_testing - add_executable( loadmodule testmain.cpp ) - target_link_libraries( loadmodule PRIVATE Qt5::Core Qt5::Widgets calamares calamaresui ) + add_executable(loadmodule testmain.cpp) + target_link_libraries( + loadmodule + PRIVATE Qt5::Core Qt5::Widgets calamares calamaresui + ) - add_executable( test_conf test_conf.cpp ) - target_link_libraries( test_conf PUBLIC yamlcpp::yamlcpp Qt5::Core ) + add_executable(test_conf test_conf.cpp) + target_link_libraries(test_conf PUBLIC yamlcpp::yamlcpp Qt5::Core) endif() diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 95081bb5e..d64bc26ef 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -10,20 +10,26 @@ # (non-GUI) jobs. # -add_definitions( -DDLLEXPORT_PRO ) -include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ) +add_definitions(-DDLLEXPORT_PRO) +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresConfig.h.in - ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h ) -configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersion.h.in - ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersion.h ) -configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersionX.h.in - ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersionX.h ) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresConfig.h.in + ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h +) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersion.h.in + ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersion.h +) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersionX.h.in + ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersionX.h +) -set( OPTIONAL_PRIVATE_LIBRARIES "" ) -set( OPTIONAL_PUBLIC_LIBRARIES "" ) +set(OPTIONAL_PRIVATE_LIBRARIES "") +set(OPTIONAL_PUBLIC_LIBRARIES "") -set( libSources +set(libSources CalamaresAbout.cpp CppJob.cpp GlobalStorage.cpp @@ -32,13 +38,11 @@ set( libSources JobQueue.cpp ProcessJob.cpp Settings.cpp - # GeoIP services geoip/Interface.cpp geoip/GeoIPFixed.cpp geoip/GeoIPJSON.cpp geoip/Handler.cpp - # Locale-data service locale/Global.cpp locale/Lookup.cpp @@ -47,7 +51,6 @@ set( libSources locale/TranslatableString.cpp locale/Translation.cpp locale/TranslationsModel.cpp - # Modules modulesystem/Config.cpp modulesystem/Descriptor.cpp @@ -56,19 +59,15 @@ set( libSources modulesystem/Preset.cpp modulesystem/RequirementsChecker.cpp modulesystem/RequirementsModel.cpp - # Network service network/Manager.cpp - # Packages service packages/Globals.cpp - # Partition service partition/Global.cpp partition/Mount.cpp partition/PartitionSize.cpp partition/Sync.cpp - # Utility service utils/CalamaresUtilsSystem.cpp utils/CommandList.cpp @@ -88,20 +87,16 @@ set( libSources ### OPTIONAL Automount support (requires dbus) # # -if( Qt5DBus_FOUND) - list( APPEND libSources partition/AutoMount.cpp ) - list( APPEND OPTIONAL_PRIVATE_LIBRARIES Qt5::DBus ) +if(Qt5DBus_FOUND) + list(APPEND libSources partition/AutoMount.cpp) + list(APPEND OPTIONAL_PRIVATE_LIBRARIES Qt5::DBus) endif() ### OPTIONAL Python support # # -if( WITH_PYTHON ) - list( APPEND libSources - PythonHelper.cpp - PythonJob.cpp - PythonJobApi.cpp - ) +if(WITH_PYTHON) + list(APPEND libSources PythonHelper.cpp PythonJob.cpp PythonJobApi.cpp) include_directories(${PYTHON_INCLUDE_DIRS}) link_directories(${PYTHON_LIBRARIES}) @@ -109,7 +104,9 @@ if( WITH_PYTHON ) include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) - list( APPEND OPTIONAL_PRIVATE_LIBRARIES + list( + APPEND + OPTIONAL_PRIVATE_LIBRARIES ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} ) @@ -119,48 +116,52 @@ endif() # # find_package(Qt5 COMPONENTS Xml) -if( Qt5Xml_FOUND ) - list( APPEND libSources geoip/GeoIPXML.cpp ) - list( APPEND OPTIONAL_PUBLIC_LIBRARIES Qt5::Network Qt5::Xml ) +if(Qt5Xml_FOUND) + list(APPEND libSources geoip/GeoIPXML.cpp) + list(APPEND OPTIONAL_PUBLIC_LIBRARIES Qt5::Network Qt5::Xml) endif() ### OPTIONAL KPMcore support # # -include( KPMcoreHelper ) +include(KPMcoreHelper) -if ( KPMcore_FOUND ) - find_package( Qt5 REQUIRED DBus ) # Needed for KPMCore - find_package( KF5 REQUIRED I18n WidgetsAddons ) # Needed for KPMCore +if(KPMcore_FOUND) + find_package(Qt5 REQUIRED DBus) # Needed for KPMCore + find_package(KF5 REQUIRED I18n WidgetsAddons) # Needed for KPMCore - foreach ( d ${KPMcore_API_DEFINITIONS} ) - add_definitions( -D${d} ) + foreach(d ${KPMcore_API_DEFINITIONS}) + add_definitions(-D${d}) endforeach() - include_directories( ${KPMCORE_INCLUDE_DIR} ) - list( APPEND libSources + include_directories(${KPMCORE_INCLUDE_DIR}) + list( + APPEND + libSources partition/FileSystem.cpp partition/KPMManager.cpp partition/PartitionIterator.cpp partition/PartitionQuery.cpp ) - list( APPEND OPTIONAL_PRIVATE_LIBRARIES kpmcore ) + list(APPEND OPTIONAL_PRIVATE_LIBRARIES kpmcore) endif() ### LIBRARY # # -add_library( calamares SHARED ${libSources} ) -set_target_properties( calamares +add_library(calamares SHARED ${libSources}) +set_target_properties( + calamares PROPERTIES VERSION ${CALAMARES_VERSION_SHORT} SOVERSION ${CALAMARES_VERSION_SHORT} - INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_INSTALL_FULL_INCLUDEDIR}/libcalamares + INTERFACE_INCLUDE_DIRECTORIES + ${CMAKE_INSTALL_FULL_INCLUDEDIR}/libcalamares ) calamares_automoc( calamares ) -target_link_libraries( calamares - LINK_PRIVATE - ${OPTIONAL_PRIVATE_LIBRARIES} +target_link_libraries( + calamares + LINK_PRIVATE ${OPTIONAL_PRIVATE_LIBRARIES} LINK_PUBLIC yamlcpp::yamlcpp Qt5::Core @@ -173,22 +174,29 @@ add_library(Calamares::calamares ALIAS calamares) ### Installation # # -install( TARGETS calamares +install( + TARGETS calamares EXPORT Calamares - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME + DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY + DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE + DESTINATION ${CMAKE_INSTALL_LIBDIR} ) # Make symlink lib/calamares/libcalamares.so to lib/libcalamares.so.VERSION so # lib/calamares can be used as module path for the Python interpreter. -install( CODE " +install( + CODE + " file( MAKE_DIRECTORY \"\$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_LIBDIR}/calamares\" ) execute_process( COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ../libcalamares.so.${CALAMARES_VERSION_SHORT} libcalamares.so WORKING_DIRECTORY \"\$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_LIBDIR}/calamares\" ) -") +" +) # Install header files -file( GLOB rootHeaders "*.h" ) +file(GLOB rootHeaders "*.h") install( FILES ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h @@ -197,12 +205,11 @@ install( DESTINATION include/libcalamares ) # Install each subdir-worth of header files -foreach( subdir geoip locale modulesystem network partition utils ) - file( GLOB subdir_headers "${subdir}/*.h" ) - install( FILES ${subdir_headers} DESTINATION include/libcalamares/${subdir} ) +foreach(subdir geoip locale modulesystem network partition utils) + file(GLOB subdir_headers "${subdir}/*.h") + install(FILES ${subdir_headers} DESTINATION include/libcalamares/${subdir}) endforeach() - ### TESTING # # @@ -219,44 +226,70 @@ calamares_add_test( ${geoip_src} ) -function ( calamares_qrc_translations basename ) - set( NAME ${ARGV0} ) - set( options "" ) - set( oneValueArgs SUBDIRECTORY OUTPUT_VARIABLE ) - set( multiValueArgs LANGUAGES ) - cmake_parse_arguments( _qrt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) +function(calamares_qrc_translations basename) + set(NAME ${ARGV0}) + set(options "") + set(oneValueArgs SUBDIRECTORY OUTPUT_VARIABLE) + set(multiValueArgs LANGUAGES) + cmake_parse_arguments( + _qrt + "${options}" + "${oneValueArgs}" + "${multiValueArgs}" + ${ARGN} + ) - if( NOT _qrt_OUTPUT_VARIABLE ) - set( _qrt_OUTPUT_VARIABLE "qrc_translations_${basename}" ) + if(NOT _qrt_OUTPUT_VARIABLE) + set(_qrt_OUTPUT_VARIABLE "qrc_translations_${basename}") endif() - set( translations_qrc_infile ${CMAKE_CURRENT_BINARY_DIR}/${basename}.qrc ) - set( translations_qrc_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${basename}.cxx ) + set(translations_qrc_infile ${CMAKE_CURRENT_BINARY_DIR}/${basename}.qrc) + set(translations_qrc_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${basename}.cxx) # Must use this variable name because of the @ substitution - set( calamares_i18n_qrc_content "" ) - set( calamares_i18n_ts_filelist "" ) - foreach( lang ${_qrt_LANGUAGES} ) - string( APPEND calamares_i18n_qrc_content "${basename}_${lang}.qm" ) - list( APPEND calamares_i18n_ts_filelist "${CMAKE_CURRENT_SOURCE_DIR}/${_qrt_SUBDIRECTORY}/${basename}_${lang}.ts" ) + set(calamares_i18n_qrc_content "") + set(calamares_i18n_ts_filelist "") + foreach(lang ${_qrt_LANGUAGES}) + string( + APPEND + calamares_i18n_qrc_content + "${basename}_${lang}.qm" + ) + list( + APPEND + calamares_i18n_ts_filelist + "${CMAKE_CURRENT_SOURCE_DIR}/${_qrt_SUBDIRECTORY}/${basename}_${lang}.ts" + ) endforeach() - configure_file( ${CMAKE_SOURCE_DIR}/lang/calamares_i18n.qrc.in ${translations_qrc_infile} @ONLY ) + configure_file( + ${CMAKE_SOURCE_DIR}/lang/calamares_i18n.qrc.in + ${translations_qrc_infile} + @ONLY + ) qt5_add_translation(QM_FILES ${calamares_i18n_ts_filelist}) # Run the resource compiler (rcc_options should already be set) add_custom_command( OUTPUT ${translations_qrc_outfile} COMMAND "${Qt5Core_RCC_EXECUTABLE}" - ARGS ${rcc_options} --format-version 1 -name ${basename} -o ${translations_qrc_outfile} ${translations_qrc_infile} + ARGS + ${rcc_options} + --format-version + 1 + -name + ${basename} + -o + ${translations_qrc_outfile} + ${translations_qrc_infile} MAIN_DEPENDENCY ${translations_qrc_infile} DEPENDS ${QM_FILES} ) - set( ${_qrt_OUTPUT_VARIABLE} ${translations_qrc_outfile} PARENT_SCOPE ) + set(${_qrt_OUTPUT_VARIABLE} ${translations_qrc_outfile} PARENT_SCOPE) endfunction() -calamares_qrc_translations( localetest OUTPUT_VARIABLE localetest_qrc SUBDIRECTORY testdata LANGUAGES nl ) +calamares_qrc_translations(localetest OUTPUT_VARIABLE localetest_qrc SUBDIRECTORY testdata LANGUAGES nl) calamares_add_test( libcalamareslocaletest SOURCES @@ -291,7 +324,7 @@ calamares_add_test( ${OPTIONAL_PRIVATE_LIBRARIES} ) -if( KPMcore_FOUND ) +if(KPMcore_FOUND) calamares_add_test( libcalamarespartitionkpmtest SOURCES @@ -314,14 +347,18 @@ calamares_add_test( utils/TestPaths.cpp ) - # This is not an actual test, it's a test / demo application # for experimenting with GeoIP. -add_executable( test_geoip geoip/test_geoip.cpp ${geoip_src} ) -target_link_libraries( test_geoip Calamares::calamares Qt5::Network yamlcpp::yamlcpp ) +add_executable(test_geoip geoip/test_geoip.cpp ${geoip_src}) +target_link_libraries( + test_geoip + Calamares::calamares + Qt5::Network + yamlcpp::yamlcpp +) calamares_automoc( test_geoip ) -if ( Qt5DBus_FOUND ) - add_executable( test_automount partition/calautomount.cpp ) - target_link_libraries( test_automount Calamares::calamares Qt5::DBus ) +if(Qt5DBus_FOUND) + add_executable(test_automount partition/calautomount.cpp) + target_link_libraries(test_automount Calamares::calamares Qt5::DBus) endif() diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt index 48e4c4b4d..90cdb329e 100644 --- a/src/libcalamaresui/CMakeLists.txt +++ b/src/libcalamaresui/CMakeLists.txt @@ -8,24 +8,25 @@ # view modules, view steps, widgets, and branding. # The UI libs use the non-UI library -include_directories( ${CMAKE_SOURCE_DIR}/src/libcalamares ${CMAKE_BINARY_DIR}/src/libcalamares ${CMAKE_SOURCE_DIR} ) +include_directories( + ${CMAKE_SOURCE_DIR}/src/libcalamares + ${CMAKE_BINARY_DIR}/src/libcalamares + ${CMAKE_SOURCE_DIR} +) -set( calamaresui_SOURCES +set(calamaresui_SOURCES modulesystem/CppJobModule.cpp modulesystem/ModuleFactory.cpp modulesystem/ModuleManager.cpp modulesystem/ProcessJobModule.cpp modulesystem/ViewModule.cpp - utils/CalamaresUtilsGui.cpp utils/ImageRegistry.cpp utils/Paste.cpp - viewpages/BlankViewStep.cpp viewpages/ExecutionViewStep.cpp viewpages/Slideshow.cpp viewpages/ViewStep.cpp - widgets/ClickableLabel.cpp widgets/ErrorDialog.cpp widgets/FixedAspectRatioLabel.cpp @@ -34,7 +35,6 @@ set( calamaresui_SOURCES widgets/TranslationFix.cpp widgets/WaitingWidget.cpp ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp - Branding.cpp ViewManager.cpp ) @@ -44,14 +44,14 @@ mark_thirdparty_code( ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp ) -if( WITH_PYTHON ) - list( APPEND calamaresui_SOURCES - modulesystem/PythonJobModule.cpp - ) +if(WITH_PYTHON) + list(APPEND calamaresui_SOURCES modulesystem/PythonJobModule.cpp) endif() -if( WITH_PYTHONQT ) - list( APPEND calamaresui_SOURCES +if(WITH_PYTHONQT) + list( + APPEND + calamaresui_SOURCES modulesystem/PythonQtViewModule.cpp utils/PythonQtUtils.cpp viewpages/PythonQtJob.cpp @@ -61,14 +61,11 @@ if( WITH_PYTHONQT ) ) endif() -if( WITH_QML ) - list( APPEND calamaresui_SOURCES - utils/Qml.cpp - viewpages/QmlViewStep.cpp - ) +if(WITH_QML) + list(APPEND calamaresui_SOURCES utils/Qml.cpp viewpages/QmlViewStep.cpp) endif() -calamares_add_library( calamaresui +calamares_add_library(calamaresui SOURCES ${calamaresui_SOURCES} EXPORT_MACRO UIDLLEXPORT_PRO LINK_LIBRARIES @@ -79,22 +76,27 @@ calamares_add_library( calamaresui utils/ErrorDialog/ErrorDialog.ui VERSION ${CALAMARES_VERSION_SHORT} ) -target_link_libraries( calamaresui PRIVATE yamlcpp::yamlcpp ) -if( KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58 ) - target_compile_definitions( calamaresui PRIVATE WITH_KOSRelease ) +target_link_libraries(calamaresui PRIVATE yamlcpp::yamlcpp) +if(KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58) + target_compile_definitions(calamaresui PRIVATE WITH_KOSRelease) endif() -if( WITH_PYTHONQT ) +if(WITH_PYTHONQT) # *_DIRS because we also use extensions - target_include_directories( calamaresui PRIVATE ${PYTHON_INCLUDE_DIRS} ${PYTHONQT_INCLUDE_DIRS} ) - target_link_libraries( calamaresui PRIVATE ${PYTHON_LIBRARIES} ${PYTHONQT_LIBRARIES} ) + target_include_directories( + calamaresui + PRIVATE ${PYTHON_INCLUDE_DIRS} ${PYTHONQT_INCLUDE_DIRS} + ) + target_link_libraries( + calamaresui + PRIVATE ${PYTHON_LIBRARIES} ${PYTHONQT_LIBRARIES} + ) endif() -if( WITH_QML ) - target_link_libraries( calamaresui PUBLIC Qt5::QuickWidgets ) +if(WITH_QML) + target_link_libraries(calamaresui PUBLIC Qt5::QuickWidgets) endif() add_library(Calamares::calamaresui ALIAS calamaresui) - ### Installation # # @@ -103,17 +105,12 @@ add_library(Calamares::calamaresui ALIAS calamaresui) # where libcalamares and libcalamaresui live in different branches, # we're going to glom it all together in the installed headers location. -install( - FILES - Branding.h - ViewManager.h - DESTINATION include/libcalamares -) +install(FILES Branding.h ViewManager.h DESTINATION include/libcalamares) # Install each subdir-worth of header files -foreach( subdir modulesystem utils viewpages widgets ) - file( GLOB subdir_headers "${subdir}/*.h" ) - install( FILES ${subdir_headers} DESTINATION include/libcalamares/${subdir} ) +foreach(subdir modulesystem utils viewpages widgets) + file(GLOB subdir_headers "${subdir}/*.h") + install(FILES ${subdir_headers} DESTINATION include/libcalamares/${subdir}) endforeach() calamares_add_test( diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 03384105e..593815459 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -8,7 +8,7 @@ # individual modules can also decide they must be skipped (e.g. OS-specific # modules, or ones with unmet dependencies). Collect the skipped modules # in this list. -set( LIST_SKIPPED_MODULES "" ) +set(LIST_SKIPPED_MODULES "") include_directories( ${CMAKE_SOURCE_DIR}/src/libcalamares @@ -16,29 +16,40 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/libcalamaresui ) -string( REPLACE " " ";" SKIP_LIST "${SKIP_MODULES}" ) +string(REPLACE " " ";" SKIP_LIST "${SKIP_MODULES}") -file( GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*" ) -list( SORT SUBDIRECTORIES ) +file(GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*") +list(SORT SUBDIRECTORIES) -foreach( SUBDIRECTORY ${SUBDIRECTORIES} ) +foreach(SUBDIRECTORY ${SUBDIRECTORIES}) calamares_add_module_subdirectory( ${SUBDIRECTORY} LIST_SKIPPED_MODULES ) endforeach() # TODO:3.3: Use FindPython3 -if ( BUILD_TESTING AND BUILD_SCHEMA_TESTING AND PYTHONINTERP_FOUND AND PYTHON_EXECUTABLE ) +if( + BUILD_TESTING + AND BUILD_SCHEMA_TESTING + AND PYTHONINTERP_FOUND + AND PYTHON_EXECUTABLE +) # The tests for each config file are independent of whether the # module is enabled or not: the config file should match its schema # regardless. - foreach( SUBDIRECTORY ${SUBDIRECTORIES} ) - set( _schema_file "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${SUBDIRECTORY}.schema.yaml" ) - set( _conf_file "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${SUBDIRECTORY}.conf" ) - if ( EXISTS "${_schema_file}" AND EXISTS "${_conf_file}" ) + foreach(SUBDIRECTORY ${SUBDIRECTORIES}) + set(_schema_file + "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${SUBDIRECTORY}.schema.yaml" + ) + set(_conf_file + "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${SUBDIRECTORY}.conf" + ) + if(EXISTS "${_schema_file}" AND EXISTS "${_conf_file}") add_test( NAME validate-${SUBDIRECTORY} - COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" "${_schema_file}" "${_conf_file}" + COMMAND + ${PYTHON_EXECUTABLE} + "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" + "${_schema_file}" "${_conf_file}" ) endif() endforeach() endif() - diff --git a/src/modules/contextualprocess/CMakeLists.txt b/src/modules/contextualprocess/CMakeLists.txt index d7716bbfb..56cf409b5 100644 --- a/src/modules/contextualprocess/CMakeLists.txt +++ b/src/modules/contextualprocess/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( contextualprocess +calamares_add_plugin(contextualprocess TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/dracutlukscfg/CMakeLists.txt b/src/modules/dracutlukscfg/CMakeLists.txt index aaa7a8c17..85efccc0c 100644 --- a/src/modules/dracutlukscfg/CMakeLists.txt +++ b/src/modules/dracutlukscfg/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( dracutlukscfg +calamares_add_plugin(dracutlukscfg TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/dummycpp/CMakeLists.txt b/src/modules/dummycpp/CMakeLists.txt index 2916b4d67..b822a03be 100644 --- a/src/modules/dummycpp/CMakeLists.txt +++ b/src/modules/dummycpp/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( dummycpp +calamares_add_plugin(dummycpp TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/finished/CMakeLists.txt b/src/modules/finished/CMakeLists.txt index 619f6d8b0..ab435a9eb 100644 --- a/src/modules/finished/CMakeLists.txt +++ b/src/modules/finished/CMakeLists.txt @@ -3,11 +3,11 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network ) +find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network) -include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) +include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui) -calamares_add_plugin( finished +calamares_add_plugin(finished TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/finishedq/CMakeLists.txt b/src/modules/finishedq/CMakeLists.txt index facc2d691..2e688c45d 100644 --- a/src/modules/finishedq/CMakeLists.txt +++ b/src/modules/finishedq/CMakeLists.txt @@ -3,21 +3,21 @@ # SPDX-FileCopyrightText: 2021 Anke Boersma # SPDX-License-Identifier: BSD-2-Clause # -if( NOT WITH_QML ) +if(NOT WITH_QML) calamares_skip_module( "finishedq (QML is not supported in this build)" ) return() endif() -find_package( Qt5 ${QT_VERSION} CONFIG COMPONENTS DBus Network ) -if ( NOT TARGET Qt5::DBus OR NOT TARGET Qt5::Network ) +find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS DBus Network) +if(NOT TARGET Qt5::DBus OR NOT TARGET Qt5::Network) calamares_skip_module( "finishedq (missing DBus or Network)" ) return() endif() -set( _finished ${CMAKE_CURRENT_SOURCE_DIR}/../finished ) -include_directories( ${_finished} ) +set(_finished ${CMAKE_CURRENT_SOURCE_DIR}/../finished) +include_directories(${_finished}) -calamares_add_plugin( finishedq +calamares_add_plugin(finishedq TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/fsresizer/CMakeLists.txt b/src/modules/fsresizer/CMakeLists.txt index e721d7f6b..da4109195 100644 --- a/src/modules/fsresizer/CMakeLists.txt +++ b/src/modules/fsresizer/CMakeLists.txt @@ -3,18 +3,21 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -find_package( KF5Config CONFIG ) -find_package( KF5I18n CONFIG ) -find_package( KF5WidgetsAddons CONFIG ) +find_package(KF5Config CONFIG) +find_package(KF5I18n CONFIG) +find_package(KF5WidgetsAddons CONFIG) -include( KPMcoreHelper ) +include(KPMcoreHelper) -if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND ) - include_directories( ${KPMCORE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src/modules/partition ) +if(KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND) + include_directories( + ${KPMCORE_INCLUDE_DIR} + ${CMAKE_SOURCE_DIR}/src/modules/partition + ) # The PartitionIterator is a small class, and it's easiest -- but also a # gross hack -- to just compile it again from the partition module tree. - calamares_add_plugin( fsresizer + calamares_add_plugin(fsresizer TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES @@ -35,7 +38,7 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND DEFINITIONS ${KPMcore_API_DEFINITIONS} ) else() - if ( NOT KPMcore_FOUND ) + if(NOT KPMcore_FOUND) calamares_skip_module( "fsresizer (missing suitable KPMcore)" ) else() calamares_skip_module( "fsresizer (missing dependencies for KPMcore)" ) diff --git a/src/modules/hostinfo/CMakeLists.txt b/src/modules/hostinfo/CMakeLists.txt index 55be66f81..8f9f327e3 100644 --- a/src/modules/hostinfo/CMakeLists.txt +++ b/src/modules/hostinfo/CMakeLists.txt @@ -23,7 +23,7 @@ # - *hostCPU* the make (brand) of the CPU, if it can be determined. # Values are "Intel" or "AMD" or blank. -calamares_add_plugin( hostinfo +calamares_add_plugin(hostinfo TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES @@ -32,8 +32,8 @@ calamares_add_plugin( hostinfo NO_CONFIG ) -if ( KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58 ) - target_compile_definitions( calamares_job_hostinfo PRIVATE WITH_KOSRelease ) +if(KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58) + target_compile_definitions(calamares_job_hostinfo PRIVATE WITH_KOSRelease) endif() calamares_add_test( diff --git a/src/modules/initcpio/CMakeLists.txt b/src/modules/initcpio/CMakeLists.txt index 48fd09371..9032d4d17 100644 --- a/src/modules/initcpio/CMakeLists.txt +++ b/src/modules/initcpio/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( initcpio +calamares_add_plugin(initcpio TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/initramfs/CMakeLists.txt b/src/modules/initramfs/CMakeLists.txt index 2dec41cba..d56ca14ff 100644 --- a/src/modules/initramfs/CMakeLists.txt +++ b/src/modules/initramfs/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( initramfs +calamares_add_plugin(initramfs TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/interactiveterminal/CMakeLists.txt b/src/modules/interactiveterminal/CMakeLists.txt index 20aee8257..05696f945 100644 --- a/src/modules/interactiveterminal/CMakeLists.txt +++ b/src/modules/interactiveterminal/CMakeLists.txt @@ -5,21 +5,23 @@ # find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE) -set( kf5_ver 5.41 ) +set(kf5_ver 5.41) -find_package( KF5Service ${kf5_ver} ) -find_package( KF5Parts ${kf5_ver} ) +find_package(KF5Service ${kf5_ver}) +find_package(KF5Parts ${kf5_ver}) set_package_properties( - KF5Service PROPERTIES + KF5Service + PROPERTIES PURPOSE "For finding KDE services at runtime" ) set_package_properties( - KF5Parts PROPERTIES + KF5Parts + PROPERTIES PURPOSE "For finding KDE parts at runtime" ) -if ( KF5Parts_FOUND AND KF5Service_FOUND ) - calamares_add_plugin( interactiveterminal +if(KF5Parts_FOUND AND KF5Service_FOUND) + calamares_add_plugin(interactiveterminal TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/keyboard/CMakeLists.txt b/src/modules/keyboard/CMakeLists.txt index fe341cef0..51856709e 100644 --- a/src/modules/keyboard/CMakeLists.txt +++ b/src/modules/keyboard/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( keyboard +calamares_add_plugin(keyboard TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/keyboardq/CMakeLists.txt b/src/modules/keyboardq/CMakeLists.txt index 2b0577aa7..9c7922d86 100644 --- a/src/modules/keyboardq/CMakeLists.txt +++ b/src/modules/keyboardq/CMakeLists.txt @@ -3,16 +3,16 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -if( NOT WITH_QML ) +if(NOT WITH_QML) calamares_skip_module( "keyboardq (QML is not supported in this build)" ) return() endif() -set( _keyboard ${CMAKE_CURRENT_SOURCE_DIR}/../keyboard ) +set(_keyboard ${CMAKE_CURRENT_SOURCE_DIR}/../keyboard) -include_directories( ${_keyboard} ) +include_directories(${_keyboard}) -calamares_add_plugin( keyboardq +calamares_add_plugin(keyboardq TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/license/CMakeLists.txt b/src/modules/license/CMakeLists.txt index 0cd838799..d214d6ca7 100644 --- a/src/modules/license/CMakeLists.txt +++ b/src/modules/license/CMakeLists.txt @@ -3,9 +3,9 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) +include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui) -calamares_add_plugin( license +calamares_add_plugin(license TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt index 272dea3de..6543d7d94 100644 --- a/src/modules/locale/CMakeLists.txt +++ b/src/modules/locale/CMakeLists.txt @@ -7,14 +7,14 @@ # When debugging the timezone widget, add this debugging definition # to have a debugging-friendly timezone widget, debug logging, # and no intrusive timezone-setting while clicking around. -option( DEBUG_TIMEZONES "Debug-friendly timezone widget." OFF ) -if( DEBUG_TIMEZONES ) - add_definitions( -DDEBUG_TIMEZONES ) +option(DEBUG_TIMEZONES "Debug-friendly timezone widget." OFF) +if(DEBUG_TIMEZONES) + add_definitions(-DDEBUG_TIMEZONES) endif() -include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) +include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui) -calamares_add_plugin( locale +calamares_add_plugin(locale TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/localeq/CMakeLists.txt b/src/modules/localeq/CMakeLists.txt index ee3f07314..85b3721d9 100644 --- a/src/modules/localeq/CMakeLists.txt +++ b/src/modules/localeq/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -if( NOT WITH_QML ) +if(NOT WITH_QML) calamares_skip_module( "localeq (QML is not supported in this build)" ) return() endif() @@ -11,28 +11,32 @@ endif() # When debugging the timezone widget, add this debugging definition # to have a debugging-friendly timezone widget, debug logging, # and no intrusive timezone-setting while clicking around. -option( DEBUG_TIMEZONES "Debug-friendly timezone widget." OFF ) -if( DEBUG_TIMEZONES ) - add_definitions( -DDEBUG_TIMEZONES ) +option(DEBUG_TIMEZONES "Debug-friendly timezone widget." OFF) +if(DEBUG_TIMEZONES) + add_definitions(-DDEBUG_TIMEZONES) endif() find_package(Qt5Location CONFIG) -set_package_properties(Qt5Location PROPERTIES +set_package_properties( + Qt5Location + PROPERTIES DESCRIPTION "Used for rendering the map" TYPE RUNTIME ) find_package(Qt5Positioning CONFIG) -set_package_properties(Qt5Positioning PROPERTIES +set_package_properties( + Qt5Positioning + PROPERTIES DESCRIPTION "Used for GeoLocation and GeoCoding" TYPE RUNTIME ) # Because we're sharing sources with the regular locale module -set( _locale ${CMAKE_CURRENT_SOURCE_DIR}/../locale ) +set(_locale ${CMAKE_CURRENT_SOURCE_DIR}/../locale) -include_directories( ${_locale} ) +include_directories(${_locale}) -calamares_add_plugin( localeq +calamares_add_plugin(localeq TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/luksopenswaphookcfg/CMakeLists.txt b/src/modules/luksopenswaphookcfg/CMakeLists.txt index caede06a7..dbec1dc55 100644 --- a/src/modules/luksopenswaphookcfg/CMakeLists.txt +++ b/src/modules/luksopenswaphookcfg/CMakeLists.txt @@ -6,7 +6,7 @@ # Because LUKS Open Swap Hook (Job) is such a mouthful, we'll # use LOSH all over the place as a shorthand. -calamares_add_plugin( luksopenswaphookcfg +calamares_add_plugin(luksopenswaphookcfg TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/machineid/CMakeLists.txt b/src/modules/machineid/CMakeLists.txt index 0ab035ab4..a0b60a6ef 100644 --- a/src/modules/machineid/CMakeLists.txt +++ b/src/modules/machineid/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( machineid +calamares_add_plugin(machineid TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/netinstall/CMakeLists.txt b/src/modules/netinstall/CMakeLists.txt index 13c6fa0ce..6b51b1388 100644 --- a/src/modules/netinstall/CMakeLists.txt +++ b/src/modules/netinstall/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( netinstall +calamares_add_plugin(netinstall TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES @@ -32,4 +32,3 @@ calamares_add_test( LIBRARIES Qt5::Gui ) - diff --git a/src/modules/notesqml/CMakeLists.txt b/src/modules/notesqml/CMakeLists.txt index 5eab06663..c76ab5179 100644 --- a/src/modules/notesqml/CMakeLists.txt +++ b/src/modules/notesqml/CMakeLists.txt @@ -3,12 +3,12 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -if( NOT WITH_QML ) +if(NOT WITH_QML) calamares_skip_module( "notesqml (QML is not supported in this build)" ) return() endif() -calamares_add_plugin( notesqml +calamares_add_plugin(notesqml TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/oemid/CMakeLists.txt b/src/modules/oemid/CMakeLists.txt index af7fe1ff7..45825c85e 100644 --- a/src/modules/oemid/CMakeLists.txt +++ b/src/modules/oemid/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( oemid +calamares_add_plugin(oemid TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/packagechooser/CMakeLists.txt b/src/modules/packagechooser/CMakeLists.txt index d2e6ff118..4fbb0b533 100644 --- a/src/modules/packagechooser/CMakeLists.txt +++ b/src/modules/packagechooser/CMakeLists.txt @@ -3,45 +3,54 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -find_package( Qt5 COMPONENTS Core Gui Widgets REQUIRED ) -set( _extra_libraries "" ) -set( _extra_src "" ) +find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED) +set(_extra_libraries "") +set(_extra_src "") ### OPTIONAL AppData XML support in PackageModel # # # TODO:3.3:WITH->BUILD (this doesn't affect the ABI offered by Calamares) -option( WITH_APPDATA "Support appdata: items in PackageChooser (requires QtXml)" ON ) -if ( WITH_APPDATA ) +option( + WITH_APPDATA + "Support appdata: items in PackageChooser (requires QtXml)" + ON +) +if(WITH_APPDATA) find_package(Qt5 COMPONENTS Xml) - if ( Qt5Xml_FOUND ) - add_definitions( -DHAVE_APPDATA ) - list( APPEND _extra_libraries Qt5::Xml ) - list( APPEND _extra_src ItemAppData.cpp ) + if(Qt5Xml_FOUND) + add_definitions(-DHAVE_APPDATA) + list(APPEND _extra_libraries Qt5::Xml) + list(APPEND _extra_src ItemAppData.cpp) endif() endif() ### OPTIONAL AppStream support in PackageModel # # -option( WITH_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON ) -if ( WITH_APPSTREAM ) +option( + WITH_APPSTREAM + "Support appstream: items in PackageChooser (requires libappstream-qt)" + ON +) +if(WITH_APPSTREAM) find_package(AppStreamQt) set_package_properties( - AppStreamQt PROPERTIES + AppStreamQt + PROPERTIES DESCRIPTION "Support for AppStream (cache) data" URL "https://github.com/ximion/appstream" PURPOSE "AppStream provides package data" TYPE OPTIONAL ) - if ( AppStreamQt_FOUND ) - add_definitions( -DHAVE_APPSTREAM ) - list( APPEND _extra_libraries AppStreamQt ) - list( APPEND _extra_src ItemAppStream.cpp ) + if(AppStreamQt_FOUND) + add_definitions(-DHAVE_APPSTREAM) + list(APPEND _extra_libraries AppStreamQt) + list(APPEND _extra_src ItemAppStream.cpp) endif() endif() -calamares_add_plugin( packagechooser +calamares_add_plugin(packagechooser TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/packagechooserq/CMakeLists.txt b/src/modules/packagechooserq/CMakeLists.txt index 51a17e215..e92b8b30e 100644 --- a/src/modules/packagechooserq/CMakeLists.txt +++ b/src/modules/packagechooserq/CMakeLists.txt @@ -4,55 +4,64 @@ # SPDX-FileCopyrightText: 2021 Anke Boersma # SPDX-License-Identifier: BSD-2-Clause # -if( NOT WITH_QML ) - calamares_skip_module( "packagechooserq (QML is not supported in this build)" ) +if(NOT WITH_QML) + calamares_skip_module("packagechooserq (QML is not supported in this build)") return() endif() -find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core ) +find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Core) # Add optional libraries here -set( USER_EXTRA_LIB ) +set(USER_EXTRA_LIB) # include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../packagechooser ) -set( _packagechooser ${CMAKE_CURRENT_SOURCE_DIR}/../packagechooser ) -include_directories( ${_packagechooser} ) +set(_packagechooser ${CMAKE_CURRENT_SOURCE_DIR}/../packagechooser) +include_directories(${_packagechooser}) ### OPTIONAL AppData XML support in PackageModel # # # TODO:3.3:WITH->BUILD (this doesn't affect the ABI offered by Calamares) -option( WITH_APPDATA "Support appdata: items in PackageChooser (requires QtXml)" ON ) -if ( WITH_APPDATA ) +option( + WITH_APPDATA + "Support appdata: items in PackageChooser (requires QtXml)" + ON +) +if(WITH_APPDATA) find_package(Qt5 COMPONENTS Xml) - if ( Qt5Xml_FOUND ) - add_definitions( -DHAVE_APPDATA ) - list( APPEND _extra_libraries Qt5::Xml ) - list( APPEND _extra_src ${_packagechooser}/ItemAppData.cpp ) + if(Qt5Xml_FOUND) + add_definitions(-DHAVE_APPDATA) + list(APPEND _extra_libraries Qt5::Xml) + list(APPEND _extra_src ${_packagechooser}/ItemAppData.cpp) endif() endif() ### OPTIONAL AppStream support in PackageModel # # -option( WITH_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON ) -if ( WITH_APPSTREAM ) +option( + WITH_APPSTREAM + "Support appstream: items in PackageChooser (requires libappstream-qt)" + ON +) +if(WITH_APPSTREAM) find_package(AppStreamQt) set_package_properties( - AppStreamQt PROPERTIES + AppStreamQt + PROPERTIES DESCRIPTION "Support for AppStream (cache) data" URL "https://github.com/ximion/appstream" PURPOSE "AppStream provides package data" TYPE OPTIONAL ) - if ( AppStreamQt_FOUND ) - add_definitions( -DHAVE_APPSTREAM ) - list( APPEND _extra_libraries AppStreamQt ) - list( APPEND _extra_src ${_packagechooser}/ItemAppStream.cpp ) + if(AppStreamQt_FOUND) + add_definitions(-DHAVE_APPSTREAM) + list(APPEND _extra_libraries AppStreamQt) + list(APPEND _extra_src ${_packagechooser}/ItemAppStream.cpp) endif() endif() -calamares_add_plugin( packagechooserq +calamares_add_plugin(packagechooserq TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt index 940aacdd8..6c923cc5d 100644 --- a/src/modules/partition/CMakeLists.txt +++ b/src/modules/partition/CMakeLists.txt @@ -18,45 +18,49 @@ # modules since the partitions on disk won't match GS, but it can be # useful for debugging simulated installations that don't need to # mount the target filesystems. -option( DEBUG_PARTITION_UNSAFE "Allow unsafe partitioning choices." OFF ) -option( DEBUG_PARTITION_BAIL_OUT "Unsafe partitioning will error out on exec." ON ) -option( DEBUG_PARTITION_SKIP "Don't actually do any partitioning." OFF) +option(DEBUG_PARTITION_UNSAFE "Allow unsafe partitioning choices." OFF) +option( + DEBUG_PARTITION_BAIL_OUT + "Unsafe partitioning will error out on exec." + ON +) +option(DEBUG_PARTITION_SKIP "Don't actually do any partitioning." OFF) # This is very chatty, useful mostly if you don't know what KPMCore offers. -option( DEBUG_FILESYSTEMS "Log all available Filesystems from KPMCore." OFF ) +option(DEBUG_FILESYSTEMS "Log all available Filesystems from KPMCore." OFF) -include_directories( ${CMAKE_SOURCE_DIR} ) # For 3rdparty +include_directories(${CMAKE_SOURCE_DIR}) # For 3rdparty -set( _partition_defs ) -if( DEBUG_PARTITION_UNSAFE ) - if( DEBUG_PARTITION_BAIL_OUT ) - list( APPEND _partition_defs DEBUG_PARTITION_BAIL_OUT ) +set(_partition_defs) +if(DEBUG_PARTITION_UNSAFE) + if(DEBUG_PARTITION_BAIL_OUT) + list(APPEND _partition_defs DEBUG_PARTITION_BAIL_OUT) endif() - list( APPEND _partition_defs DEBUG_PARTITION_UNSAFE ) + list(APPEND _partition_defs DEBUG_PARTITION_UNSAFE) endif() -if ( DEBUG_FILESYSTEMS ) - list( APPEND _partition_defs DEBUG_FILESYSTEMS ) +if(DEBUG_FILESYSTEMS) + list(APPEND _partition_defs DEBUG_FILESYSTEMS) endif() -if( DEBUG_PARTITION_SKIP ) - list( APPEND _partition_defs DEBUG_PARTITION_SKIP ) +if(DEBUG_PARTITION_SKIP) + list(APPEND _partition_defs DEBUG_PARTITION_SKIP) endif() find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE) -include( KPMcoreHelper ) +include(KPMcoreHelper) -find_package( KF5Config CONFIG ) -find_package( KF5I18n CONFIG ) -find_package( KF5WidgetsAddons CONFIG ) +find_package(KF5Config CONFIG) +find_package(KF5I18n CONFIG) +find_package(KF5WidgetsAddons CONFIG) -if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND ) - list( APPEND _partition_defs ${KPMcore_API_DEFINITIONS} ) - include_directories( ${KPMCORE_INCLUDE_DIR} ) - include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) +if(KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND) + list(APPEND _partition_defs ${KPMcore_API_DEFINITIONS}) + include_directories(${KPMCORE_INCLUDE_DIR}) + include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui) - add_subdirectory( tests ) + add_subdirectory(tests) - calamares_add_plugin( partition + calamares_add_plugin(partition TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES @@ -124,10 +128,9 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND SHARED_LIB ) else() - if ( NOT KPMcore_FOUND ) + if(NOT KPMcore_FOUND) calamares_skip_module( "partition (missing suitable KPMcore)" ) else() calamares_skip_module( "partition (missing dependencies for KPMcore)" ) endif() endif() - diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt index da017d96f..5fb2ebacf 100644 --- a/src/modules/partition/tests/CMakeLists.txt +++ b/src/modules/partition/tests/CMakeLists.txt @@ -3,9 +3,9 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -find_package( Qt5 COMPONENTS Gui REQUIRED ) +find_package(Qt5 COMPONENTS Gui REQUIRED) -set( PartitionModule_SOURCE_DIR .. ) +set(PartitionModule_SOURCE_DIR ..) include_directories( ${Qt5Gui_INCLUDE_DIRS} @@ -40,7 +40,6 @@ calamares_add_test( DEFINITIONS ${_partition_defs} ) - calamares_add_test( partitioncreatelayoutstest SOURCES diff --git a/src/modules/plasmalnf/CMakeLists.txt b/src/modules/plasmalnf/CMakeLists.txt index 8ae205aed..60152fc84 100644 --- a/src/modules/plasmalnf/CMakeLists.txt +++ b/src/modules/plasmalnf/CMakeLists.txt @@ -7,28 +7,31 @@ find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE) # Requires a sufficiently recent Plasma framework, but also # needs a runtime support component (which we don't test for). -set( lnf_ver 5.41 ) +set(lnf_ver 5.41) -find_package( KF5Config ${lnf_ver} ) +find_package(KF5Config ${lnf_ver}) set_package_properties( - KF5Config PROPERTIES + KF5Config + PROPERTIES PURPOSE "For finding default Plasma Look-and-Feel" ) -find_package( KF5Plasma ${lnf_ver} ) +find_package(KF5Plasma ${lnf_ver}) set_package_properties( - KF5Plasma PROPERTIES + KF5Plasma + PROPERTIES PURPOSE "For Plasma Look-and-Feel selection" ) -find_package( KF5Package ${lnf_ver} ) +find_package(KF5Package ${lnf_ver}) set_package_properties( - KF5Package PROPERTIES + KF5Package + PROPERTIES PURPOSE "For Plasma Look-and-Feel selection" ) -if ( KF5Plasma_FOUND AND KF5Package_FOUND ) - calamares_add_plugin( plasmalnf +if(KF5Plasma_FOUND AND KF5Package_FOUND) + calamares_add_plugin(plasmalnf TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO COMPILE_DEFINITIONS @@ -48,8 +51,11 @@ if ( KF5Plasma_FOUND AND KF5Package_FOUND ) KF5::Plasma SHARED_LIB ) - if ( KF5Config_FOUND ) - target_compile_definitions(calamares_viewmodule_plasmalnf PRIVATE WITH_KCONFIG) + if(KF5Config_FOUND) + target_compile_definitions( + calamares_viewmodule_plasmalnf + PRIVATE WITH_KCONFIG + ) endif() else() calamares_skip_module( "plasmalnf (missing requirements)" ) diff --git a/src/modules/preservefiles/CMakeLists.txt b/src/modules/preservefiles/CMakeLists.txt index 5df637321..aa8c3060d 100644 --- a/src/modules/preservefiles/CMakeLists.txt +++ b/src/modules/preservefiles/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( preservefiles +calamares_add_plugin(preservefiles TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/removeuser/CMakeLists.txt b/src/modules/removeuser/CMakeLists.txt index 7663b3472..eaaf20157 100644 --- a/src/modules/removeuser/CMakeLists.txt +++ b/src/modules/removeuser/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( removeuser +calamares_add_plugin(removeuser TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/shellprocess/CMakeLists.txt b/src/modules/shellprocess/CMakeLists.txt index ac6630c6d..aa1fadc6c 100644 --- a/src/modules/shellprocess/CMakeLists.txt +++ b/src/modules/shellprocess/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( shellprocess +calamares_add_plugin(shellprocess TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/summary/CMakeLists.txt b/src/modules/summary/CMakeLists.txt index e3c1a381c..16f98ebb4 100644 --- a/src/modules/summary/CMakeLists.txt +++ b/src/modules/summary/CMakeLists.txt @@ -3,8 +3,8 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) -calamares_add_plugin( summary +include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui) +calamares_add_plugin(summary TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/summaryq/CMakeLists.txt b/src/modules/summaryq/CMakeLists.txt index 8aac1bc2f..071c344ef 100644 --- a/src/modules/summaryq/CMakeLists.txt +++ b/src/modules/summaryq/CMakeLists.txt @@ -3,15 +3,15 @@ # SPDX-FileCopyrightText: 2021 Anke Boersma # SPDX-License-Identifier: BSD-2-Clause # -if( NOT WITH_QML ) +if(NOT WITH_QML) calamares_skip_module( "summaryq (QML is not supported in this build)" ) return() endif() -set( _summary ${CMAKE_CURRENT_SOURCE_DIR}/../summary ) -include_directories( ${_summary} ) +set(_summary ${CMAKE_CURRENT_SOURCE_DIR}/../summary) +include_directories(${_summary}) -calamares_add_plugin( summaryq +calamares_add_plugin(summaryq TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/tracking/CMakeLists.txt b/src/modules/tracking/CMakeLists.txt index a878961b0..71ba1a8d7 100644 --- a/src/modules/tracking/CMakeLists.txt +++ b/src/modules/tracking/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( tracking +calamares_add_plugin(tracking TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/umount/CMakeLists.txt b/src/modules/umount/CMakeLists.txt index d72847007..4e05d1b7c 100644 --- a/src/modules/umount/CMakeLists.txt +++ b/src/modules/umount/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2021 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( umount +calamares_add_plugin(umount TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt index 8203ecf08..d01dec572 100644 --- a/src/modules/users/CMakeLists.txt +++ b/src/modules/users/CMakeLists.txt @@ -3,39 +3,41 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus Network ) -find_package( Crypt REQUIRED ) +find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus Network) +find_package(Crypt REQUIRED) # Add optional libraries here -set( USER_EXTRA_LIB ) +set(USER_EXTRA_LIB) -find_package( LibPWQuality ) +find_package(LibPWQuality) set_package_properties( - LibPWQuality PROPERTIES + LibPWQuality + PROPERTIES PURPOSE "Extra checks of password quality" ) -if( LibPWQuality_FOUND ) - list( APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES} ) - include_directories( ${LibPWQuality_INCLUDE_DIRS} ) - add_definitions( -DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY ) +if(LibPWQuality_FOUND) + list(APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES}) + include_directories(${LibPWQuality_INCLUDE_DIRS}) + add_definitions(-DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY) endif() -find_package( ICU COMPONENTS uc i18n ) +find_package(ICU COMPONENTS uc i18n) set_package_properties( - ICU PROPERTIES + ICU + PROPERTIES PURPOSE "Transliteration support for full name to username conversion" ) -if( ICU_FOUND ) - list( APPEND USER_EXTRA_LIB ICU::uc ICU::i18n ) - include_directories( ${ICU_INCLUDE_DIRS} ) - add_definitions( -DHAVE_ICU ) +if(ICU_FOUND) + list(APPEND USER_EXTRA_LIB ICU::uc ICU::i18n) + include_directories(${ICU_INCLUDE_DIRS}) + add_definitions(-DHAVE_ICU) endif() -include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) +include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui) -set( _users_src +set(_users_src # Jobs CreateUserJob.cpp MiscJobs.cpp @@ -59,7 +61,7 @@ calamares_add_library( ${CRYPT_LIBRARIES} ) -calamares_add_plugin( users +calamares_add_plugin(users TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/usersq/CMakeLists.txt b/src/modules/usersq/CMakeLists.txt index 8465b0246..3e58a4a24 100644 --- a/src/modules/usersq/CMakeLists.txt +++ b/src/modules/usersq/CMakeLists.txt @@ -3,45 +3,47 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -if( NOT WITH_QML ) +if(NOT WITH_QML) calamares_skip_module( "usersq (QML is not supported in this build)" ) return() endif() -find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus Network ) -find_package( Crypt REQUIRED ) +find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus Network) +find_package(Crypt REQUIRED) # Add optional libraries here -set( USER_EXTRA_LIB ) +set(USER_EXTRA_LIB) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../users ) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../users) -find_package( LibPWQuality ) +find_package(LibPWQuality) set_package_properties( - LibPWQuality PROPERTIES + LibPWQuality + PROPERTIES PURPOSE "Extra checks of password quality" ) -if( LibPWQuality_FOUND ) - list( APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES} ) - include_directories( ${LibPWQuality_INCLUDE_DIRS} ) - add_definitions( -DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY ) +if(LibPWQuality_FOUND) + list(APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES}) + include_directories(${LibPWQuality_INCLUDE_DIRS}) + add_definitions(-DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY) endif() #needed for ${_users}/Config.cpp -find_package( ICU COMPONENTS uc i18n ) +find_package(ICU COMPONENTS uc i18n) set_package_properties( - ICU PROPERTIES + ICU + PROPERTIES PURPOSE "Transliteration support for full name to username conversion" ) -if( ICU_FOUND ) - list( APPEND USER_EXTRA_LIB ICU::uc ICU::i18n ) - include_directories( ${ICU_INCLUDE_DIRS} ) - add_definitions( -DHAVE_ICU ) +if(ICU_FOUND) + list(APPEND USER_EXTRA_LIB ICU::uc ICU::i18n) + include_directories(${ICU_INCLUDE_DIRS}) + add_definitions(-DHAVE_ICU) endif() -calamares_add_plugin( usersq +calamares_add_plugin(usersq TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/webview/CMakeLists.txt b/src/modules/webview/CMakeLists.txt index 54e1d18b0..34ddb1738 100644 --- a/src/modules/webview/CMakeLists.txt +++ b/src/modules/webview/CMakeLists.txt @@ -3,52 +3,57 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -set( CALA_WEBVIEW_LINK_LIBRARIES "" ) +set(CALA_WEBVIEW_LINK_LIBRARIES "") -option( WEBVIEW_FORCE_WEBKIT "Always build webview with WebKit instead of WebEngine regardless of Qt version." OFF) +option( + WEBVIEW_FORCE_WEBKIT + "Always build webview with WebKit instead of WebEngine regardless of Qt version." + OFF +) -set( _reason "" ) +set(_reason "") -message( STATUS "Found Qt version ${Qt5Core_VERSION}") -if ( Qt5Core_VERSION VERSION_LESS 5.6 OR WEBVIEW_FORCE_WEBKIT ) - message( STATUS " .. using webkit") - find_package( Qt5 ${QT_VERSION} CONFIG COMPONENTS WebKit WebKitWidgets ) +message(STATUS "Found Qt version ${Qt5Core_VERSION}") +if(Qt5Core_VERSION VERSION_LESS 5.6 OR WEBVIEW_FORCE_WEBKIT) + message(STATUS " .. using webkit") + find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS WebKit WebKitWidgets) - if ( Qt5WebKit_FOUND AND Qt5WebKitWidgets_FOUND ) - list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES - ${QT_QTWEBKIT_INCLUDE_DIR} - ) - list( APPEND CALA_WEBVIEW_LINK_LIBRARIES - Qt5::WebKit - Qt5::WebKitWidgets - ) - set( WEBVIEW_WITH_WEBKIT 1 ) + if(Qt5WebKit_FOUND AND Qt5WebKitWidgets_FOUND) + list(APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES ${QT_QTWEBKIT_INCLUDE_DIR}) + list(APPEND CALA_WEBVIEW_LINK_LIBRARIES Qt5::WebKit Qt5::WebKitWidgets) + set(WEBVIEW_WITH_WEBKIT 1) else() - set( _reason "No suitable WebKit" ) + set(_reason "No suitable WebKit") endif() else() - message( STATUS " .. using webengine") - find_package( Qt5 ${QT_VERSION} CONFIG COMPONENTS WebEngine WebEngineWidgets ) + message(STATUS " .. using webengine") + find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS WebEngine WebEngineWidgets) - if ( Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND ) - list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES + if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND) + list( + APPEND + CALA_WEBVIEW_INCLUDE_DIRECTORIES ${QT_QTWEBENGINE_INCLUDE_DIR} ) - list( APPEND CALA_WEBVIEW_LINK_LIBRARIES + list( + APPEND + CALA_WEBVIEW_LINK_LIBRARIES Qt5::WebEngine Qt5::WebEngineWidgets ) - set( WEBVIEW_WITH_WEBENGINE 1 ) + set(WEBVIEW_WITH_WEBENGINE 1) else() - set( _reason "No suitable WebEngine" ) + set(_reason "No suitable WebEngine") endif() endif() -if ( NOT _reason ) - configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/WebViewConfig.h.in - ${CMAKE_CURRENT_BINARY_DIR}/WebViewConfig.h ) +if(NOT _reason) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/WebViewConfig.h.in + ${CMAKE_CURRENT_BINARY_DIR}/WebViewConfig.h + ) - calamares_add_plugin( webview + calamares_add_plugin(webview TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/welcome/CMakeLists.txt b/src/modules/welcome/CMakeLists.txt index 01a89703a..50f30839a 100644 --- a/src/modules/welcome/CMakeLists.txt +++ b/src/modules/welcome/CMakeLists.txt @@ -3,19 +3,19 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network ) +find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network) -find_package( LIBPARTED ) -if ( LIBPARTED_FOUND ) - set( PARTMAN_SRC checker/partman_devices.c ) - set( PARTMAN_LIB ${LIBPARTED_LIBRARY} ) +find_package(LIBPARTED) +if(LIBPARTED_FOUND) + set(PARTMAN_SRC checker/partman_devices.c) + set(PARTMAN_LIB ${LIBPARTED_LIBRARY}) else() - set( PARTMAN_SRC ) - set( PARTMAN_LIB ) - add_definitions( -DWITHOUT_LIBPARTED ) + set(PARTMAN_SRC) + set(PARTMAN_LIB) + add_definitions(-DWITHOUT_LIBPARTED) endif() -calamares_add_plugin( welcome +calamares_add_plugin(welcome TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/welcomeq/CMakeLists.txt b/src/modules/welcomeq/CMakeLists.txt index b6f950dad..7afdf638c 100644 --- a/src/modules/welcomeq/CMakeLists.txt +++ b/src/modules/welcomeq/CMakeLists.txt @@ -7,34 +7,31 @@ # This is a re-write of the welcome module using QML view steps # instead of widgets. -if( NOT WITH_QML ) +if(NOT WITH_QML) calamares_skip_module( "welcomeq (QML is not supported in this build)" ) return() endif() -set( _welcome ${CMAKE_CURRENT_SOURCE_DIR}/../welcome ) +set(_welcome ${CMAKE_CURRENT_SOURCE_DIR}/../welcome) -include_directories( ${_welcome} ) +include_directories(${_welcome}) # DUPLICATED WITH WELCOME MODULE -find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network ) +find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network) -find_package( LIBPARTED ) -if ( LIBPARTED_FOUND ) - set( PARTMAN_SRC ${_welcome}/checker/partman_devices.c ) - set( CHECKER_LINK_LIBRARIES ${LIBPARTED_LIBRARY} ) +find_package(LIBPARTED) +if(LIBPARTED_FOUND) + set(PARTMAN_SRC ${_welcome}/checker/partman_devices.c) + set(CHECKER_LINK_LIBRARIES ${LIBPARTED_LIBRARY}) else() - set( PARTMAN_SRC ) - set( CHECKER_LINK_LIBRARIES ) - add_definitions( -DWITHOUT_LIBPARTED ) + set(PARTMAN_SRC) + set(CHECKER_LINK_LIBRARIES) + add_definitions(-DWITHOUT_LIBPARTED) endif() -set( CHECKER_SOURCES - ${_welcome}/checker/GeneralRequirements.cpp - ${PARTMAN_SRC} -) +set(CHECKER_SOURCES ${_welcome}/checker/GeneralRequirements.cpp ${PARTMAN_SRC}) -calamares_add_plugin( welcomeq +calamares_add_plugin(welcomeq TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES diff --git a/src/modules/zfs/CMakeLists.txt b/src/modules/zfs/CMakeLists.txt index 2feb911d0..07764a360 100644 --- a/src/modules/zfs/CMakeLists.txt +++ b/src/modules/zfs/CMakeLists.txt @@ -3,11 +3,10 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -calamares_add_plugin( zfs +calamares_add_plugin(zfs TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES ZfsJob.cpp SHARED_LIB ) - diff --git a/src/qml/calamares/CMakeLists.txt b/src/qml/calamares/CMakeLists.txt index d74e79ea0..38c46b484 100644 --- a/src/qml/calamares/CMakeLists.txt +++ b/src/qml/calamares/CMakeLists.txt @@ -12,29 +12,46 @@ # Iterate over all the subdirectories which have a qmldir file, copy them over to the build dir, # and install them into share/calamares/qml/calamares -file( GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*" ) -foreach( SUBDIRECTORY ${SUBDIRECTORIES} ) - if( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}" - AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/qmldir" ) - - set( QML_DIR share/calamares/qml ) - set( QML_MODULE_DESTINATION ${QML_DIR}/calamares/${SUBDIRECTORY} ) +file(GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*") +foreach(SUBDIRECTORY ${SUBDIRECTORIES}) + if( + IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}" + AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/qmldir" + ) + set(QML_DIR share/calamares/qml) + set(QML_MODULE_DESTINATION ${QML_DIR}/calamares/${SUBDIRECTORY}) # We glob all the files inside the subdirectory, and we make sure they are # synced with the bindir structure and installed. - file( GLOB QML_MODULE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY} "${SUBDIRECTORY}/*" ) - foreach( QML_MODULE_FILE ${QML_MODULE_FILES} ) - if( NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE} ) - configure_file( ${SUBDIRECTORY}/${QML_MODULE_FILE} ${SUBDIRECTORY}/${QML_MODULE_FILE} COPYONLY ) + file( + GLOB QML_MODULE_FILES + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY} + "${SUBDIRECTORY}/*" + ) + foreach(QML_MODULE_FILE ${QML_MODULE_FILES}) + if( + NOT + IS_DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE} + ) + configure_file( + ${SUBDIRECTORY}/${QML_MODULE_FILE} + ${SUBDIRECTORY}/${QML_MODULE_FILE} + COPYONLY + ) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE} - DESTINATION ${QML_MODULE_DESTINATION} ) + install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE} + DESTINATION ${QML_MODULE_DESTINATION} + ) endif() endforeach() - message( "-- ${BoldYellow}Configured QML module: ${BoldRed}calamares.${SUBDIRECTORY}${ColorReset}" ) - + message( + "-- ${BoldYellow}Configured QML module: ${BoldRed}calamares.${SUBDIRECTORY}${ColorReset}" + ) endif() endforeach() -message( "" ) +message("") From ab27f0aa2e9a311d22d96af535aa29e9842fc768 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 26 Jul 2022 22:10:46 +0200 Subject: [PATCH 20/26] [locale] Repair locale-matching (cherry-pick from *calamares*) - add struct that splits a locale name into parts - be more chatty during matching (cherry picked from commit fd56b5bdc43f88bcaa44d728c3f157726c14b395) (cherry picked from commit 78e216fedbbcdcf4fc40c5a69e075521aa16be80) (cherry picked from commit cfb8ef9f65da630203c6ecd41b6ac13f8ac9c460) (cherry picked from commit eb242168bf4ac80aa920d795a9b0cbec632af8f1) (cherry picked from commit 40527ffd4e6585038ac9cbbe3e75853a7b6fd6e0) (cherry picked from commit 6cbf2d7e3292f4d15af1452117d4ecc6b3786caa) (cherry picked from commit a422fd80d98a5cdbd6db1d9f5405a1bd432bdff9) (cherry picked from commit 35401214499ff6ed98b1dd143883e7b7d4d84130) --- src/modules/locale/CMakeLists.txt | 15 +- src/modules/locale/LocaleConfiguration.cpp | 236 ++++++++++----------- src/modules/locale/LocaleNames.cpp | 90 ++++++++ src/modules/locale/LocaleNames.h | 46 ++++ src/modules/locale/Tests.cpp | 99 ++++++++- 5 files changed, 346 insertions(+), 140 deletions(-) create mode 100644 src/modules/locale/LocaleNames.cpp create mode 100644 src/modules/locale/LocaleNames.h diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt index 6543d7d94..b631f77f7 100644 --- a/src/modules/locale/CMakeLists.txt +++ b/src/modules/locale/CMakeLists.txt @@ -22,6 +22,7 @@ calamares_add_plugin(locale Config.cpp LCLocaleDialog.cpp LocaleConfiguration.cpp + LocaleNames.cpp LocalePage.cpp LocaleViewStep.cpp SetTimezoneJob.cpp @@ -39,15 +40,7 @@ calamares_add_plugin(locale calamares_add_test( localetest - SOURCES - Tests.cpp - Config.cpp - LocaleConfiguration.cpp - SetTimezoneJob.cpp - timezonewidget/TimeZoneImage.cpp - DEFINITIONS - SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images" - DEBUG_TIMEZONES=1 - LIBRARIES - Qt5::Gui + SOURCES Tests.cpp Config.cpp LocaleConfiguration.cpp LocaleNames.cpp SetTimezoneJob.cpp timezonewidget/TimeZoneImage.cpp + DEFINITIONS SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images" DEBUG_TIMEZONES=1 + LIBRARIES Qt5::Gui ) diff --git a/src/modules/locale/LocaleConfiguration.cpp b/src/modules/locale/LocaleConfiguration.cpp index 17953f079..c62b1ab08 100644 --- a/src/modules/locale/LocaleConfiguration.cpp +++ b/src/modules/locale/LocaleConfiguration.cpp @@ -9,11 +9,13 @@ */ #include "LocaleConfiguration.h" +#include "LocaleNames.h" #include "utils/Logger.h" #include #include +#include LocaleConfiguration::LocaleConfiguration() : explicit_lang( false ) @@ -40,6 +42,106 @@ LocaleConfiguration::setLanguage( const QString& localeName ) m_lang = localeName; } +static LocaleNameParts +updateCountry( LocaleNameParts p, const QString& country ) +{ + p.country = country; + return p; +} + +static QPair< int, LocaleNameParts > +identifyBestLanguageMatch( const LocaleNameParts& referenceLocale, QVector< LocaleNameParts >& others ) +{ + std::sort( others.begin(), + others.end(), + [ & ]( const LocaleNameParts& lhs, const LocaleNameParts& rhs ) + { return referenceLocale.similarity( lhs ) < referenceLocale.similarity( rhs ); } ); + // The best match is at the end + LocaleNameParts best_match = others.last(); + if ( !( referenceLocale.similarity( best_match ) > LocaleNameParts::no_match ) ) + { + cDebug() << Logger::SubEntry << "Got no good match for" << referenceLocale.name(); + return { LocaleNameParts::no_match, LocaleNameParts {} }; + } + else + { + cDebug() << Logger::SubEntry << "Got best match for" << referenceLocale.name() << "as" << best_match.name(); + return { referenceLocale.similarity( best_match ), best_match }; + } +} + +/** @brief Returns the QString from @p availableLocales that best-matches. + */ +static LocaleNameParts +identifyBestLanguageMatch( const QString& languageLocale, + const QStringList& availableLocales, + const QString& countryCode ) +{ + const QString default_lang = QStringLiteral( "en_US.UTF-8" ); + + const LocaleNameParts self = LocaleNameParts::fromName( languageLocale ); + if ( self.isValid() && !availableLocales.isEmpty() ) + { + QVector< LocaleNameParts > others; + others.resize( availableLocales.length() ); // Makes default structs + std::transform( availableLocales.begin(), availableLocales.end(), others.begin(), LocaleNameParts::fromName ); + + // Keep track of the best match in various attempts + int best_score = LocaleNameParts::no_match; + LocaleNameParts best_match; + + // Check with the unmodified language setting + { + auto [ score, match ] = identifyBestLanguageMatch( self, others ); + if ( score >= LocaleNameParts::complete_match ) + { + return match; + } + else if ( score > best_score ) + { + best_match = match; + } + } + + + // .. but it might match **better** with the chosen location country Code + { + auto [ score, match ] = identifyBestLanguageMatch( updateCountry( self, countryCode ), others ); + if ( score >= LocaleNameParts::complete_match ) + { + return match; + } + else if ( score > best_score ) + { + best_match = match; + } + } + + // .. or better yet with the QLocale-derived country + { + const QString localeCountry = LocaleNameParts::fromName( QLocale( languageLocale ).name() ).country; + auto [ score, match ] = identifyBestLanguageMatch( updateCountry( self, localeCountry ), others ); + if ( score >= LocaleNameParts::complete_match ) + { + return match; + } + else if ( score > best_score ) + { + best_match = match; + } + } + + if ( best_match.isValid() ) + { + cDebug() << Logger::SubEntry << "Matched best with" << best_match.name(); + return best_match; + } + } + + // Else we have an unrecognized or unsupported locale, all we can do is go with + // en_US.UTF-8 UTF-8. This completes all default language setting guesswork. + return LocaleNameParts::fromName( default_lang ); +} LocaleConfiguration LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale, @@ -47,100 +149,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale, const QString& countryCode ) { cDebug() << "Mapping" << languageLocale << "in" << countryCode << "to locale."; - QString language = languageLocale.split( '_' ).first(); - QString region; - if ( language.contains( '@' ) ) - { - auto r = language.split( '@' ); - language = r.first(); - region = r[ 1 ]; // second() - } - - // Either an exact match, or the whole language part matches - // (followed by . or _ - QStringList linesForLanguage = availableLocales.filter( QRegularExpression( language + "[._]" ) ); - cDebug() << Logger::SubEntry << "Matching" << linesForLanguage; - - QString lang; - if ( linesForLanguage.isEmpty() || languageLocale.isEmpty() ) - { - lang = "en_US.UTF-8"; - } - else if ( linesForLanguage.length() == 1 ) - { - lang = linesForLanguage.first(); - } - - // lang could still be empty if we found multiple locales that satisfy myLanguage - const QString combinedLanguageAndCountry = QString( "%1_%2" ).arg( language ).arg( countryCode ); - if ( lang.isEmpty() && region.isEmpty() ) - { - auto l = linesForLanguage.filter( - QRegularExpression( combinedLanguageAndCountry + "[._]" ) ); // no regional variants - if ( l.length() == 1 ) - { - lang = l.first(); - } - } - - // The following block was inspired by Ubiquity, scripts/localechooser-apply. - // No copyright statement found in file, assuming GPL v2 or later. - /* # In the special cases of Portuguese and Chinese, selecting a - # different location may imply a different dialect of the language. - # In such cases, make LANG reflect the selected language (for - # messages, character types, and collation) and make the other - # locale categories reflect the selected location. */ - if ( language == "pt" || language == "zh" ) - { - cDebug() << Logger::SubEntry << "Special-case Portuguese and Chinese"; - QString proposedLocale = QString( "%1_%2" ).arg( language ).arg( countryCode ); - for ( const QString& line : linesForLanguage ) - { - if ( line.contains( proposedLocale ) ) - { - cDebug() << Logger::SubEntry << "Country-variant" << line << "chosen."; - lang = line; - break; - } - } - } - if ( lang.isEmpty() && !region.isEmpty() ) - { - cDebug() << Logger::SubEntry << "Special-case region @" << region; - QString proposedRegion = QString( "@%1" ).arg( region ); - for ( const QString& line : linesForLanguage ) - { - if ( line.startsWith( language ) && line.contains( proposedRegion ) ) - { - cDebug() << Logger::SubEntry << "Region-variant" << line << "chosen."; - lang = line; - break; - } - } - } - - - // If we found no good way to set a default lang, do a search with the whole - // language locale and pick the first result, if any. - if ( lang.isEmpty() ) - { - for ( const QString& line : availableLocales ) - { - if ( line.startsWith( languageLocale ) ) - { - lang = line; - break; - } - } - } - - // Else we have an unrecognized or unsupported locale, all we can do is go with - // en_US.UTF-8 UTF-8. This completes all default language setting guesswork. - if ( lang.isEmpty() ) - { - lang = "en_US.UTF-8"; - } - + const auto bestLocale = identifyBestLanguageMatch( languageLocale, availableLocales, countryCode ); // The following block was inspired by Ubiquity, scripts/localechooser-apply. // No copyright statement found in file, assuming GPL v2 or later. @@ -188,34 +197,16 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale, // We make a proposed locale based on the UI language and the timezone's country. There is no // guarantee that this will be a valid, supported locale (often it won't). QString lc_formats; - const QString combined = QString( "%1_%2" ).arg( language ).arg( countryCode ); - if ( lang.isEmpty() ) + const QString combined = QString( "%1_%2" ).arg( bestLocale.language ).arg( countryCode ); + if ( availableLocales.contains( bestLocale.language ) ) { - cDebug() << Logger::SubEntry << "Looking up formats for" << combinedLanguageAndCountry; - // We look up if it's a supported locale. - for ( const QString& line : availableLocales ) - { - if ( line.startsWith( combinedLanguageAndCountry ) ) - { - lang = line; - lc_formats = line; - break; - } - } + cDebug() << Logger::SubEntry << "Exact formats match for language tag" << bestLocale.language; + lc_formats = bestLocale.language; } - else + else if ( availableLocales.contains( combined ) ) { - if ( availableLocales.contains( lang ) ) - { - cDebug() << Logger::SubEntry << "Exact formats match for language tag" << lang; - lc_formats = lang; - } - else if ( availableLocales.contains( combinedLanguageAndCountry ) ) - { - cDebug() << Logger::SubEntry << "Exact formats match for combined" << combinedLanguageAndCountry; - lang = combinedLanguageAndCountry; - lc_formats = combinedLanguageAndCountry; - } + cDebug() << Logger::SubEntry << "Exact formats match for combined" << combined; + lc_formats = combined; } if ( lc_formats.isEmpty() ) @@ -303,12 +294,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale, // If we cannot make a good choice for a given country we go with the LANG // setting, which defaults to en_US.UTF-8 UTF-8 if all else fails. - if ( lc_formats.isEmpty() ) - { - lc_formats = lang; - } - - return LocaleConfiguration( lang, lc_formats ); + return LocaleConfiguration( bestLocale.name(), lc_formats.isEmpty() ? bestLocale.name() : lc_formats ); } diff --git a/src/modules/locale/LocaleNames.cpp b/src/modules/locale/LocaleNames.cpp new file mode 100644 index 000000000..401aa4809 --- /dev/null +++ b/src/modules/locale/LocaleNames.cpp @@ -0,0 +1,90 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2022 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "LocaleNames.h" + +#include "utils/Logger.h" + +#include + +LocaleNameParts +LocaleNameParts::fromName( const QString& name ) +{ + auto requireAndRemoveLeadingChar = []( QChar c, QString s ) + { + if ( s.startsWith( c ) ) + { + return s.remove( 0, 1 ); + } + else + { + return QString(); + } + }; + + auto parts = QRegularExpression( "^([a-zA-Z]+)(_[a-zA-Z]+)?(\\.[-a-zA-Z0-9]+)?(@[a-zA-Z]+)?" ).match( name ); + const QString calamaresLanguage = parts.captured( 1 ); + const QString calamaresCountry = requireAndRemoveLeadingChar( '_', parts.captured( 2 ) ); + const QString calamaresEncoding = requireAndRemoveLeadingChar( '.', parts.captured( 3 ) ); + const QString calamaresRegion = requireAndRemoveLeadingChar( '@', parts.captured( 4 ) ); + + if ( calamaresLanguage.isEmpty() ) + { + return LocaleNameParts {}; + } + else + { + return LocaleNameParts { calamaresLanguage, calamaresCountry, calamaresRegion, calamaresEncoding }; + } +} + +QString +LocaleNameParts::name() const +{ + // We don't want QStringView to a temporary; force conversion + auto insertLeadingChar = []( QChar c, QString s ) -> QString + { + if ( s.isEmpty() ) + { + return QString(); + } + else + { + return c + s; + } + }; + + if ( !isValid() ) + { + return QString(); + } + else + { + return language + insertLeadingChar( '_', country ) + insertLeadingChar( '.', encoding ) + + insertLeadingChar( '@', region ); + } +} + + +int +LocaleNameParts::similarity( const LocaleNameParts& other ) const +{ + if ( !isValid() || !other.isValid() ) + { + return 0; + } + if ( language != other.language ) + { + return 0; + } + const auto matched_region = ( region == other.region ? 30 : 0 ); + const auto matched_country = ( country == other.country ? ( country.isEmpty() ? 10 : 20 ) : 0 ); + const auto no_other_country_given = ( ( country != other.country && other.country.isEmpty() ) ? 10 : 0 ); + return 50 + matched_region + matched_country + no_other_country_given; +} diff --git a/src/modules/locale/LocaleNames.h b/src/modules/locale/LocaleNames.h new file mode 100644 index 000000000..8498aa28a --- /dev/null +++ b/src/modules/locale/LocaleNames.h @@ -0,0 +1,46 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2022 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef LOCALENAMES_H +#define LOCALENAMES_H + +#include + +/** @brief parts of a locale-name (e.g. "ar_LY.UTF-8", split apart) + * + * These are created from lines in `/usr/share/i18n/SUPPORTED`, + * which lists all the locales supported by the system (there + * are also other sources of the same). + * + */ +struct LocaleNameParts +{ + QString language; // e.g. "ar" + QString country; // e.g. "LY" (may be empty) + QString region; // e.g. "@valencia" (may be empty) + QString encoding; // e.g. "UTF-8" (may be empty) + + bool isValid() const { return !language.isEmpty(); } + QString name() const; + + static LocaleNameParts fromName( const QString& name ); + + static inline constexpr const int no_match = 0; + static inline constexpr const int complete_match = 100; + + /** @brief Compute similarity-score with another locale-name. + * + * Similarity is driven by language and region, then country. + * Returns a number between 0 (no similarity, e.g. the + * language is different) and 100 (complete match). + */ + int similarity( const LocaleNameParts& other ) const; +}; + +#endif diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp index 69a6a9258..1e1551992 100644 --- a/src/modules/locale/Tests.cpp +++ b/src/modules/locale/Tests.cpp @@ -9,6 +9,7 @@ #include "Config.h" #include "LocaleConfiguration.h" +#include "LocaleNames.h" #include "timezonewidget/TimeZoneImage.h" #include "CalamaresVersion.h" @@ -50,12 +51,16 @@ private Q_SLOTS: void testLanguageDetection(); void testLanguageDetectionValencia(); - // Check realistic language mapping for issue 2008 + // Check that the test-data is available and ok void testKDENeonLanguageData(); + void testLocaleNameParts(); + + // Check realistic language mapping for issue 2008 void testLanguageMappingNeon_data(); void testLanguageMappingNeon(); void testLanguageMappingFreeBSD_data(); void testLanguageMappingFreeBSD(); + void testLanguageSimilarity(); private: QStringList m_KDEneonLocales; @@ -395,6 +400,10 @@ splitTestFileIntoLines( const QString& filename ) void LocaleTests::testKDENeonLanguageData() { + if ( !m_KDEneonLocales.isEmpty() ) + { + return; + } const QStringList neonLocales = splitTestFileIntoLines( QStringLiteral( "locale-data-neon" ) ); cDebug() << "Loaded KDE neon locales test data" << neonLocales.front() << "to" << neonLocales.back(); QCOMPARE( neonLocales.length(), 318 ); // wc -l tells me 318 lines @@ -415,7 +424,7 @@ LocaleTests::MappingData() // Tired of writing QString or QStringLiteral all the time. auto l = []( const char* p ) { return QString::fromUtf8( p ); }; - auto u = [](){ return QString(); }; + auto u = []() { return QString(); }; // The KDEneon columns include the .UTF-8 from the source data // The FreeBSD columns may have u() to indicate "same as KDEneon", @@ -445,12 +454,14 @@ LocaleTests::MappingData() } -void LocaleTests::testLanguageMappingNeon_data() +void +LocaleTests::testLanguageMappingNeon_data() { MappingData(); } -void LocaleTests::testLanguageMappingFreeBSD_data() +void +LocaleTests::testLanguageMappingFreeBSD_data() { MappingData(); } @@ -458,6 +469,7 @@ void LocaleTests::testLanguageMappingFreeBSD_data() void LocaleTests::testLanguageMappingNeon() { + testKDENeonLanguageData(); QVERIFY( !m_KDEneonLocales.isEmpty() ); QFETCH( QString, selectedLanguage ); @@ -474,6 +486,7 @@ LocaleTests::testLanguageMappingNeon() void LocaleTests::testLanguageMappingFreeBSD() { + testKDENeonLanguageData(); QVERIFY( !m_FreeBSDLocales.isEmpty() ); QFETCH( QString, selectedLanguage ); @@ -488,6 +501,84 @@ LocaleTests::testLanguageMappingFreeBSD() QCOMPARE( bsd.language(), expected ); } +void +LocaleTests::testLocaleNameParts() +{ + testKDENeonLanguageData(); + QVERIFY( !m_FreeBSDLocales.isEmpty() ); + QVERIFY( !m_KDEneonLocales.isEmpty() ); + + // Example constant locales + { + auto c_parts = LocaleNameParts::fromName( QStringLiteral( "nl_NL.UTF-8" ) ); + QCOMPARE( c_parts.language, QStringLiteral( "nl" ) ); + QCOMPARE( c_parts.country, QStringLiteral( "NL" ) ); + QCOMPARE( c_parts.encoding, QStringLiteral( "UTF-8" ) ); + QVERIFY( c_parts.region.isEmpty() ); + } + { + auto c_parts = LocaleNameParts::fromName( QStringLiteral( "C.UTF-8" ) ); + QCOMPARE( c_parts.language, QStringLiteral( "C" ) ); + QVERIFY( c_parts.country.isEmpty() ); + QCOMPARE( c_parts.encoding, QStringLiteral( "UTF-8" ) ); + QVERIFY( c_parts.region.isEmpty() ); + } + + // Check all the loaded test locales + for ( const auto& s : m_FreeBSDLocales ) + { + auto parts = LocaleNameParts::fromName( s ); + QVERIFY( parts.isValid() ); + QCOMPARE( parts.name(), s ); + } + + for ( const auto& s : m_KDEneonLocales ) + { + auto parts = LocaleNameParts::fromName( s ); + QVERIFY( parts.isValid() ); + QCOMPARE( parts.name(), s ); + } +} + +void +LocaleTests::testLanguageSimilarity() +{ + // Empty + { + QCOMPARE( LocaleNameParts().similarity( LocaleNameParts() ), 0 ); + } + // Some simple Dutch situations + { + auto nl_parts = LocaleNameParts::fromName( QStringLiteral( "nl_NL.UTF-8" ) ); + auto be_parts = LocaleNameParts::fromName( QStringLiteral( "nl_BE.UTF-8" ) ); + auto nl_short_parts = LocaleNameParts::fromName( QStringLiteral( "nl" ) ); + QCOMPARE( nl_parts.similarity( nl_parts ), 100 ); + QCOMPARE( nl_parts.similarity( LocaleNameParts() ), 0 ); + QCOMPARE( nl_parts.similarity( be_parts ), 80 ); // Language + (empty) region match + QCOMPARE( nl_parts.similarity( nl_short_parts ), 90 ); + } + + // Everything matches itself + { + if ( m_KDEneonLocales.isEmpty() ) + { + testKDENeonLanguageData(); + } + QVERIFY( !m_FreeBSDLocales.isEmpty() ); + QVERIFY( !m_KDEneonLocales.isEmpty() ); + for ( const auto& l : m_KDEneonLocales ) + { + auto locale_name = LocaleNameParts::fromName( l ); + auto self_similarity = locale_name.similarity( locale_name ); + if ( self_similarity != 100 ) + { + cDebug() << "Locale" << l << "is unusual."; + } + QCOMPARE( self_similarity, 100 ); + } + } +} + #include "utils/moc-warnings.h" From 3f5d656c61188876538824656d379432a755d591 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Aug 2022 17:16:12 +0200 Subject: [PATCH 21/26] [localeq] Needs more shared sources from locale (cherry picked from commit a988298a653295ef674061e81ca2d49d982d0a9f) --- src/modules/localeq/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/localeq/CMakeLists.txt b/src/modules/localeq/CMakeLists.txt index 85b3721d9..d9741e506 100644 --- a/src/modules/localeq/CMakeLists.txt +++ b/src/modules/localeq/CMakeLists.txt @@ -41,8 +41,9 @@ calamares_add_plugin(localeq EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES LocaleQmlViewStep.cpp - ${_locale}/LocaleConfiguration.cpp ${_locale}/Config.cpp + ${_locale}/LocaleConfiguration.cpp + ${_locale}/LocaleNames.cpp ${_locale}/SetTimezoneJob.cpp RESOURCES localeq.qrc From befa6778232bd060c737e3148e8a2953a496c070 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Aug 2022 15:36:53 +0200 Subject: [PATCH 22/26] CI: import abi-checking script (with a suitable 3.2 base version) --- ci/abicheck.sh | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100755 ci/abicheck.sh diff --git a/ci/abicheck.sh b/ci/abicheck.sh new file mode 100755 index 000000000..31e50e699 --- /dev/null +++ b/ci/abicheck.sh @@ -0,0 +1,74 @@ +#! /bin/sh +# +# SPDX-FileCopyrightText: 2021 Adriaan de Groot +# SPDX-License-Identifier: BSD-2-Clause +# +# Compares the ABI of the current working tree with the ABI +# from a base-version. Uses libabigail for the actual comparison. +# +# To use the tool, just run the script. It will build Calamares at +# least once, maybe twice (if it needs the base-version ABI information +# and hasn't cached it). + +# The base version can be a tag or git-hash; it will be checked-out +# in a worktree. +# +# Note that the hash here now is 3.2.60, which is sort-of-the +# start of LTS releases. We try to keep ABI compatibility from +# there on out. +BASE_VERSION=b11ee3abc583e571e588fd00afb99d1a528373e6 + +### Build a tree and cache the ABI info into ci/ +# +# +do_build() { + LABEL=$1 + SOURCE_DIR=$2 + + BUILD_DIR=build-abi-$LABEL + rm -rf $BUILD_DIR + mkdir $BUILD_DIR + + if ( cd $BUILD_DIR && cmake $SOURCE_DIR -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-Og -g -gdwarf" -DCMAKE_C_FLAGS="-Og -g -gdwarf" && make -j12 ) > /dev/null 2>&1 + then + ls -1 $BUILD_DIR/libcalamares*.so.* + # Copy the un-versioned files; .so is a symlink to the just-built one + for lib in $BUILD_DIR/libcalamares*.so + do + cp $lib ci/`basename $lib`.$LABEL + done + else + echo "! failed to build $LABEL" + exit 1 + fi +} + +### Build current tree and get ABI info +# +# +do_build current `pwd -P` + +### Build ABI base version +# +# We cache this to save on some build time, if we are chasing a +# single branch from an unchanging base version. +# +if test -f ci/libcalamares.so.$BASE_VERSION +then + # The ABI version is cached, so we're good + : +else + git worktree remove --force tree-abi-$BASE_VERSION + git worktree add tree-abi-$BASE_VERSION $BASE_VERSION > /dev/null 2>&1 || { echo "! could not create worktree for $BASE_VERSION" ; exit 1 ; } + do_build $BASE_VERSION $( cd tree-abi-$BASE_VERSION && pwd -P ) +fi + +### Compare & Report +# +# abidiff compares the Application Binary Interfaces (ABI) of two +# shared libraries in ELF format. It emits a meaningful report describing +# the differences between the two ABIs. +# +# -l prints only the leaf changes, leaving out explanations of why. +# +abidiff -l ci/libcalamares.so.$BASE_VERSION ci/libcalamares.so.current From c8eec51c5a3a984fb2884aab623d8fc806426c40 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 24 Aug 2022 21:31:53 +0200 Subject: [PATCH 23/26] Changes: pre-release housekeeping --- CHANGES-3.2 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index d15a22d68..acb774e81 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -10,7 +10,7 @@ website will have to do for older versions. > Note that the 3.2 series is now in LTS / bug-fix-only mode. -# 3.2.61 (unreleased) # +# 3.2.61 (2022-08-24) # This is the second community-maintainence release of Calamares 3.2. It corrects a handful of bugs foud in the stable release. There @@ -28,10 +28,15 @@ This release contains contributions from (alphabetically by first name): ## Modules ## - *bootloader* Python code slipped in that was incompatible with the minimum required Python version. #2033 (Thanks Adriaan) + - *locale* fixes a large regression introduced with 3.2.60, where + the location picked for many locales was not the same as in 3.2.59, + and generally peculiar (e.g. picking "English" led to "en_AG" which + is nice if you are in Bermuda, but not expected in the rest of the + world). #2008 - *luksopenswaphookcfg* Remove duplicate options. #1659 (Thanks Anke) - # 3.2.60 (2022-06-19) # +# 3.2.60 (2022-06-19) # This is the first community-maintainence release of Calamares 3.2. Somewhat ironically, all the commits in the branch come from From d7254f6f82c781406edd767a8e79f9d6e5563479 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Aug 2022 16:04:24 +0200 Subject: [PATCH 24/26] [displaymanager] Skip greetd test if there's no toml toml is needed for greetd, but that shouldn't stop the tests from running. (cherry picked from commit 065647154e814de45c40f3974ec406943cb9b2c3) --- src/modules/displaymanager/tests/test-dm-greetd.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/modules/displaymanager/tests/test-dm-greetd.py b/src/modules/displaymanager/tests/test-dm-greetd.py index d41c2dadf..e2682afc7 100644 --- a/src/modules/displaymanager/tests/test-dm-greetd.py +++ b/src/modules/displaymanager/tests/test-dm-greetd.py @@ -17,6 +17,14 @@ try: except FileNotFoundError as e: pass +try: + import toml +except ImportError: + # This is a failure of the test-environment. + import sys + print("Can't find module toml.", file=sys.stderr) + sys.exit(0) + # Specific DM test d = main.DMgreetd("/tmp") d.set_autologin("d", True, default_desktop_environment) From 55bea246609351d36bbc93d77fa872c0475a30ff Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Aug 2022 02:02:54 +0200 Subject: [PATCH 25/26] [locale] Repair tests - prefers language default country (ca_ES over ca_AD) - prefers non-empty country match (cherry picked from commit fb3112b75dd9eb548ce3c4e0eb925fcf62bb12dc) --- src/modules/locale/Tests.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp index 1e1551992..bdb0d5ebe 100644 --- a/src/modules/locale/Tests.cpp +++ b/src/modules/locale/Tests.cpp @@ -310,10 +310,10 @@ LocaleTests::testLanguageDetection_data() QTest::newRow( "english (US)" ) << QStringLiteral( "en" ) << QStringLiteral( "US" ) << QStringLiteral( "en_US.UTF-8" ); QTest::newRow( "english (CA)" ) << QStringLiteral( "en" ) << QStringLiteral( "CA" ) - << QStringLiteral( "en" ); // because it's first in the list + << QStringLiteral( "en_US.UTF-8" ); QTest::newRow( "english (GB)" ) << QStringLiteral( "en" ) << QStringLiteral( "GB" ) << QStringLiteral( "en_GB.UTF-8" ); - QTest::newRow( "english (NL)" ) << QStringLiteral( "en" ) << QStringLiteral( "NL" ) << QStringLiteral( "en" ); + QTest::newRow( "english (NL)" ) << QStringLiteral( "en" ) << QStringLiteral( "NL" ) << QStringLiteral( "en_US.UTF-8" ); QTest::newRow( "portuguese (PT)" ) << QStringLiteral( "pt" ) << QStringLiteral( "PT" ) << QStringLiteral( "pt_PT.UTF-8" ); @@ -323,11 +323,11 @@ LocaleTests::testLanguageDetection_data() << QStringLiteral( "pt_BR.UTF-8" ); QTest::newRow( "catalan ()" ) << QStringLiteral( "ca" ) << QStringLiteral( "" ) - << QStringLiteral( "ca_AD.UTF-8" ); // no country given? Matches first + << QStringLiteral( "ca_ES.UTF-8" ); // no country given? Matches QLocale-default QTest::newRow( "catalan (ES)" ) << QStringLiteral( "ca" ) << QStringLiteral( "ES" ) << QStringLiteral( "ca_ES.UTF-8" ); QTest::newRow( "catalan (NL)" ) << QStringLiteral( "ca" ) << QStringLiteral( "NL" ) - << QStringLiteral( "ca_AD.UTF-8" ); + << QStringLiteral( "ca_ES.UTF-8" ); QTest::newRow( "catalan (@valencia)" ) << QStringLiteral( "ca@valencia" ) << QStringLiteral( "ES" ) << QStringLiteral( "ca_ES@valencia" ); // Prefers regional variant QTest::newRow( "catalan (@valencia_NL)" ) From 7f3d3746e16fd12f7e87e5ebe7acc30fd692711b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Aug 2022 02:06:06 +0200 Subject: [PATCH 26/26] [locale] Repair tests - Esperanto now doesn't quite self-match because it has no country - sr prefers RS as country over ME (cherry picked from commit 9a4d992778355d115a1d3cbd6b3ef7d61626e4b0) --- src/modules/locale/Tests.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp index bdb0d5ebe..3b3c45881 100644 --- a/src/modules/locale/Tests.cpp +++ b/src/modules/locale/Tests.cpp @@ -374,7 +374,7 @@ LocaleTests::testLanguageDetectionValencia() { auto r = LocaleConfiguration::fromLanguageAndLocation( QStringLiteral( "sr" ), availableLocales, QStringLiteral( "NL" ) ); - QCOMPARE( r.language(), "sr_ME" ); // Because that one is first in the list + QCOMPARE( r.language(), "sr_RS" ); // Because that one is first in the list } { auto r = LocaleConfiguration::fromLanguageAndLocation( @@ -573,6 +573,10 @@ LocaleTests::testLanguageSimilarity() if ( self_similarity != 100 ) { cDebug() << "Locale" << l << "is unusual."; + if ( l == QStringLiteral( "eo" ) ) + { + QEXPECT_FAIL( "", "Esperanto has no country to match", Continue ); + } } QCOMPARE( self_similarity, 100 ); }