diff --git a/CHANGES b/CHANGES index 88d8c7350..0f8963ae1 100644 --- a/CHANGES +++ b/CHANGES @@ -3,7 +3,7 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. -# 3.2.3 (unreleased) # +# 3.2.4 (unreleased) # This release contains contributions from (alphabetically by first name): - Alf Gaida @@ -45,6 +45,30 @@ This release contains contributions from (alphabetically by first name): for all operations, not just during install (keep in mind that these run as three separate shells, though). + +# 3.2.3 (2019-01-09) # + +This release contains contributions from (alphabetically by first name): + - aliveafter1000 + +## Core ## + +There are no core changes in this release. + +## Modules ## + + * *partition* Fixed bug where, during detection of existing systems, the + existing system partitions may be mounted and then files deleted. + This is a **limited** version of the patch from aliveafter1000 + that will be in 3.2.4, which tries harder to mount filesystems + read-only and unmodifiable. + * *locale* It was possible to set the installer and system language + (e.g. to German) while the global storage value for *locale* + remained set to English. Then no localization packages are installed + (see feature `${LOCALE}` in `packages.conf`). Reported downstream + in Netrunner. + + # 3.2.2 (2018-09-04) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index 47054bd8c..ec3439976 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ set( CALAMARES_DESCRIPTION_SUMMARY set( CALAMARES_VERSION_MAJOR 3 ) set( CALAMARES_VERSION_MINOR 2 ) -set( CALAMARES_VERSION_PATCH 3 ) +set( CALAMARES_VERSION_PATCH 4 ) set( CALAMARES_VERSION_RC 1 ) @@ -113,7 +113,7 @@ set( _tx_bad eo kk kn uz ur mk lo gu fr_CH fa be ) ### Required versions # # See DEPENDENCIES section below. -set( QT_VERSION 5.7.0 ) +set( QT_VERSION 5.10.0 ) set( YAMLCPP_VERSION 0.5.1 ) set( ECM_VERSION 5.18 ) set( PYTHONLIBS_VERSION 3.3 ) @@ -152,7 +152,7 @@ set( CMAKE_C_STANDARD_REQUIRED ON ) # location database. # - DEBUG_FILESYSTEMS does extra logging and checking when looking at # partition configuration. Lists known KPMCore FS types. -# +# # The flags listed here are enabled in Debug builds. By default, none # are **actually** listed, because they're for such specific scenarios. set( _enable_debug_flags diff --git a/calamares.desktop b/calamares.desktop index c29b9b345..79180c475 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -13,7 +13,10 @@ StartupNotify=true Categories=Qt;System; X-AppStream-Ignore=true -Name[ar]=نظام التثبيت +Name[ar]=تثبيت النظام +Icon[ar]=كالامارس +GenericName[ar]=مثبت النظام +Comment[ar]=كالامارس - مثبت النظام Name[be]=Усталяваць сістэму Icon[be]=calamares GenericName[be]=Усталёўшчык сістэмы @@ -51,6 +54,9 @@ Icon[et]=calamares GenericName[et]=Süsteemipaigaldaja Comment[et]=Calamares — süsteemipaigaldaja Name[eu]=Sistema instalatu +Icon[eu]=calamares +GenericName[eu]=Sistema instalatzailea +Comment[eu]=Calamares - sistema instalatzailea Name[es_PR]=Instalar el sistema Name[fr]=Installer le système Icon[fr]=calamares diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts index 32ed6c1d7..f50c7d51f 100644 --- a/lang/calamares_ar.ts +++ b/lang/calamares_ar.ts @@ -73,7 +73,7 @@ Modules - الوحدا + الوحدات @@ -2834,7 +2834,7 @@ Output: %1 support - 1% الدعم + %1 الدعم diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts index 811d034b3..8b888a599 100644 --- a/lang/calamares_eu.ts +++ b/lang/calamares_eu.ts @@ -4,17 +4,17 @@ The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + Sistema honen <strong>abio ingurunea</strong>. <br><br>X86 zaharrek <strong>BIOS</strong> euskarria bakarrik daukate. <br>Sistema modernoek normalean <strong>EFI</strong> darabilte, baina BIOS bezala ere agertu daitezke konpatibilitate moduan hasiz gero. This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + Sistema hau <strong>EFI</strong> abio inguruneaz hasi da.<br><br>EFI ingurunetik abiaraztea konfiguratzeko instalatzaile honek abio kargatzaile aplikazioa ezarri behar du, <strong>GRUB </strong> bezalakoa edo <strong>systemd-abioa</strong> <strong>EFI sistema partizio</strong> batean. Hau automatikoa da, zuk partizioak eskuz egitea aukeratzen ez baduzu, eta kasu horretan zuk sortu edo aukeratu beharko duzu zure kabuz. This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. - + Sistema hau <strong>BIOS</strong> abio inguruneaz hasi da.<br><br>BIOS ingurunetik abiaraztea konfiguratzeko instalatzaile honek abio kargatzaile aplikazioa ezarri behar du, <strong>GRUB</strong> bezalakoa, partizioaren hasieran edo <strong>Master Boot Record</strong> deritzonean partizio taularen hasieratik gertu (hobetsia). Hau automatikoa da, zuk partizioak eskuz egitea aukeratzen ez baduzu eta kasu horretan zuk sortu edo aukeratu beharko duzu zure kabuz. @@ -22,7 +22,7 @@ Master Boot Record of %1 - + %1-(e)n Master Boot Record @@ -50,7 +50,7 @@ Blank Page - + Orri zuria @@ -63,7 +63,7 @@ GlobalStorage - + Biltegiratze globala @@ -84,12 +84,12 @@ none - + Ezer ez Interface: - + Interfasea: @@ -99,7 +99,7 @@ Debug information - + Arazte informazioa @@ -146,7 +146,7 @@ Working directory %1 for python job %2 is not readable. - + %1 lanerako direktorioa %2 python lanak ezin du irakurri. @@ -161,7 +161,7 @@ Boost.Python error in job "%1". - + Boost.Python errorea "%1" lanean. @@ -192,22 +192,22 @@ Calamares Initialization Failed - + Calamares instalazioak huts egin du %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + %1 ezin da instalatu. Calamares ez da gai konfiguratutako modulu guztiak kargatzeko. Arazao hau banaketak Calamares erabiltzen duen eragatik da. <br/>The following modules could not be loaded: - + <br/> Ondorengo moduluak ezin izan dira kargatu: &Install - + &Instalatu @@ -218,7 +218,8 @@ Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + Ziur uneko instalazio prozesua bertan behera utzi nahi duzula? +Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. @@ -243,7 +244,7 @@ The installer will quit and all changes will be lost. The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + %1 instalatzailea zure diskoan aldaketak egitera doa %2 instalatzeko.<br/><strong>Ezingo dituzu desegin aldaketa hauek.</strong> @@ -281,7 +282,7 @@ The installer will quit and all changes will be lost. Unknown exception type - + Salbuespen-mota ezezaguna @@ -309,7 +310,7 @@ The installer will quit and all changes will be lost. Show debug information - + Erakutsi arazte informazioa @@ -317,17 +318,17 @@ The installer will quit and all changes will be lost. This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + Konputagailu honek ez dauzka gutxieneko eskakizunak %1 instalatzeko. <br/>Instalazioak ezin du jarraitu. <a href="#details">Xehetasunak...</a> This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + Konputagailu honek ez du betetzen gomendatutako zenbait eskakizun %1 instalatzeko. <br/>Instalazioak jarraitu ahal du, baina zenbait ezaugarri desgaituko dira. This program will ask you some questions and set up %2 on your computer. - + Konputagailuan %2 ezartzeko programa honek hainbat galdera egingo dizkizu. @@ -365,12 +366,12 @@ The installer will quit and all changes will be lost. %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + %1 %2MB-ra txikituko da, eta %3MB-tako partizio berri bat sortuko da %4-(e)rako. Select storage de&vice: - + Aukeratu &biltegiratze-gailua: @@ -388,7 +389,7 @@ The installer will quit and all changes will be lost. <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + <strong>Aukeratu partizioa txikitzeko eta gero arrastatu azpiko-barra tamaina aldatzeko</strong> @@ -413,7 +414,7 @@ The installer will quit and all changes will be lost. This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + Biltegiratze-gailuak badirudi ez duela sistema eragilerik. Zer egin nahiko zenuke? <br/>Zure aukerak berrikusteko eta berresteko aukera izango duzu aldaketak gauzatu aurretik biltegiratze-gailuan @@ -421,12 +422,12 @@ The installer will quit and all changes will be lost. <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + <strong>Diskoa ezabatu</strong><br/>Honek orain dauden datu guztiak <font color="red">ezbatuko</font> ditu biltegiratze-gailutik. This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + Biltegiratze-gailuak %1 dauka. Zer egin nahiko zenuke? <br/>Zure aukerak berrikusteko eta berresteko aukera izango duzu aldaketak gauzatu aurretik biltegiratze-gailuan @@ -434,7 +435,7 @@ The installer will quit and all changes will be lost. <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - + <strong>Instalatu alboan</strong><br/>Instalatzaileak partizioa txikituko du lekua egiteko %1-(r)i. @@ -442,7 +443,7 @@ The installer will quit and all changes will be lost. <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + <strong>Ordeztu partizioa</strong><br/>ordezkatu partizioa %1-(e)kin. @@ -533,7 +534,7 @@ The installer will quit and all changes will be lost. MiB - + MiB @@ -558,12 +559,12 @@ The installer will quit and all changes will be lost. LVM LV name - + LVM LV izena Flags: - + Banderak: @@ -573,12 +574,12 @@ The installer will quit and all changes will be lost. Si&ze: - Ta&maina: + &Tamaina: En&crypt - + En%kriptatu @@ -598,7 +599,7 @@ The installer will quit and all changes will be lost. Mountpoint already in use. Please select another one. - + Muntatze-puntua erabiltzen. Mesedez aukeratu beste bat. @@ -606,22 +607,22 @@ The installer will quit and all changes will be lost. Create new %2MB partition on %4 (%3) with file system %1. - + Sortu %2MB partizioa %4n (%3) %1 fitxategi sistemaz. Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Sortu <strong>%2MB</strong> partizioa <strong>%4</strong>n (%3) <strong>%1</strong> fitxategi sistemaz. Creating new %1 partition on %2. - + %1 partizioa berria sortzen %2n. The installer failed to create partition on disk '%1'. - + Huts egin du instalatzaileak '%1' diskoan partizioa sortzen. @@ -634,17 +635,17 @@ The installer will quit and all changes will be lost. Creating a new partition table will delete all existing data on the disk. - + Partizio taula berria sortzean diskoan dauden datu guztiak ezabatuko dira. What kind of partition table do you want to create? - + Zein motatako partizio taula sortu nahi duzu? Master Boot Record (MBR) - + Master Boot Record (MBR) @@ -657,22 +658,22 @@ The installer will quit and all changes will be lost. Create new %1 partition table on %2. - + Sortu %1 partizio taula berria %2n. Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). - + Sortu <strong>%1</strong> partizio taula berria <strong>%2</strong>n (%3). Creating new %1 partition table on %2. - + %1 partizio taula berria %2n sortzen. The installer failed to create a partition table on %1. - + Huts egin du instalatzaileak '%1' diskoan partizioa taula sortzen. @@ -685,7 +686,7 @@ The installer will quit and all changes will be lost. Create user <strong>%1</strong>. - + Sortu <strong>%1</strong> erabiltzailea @@ -718,22 +719,22 @@ The installer will quit and all changes will be lost. Create new volume group named %1. - + Sortu bolumen talde berria %1 izenaz. Create new volume group named <strong>%1</strong>. - + Sortu bolumen talde berria<strong> %1</strong> izenaz. Creating new volume group named %1. - + Bolumen talde berria sortzen %1 izenaz. The installer failed to create a volume group named '%1'. - + Huts egin du instalatzaileak '%1' izeneko bolumen taldea sortzen. @@ -742,17 +743,17 @@ The installer will quit and all changes will be lost. Deactivate volume group named %1. - + Desaktibatu %1 izeneko bolumen taldea. Deactivate volume group named <strong>%1</strong>. - + Desaktibatu <strong>%1</strong> izeneko bolumen taldea. The installer failed to deactivate a volume group named %1. - + Huts egin du instalatzaileak '%1' izeneko bolumen taldea desaktibatzen. @@ -765,7 +766,7 @@ The installer will quit and all changes will be lost. Delete partition <strong>%1</strong>. - + Ezabatu <strong>%1</strong> partizioa. @@ -775,7 +776,7 @@ The installer will quit and all changes will be lost. The installer failed to delete partition %1. - + Huts egin du instalatzaileak %1 partizioa ezabatzen. @@ -788,7 +789,7 @@ The installer will quit and all changes will be lost. This device has a <strong>%1</strong> partition table. - + Gailuak <strong>%1</strong> partizio taula dauka. @@ -821,7 +822,7 @@ The installer will quit and all changes will be lost. %1 - (%2) - + %1 - (%2) @@ -839,7 +840,7 @@ The installer will quit and all changes will be lost. Failed to open %1 - + Huts egin du %1 irekitzean @@ -847,7 +848,7 @@ The installer will quit and all changes will be lost. Dummy C++ Job - + Dummy C++ lana @@ -855,7 +856,7 @@ The installer will quit and all changes will be lost. Edit Existing Partition - + Editatu badagoen partizioa @@ -865,7 +866,7 @@ The installer will quit and all changes will be lost. &Keep - + M&antendu @@ -890,7 +891,7 @@ The installer will quit and all changes will be lost. MiB - + MiB @@ -900,12 +901,12 @@ The installer will quit and all changes will be lost. Flags: - + Banderak: Mountpoint already in use. Please select another one. - + Muntatze-puntua erabiltzen. Mesedez aukeratu beste bat. @@ -918,22 +919,22 @@ The installer will quit and all changes will be lost. En&crypt system - + Sistema en%kriptatua Passphrase - + Pasahitza Confirm passphrase - + Berretsi pasahitza Please enter the same passphrase in both boxes. - + Mesedez sartu pasahitz berdina bi kutxatan. @@ -946,7 +947,7 @@ The installer will quit and all changes will be lost. Install %1 on <strong>new</strong> %2 system partition. - + Instalatu %1 sistemako %2 partizio <strong>berrian</strong>. @@ -966,7 +967,7 @@ The installer will quit and all changes will be lost. Install boot loader on <strong>%1</strong>. - + Instalatu abio kargatzailea <strong>%1</strong>-(e)n. @@ -1012,12 +1013,12 @@ The installer will quit and all changes will be lost. Installation Complete - + Instalazioa amaitua The installation of %1 is complete. - + %1 instalazioa amaitu da. @@ -1025,7 +1026,7 @@ The installer will quit and all changes will be lost. Format partition %1 (file system: %2, size: %3 MB) on %4. - + Formateatu %1 partizioa %4-(e)n (fitxategi sistema: %2, tamaina: %3 MB). @@ -1035,12 +1036,12 @@ The installer will quit and all changes will be lost. Formatting partition %1 with file system %2. - + %1 partizioa formateatzen %2 sistemaz. The installer failed to format partition %1 on disk '%2'. - + Huts egin du instalatzaileak %1 partizioa sortzen '%2' diskoan. @@ -1053,7 +1054,7 @@ The installer will quit and all changes will be lost. Please install KDE Konsole and try again! - + Mesedez instalatu KDE kontsola eta saiatu berriz! @@ -1066,7 +1067,7 @@ The installer will quit and all changes will be lost. Script - + Script @@ -1074,12 +1075,12 @@ The installer will quit and all changes will be lost. Set keyboard model to %1.<br/> - + Ezarri teklatu mota %1ra.<br/> Set keyboard layout to %1/%2. - + Ezarri teklatu diseinua %1%2ra. @@ -1110,7 +1111,7 @@ The installer will quit and all changes will be lost. &OK - + &Ados @@ -1180,7 +1181,7 @@ The installer will quit and all changes will be lost. <a href="%1">view license agreement</a> - + <a href="%1">Ikusi lizentzia kontratua</a> @@ -1196,12 +1197,12 @@ The installer will quit and all changes will be lost. 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. @@ -1222,7 +1223,7 @@ The installer will quit and all changes will be lost. Set timezone to %1/%2.<br/> - + Ordu-zonaldea %1%2-ra ezarri da.<br/> @@ -1254,7 +1255,7 @@ The installer will quit and all changes will be lost. Description - + Deskribapena @@ -1272,7 +1273,7 @@ The installer will quit and all changes will be lost. Package selection - + Pakete aukeraketa @@ -1280,17 +1281,17 @@ The installer will quit and all changes will be lost. Password is too short - + Pasahitza laburregia da Password is too long - + Pasahitza luzeegia da Password is too weak - + Pasahitza ahulegia da @@ -1305,12 +1306,12 @@ The installer will quit and all changes will be lost. The password is the same as the old one - + Pasahitza aurreko zahar baten berdina da The password is a palindrome - + Pasahitza palindromoa da @@ -1320,7 +1321,7 @@ The installer will quit and all changes will be lost. The password is too similar to the old one - + Pasahitza aurreko zahar baten oso antzerakoa da @@ -1340,52 +1341,52 @@ The installer will quit and all changes will be lost. The password contains less than %1 digits - + Pasahitzak %1 baino zenbaki gutxiago ditu The password contains too few digits - + Pasahitzak zenbaki gutxiegi ditu The password contains less than %1 uppercase letters - + Pasahitzak %1 baino maiuskula gutxiago ditu The password contains too few uppercase letters - + Pasahitzak maiuskula gutxiegi ditu The password contains less than %1 lowercase letters - + Pasahitzak %1 baino minuskula gutxiago ditu The password contains too few lowercase letters - + Pasahitzak minuskula gutxiegi ditu The password contains less than %1 non-alphanumeric characters - + Pasahitzak alfabetokoak ez diren %1 baino karaktere gutxiago ditu The password contains too few non-alphanumeric characters - + Pasahitzak alfabetokoak ez diren karaktere gutxiegi ditu The password is shorter than %1 characters - + Pasahitza %1 karaktere baino motzagoa da. The password is too short - + Pasahitza motzegia da @@ -1551,24 +1552,24 @@ The installer will quit and all changes will be lost. What name do you want to use to log in? - + Zein izen erabili nahi duzu saioa hastean? font-weight: normal - + Letra-mota zabalera: normala <small>If more than one person will use this computer, you can set up multiple accounts after installation.</small> - + <small>Ordenagailu hau pertsona batek baino gehiagok erabiltzen badu, instalazio ondoren hainbat kontu ezarri zenitzake.</small> Choose a password to keep your account safe. - + Aukeratu pasahitza zure kontua babesteko. @@ -1583,7 +1584,7 @@ The installer will quit and all changes will be lost. <small>This name will be used if you make the computer visible to others on a network.</small> - + <small>Izen hau erakutsiko da sarean zure ordenagailua besteei erakustean.</small> @@ -1603,7 +1604,7 @@ The installer will quit and all changes will be lost. <small>Enter the same password twice, so that it can be checked for typing errors.</small> - + <small>Sartu pasahitza birritan, honela tekleatze erroreak egiaztatzeko.</small> @@ -1611,32 +1612,32 @@ The installer will quit and all changes will be lost. Root - + Root Home - + Home Boot - + Boot EFI system - + EFI sistema Swap - + Swap New partition for %1 - + Partizio berri %1(e)ntzat @@ -1646,7 +1647,7 @@ The installer will quit and all changes will be lost. %1 %2 - + %1 %2 @@ -1694,12 +1695,12 @@ The installer will quit and all changes will be lost. Storage de&vice: - + Biltegiratze-gailua: &Revert All Changes - + Atze&ra bota aldaketa guztiak: @@ -1905,7 +1906,7 @@ The installer will quit and all changes will be lost. Saving files for later ... - + Fitxategiak geroko gordetzen... @@ -1931,32 +1932,34 @@ There was no output from the command. Output: - + +Irteera: + External command crashed. - + Kanpo-komandoak huts egin du. Command <i>%1</i> crashed. - + <i>%1</i> komandoak huts egin du. External command failed to start. - + Ezin izan da %1 kanpo-komandoa abiarazi. Command <i>%1</i> failed to start. - + Ezin izan da <i>%1</i> komandoa abiarazi. Internal error when starting command. - + Barne-akatsa komandoa abiarazterakoan. @@ -1966,7 +1969,7 @@ Output: External command failed to finish. - + Kanpo-komandoa ez da bukatu. @@ -1976,7 +1979,7 @@ Output: External command finished with errors. - + Kanpo-komandoak akatsekin bukatu da. @@ -1989,7 +1992,7 @@ Output: Default Keyboard Model - + Teklatu mota lehenetsia @@ -2000,22 +2003,22 @@ Output: unknown - + Ezezaguna extended - + Hedatua unformatted - + Formatugabea swap - + swap @@ -2167,12 +2170,12 @@ Output: The installer is not running with administrator rights. - + Instalatzailea ez dabil exekutatzen administrari eskubideekin. The screen is too small to display the installer. - + Pantaila txikiegia da instalatzailea erakusteko. @@ -2185,7 +2188,7 @@ Output: Invalid configuration - + Konfigurazio baliogabea @@ -2251,7 +2254,7 @@ Output: Resize partition %1. - + Tamaina aldatu %1 partizioari. @@ -2293,12 +2296,12 @@ Output: Scanning storage devices... - + Biltegiratze-gailuak eskaneatzen... Partitioning - + Partizioa(k) egiten @@ -2469,7 +2472,7 @@ Output: Cannot disable root account. - + Ezin da desgaitu root kontua. @@ -2517,7 +2520,7 @@ Output: Cannot set timezone, - + Ezin da ezarri ordu-zonaldea @@ -2747,12 +2750,12 @@ Output: MiB - + MiB Total Size: - + Tamaina guztira: @@ -2760,22 +2763,22 @@ Output: --- - + --- Used Size: - + Erabilitako tamaina: Total Sectors: - + Sektoreak guztira: Quantity of LVs: - + LV kopurua: diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts index 0be907a6c..47a596df1 100644 --- a/lang/calamares_hu.ts +++ b/lang/calamares_hu.ts @@ -192,17 +192,17 @@ Calamares Initialization Failed - + A Calamares előkészítése meghiúsult %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + A(z) %1 nem telepíthető. A Calamares nem tudta betölteni a konfigurált modulokat. Ez a probléma abból fakad, ahogy a disztribúció a Calamarest használja. <br/>The following modules could not be loaded: - + <br/>A következő modulok nem tölthetőek be: @@ -509,12 +509,12 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. - + A parancs a gazdakörnyezetben fut, és ismernie kell a gyökér útvonalát, de nincs rootMountPoint megadva. The command needs to know the user's name, but no username is defined. - + A parancsnak tudnia kell a felhasználónevet, de az nincs megadva. @@ -522,7 +522,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Contextual Processes Job - + Környezetfüggő folyamatok feladat @@ -560,7 +560,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l LVM LV name - + LVM LV név @@ -720,22 +720,22 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Create new volume group named %1. - + Új kötetcsoport létrehozása: %1. Create new volume group named <strong>%1</strong>. - + Új kötetcsoport létrehozása: <strong>%1</strong>. Creating new volume group named %1. - + Új kötetcsoport létrehozása: %1. The installer failed to create a volume group named '%1'. - + A telepítő nem tudta létrehozni a kötetcsoportot: „%1”. @@ -744,17 +744,17 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Deactivate volume group named %1. - + A kötetcsoport deaktiválása: %1. Deactivate volume group named <strong>%1</strong>. - + Kötetcsoport deaktiválása: <strong>%1</strong>. The installer failed to deactivate a volume group named %1. - + A telepítőnek nem sikerült deaktiválnia a kötetcsoportot: %1. @@ -823,7 +823,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l %1 - (%2) - + %1 – (%2) @@ -986,7 +986,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l <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>Ha ez be van jelölve, akkor a rendszer azonnal újraindul, ha a <span style=" font-style:italic;">Kész</span>-re kattint, vagy bezárja a telepítőt.</p></body></html> @@ -1292,232 +1292,232 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Password is too weak - + A jelszó túl gyenge Memory allocation error when setting '%1' - + Memóriafoglalási hiba a(z) „%1” beállításakor Memory allocation error - + Memóriafoglalási hiba The password is the same as the old one - + A jelszó ugyanaz, mint a régi The password is a palindrome - + A jelszó egy palindrom The password differs with case changes only - + A jelszó csak kis- és nagybetűben tér el The password is too similar to the old one - + A jelszó túlságosan hasonlít a régire The password contains the user name in some form - + A jelszó tartalmazza felhasználónevet valamilyen formában The password contains words from the real name of the user in some form - + A jelszó tartalmazza a felhasználó valódi nevét valamilyen formában The password contains forbidden words in some form - + A jelszó tiltott szavakat tartalmaz valamilyen formában The password contains less than %1 digits - + A jelszó kevesebb mint %1 számjegyet tartalmaz The password contains too few digits - + A jelszó túl kevés számjegyet tartalmaz The password contains less than %1 uppercase letters - + A jelszó kevesebb mint %1 nagybetűt tartalmaz The password contains too few uppercase letters - + A jelszó túl kevés nagybetűt tartalmaz The password contains less than %1 lowercase letters - + A jelszó kevesebb mint %1 kisbetűt tartalmaz The password contains too few lowercase letters - + A jelszó túl kevés kisbetűt tartalmaz The password contains less than %1 non-alphanumeric characters - + A jelszó kevesebb mint %1 nem alfanumerikus karaktert tartalmaz The password contains too few non-alphanumeric characters - + A jelszó túl kevés nem alfanumerikus karaktert tartalmaz The password is shorter than %1 characters - + A jelszó rövidebb mint %1 karakter The password is too short - + A jelszó túl rövid The password is just rotated old one - + A jelszó egy újra felhasznált régi jelszó The password contains less than %1 character classes - + A jelszó kevesebb mint %1 karaktert tartalmaz The password does not contain enough character classes - + A jelszó nem tartalmaz elég karakterosztályt The password contains more than %1 same characters consecutively - + A jelszó több mint %1 egyező karaktert tartalmaz egymás után The password contains too many same characters consecutively - + A jelszó túl sok egyező karaktert tartalmaz egymás után The password contains more than %1 characters of the same class consecutively - + A jelszó több mint %1 karaktert tartalmaz ugyanabból a karakterosztályból egymás után The password contains too many characters of the same class consecutively - + A jelszó túl sok karaktert tartalmaz ugyanabból a karakterosztályból egymás után The password contains monotonic sequence longer than %1 characters - + A jelszó %1 karakternél hosszabb monoton sorozatot tartalmaz The password contains too long of a monotonic character sequence - + A jelszó túl hosszú monoton karaktersorozatot tartalmaz No password supplied - + Nincs jelszó megadva Cannot obtain random numbers from the RNG device - + Nem nyerhetőek ki véletlenszámok az RNG eszközből Password generation failed - required entropy too low for settings - + A jelszó előállítás meghiúsult – a szükséges entrópia túl alacsony a beállításokhoz The password fails the dictionary check - %1 - + A jelszó megbukott a szótárellenőrzésen – %1 The password fails the dictionary check - + A jelszó megbukott a szótárellenőrzésen Unknown setting - %1 - + Ismeretlen beállítás – %1 Unknown setting - + Ismeretlen beállítás Bad integer value of setting - %1 - + Hibás egész érték a beállításnál – %1 Bad integer value - + Hibás egész érték Setting %1 is not of integer type - + A(z) %1 beállítás nem egész típusú Setting is not of integer type - + A beállítás nem egész típusú Setting %1 is not of string type - + A(z) %1 beállítás nem karakterlánc típusú Setting is not of string type - + A beállítás nem karakterlánc típusú Opening the configuration file failed - + A konfigurációs fájl megnyitása meghiúsult The configuration file is malformed - + A konfigurációs fájl rosszul formázott Fatal failure - + Végzetes hiba Unknown error - + Ismeretlen hiba @@ -1711,7 +1711,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Cre&ate - + &Létrehozás @@ -1726,27 +1726,27 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l New Volume Group - + Új kötetcsoport Resize Volume Group - + Kötetcsoport átméretezése Deactivate Volume Group - + Kötetcsoport deaktiválása Remove Volume Group - + Kötetcsoport eltávolítása I&nstall boot loader on: - + Rendszerbetöltő &telepítése ide: @@ -1756,12 +1756,12 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Can not create new partition - + Nem hozható létre új partíció 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(z) %1 lemezen lévő partíciós táblában már %2 elsődleges partíció van, és több nem adható hozzá. Helyette távolítson el egy elsődleges partíciót, és adjon hozzá egy kiterjesztett partíciót. @@ -1867,13 +1867,13 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Plasma Look-and-Feel Job - + Plasma kinézet feladat Could not select KDE Plasma Look-and-Feel package - + A KDE Plasma kinézeti csomag nem válaszható ki @@ -1891,7 +1891,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l 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. - + Válasszon egy kinézetet a KDE Plasma asztali környezethez. Ki is hagyhatja ezt a lépést, és beállíthatja a kinézetet, ha a telepítés elkészült. A kinézetválasztóra kattintva élő előnézetet kaphat a kinézetről. @@ -1899,7 +1899,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Look-and-Feel - + Kinézet @@ -1907,17 +1907,17 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Saving files for later ... - + Fájlok mentése későbbre … No files configured to save for later. - + Nincsenek fájlok beállítva elmentésre későbbre Not all of the configured files could be preserved. - + Nem az összes beállított fájl örízhető meg. @@ -1926,14 +1926,17 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l There was no output from the command. - + +A parancsnak nem volt kimenete. Output: - + +Kimenet: + @@ -1948,17 +1951,17 @@ Output: External command failed to start. - + A külső parancsot nem sikerült elindítani. Command <i>%1</i> failed to start. - + A(z) <i>%1</i> parancsot nem sikerült elindítani. Internal error when starting command. - + Belső hiba a parancs végrehajtásakor. @@ -1973,17 +1976,17 @@ Output: Command <i>%1</i> failed to finish in %2 seconds. - + A(z) <i>%1</i> parancsot nem sikerült befejezni %2 másodperc alatt. External command finished with errors. - + A külső parancs hibával fejeződött be. Command <i>%1</i> finished with exit code %2. - + A(z) <i>%1</i> parancs hibakóddal lépett ki: %2. @@ -2031,17 +2034,17 @@ Output: Remove Volume Group named %1. - + A kötetcsoport eltávolítása: %1. Remove Volume Group named <strong>%1</strong>. - + Kötetcsoport eltávolítása: <strong>%1</strong>. The installer failed to remove a volume group named '%1'. - + A telepítő nem tudta eltávolítani a kötetcsoportot: „%1”. @@ -2182,29 +2185,29 @@ Output: Resize Filesystem Job - + Fájlrendszer átméretezési feladat Invalid configuration - + Érvénytelen konfiguráció The file-system resize job has an invalid configuration and will not run. - + A fájlrendszer átméretezési feladat konfigurációja érvénytelen, és nem fog futni. KPMCore not Available - + A KPMCore nem érhető el Calamares cannot start KPMCore for the file-system resize job. - + A Calamares nem tudja elindítani a KPMCore-t a fájlrendszer átméretezési feladathoz. @@ -2213,39 +2216,39 @@ Output: Resize Failed - + Az átméretezés meghiúsult The filesystem %1 could not be found in this system, and cannot be resized. - + A(z) %1 fájlrendszer nem található a rendszeren, és nem méretezhető át. The device %1 could not be found in this system, and cannot be resized. - + A(z) %1 eszköz nem található a rendszeren, és nem méretezhető át. The filesystem %1 cannot be resized. - + A(z) %1 fájlrendszer nem méretezhető át. The device %1 cannot be resized. - + A(z) %1 eszköz nem méretezhető át. The filesystem %1 must be resized, but cannot. - + A(z) %1 fájlrendszert át kell méretezni, de nem lehet. The device %1 must be resized, but cannot - + A(z) %1 eszközt át kell méretezni, de nem lehet @@ -2277,17 +2280,17 @@ Output: Resize volume group named %1 from %2 to %3. - + A(z) %1 kötet átméretezése ekkoráról: %2, ekkorára: %3. Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>. - + A(z) <strong>%1</strong> kötet átméretezése ekkoráról: <strong>%2</strong>, ekkorára: <strong>%3</strong>. The installer failed to resize a volume group named '%1'. - + A telepítő nem tudta átméretezni a kötetcsoportot: „%1”. @@ -2532,7 +2535,7 @@ Output: Shell Processes Job - + Parancssori folyamatok feladat @@ -2541,7 +2544,7 @@ Output: %L1 / %L2 slide counter, %1 of %2 (numeric) - + %L1 / %L2 @@ -2725,27 +2728,27 @@ Calamares hiba %1. VolumeGroupDialog - + Kötetcsoport párbeszédablak List of Physical Volumes - + Fizikai kötetek listája Volume Group Name: - + Kötetcsoport neve: Volume Group Type: - + Kötetcsoport típusa: Physical Extent Size: - + Fizikai kiterjedés mérete: @@ -2755,7 +2758,7 @@ Calamares hiba %1. Total Size: - + Teljes méret: @@ -2763,22 +2766,22 @@ Calamares hiba %1. --- - + --- Used Size: - + Használt méret: Total Sectors: - + Szektorok összesen: Quantity of LVs: - + Logkai kötetek száma: @@ -2831,7 +2834,7 @@ Calamares hiba %1. <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Köszönet: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg és a <a href="https://www.transifex.com/calamares/calamares/">Calamares fordítócsapat</a>.<br/><br/>A <a href="https://calamares.io/">Calamares</a> fejlesztését a <br/><a href="http://www.blue-systems.com/">Blue Systems</a> támogatja. diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index 673f3e4bb..1fb982825 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -14,7 +14,7 @@ This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. - このシステムは <strong>BIOS</strong> ブート環境で起動しました。<br><br> BIOS環境からの起動について設定するためには、パーティションの開始位置あるいはパーティションテーブルの開始位置の近く(推奨)にある<strong>マスターブートレコード</strong>に <strong>GRUB</strong> のようなブートローダーをインストールしなければなりません。手動によるパーティショニングを選択する場合はユーザー自身で設定しなければなりません。そうでない場合は、この操作は自動的に行われます。 + このシステムは <strong>BIOS</strong> ブート環境で起動しました。<br><br> BIOS環境からの起動について設定するためには、パーティションの開始位置あるいはパーティションテーブルの開始位置の近く (推奨) にある<strong>マスターブートレコード</strong>に <strong>GRUB</strong> のようなブートローダーをインストールしなければなりません。手動によるパーティショニングを選択する場合はユーザー自身で設定しなければなりません。そうでない場合は、この操作は自動的に行われます。 @@ -169,19 +169,19 @@ &Back - 戻る（&B） + 戻る (&B) &Next - 次へ（&N） + 次へ (&N) &Cancel - 中止（&C） + 中止 (&C) @@ -197,7 +197,7 @@ %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - %1 はインストールできません。Calamares は全てのモジュールをロードすることをできませんでした。これは、Calamares のこのディストリビューションでの使用法による問題です。 + %1 はインストールできません。Calamares はすべてのモジュールをロードすることをできませんでした。これは、Calamares のこのディストリビューションでの使用法による問題です。 @@ -207,7 +207,7 @@ &Install - インストール（&I） + インストール (&I) @@ -224,17 +224,17 @@ The installer will quit and all changes will be lost. &Yes - はい（&Y） + はい (&Y) &No - いいえ（&N） + いいえ (&N) &Close - 閉じる（&C） + 閉じる (&C) @@ -249,17 +249,17 @@ The installer will quit and all changes will be lost. &Install now - 今すぐインストール（&I） + 今すぐインストール (&I) Go &back - 戻る（&B） + 戻る (&B) &Done - 実行（&D） + 実行 (&D) @@ -371,7 +371,7 @@ The installer will quit and all changes will be lost. Select storage de&vice: - ストレージデバイスを選択（&V）: + ストレージデバイスを選択 (&V): @@ -539,22 +539,22 @@ The installer will quit and all changes will be lost. Partition &Type: - パーティションの種類（&T）: + パーティションの種類 (&T): &Primary - プライマリ（&P） + プライマリ (&P) E&xtended - 拡張（&x） + 拡張 (&X) Fi&le System: - ファイルシステム （&L）: + ファイルシステム (&L): @@ -569,17 +569,17 @@ The installer will quit and all changes will be lost. &Mount Point: - マウントポイント（&M） + マウントポイント (&M) Si&ze: - サイズ（&Z） + サイズ (&Z) En&crypt - 暗号化（&C） + 暗号化 (&C) @@ -650,7 +650,7 @@ The installer will quit and all changes will be lost. GUID Partition Table (GPT) - GUID パーティションテーブル(GPT) + GUID パーティションテーブル (GPT) @@ -784,7 +784,7 @@ The installer will quit and all changes will be lost. The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred. - 選択したストレージデバイスにおける<strong> パーティションテーブル </strong> の種類。 <br><br> パーティションテーブルの種類を変更する唯一の方法は、パーティションテーブルを消去し、最初から再作成を行うことですが、この操作はストレージ上の全てのデータを破壊します。 <br> このインストーラーは、他の種類へ明示的に変更ししない限り、現在のパーティションテーブルが保持されます。よくわからない場合、最近のシステムではGPTが推奨されます。 + 選択したストレージデバイスにおける<strong> パーティションテーブル </strong> の種類。 <br><br> パーティションテーブルの種類を変更する唯一の方法は、パーティションテーブルを消去し、最初から再作成を行うことですが、この操作はストレージ上のすべてのデータを破壊します。 <br> このインストーラーは、他の種類へ明示的に変更ししない限り、現在のパーティションテーブルが保持されます。よくわからない場合、最近のシステムではGPTが推奨されます。 @@ -866,7 +866,7 @@ The installer will quit and all changes will be lost. &Keep - 保持（&K） + 保持 (&K) @@ -881,12 +881,12 @@ The installer will quit and all changes will be lost. &Mount Point: - マウントポイント（&M） + マウントポイント (&M) Si&ze: - サイズ（&Z）: + サイズ (&Z): @@ -896,7 +896,7 @@ The installer will quit and all changes will be lost. Fi&le System: - ファイルシステム（&L） + ファイルシステム (&L) @@ -919,7 +919,7 @@ The installer will quit and all changes will be lost. En&crypt system - システムを暗号化（&C） + システムを暗号化 (&C) @@ -990,7 +990,7 @@ The installer will quit and all changes will be lost. &Restart now - 今すぐ再起動（&R） + 今すぐ再起動 (&R) @@ -1107,12 +1107,12 @@ The installer will quit and all changes will be lost. &Cancel - 中止（&C） + 中止 (&C) &OK - 了解（&O） + 了解 (&O) @@ -1219,7 +1219,7 @@ The installer will quit and all changes will be lost. &Change... - 変更（&C）... + 変更 (&C)... @@ -1696,7 +1696,7 @@ The installer will quit and all changes will be lost. Storage de&vice: - ストレージデバイス （&V）: + ストレージデバイス (&V): @@ -1706,22 +1706,22 @@ The installer will quit and all changes will be lost. New Partition &Table - 新しいパーティションテーブル（&T） + 新しいパーティションテーブル (&T) Cre&ate - 作成（&a） + 作成 (&A) &Edit - 編集（&E） + 編集 (&E) &Delete - 削除（&D） + 削除 (&D) @@ -1859,7 +1859,7 @@ The installer will quit and all changes will be lost. A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - ブートパーティションは暗号化されたルートパーティションとともにセットアップされましたが、ブートパーティションは暗号化されていません。<br/><br/>重要なシステムファイルが暗号化されていないパーティションに残されているため、このようなセットアップは安全上の懸念があります。<br/>セットアップを続行することはできますが、後でシステムの起動中にファイルシステムが解除されるおそれがあります。<br/>ブートパーティションを暗号化させるには、前の画面に戻って、再度パーティションを作成し、パーティション作成ウィンドウ内で<strong>Encrypt</strong>（暗号化）を選択してください。 + ブートパーティションは暗号化されたルートパーティションとともにセットアップされましたが、ブートパーティションは暗号化されていません。<br/><br/>重要なシステムファイルが暗号化されていないパーティションに残されているため、このようなセットアップは安全上の懸念があります。<br/>セットアップを続行することはできますが、後でシステムの起動中にファイルシステムが解除されるおそれがあります。<br/>ブートパーティションを暗号化させるには、前の画面に戻って、再度パーティションを作成し、パーティション作成ウィンドウ内で<strong>Encrypt</strong> (暗号化) を選択してください。 @@ -1917,7 +1917,7 @@ The installer will quit and all changes will be lost. Not all of the configured files could be preserved. - 設定ファイルは全て保護されるわけではありません。 + 設定ファイルはすべて保護されるわけではありません。 @@ -2654,7 +2654,7 @@ Output: Install tracking helps %1 to see how many users they have, what hardware they install %1 to and (with the last two options below), get continuous information about preferred applications. To see what will be sent, please click the help icon next to each area. - インストールトラッキングは %1 にとって、どれだけのユーザーが どのハードに %1 をインストールするのか(下記の2つのオプション)、どのようなアプリケーションが好まれているのかについての情報を把握することの補助を行っています。 どのような情報が送信されているのか確認したい場合は、以下の各エリアのヘルプのアイコンをクリックして下さい。 + インストールトラッキングは %1 にとって、どれだけのユーザーが どのハードに %1 をインストールするのか (下記の2つのオプション)、どのようなアプリケーションが好まれているのかについての情報を把握することの補助を行っています。 どのような情報が送信されているのか確認したい場合は、以下の各エリアのヘルプのアイコンをクリックして下さい。 @@ -2757,7 +2757,7 @@ Output: Total Size: - 全てのサイズ: + すべてのサイズ: @@ -2775,7 +2775,7 @@ Output: Total Sectors: - 全てのセクター: + すべてのセクター: @@ -2793,17 +2793,17 @@ Output: &Language: - 言語（&L）: + 言語 (&L): &Release notes - リリースノート（&R） + リリースノート (&R) &Known issues - 既知の問題（&K） + 既知の問題 (&K) @@ -2813,7 +2813,7 @@ Output: &About - 説明（&A） + 説明 (&A) diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts index a1b95a0da..b6002eb4a 100644 --- a/lang/calamares_mk.ts +++ b/lang/calamares_mk.ts @@ -50,7 +50,7 @@ Blank Page - + Празна Страна @@ -94,7 +94,7 @@ Tools - + Алатки @@ -107,7 +107,7 @@ Install - + Инсталирај @@ -115,7 +115,7 @@ Done - + Готово @@ -263,12 +263,12 @@ The installer will quit and all changes will be lost. The installation is complete. Close the installer. - + Инсталацијата е готова. Исклучете го инсталерот. Error - + Грешка diff --git a/lang/python/ar/LC_MESSAGES/python.mo b/lang/python/ar/LC_MESSAGES/python.mo index 05f9dbc33..43e3ffa7e 100644 Binary files a/lang/python/ar/LC_MESSAGES/python.mo and b/lang/python/ar/LC_MESSAGES/python.mo differ diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po index 9c1c7bda4..0250a0690 100644 --- a/lang/python/ar/LC_MESSAGES/python.po +++ b/lang/python/ar/LC_MESSAGES/python.po @@ -3,6 +3,9 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +# Translators: +# Abubakaragoub Y , 2018 +# #, fuzzy msgid "" msgstr "" @@ -10,6 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-05 11:34-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" +"Last-Translator: Abubakaragoub Y , 2018\n" "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,43 +23,43 @@ msgstr "" #: src/modules/displaymanager/main.py:380 msgid "Cannot write KDM configuration file" -msgstr "" +msgstr "فشلت كتابة ملف ضبط KDM." #: src/modules/displaymanager/main.py:381 msgid "KDM config file {!s} does not exist" -msgstr "" +msgstr "ملف ضبط KDM {!s} غير موجود" #: src/modules/displaymanager/main.py:442 msgid "Cannot write LXDM configuration file" -msgstr "" +msgstr "فشلت كتابة ملف ضبط LXDM." #: src/modules/displaymanager/main.py:443 msgid "LXDM config file {!s} does not exist" -msgstr "" +msgstr "ملف ضبط LXDM {!s} غير موجود" #: src/modules/displaymanager/main.py:517 msgid "Cannot write LightDM configuration file" -msgstr "" +msgstr "فشلت كتابة ملف ضبط LightDM." #: src/modules/displaymanager/main.py:518 msgid "LightDM config file {!s} does not exist" -msgstr "" +msgstr "ملف ضبط LightDM {!s} غير موجود" #: src/modules/displaymanager/main.py:592 msgid "Cannot configure LightDM" -msgstr "" +msgstr "فشل ضبط LightDM" #: src/modules/displaymanager/main.py:593 msgid "No LightDM greeter installed." -msgstr "" +msgstr "لم يتم تصيب LightDM" #: src/modules/displaymanager/main.py:624 msgid "Cannot write SLIM configuration file" -msgstr "" +msgstr "فشلت كتابة ملف ضبط SLIM." #: src/modules/displaymanager/main.py:625 msgid "SLIM config file {!s} does not exist" -msgstr "" +msgstr "ملف ضبط SLIM {!s} غير موجود" #: src/modules/displaymanager/main.py:740 #: src/modules/displaymanager/main.py:772 @@ -78,28 +82,28 @@ msgstr "" #: src/modules/umount/main.py:40 msgid "Unmount file systems." -msgstr "" +msgstr "الغاء تحميل ملف النظام" #: src/modules/dummypython/main.py:44 msgid "Dummy python job." -msgstr "" +msgstr "عملية بايثون دميه" #: src/modules/dummypython/main.py:97 msgid "Dummy python step {}" -msgstr "" +msgstr "عملية دميه خطوه بايثون {}" #: src/modules/machineid/main.py:35 msgid "Generate machine-id." -msgstr "" +msgstr "توليد معرف الجهاز" #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" -msgstr "" +msgstr "جاري تحميل الحزم (%(count)d/%(total)d)" #: src/modules/packages/main.py:64 src/modules/packages/main.py:74 msgid "Install packages." -msgstr "" +msgstr "تثبيت الحزم" #: src/modules/packages/main.py:67 #, python-format diff --git a/lang/python/ast/LC_MESSAGES/python.mo b/lang/python/ast/LC_MESSAGES/python.mo index 213918efd..666f07af3 100644 Binary files a/lang/python/ast/LC_MESSAGES/python.mo and b/lang/python/ast/LC_MESSAGES/python.mo differ diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po index 815095319..786839323 100644 --- a/lang/python/ast/LC_MESSAGES/python.po +++ b/lang/python/ast/LC_MESSAGES/python.po @@ -3,9 +3,6 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# enolp , 2017 -# #, fuzzy msgid "" msgstr "" @@ -13,7 +10,6 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-05 11:34-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: enolp , 2017\n" "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,15 +82,15 @@ msgstr "" #: src/modules/dummypython/main.py:44 msgid "Dummy python job." -msgstr "Trabayu maniquín de python." +msgstr "" #: src/modules/dummypython/main.py:97 msgid "Dummy python step {}" -msgstr "Pasu maniquín de python {}" +msgstr "" #: src/modules/machineid/main.py:35 msgid "Generate machine-id." -msgstr "Xenerar machine-id." +msgstr "" #: src/modules/packages/main.py:62 #, python-format diff --git a/lang/python/de/LC_MESSAGES/python.mo b/lang/python/de/LC_MESSAGES/python.mo index 9d613105a..62936843d 100644 Binary files a/lang/python/de/LC_MESSAGES/python.mo and b/lang/python/de/LC_MESSAGES/python.mo differ diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po index 8b6cf8b24..7328d957c 100644 --- a/lang/python/de/LC_MESSAGES/python.po +++ b/lang/python/de/LC_MESSAGES/python.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Dirk Hein , 2017 +# Adriaan de Groot , 2017 # Christian Spaan, 2018 # Andreas Eitel, 2018 # @@ -115,11 +115,11 @@ msgstr "Pakete installieren " msgid "Installing one package." msgid_plural "Installing %(num)d packages." msgstr[0] "Installiere ein Paket" -msgstr[1] "Installiere %(num)dPakete." +msgstr[1] "Installiere %(num)d Pakete." #: src/modules/packages/main.py:70 #, python-format msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "Entferne ein Paket" -msgstr[1] "Entferne %(num)dPakete." +msgstr[1] "Entferne %(num)d Pakete." diff --git a/lang/python/eu/LC_MESSAGES/python.mo b/lang/python/eu/LC_MESSAGES/python.mo index 5c9c13e0c..5abe8e5b2 100644 Binary files a/lang/python/eu/LC_MESSAGES/python.mo and b/lang/python/eu/LC_MESSAGES/python.mo differ diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po index 57a4e1b84..dc5751b86 100644 --- a/lang/python/eu/LC_MESSAGES/python.po +++ b/lang/python/eu/LC_MESSAGES/python.po @@ -3,6 +3,9 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +# Translators: +# Ander Elortondo, 2019 +# #, fuzzy msgid "" msgstr "" @@ -10,6 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-05 11:34-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" +"Last-Translator: Ander Elortondo, 2019\n" "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,98 +23,102 @@ msgstr "" #: src/modules/displaymanager/main.py:380 msgid "Cannot write KDM configuration file" -msgstr "" +msgstr "Ezin da KDM konfigurazio fitxategia idatzi" #: src/modules/displaymanager/main.py:381 msgid "KDM config file {!s} does not exist" -msgstr "" +msgstr "KDM konfigurazio fitxategia {!s} ez da existitzen" #: src/modules/displaymanager/main.py:442 msgid "Cannot write LXDM configuration file" -msgstr "" +msgstr "Ezin da LXDM konfigurazio fitxategia idatzi" #: src/modules/displaymanager/main.py:443 msgid "LXDM config file {!s} does not exist" -msgstr "" +msgstr "LXDM konfigurazio fitxategia {!s} ez da existitzen" #: src/modules/displaymanager/main.py:517 msgid "Cannot write LightDM configuration file" -msgstr "" +msgstr "Ezin da LightDM konfigurazio fitxategia idatzi" #: src/modules/displaymanager/main.py:518 msgid "LightDM config file {!s} does not exist" -msgstr "" +msgstr "LightDM konfigurazio fitxategia {!s} ez da existitzen" #: src/modules/displaymanager/main.py:592 msgid "Cannot configure LightDM" -msgstr "" +msgstr "Ezin da LightDM konfiguratu" #: src/modules/displaymanager/main.py:593 msgid "No LightDM greeter installed." -msgstr "" +msgstr "Ez dago LightDM harrera instalatua." #: src/modules/displaymanager/main.py:624 msgid "Cannot write SLIM configuration file" -msgstr "" +msgstr "Ezin da SLIM konfigurazio fitxategia idatzi" #: src/modules/displaymanager/main.py:625 msgid "SLIM config file {!s} does not exist" -msgstr "" +msgstr "SLIM konfigurazio fitxategia {!s} ez da existitzen" #: src/modules/displaymanager/main.py:740 #: src/modules/displaymanager/main.py:772 msgid "No display managers selected for the displaymanager module." msgstr "" +"Ez da pantaila kudeatzailerik aukeratu pantaila-kudeatzaile modulurako." #: src/modules/displaymanager/main.py:741 msgid "" "The displaymanagers list is empty or undefined in bothglobalstorage and " "displaymanager.conf." msgstr "" +"Pantaila-kudeatzaile-zerrenda hutsik dago edo definitzeke bothglobalstorage " +"eta displaymanager.conf" #: src/modules/displaymanager/main.py:773 msgid "The list is empty after checking for installed display managers." msgstr "" +"Zerrenda hutsik dago instalatutako pantaila-kudeatzaileak egiaztatu ondoren." #: src/modules/displaymanager/main.py:821 msgid "Display manager configuration was incomplete" -msgstr "" +msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe" #: src/modules/umount/main.py:40 msgid "Unmount file systems." -msgstr "" +msgstr "Fitxategi sistemak desmuntatu." #: src/modules/dummypython/main.py:44 msgid "Dummy python job." -msgstr "" +msgstr "Dummy python lana." #: src/modules/dummypython/main.py:97 msgid "Dummy python step {}" -msgstr "" +msgstr "Dummy python urratsa {}" #: src/modules/machineid/main.py:35 msgid "Generate machine-id." -msgstr "" +msgstr "Sortu makina-id." #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" -msgstr "" +msgstr "Paketeak prozesatzen (%(count)d/ %(total)d) " #: src/modules/packages/main.py:64 src/modules/packages/main.py:74 msgid "Install packages." -msgstr "" +msgstr "Instalatu paketeak" #: src/modules/packages/main.py:67 #, python-format msgid "Installing one package." msgid_plural "Installing %(num)d packages." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Pakete bat instalatzen." +msgstr[1] "%(num)dpakete instalatzen." #: src/modules/packages/main.py:70 #, python-format msgid "Removing one package." msgid_plural "Removing %(num)d packages." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Pakete bat kentzen." +msgstr[1] "%(num)dpakete kentzen." diff --git a/lang/python/fr/LC_MESSAGES/python.mo b/lang/python/fr/LC_MESSAGES/python.mo index b612733ea..21eee76c0 100644 Binary files a/lang/python/fr/LC_MESSAGES/python.mo and b/lang/python/fr/LC_MESSAGES/python.mo differ diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po index f4d4ef26c..f51f485b0 100644 --- a/lang/python/fr/LC_MESSAGES/python.po +++ b/lang/python/fr/LC_MESSAGES/python.po @@ -9,6 +9,7 @@ # Aestan , 2018 # Jeremy Gourmel , 2018 # Aurnytoraink , 2018 +# Florian B , 2018 # #, fuzzy msgid "" @@ -17,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-05 11:34-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Aurnytoraink , 2018\n" +"Last-Translator: Florian B , 2018\n" "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,7 +32,7 @@ msgstr "Impossible d'écrire le fichier de configuration KDM" #: src/modules/displaymanager/main.py:381 msgid "KDM config file {!s} does not exist" -msgstr "" +msgstr "Le fichier de configuration KDM n'existe pas" #: src/modules/displaymanager/main.py:442 msgid "Cannot write LXDM configuration file" @@ -39,7 +40,7 @@ msgstr "Impossible d'écrire le fichier de configuration LXDM" #: src/modules/displaymanager/main.py:443 msgid "LXDM config file {!s} does not exist" -msgstr "" +msgstr "Le fichier de configuration LXDM n'existe pas" #: src/modules/displaymanager/main.py:517 msgid "Cannot write LightDM configuration file" diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp index f540c2683..b953f821a 100644 --- a/src/libcalamares/PythonJobApi.cpp +++ b/src/libcalamares/PythonJobApi.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2016, Teo Mrnjavac - * Copyright 2017-2018, Adriaan de Groot + * Copyright 2017-2019, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -275,16 +275,21 @@ gettext_path() } _add_localedirs( candidatePaths, QDir().canonicalPath() ); // . - cDebug() << "Standard paths" << candidatePaths; + cDebug() << "Determining gettext path from" << candidatePaths; - for ( auto lang : _gettext_languages() ) + QStringList candidateLanguages = _gettext_languages(); + + for ( const auto& lang : candidateLanguages ) for ( auto localedir : candidatePaths ) { QDir ldir( localedir ); - cDebug() << "Checking" << lang << "in" <, YEAR. # +# Translators: +# Abubakaragoub Y , 2018 +# #, fuzzy msgid "" msgstr "" @@ -10,6 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-05 11:34-0400\n" "PO-Revision-Date: 2016-12-16 12:18+0000\n" +"Last-Translator: Abubakaragoub Y , 2018\n" "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,24 +23,24 @@ msgstr "" #: src/modules/dummypythonqt/main.py:84 msgid "Click me!" -msgstr "" +msgstr "اضغط علي!" #: src/modules/dummypythonqt/main.py:94 msgid "A new QLabel." -msgstr "" +msgstr "QLabel جديد" #: src/modules/dummypythonqt/main.py:97 msgid "Dummy PythonQt ViewStep" -msgstr "" +msgstr "دميه خطوة PythonQt " #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" -msgstr "" +msgstr "دميه عملية PythonQt " #: src/modules/dummypythonqt/main.py:186 msgid "This is the Dummy PythonQt Job. The dummy job says: {}" -msgstr "" +msgstr "هذة دميه عملية خطوة PythonQt. و تقول: {}" #: src/modules/dummypythonqt/main.py:190 msgid "A status message for Dummy PythonQt Job." -msgstr "" +msgstr "رسالة حاله دميه عملية خطوة PythonQt" diff --git a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.mo index 35ad2c9ea..da5256c9f 100644 Binary files a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po index 0fc16c2b9..6721edaea 100644 --- a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# enolp , 2017 +# enolp , 2019 # #, fuzzy msgid "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-05 11:34-0400\n" "PO-Revision-Date: 2016-12-16 12:18+0000\n" -"Last-Translator: enolp , 2017\n" +"Last-Translator: enolp , 2019\n" "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,7 +23,7 @@ msgstr "" #: src/modules/dummypythonqt/main.py:84 msgid "Click me!" -msgstr "¡Prímime!" +msgstr "¡Fai clic en min!" #: src/modules/dummypythonqt/main.py:94 msgid "A new QLabel." @@ -31,7 +31,7 @@ msgstr "Una QLabel nueva." #: src/modules/dummypythonqt/main.py:97 msgid "Dummy PythonQt ViewStep" -msgstr "" +msgstr "ViewStep maniquín de PythonQT" #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" diff --git a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo index 60bb83584..d508e3fac 100644 Binary files a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po index 9ac8d08f0..a336c22a0 100644 --- a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po @@ -3,6 +3,9 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +# Translators: +# Ander Elortondo, 2019 +# #, fuzzy msgid "" msgstr "" @@ -10,6 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-05 11:34-0400\n" "PO-Revision-Date: 2016-12-16 12:18+0000\n" +"Last-Translator: Ander Elortondo, 2019\n" "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,24 +23,24 @@ msgstr "" #: src/modules/dummypythonqt/main.py:84 msgid "Click me!" -msgstr "" +msgstr "Egidazu klik!" #: src/modules/dummypythonqt/main.py:94 msgid "A new QLabel." -msgstr "" +msgstr "QLabel berria." #: src/modules/dummypythonqt/main.py:97 msgid "Dummy PythonQt ViewStep" -msgstr "" +msgstr "Dummy PythonQt pauso-ikuspegia" #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" -msgstr "" +msgstr " Dummy PythonQt lana" #: src/modules/dummypythonqt/main.py:186 msgid "This is the Dummy PythonQt Job. The dummy job says: {}" -msgstr "" +msgstr "Hau Dummy PythonQt lana da. Dummy lanak zera dio: {}" #: src/modules/dummypythonqt/main.py:190 msgid "A status message for Dummy PythonQt Job." -msgstr "" +msgstr "Dummy PythonQt lanaren egoera mezua." diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt index 576f2e16e..b70c6d1ab 100644 --- a/src/modules/locale/CMakeLists.txt +++ b/src/modules/locale/CMakeLists.txt @@ -53,6 +53,17 @@ if( ECM_FOUND AND BUILD_TESTING ) ${YAMLCPP_LIBRARY} ) set_target_properties( geoiptest PROPERTIES AUTOMOC TRUE ) + + ecm_add_test( + Tests.cpp + LocaleConfiguration.cpp + TEST_NAME + localetest + LINK_LIBRARIES + calamares + Qt5::Test + ) + set_target_properties( localetest PROPERTIES AUTOMOC TRUE ) endif() if( BUILD_TESTING ) diff --git a/src/modules/locale/LocaleConfiguration.cpp b/src/modules/locale/LocaleConfiguration.cpp index 7c8ad3305..8bc2b2c77 100644 --- a/src/modules/locale/LocaleConfiguration.cpp +++ b/src/modules/locale/LocaleConfiguration.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2016, Teo Mrnjavac - * Copyright 2017-2018, Adriaan de Groot + * Copyright 2017-2019, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,14 +27,23 @@ LocaleConfiguration::LocaleConfiguration() } -LocaleConfiguration -LocaleConfiguration::createDefault() +LocaleConfiguration::LocaleConfiguration( const QString& localeName, const QString& formatsName ) + : LocaleConfiguration() +{ + lc_numeric = lc_time = lc_monetary = lc_paper = lc_name + = lc_address = lc_telephone = lc_measurement + = lc_identification = formatsName; + + (void) setLanguage( localeName ); +} + + +void +LocaleConfiguration::setLanguage(const QString& localeName ) { - LocaleConfiguration lc = LocaleConfiguration(); - lc.lang = lc.lc_numeric = lc.lc_time = lc.lc_monetary = lc.lc_paper = lc.lc_name - = lc.lc_address = lc.lc_telephone = lc.lc_measurement - = lc.lc_identification = "en_US.UTF-8"; - return lc; + QString language = localeName.split( '_' ).first(); + m_languageLocaleBcp47 = QLocale( language ).bcp47Name().toLower(); + m_lang = localeName; } @@ -43,11 +52,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale, const QStringList& availableLocales, const QString& countryCode ) { - LocaleConfiguration lc; - - // Note that the documentation how this works is in packages.conf QString language = languageLocale.split( '_' ).first(); - lc.myLanguageLocaleBcp47 = QLocale(language).bcp47Name().toLower(); QStringList linesForLanguage; for ( const QString &line : availableLocales ) @@ -264,19 +269,14 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale, if ( lc_formats.isEmpty() ) lc_formats = lang; - lc.lang = lang; - lc.lc_address = lc.lc_identification = lc.lc_measurement = lc.lc_monetary - = lc.lc_name = lc.lc_numeric = lc.lc_paper = lc.lc_telephone - = lc.lc_time = lc_formats; - - return lc; + return LocaleConfiguration( lang, lc_formats ); } bool LocaleConfiguration::isEmpty() const { - return lang.isEmpty() && + return m_lang.isEmpty() && lc_numeric.isEmpty() && lc_time.isEmpty() && lc_monetary.isEmpty() && @@ -294,8 +294,8 @@ LocaleConfiguration::toMap() const { QMap< QString, QString > map; - if ( !lang.isEmpty() ) - map.insert( "LANG", lang ); + if ( !m_lang.isEmpty() ) + map.insert( "LANG", m_lang ); if ( !lc_numeric.isEmpty() ) map.insert( "LC_NUMERIC", lc_numeric ); @@ -327,8 +327,3 @@ LocaleConfiguration::toMap() const return map; } -QString -LocaleConfiguration::toBcp47() const -{ - return myLanguageLocaleBcp47; -} diff --git a/src/modules/locale/LocaleConfiguration.h b/src/modules/locale/LocaleConfiguration.h index c077ef6f7..abe90ffcb 100644 --- a/src/modules/locale/LocaleConfiguration.h +++ b/src/modules/locale/LocaleConfiguration.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2016, Teo Mrnjavac - * Copyright 2017-2018, Adriaan de Groot + * Copyright 2017-2019, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,28 +20,42 @@ #ifndef LOCALECONFIGURATION_H #define LOCALECONFIGURATION_H +#include #include #include class LocaleConfiguration { public: + /// @brief Create an empty locale, with nothing set explicit LocaleConfiguration(); + /// @brief Create a locale with everything set to the given @p localeName + explicit LocaleConfiguration( const QString& localeName /* "en_US.UTF-8" */ ) + : LocaleConfiguration( localeName, localeName ) { }; + /// @brief Create a locale with language and formats separate + explicit LocaleConfiguration( const QString& localeName, const QString& formatsName ); - static LocaleConfiguration createDefault(); static LocaleConfiguration fromLanguageAndLocation( const QString& language, const QStringList& availableLocales, const QString& countryCode ); bool isEmpty() const; - QMap< QString, QString > toMap() const; + /** @brief sets lang and the BCP47 representation + * + * Note that the documentation how this works is in packages.conf + */ + void setLanguage( const QString& localeName ); + QString language() const { return m_lang; } + // Note that the documentation how this works is in packages.conf - QString toBcp47() const; + QString toBcp47() const { return m_languageLocaleBcp47; } + + QMap< QString, QString > toMap() const; // These become all uppercase in locale.conf, but we keep them lowercase here to // avoid confusion with locale.h. - QString lang, lc_numeric, lc_time, lc_monetary, lc_paper, lc_name, lc_address, + QString lc_numeric, lc_time, lc_monetary, lc_paper, lc_name, lc_address, lc_telephone, lc_measurement, lc_identification; // If the user has explicitly selected language (from the dialog) @@ -49,7 +63,13 @@ public: bool explicit_lang, explicit_lc; private: - QString myLanguageLocaleBcp47; + QString m_lang; + QString m_languageLocaleBcp47; }; +inline QDebug& operator <<( QDebug& s, const LocaleConfiguration& l ) +{ + return s << l.language() << '(' << l.toBcp47() << ") +" << l.lc_numeric; +} + #endif // LOCALECONFIGURATION_H diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp index ea77d6b9f..1ddb2cc0a 100644 --- a/src/modules/locale/LocalePage.cpp +++ b/src/modules/locale/LocalePage.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2016, Teo Mrnjavac - * Copyright 2017-2018, Adriaan de Groot + * Copyright 2017-2019, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -164,16 +164,17 @@ LocalePage::LocalePage( QWidget* parent ) { LCLocaleDialog* dlg = new LCLocaleDialog( m_selectedLocaleConfiguration.isEmpty() ? - guessLocaleConfiguration().lang : - m_selectedLocaleConfiguration.lang, + guessLocaleConfiguration().language() : + m_selectedLocaleConfiguration.language(), m_localeGenLines, this ); dlg->exec(); if ( dlg->result() == QDialog::Accepted && !dlg->selectedLCLocale().isEmpty() ) { - m_selectedLocaleConfiguration.lang = dlg->selectedLCLocale(); + m_selectedLocaleConfiguration.setLanguage( dlg->selectedLCLocale() ); m_selectedLocaleConfiguration.explicit_lang = true; + this->updateGlobalLocale(); this->updateLocaleLabels(); } @@ -317,7 +318,7 @@ LocalePage::init( const QString& initialRegion, } else { - cDebug() << "Cannot open file" << localeGenPath + cWarning() << "Cannot open file" << localeGenPath << ". Assuming the supported languages are already built into " "the locale archive."; QProcess localeA; @@ -386,7 +387,7 @@ std::pair< QString, QString > LocalePage::prettyLocaleStatus( const LocaleConfig { using CalamaresUtils::LocaleLabel; - LocaleLabel lang( lc.lang, LocaleLabel::LabelFormat::AlwaysWithCountry ); + LocaleLabel lang( lc.language(), LocaleLabel::LabelFormat::AlwaysWithCountry ); LocaleLabel num( lc.lc_numeric, LocaleLabel::LabelFormat::AlwaysWithCountry ); return std::make_pair< QString, QString >( @@ -443,7 +444,8 @@ LocalePage::onActivate() !m_selectedLocaleConfiguration.explicit_lang ) { auto newLocale = guessLocaleConfiguration(); - m_selectedLocaleConfiguration.lang = newLocale.lang; + m_selectedLocaleConfiguration.setLanguage( newLocale.language() ); + updateGlobalLocale(); updateLocaleLabels(); } } @@ -452,41 +454,39 @@ LocalePage::onActivate() LocaleConfiguration LocalePage::guessLocaleConfiguration() const { - QLocale myLocale; // User-selected language - - // If we cannot say anything about available locales - if ( m_localeGenLines.isEmpty() ) - { - cWarning() << "guessLocaleConfiguration can't guess from an empty list."; - return LocaleConfiguration::createDefault(); - } - - QString myLanguageLocale = myLocale.name(); - if ( myLanguageLocale.isEmpty() ) - return LocaleConfiguration::createDefault(); - - return LocaleConfiguration::fromLanguageAndLocation( myLanguageLocale, + return LocaleConfiguration::fromLanguageAndLocation( QLocale().name(), m_localeGenLines, m_tzWidget->getCurrentLocation().country ); } +void +LocalePage::updateGlobalLocale() +{ + auto *gs = Calamares::JobQueue::instance()->globalStorage(); + const QString bcp47 = m_selectedLocaleConfiguration.toBcp47(); + gs->insert( "locale", bcp47 ); +} + + void LocalePage::updateGlobalStorage() { + auto *gs = Calamares::JobQueue::instance()->globalStorage(); + LocaleGlobal::Location location = m_tzWidget->getCurrentLocation(); - Calamares::JobQueue::instance()->globalStorage() - ->insert( "locationRegion", location.region ); - Calamares::JobQueue::instance()->globalStorage() - ->insert( "locationZone", location.zone ); + bool locationChanged = ( location.region != gs->value( "locationRegion" ) ) || + ( location.zone != gs->value( "locationZone" ) ); - const QString bcp47 = m_selectedLocaleConfiguration.toBcp47(); - Calamares::JobQueue::instance()->globalStorage()->insert( "locale", bcp47 ); + gs->insert( "locationRegion", location.region ); + gs->insert( "locationZone", location.zone ); + + updateGlobalLocale(); // If we're in chroot mode (normal install mode), then we immediately set the // timezone on the live system. When debugging timezones, don't bother. #ifndef DEBUG_TIMEZONES - if ( Calamares::Settings::instance()->doChroot() ) + if ( locationChanged && Calamares::Settings::instance()->doChroot() ) { QProcess::execute( "timedatectl", // depends on systemd { "set-timezone", @@ -498,7 +498,7 @@ LocalePage::updateGlobalStorage() auto newLocale = guessLocaleConfiguration(); if ( !m_selectedLocaleConfiguration.isEmpty() && m_selectedLocaleConfiguration.explicit_lang ) - newLocale.lang = m_selectedLocaleConfiguration.lang; + newLocale.setLanguage( m_selectedLocaleConfiguration.language() ); if ( !m_selectedLocaleConfiguration.isEmpty() && m_selectedLocaleConfiguration.explicit_lc ) { diff --git a/src/modules/locale/LocalePage.h b/src/modules/locale/LocalePage.h index fae16cfb9..2a9dc8b60 100644 --- a/src/modules/locale/LocalePage.h +++ b/src/modules/locale/LocalePage.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Teo Mrnjavac + * Copyright 2019, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -56,6 +57,12 @@ private: // the settings for language and numbers. std::pair< QString, QString > prettyLocaleStatus( const LocaleConfiguration& ) const; + /** @brief Update the GS *locale* key with the selected system language. + * + * This uses whatever is set in m_selectedLocaleConfiguration as the language, + * and writes it to GS *locale* key (as a string, in BCP47 format). + */ + void updateGlobalLocale(); void updateGlobalStorage(); void updateLocaleLabels(); diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp new file mode 100644 index 000000000..0e1a3eb48 --- /dev/null +++ b/src/modules/locale/Tests.cpp @@ -0,0 +1,80 @@ +/* === This file is part of Calamares - === + * + * Copyright 2019, Adriaan de Groot + * + * Calamares is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + */ + + +#include "Tests.h" +#include "LocaleConfiguration.h" + +#include + +QTEST_GUILESS_MAIN( LocaleTests ) + + +LocaleTests::LocaleTests() +{ +} + +LocaleTests::~LocaleTests() +{ +} + +void LocaleTests::initTestCase() +{ +} + +void LocaleTests::testEmptyLocaleConfiguration() +{ + LocaleConfiguration lc; + + QVERIFY( lc.isEmpty() ); + QCOMPARE( lc.toBcp47(), QString() ); +} + +void LocaleTests::testDefaultLocaleConfiguration() +{ + LocaleConfiguration lc( "en_US.UTF-8" ); + QVERIFY( !lc.isEmpty() ); + QCOMPARE( lc.language(), "en_US.UTF-8" ); + QCOMPARE( lc.toBcp47(), "en" ); + + LocaleConfiguration lc2( "de_DE.UTF-8" ); + QVERIFY( !lc2.isEmpty() ); + QCOMPARE( lc2.language(), "de_DE.UTF-8" ); + QCOMPARE( lc2.toBcp47(), "de" ); +} + +void LocaleTests::testSplitLocaleConfiguration() +{ + LocaleConfiguration lc( "en_US.UTF-8", "de_DE.UTF-8" ); + QVERIFY( !lc.isEmpty() ); + QCOMPARE( lc.language(), "en_US.UTF-8" ); + QCOMPARE( lc.toBcp47(), "en" ); + QCOMPARE( lc.lc_numeric, QStringLiteral( "de_DE.UTF-8" ) ); + + LocaleConfiguration lc2( "de_DE.UTF-8", "da_DK.UTF-8" ); + QVERIFY( !lc2.isEmpty() ); + QCOMPARE( lc2.language(), "de_DE.UTF-8" ); + QCOMPARE( lc2.toBcp47(), "de" ); + QCOMPARE( lc2.lc_numeric, "da_DK.UTF-8" ); + + LocaleConfiguration lc3( "da_DK.UTF-8", "de_DE.UTF-8" ); + QVERIFY( !lc3.isEmpty() ); + QCOMPARE( lc3.toBcp47(), "da" ); + QCOMPARE( lc3.lc_numeric, "de_DE.UTF-8" ); + +} diff --git a/src/modules/locale/Tests.h b/src/modules/locale/Tests.h new file mode 100644 index 000000000..299eac61d --- /dev/null +++ b/src/modules/locale/Tests.h @@ -0,0 +1,40 @@ +/* === This file is part of Calamares - === + * + * Copyright 2019, Adriaan de Groot + * + * Calamares is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + */ + + +#ifndef TESTS_H +#define TESTS_H + +#include + +class LocaleTests : public QObject +{ + Q_OBJECT +public: + LocaleTests(); + ~LocaleTests() override; + +private Q_SLOTS: + void initTestCase(); + // Check the sample config file is processed correctly + void testEmptyLocaleConfiguration(); + void testDefaultLocaleConfiguration(); + void testSplitLocaleConfiguration(); +}; + +#endif diff --git a/src/modules/locale/timezonewidget/localeglobal.h b/src/modules/locale/timezonewidget/localeglobal.h index 5452b0b09..1a8f796d4 100644 --- a/src/modules/locale/timezonewidget/localeglobal.h +++ b/src/modules/locale/timezonewidget/localeglobal.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2016, Teo Mrnjavac + * Copyright 2019, Adriaan de Groot * * Originally from the Manjaro Installation Framework * by Roland Singer @@ -38,11 +39,13 @@ class LocaleGlobal { public: - struct Locale { + struct Locale + { QString description, locale; }; - struct Location { + struct Location + { QString region, zone, country; double latitude, longitude; static QString pretty( const QString& s ); @@ -59,7 +62,12 @@ private: static void initLocales(); static void initLocations(); - static double getRightGeoLocation(QString str); + static double getRightGeoLocation( QString str ); }; +inline QDebug& operator <<( QDebug& s, const LocaleGlobal::Location& l ) +{ + return s << l.region << '/' << l.zone << '(' << l.country << ") @N" << l.latitude << 'E' << l.longitude; +} + #endif // LOCALEGLOBAL_H diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index 9116cf2ef..aac1aa6f9 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -150,10 +150,10 @@ class PackageManager(metaclass=abc.ABCMeta): @param packagedata: str|dict """ if isinstance(packagedata, str): - self.remove([packagedata], from_local=from_local) + self.remove([packagedata]) else: self.run(packagedata["pre-script"]) - self.remove([packagedata["package"]], from_local=from_local) + self.remove([packagedata["package"]]) self.run(packagedata["post-script"]) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index cc32ca12a..2fd932e0c 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -2,6 +2,7 @@ * * Copyright 2014-2017, Teo Mrnjavac * Copyright 2017-2018, Adriaan de Groot + * Copyright 2019, Collabora Ltd * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1471,3 +1472,16 @@ ChoicePage::updateSwapChoicesTr(QComboBox* box) } } } + +int +ChoicePage::lastSelectedDeviceIndex() +{ + return m_lastSelectedDeviceIndex; +} + +void +ChoicePage::setLastSelectedDeviceIndex( int index ) +{ + m_lastSelectedDeviceIndex = index; + m_drivesCombo->setCurrentIndex( m_lastSelectedDeviceIndex ); +} diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h index 0def84bd4..34154d7d5 100644 --- a/src/modules/partition/gui/ChoicePage.h +++ b/src/modules/partition/gui/ChoicePage.h @@ -2,6 +2,7 @@ * * Copyright 2014-2016, Teo Mrnjavac * Copyright 2018, Adriaan de Groot + * Copyright 2019, Collabora Ltd * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -97,6 +98,9 @@ public: */ void applyActionChoice( ChoicePage::InstallChoice choice ); + int lastSelectedDeviceIndex(); + void setLastSelectedDeviceIndex( int index ); + signals: void nextStatusChanged( bool ); void actionChosen(); diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp index 9d972c8fd..86de992e6 100644 --- a/src/modules/partition/gui/PartitionPage.cpp +++ b/src/modules/partition/gui/PartitionPage.cpp @@ -5,6 +5,7 @@ * Copyright 2018, Adriaan de Groot * Copyright 2018, Andrius Štikonas * Copyright 2018, Caio Jordão Carvalho + * Copyright 2019, Collabora Ltd * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -609,3 +610,15 @@ PartitionPage::getCurrentUsedMountpoints() return mountPoints; } + +int +PartitionPage::selectedDeviceIndex() +{ + return m_ui->deviceComboBox->currentIndex(); +} + +void +PartitionPage::selectDeviceByIndex ( int index ) +{ + m_ui->deviceComboBox->setCurrentIndex( index ); +} diff --git a/src/modules/partition/gui/PartitionPage.h b/src/modules/partition/gui/PartitionPage.h index 70d8ccdfb..8289f2cdd 100644 --- a/src/modules/partition/gui/PartitionPage.h +++ b/src/modules/partition/gui/PartitionPage.h @@ -2,6 +2,7 @@ * * Copyright 2014, Aurélien Gâteau * Copyright 2018, Adriaan de Groot + * Copyright 2019, Collabora Ltd * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -46,6 +47,9 @@ public: void onRevertClicked(); + int selectedDeviceIndex(); + void selectDeviceByIndex( int index ); + private: QScopedPointer< Ui_PartitionPage > m_ui; PartitionCoreModule* m_core; diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 1ad76ae17..d43077c09 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -3,6 +3,7 @@ * Copyright 2014, Aurélien Gâteau * Copyright 2014-2017, Teo Mrnjavac * Copyright 2018, Adriaan de Groot + * Copyright 2019, Collabora Ltd * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -286,6 +287,7 @@ PartitionViewStep::next() if ( m_choicePage->currentChoice() == ChoicePage::Manual ) { m_widget->setCurrentWidget( m_manualPartitionPage ); + m_manualPartitionPage->selectDeviceByIndex( m_choicePage->lastSelectedDeviceIndex() ); if ( m_core->isDirty() ) m_manualPartitionPage->onRevertClicked(); } @@ -315,7 +317,10 @@ void PartitionViewStep::back() { if ( m_widget->currentWidget() != m_choicePage ) + { m_widget->setCurrentWidget( m_choicePage ); + m_choicePage->setLastSelectedDeviceIndex( m_manualPartitionPage->selectedDeviceIndex() ); + } } @@ -495,6 +500,61 @@ nameToChoice( QString name, bool& ok ) return SwapChoice::NoSwap; } +/** @brief translate @p defaultFS into a recognized name + * + * Makes several attempts to translate the string into a + * name that KPMCore will recognize. + */ +static QString +findFS( QString defaultFS ) +{ + QStringList fsLanguage { QLatin1Literal( "C" ) }; // Required language list to turn off localization + if ( defaultFS.isEmpty() ) + defaultFS = QStringLiteral( "ext4" ); + if ( FileSystem::typeForName( defaultFS, fsLanguage ) != FileSystem::Unknown ) + { + cDebug() << "Partition-module setting *defaultFileSystemType*" << defaultFS; + return defaultFS; + } + + // First pass: try the default language instead of C locale + auto fsType = FileSystem::typeForName( defaultFS ); + if ( fsType != FileSystem::Unknown ) + { + defaultFS = FileSystem::nameForType( fsType, fsLanguage ); + cWarning() << "Partition-module setting *defaultFileSystemType* changed" << defaultFS; + return defaultFS; + } + + // Second pass: try case-insensitive, both unlocalized and localized + const auto fstypes = FileSystem::types(); + for ( FileSystem::Type t : fstypes ) + { + if ( ( 0 == QString::compare( defaultFS, FileSystem::nameForType( t, fsLanguage ), Qt::CaseInsensitive ) ) || + ( 0 == QString::compare( defaultFS, FileSystem::nameForType( t ), Qt::CaseInsensitive ) ) ) + { + defaultFS = FileSystem::nameForType( fsType, fsLanguage ); + cWarning() << "Partition-module setting *defaultFileSystemType* changed" << defaultFS; + return defaultFS; + } + } + + cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << defaultFS << ") using ext4."; + defaultFS = QStringLiteral( "ext4" ); +#ifdef DEBUG_FILESYSTEMS + // This bit is for distro's debugging their settings, and shows + // all the strings that KPMCore is matching against for FS type. + { + Logger::CLog d( Logger::LOGDEBUG ); + using TR = Logger::DebugRow< int, QString >; + const auto fstypes = FileSystem::types(); + d << "Available types (" << fstypes.count() << ')'; + for ( FileSystem::Type t : fstypes ) + d << TR( static_cast( t ), FileSystem::nameForType( t, fsLanguage ) ); + } +#endif + return defaultFS; +} void PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) @@ -571,30 +631,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) gs->insert( "alwaysShowPartitionLabels", CalamaresUtils::getBool( configurationMap, "alwaysShowPartitionLabels", true ) ); gs->insert( "enableLuksAutomatedPartitioning", CalamaresUtils::getBool( configurationMap, "enableLuksAutomatedPartitioning", true ) ); gs->insert( "allowManualPartitioning", CalamaresUtils::getBool( configurationMap, "allowManualPartitioning", true ) ); - - QString defaultFS = CalamaresUtils::getString( configurationMap, "defaultFileSystemType" ); - if ( defaultFS.isEmpty() ) - defaultFS = QStringLiteral( "ext4" ); - else - cDebug() << "Partition-module setting *defaultFileSystemType*" << defaultFS; - if ( FileSystem::typeForName( defaultFS ) == FileSystem::Unknown ) - { - cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << defaultFS << ") using ext4."; - defaultFS = QStringLiteral( "ext4" ); -#ifdef DEBUG_FILESYSTEMS - // This bit is for distro's debugging their settings, and shows - // all the strings that KPMCore is matching against for FS type. - { - Logger::CLog d( Logger::LOGDEBUG ); - using TR = Logger::DebugRow< int, QString >; - const auto fstypes = FileSystem::types(); - d << "Available types (" << fstypes.count() << ')'; - for ( FileSystem::Type t : fstypes ) - d << TR( static_cast( t ), FileSystem::nameForType( t ) ); - } -#endif - } - gs->insert( "defaultFileSystemType", defaultFS ); + gs->insert( "defaultFileSystemType", findFS( CalamaresUtils::getString( configurationMap, "defaultFileSystemType" ) ) ); // Now that we have the config, we load the PartitionCoreModule in the background