Merge branch 'calamares' into refactor-translation

main
Adriaan de Groot 3 years ago
commit 5e7746668e

@ -7,22 +7,91 @@ 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.41 (unreleased) #
# 3.2.43 (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.42 (2021-09-06) #
This release contains contributions from (alphabetically by first name):
- Anke Boersma
- Artem Grinev
- Nico 'dr460nf1r3' (new contributor, welcome!)
- Waneon Kim (new contributor, welcome!)
## Core ##
- No core changes yet
## Modules ##
- BTRFS partitions are no longer listed as "check in phase 2" in
the *fstab* module. (Thanks Nico)
- The *keyboard* module (and *keyboardq*) now pick an English layout
(with Rupee) for keyboards when the language is English and locale is India,
rather than Hindi layout.
- The *localeq* module had the i18n.qml rewritten to make it easier
to customize. A bug in the layout has been fixed, and the overall
look has been updated.
- *networkcfg* now translates the "live user" on an ISO to the regular
user on the installed system, so that network configuration changes
made in the live system are automatically used after installation. #1755
- *partition* no longer allows you to delete an extended partition with
children (which led to crashes). #1749 (Thanks Artem)
- *partition* complains in more detail about the state of the UEFI
boot partition (under manual partitioning schemes). #1761
- *welcome* can now check multiple URLs to determine if internet connectivity
is available. It is still recommended to check the distro home-page or
some special "ping" page of the distro, although that has some privacy
implications; using example.com or google.com may work as well. Listing
multiple URLs will ping each of them in turn until one succeeds. #1669
- The work to make a QML version available for all view modules is almost
completed. Two new QML modules have been added *packagechooserq* and *summaryq*.
Summaryq brings the option to present the summary page in a customizable
way, with a bit more of a contemporary look. Packagechooserq adds the option
to preselect an item and displays all options in one overview.
(Thanks Anke)
# 3.2.41.1 (2021-08-05) #
This is a hotfix release for a crash in the *partition* module, reported on
KDE neon. #1746
# 3.2.41 (2021-07-31) #
This release contains contributions from (alphabetically by first name):
- Anke Boersma
- Camilo Higuita
## Core ##
- The (re)translation framework has been internally re-vamped to be
less resource-intensive and to work with all QObjects, not just
widgets. Consumers of the translations framework are expected to
set up the event filter on the top-level widget(s) manually.
set up the event filter on the top-level widget(s) manually. Since
Calamares and the Calamares-test-applications have been adjusted already,
no further action is needed.
## Modules ##
- When the *keyboard* module is activated, it no longer replaces
an explicit user choice (e.g. for a Belgian layout) by a guessed-for-
this-language layout (e.g. Danish if you're installing in Danish).
- Logic for handling installation lists has been moved around in the
*packages* module so that package managers can, in principle,
adjust how to handle critical and non-critical package lists.
- In the *partition* module, translation code has been simplified.
- The *usersq* module has had a fair bit of QML rewritten to make it easier
to customize the colors used by the module in a consistent way.
(Thanks Anke)
- *Welcome* now uses a translated message from the Config object,
increasing the sharing between widgets- and QML-modules.
# 3.2.40 (2021-07-14) #

@ -41,11 +41,11 @@
# TODO:3.3: Require CMake 3.12
cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
project( CALAMARES
VERSION 3.2.40
VERSION 3.2.43
LANGUAGES C CXX
)
set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development
set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development
### OPTIONS
#
@ -132,14 +132,15 @@ set( CALAMARES_DESCRIPTION_SUMMARY
# NOTE: update these lines by running `txstats.py`, or for full automation
# `txstats.py -e`. See also
#
# Total 77 languages
set( _tx_complete ca lt pt_PT sq uk zh_TW )
set( _tx_good as az az_AZ be ca@valencia cs_CZ da de fi_FI fr fur
he hi hr it_IT ja ko ml nl pt_BR ru sk sv tg tr_TR vi zh_CN )
# Total 79 languages
set( _tx_complete az az_AZ ca de fi_FI he hi hr ja ko lt pt_BR sq
sv uk zh_TW )
set( _tx_good as be ca@valencia cs_CZ da fr fur it_IT ml nl pt_PT
ru sk tg tr_TR vi zh_CN )
set( _tx_ok ar ast bg bn el en_GB es es_MX es_PR et eu fa gl hu id
is mr nb pl ro sl sr sr@latin th )
set( _tx_incomplete eo es_PE fr_CH gu id_ID ie kk kn lo lv mk ne
ne_NP ru_RU si te ur uz zh )
is mr nb pl ro si sl sr sr@latin th zh_HK )
set( _tx_incomplete eo es_PE fr_CH gu id_ID ie kk kn ko_KR lo lv mk
ne ne_NP ru_RU te ur uz zh )
### Required versions
#

@ -510,17 +510,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="32"/>
<source>Set filesystem label on %1.</source>
<translation type="unfinished"/>
<translation>Fayl sistemi yarlığını %1 üzərində qurun.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="39"/>
<source>Set filesystem label &lt;strong&gt;%1&lt;/strong&gt; to partition &lt;strong&gt;%2&lt;/strong&gt;.</source>
<translation type="unfinished"/>
<translation>&lt;strong&gt;%1&lt;/strong&gt; fayl sistemi yarlığını &lt;strong&gt;%2&lt;/strong&gt; bölməsinə qurun.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="70"/>
<source>The installer failed to update partition table on disk '%1'.</source>
<translation type="unfinished"/>
<translation>Quraşdırıcının '%1' diskindəki bölməni yeniləməsi baş tutmadı.</translation>
</message>
</context>
<context>
@ -896,7 +896,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/users/Config.cpp" line="548"/>
<source>OK!</source>
<translation type="unfinished"/>
<translation>OLDU!</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
@ -1012,12 +1012,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="231"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation>Fayl sitemi üçün yarlıq</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="241"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation>FS yarlığı:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="65"/>
@ -1376,12 +1376,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="186"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation>Fayl sitemi üçün yarlıq</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="196"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation>FS yarlığı:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="291"/>
@ -1889,7 +1889,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/libcalamares/locale/Tests.cpp" line="273"/>
<source>Quit</source>
<translation type="unfinished"/>
<translation>Çıxış</translation>
</message>
</context>
<context>
@ -2113,7 +2113,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/localeq/Offline.qml" line="41"/>
<source>Select your preferred Region, or use the default settings.</source>
<translation type="unfinished"/>
<translation>Üstünlük verdiyiniz Bölgənizi seçin və ilkin ayarlardan istifadə edin.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="98"/>
@ -2653,7 +2653,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="304"/>
<source>File System Label</source>
<translation type="unfinished"/>
<translation>Fayl sistemi yarlığı</translation>
</message>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="306"/>
@ -4262,7 +4262,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
<source>root is not allowed as username.</source>
<translation type="unfinished"/>
<translation>kökə istifadəçi_adı kimi icazə verilmir.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="127"/>
@ -4282,7 +4282,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="174"/>
<source>localhost is not allowed as hostname.</source>
<translation type="unfinished"/>
<translation>yerli hosta host_adı kimi icazə verilmir.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="183"/>
@ -4322,7 +4322,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="166"/>
<source>Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.</source>
<translation type="unfinished"/>
<translation>Yalnız hərflərə, saylara, alt cizgisinə və tire işarəsinə icazə verilir, ən az iki simvol.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="264"/>

@ -510,17 +510,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="32"/>
<source>Set filesystem label on %1.</source>
<translation type="unfinished"/>
<translation>Fayl sistemi yarlığını %1 üzərində qurun.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="39"/>
<source>Set filesystem label &lt;strong&gt;%1&lt;/strong&gt; to partition &lt;strong&gt;%2&lt;/strong&gt;.</source>
<translation type="unfinished"/>
<translation>&lt;strong&gt;%1&lt;/strong&gt; fayl sistemi yarlığını &lt;strong&gt;%2&lt;/strong&gt; bölməsinə qurun.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="70"/>
<source>The installer failed to update partition table on disk '%1'.</source>
<translation type="unfinished"/>
<translation>Quraşdırıcının '%1' diskindəki bölməni yeniləməsi baş tutmadı.</translation>
</message>
</context>
<context>
@ -896,7 +896,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/users/Config.cpp" line="548"/>
<source>OK!</source>
<translation type="unfinished"/>
<translation>OLDU!</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
@ -1012,12 +1012,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="231"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation>Fayl sitemi üçün yarlıq</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="241"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation>FS yarlığı:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="65"/>
@ -1376,12 +1376,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="186"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation>Fayl sitemi üçün yarlıq</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="196"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation>FS yarlığı:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="291"/>
@ -1889,7 +1889,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/libcalamares/locale/Tests.cpp" line="273"/>
<source>Quit</source>
<translation type="unfinished"/>
<translation>Çıxış</translation>
</message>
</context>
<context>
@ -2113,7 +2113,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/localeq/Offline.qml" line="41"/>
<source>Select your preferred Region, or use the default settings.</source>
<translation type="unfinished"/>
<translation>Üstünlük verdiyiniz Bölgənizi seçin və ilkin ayarlardan istifadə edin.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="98"/>
@ -2653,7 +2653,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="304"/>
<source>File System Label</source>
<translation type="unfinished"/>
<translation>Fayl sistemi yarlığı</translation>
</message>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="306"/>
@ -4262,7 +4262,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
<source>root is not allowed as username.</source>
<translation type="unfinished"/>
<translation>kökə istifadəçi_adı kimi icazə verilmir.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="127"/>
@ -4282,7 +4282,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="174"/>
<source>localhost is not allowed as hostname.</source>
<translation type="unfinished"/>
<translation>yerli hosta host_adı kimi icazə verilmir.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="183"/>
@ -4322,7 +4322,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="166"/>
<source>Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.</source>
<translation type="unfinished"/>
<translation>Yalnız hərflərə, saylara, alt cizgisinə və tire işarəsinə icazə verilir, ən az iki simvol.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="264"/>

@ -32,7 +32,7 @@
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
<source>Master Boot Record of %1</source>
<translation>1% </translation>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="92"/>
@ -217,7 +217,7 @@
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="224"/>
<source>Working directory %1 for python job %2 is not readable.</source>
<translation>ি িি 1% %2 </translation>
<translation>ি িি %1 %2 </translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="230"/>
@ -227,12 +227,12 @@
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="231"/>
<source>Main script file %1 for python job %2 is not readable.</source>
<translation> ি 1% 2% </translation>
<translation> ি %1 %2 </translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="304"/>
<source>Boost.Python error in job "%1".</source>
<translation>. 1% ি</translation>
<translation>. %1 ি</translation>
</message>
</context>
<context>
@ -497,7 +497,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
<source>%1 Installer</source>
<translation>1% </translation>
<translation>%1 </translation>
</message>
</context>
<context>

@ -510,12 +510,13 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="32"/>
<source>Set filesystem label on %1.</source>
<translation type="unfinished"/>
<translation>Setze Dateisytem-Label für %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="39"/>
<source>Set filesystem label &lt;strong&gt;%1&lt;/strong&gt; to partition &lt;strong&gt;%2&lt;/strong&gt;.</source>
<translation type="unfinished"/>
<translation>Setze Dateisytem-Label &lt;strong&gt;%1&lt;/strong&gt; für Partition &lt;strong&gt;%2&lt;/strong&gt;.
</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="70"/>
@ -896,7 +897,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message>
<location filename="../src/modules/users/Config.cpp" line="548"/>
<source>OK!</source>
<translation type="unfinished"/>
<translation>OK!</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
@ -1012,12 +1013,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="231"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation>Label für das Dateisystem</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="241"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation>FS Label:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="65"/>
@ -1376,12 +1377,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="186"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation>Label für das Dateisystem</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="196"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation>FS Label:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="291"/>
@ -1889,7 +1890,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message>
<location filename="../src/libcalamares/locale/Tests.cpp" line="273"/>
<source>Quit</source>
<translation type="unfinished"/>
<translation>Beenden</translation>
</message>
</context>
<context>
@ -2113,7 +2114,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message>
<location filename="../src/modules/localeq/Offline.qml" line="41"/>
<source>Select your preferred Region, or use the default settings.</source>
<translation type="unfinished"/>
<translation>Wählen Sie Ihre bevorzugte Region oder nutzen Sie die Standardeinstellungen.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="98"/>
@ -2653,7 +2654,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="304"/>
<source>File System Label</source>
<translation type="unfinished"/>
<translation>Dateisystem-Label</translation>
</message>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="306"/>
@ -4263,7 +4264,7 @@ Ausgabe:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
<source>root is not allowed as username.</source>
<translation type="unfinished"/>
<translation>root ist als Benutzername nicht erlaubt.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="127"/>
@ -4283,7 +4284,7 @@ Ausgabe:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="174"/>
<source>localhost is not allowed as hostname.</source>
<translation type="unfinished"/>
<translation>localhost ist als Computername nicht erlaubt.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="183"/>
@ -4323,7 +4324,7 @@ Ausgabe:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="166"/>
<source>Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.</source>
<translation type="unfinished"/>
<translation>Es sind nur Buchstaben, Zahlen, Unterstrich und Bindestrich erlaubt, minimal zwei Zeichen.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="264"/>

@ -495,12 +495,12 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>CalamaresWindow</name>
<message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="368"/>
<location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
<source>%1 Setup Program</source>
<translation>%1 Setup Program</translation>
</message>
<message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
<location filename="../src/calamares/CalamaresWindow.cpp" line="371"/>
<source>%1 Installer</source>
<translation>%1 Installer</translation>
</message>
@ -539,149 +539,149 @@ The installer will quit and all changes will be lost.</translation>
<translation>Form</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="121"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="139"/>
<source>Select storage de&amp;vice:</source>
<translation>Select storage de&amp;vice:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="122"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="987"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1033"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="140"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="996"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1042"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/>
<source>Current:</source>
<translation>Current:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="123"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="141"/>
<source>After:</source>
<translation>After:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="332"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1671"/>
<source>&lt;strong&gt;Manual partitioning&lt;/strong&gt;&lt;br/&gt;You can create or resize partitions yourself.</source>
<translation>&lt;strong&gt;Manual partitioning&lt;/strong&gt;&lt;br/&gt;You can create or resize partitions yourself.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="852"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="861"/>
<source>Reuse %1 as home partition for %2.</source>
<translation>Reuse %1 as home partition for %2.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="988"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/>
<source>&lt;strong&gt;Select a partition to shrink, then drag the bottom bar to resize&lt;/strong&gt;</source>
<translation>&lt;strong&gt;Select a partition to shrink, then drag the bottom bar to resize&lt;/strong&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1005"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1014"/>
<source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source>
<translation>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1062"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1071"/>
<source>Boot loader location:</source>
<translation>Boot loader location:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1115"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/>
<source>&lt;strong&gt;Select a partition to install on&lt;/strong&gt;</source>
<translation>&lt;strong&gt;Select a partition to install on&lt;/strong&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1174"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
<source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>The EFI system partition at %1 will be used for starting %2.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1190"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1199"/>
<source>EFI system partition:</source>
<translation>EFI system partition:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1334"/>
<source>This storage device does not seem to have an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
<translation>This storage device does not seem to have an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1330"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1367"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1389"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1414"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1339"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1376"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1398"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1423"/>
<source>&lt;strong&gt;Erase disk&lt;/strong&gt;&lt;br/&gt;This will &lt;font color="red"&gt;delete&lt;/font&gt; all data currently present on the selected storage device.</source>
<translation>&lt;strong&gt;Erase disk&lt;/strong&gt;&lt;br/&gt;This will &lt;font color="red"&gt;delete&lt;/font&gt; all data currently present on the selected storage device.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1334"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1363"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1385"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1410"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1343"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1372"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1394"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1419"/>
<source>&lt;strong&gt;Install alongside&lt;/strong&gt;&lt;br/&gt;The installer will shrink a partition to make room for %1.</source>
<translation>&lt;strong&gt;Install alongside&lt;/strong&gt;&lt;br/&gt;The installer will shrink a partition to make room for %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1338"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1372"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1393"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1418"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1381"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1402"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1427"/>
<source>&lt;strong&gt;Replace a partition&lt;/strong&gt;&lt;br/&gt;Replaces a partition with %1.</source>
<translation>&lt;strong&gt;Replace a partition&lt;/strong&gt;&lt;br/&gt;Replaces a partition with %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1357"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1366"/>
<source>This storage device has %1 on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
<translation>This storage device has %1 on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1380"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1389"/>
<source>This storage device already has an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
<translation>This storage device already has an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1405"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1414"/>
<source>This storage device has multiple operating systems on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
<translation>This storage device has multiple operating systems on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1477"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1486"/>
<source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
<translation>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/>
<source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
<translation>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1505"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1514"/>
<source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
<translation>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1632"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1641"/>
<source>No Swap</source>
<translation>No Swap</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1640"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1649"/>
<source>Reuse Swap</source>
<translation>Reuse Swap</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1643"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1652"/>
<source>Swap (no Hibernate)</source>
<translation>Swap (no Hibernate)</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1646"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1655"/>
<source>Swap (with Hibernate)</source>
<translation>Swap (with Hibernate)</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1649"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1658"/>
<source>Swap to file</source>
<translation>Swap to file</translation>
</message>
@ -749,12 +749,12 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>Config</name>
<message>
<location filename="../src/modules/keyboard/Config.cpp" line="330"/>
<location filename="../src/modules/keyboard/Config.cpp" line="354"/>
<source>Set keyboard model to %1.&lt;br/&gt;</source>
<translation>Set keyboard model to %1.&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/modules/keyboard/Config.cpp" line="337"/>
<location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Set keyboard layout to %1/%2.</translation>
</message>
@ -804,47 +804,47 @@ The installer will quit and all changes will be lost.</translation>
<translation>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="50"/>
<location filename="../src/modules/welcome/Config.cpp" line="55"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
<translation>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="54"/>
<location filename="../src/modules/welcome/Config.cpp" line="59"/>
<source>This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;Installation cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
<translation>This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;Installation cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="61"/>
<location filename="../src/modules/welcome/Config.cpp" line="66"/>
<source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
<translation>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="65"/>
<location filename="../src/modules/welcome/Config.cpp" line="70"/>
<source>This computer does not satisfy some of the recommended requirements for installing %1.&lt;br/&gt;Installation can continue, but some features might be disabled.</source>
<translation>This computer does not satisfy some of the recommended requirements for installing %1.&lt;br/&gt;Installation can continue, but some features might be disabled.</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="75"/>
<location filename="../src/modules/welcome/Config.cpp" line="80"/>
<source>This program will ask you some questions and set up %2 on your computer.</source>
<translation>This program will ask you some questions and set up %2 on your computer.</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="244"/>
<location filename="../src/modules/welcome/Config.cpp" line="252"/>
<source>&lt;h1&gt;Welcome to the Calamares setup program for %1&lt;/h1&gt;</source>
<translation>&lt;h1&gt;Welcome to the Calamares setup program for %1&lt;/h1&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="245"/>
<location filename="../src/modules/welcome/Config.cpp" line="253"/>
<source>&lt;h1&gt;Welcome to %1 setup&lt;/h1&gt;</source>
<translation>&lt;h1&gt;Welcome to %1 setup&lt;/h1&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="250"/>
<location filename="../src/modules/welcome/Config.cpp" line="257"/>
<source>&lt;h1&gt;Welcome to the Calamares installer for %1&lt;/h1&gt;</source>
<translation>&lt;h1&gt;Welcome to the Calamares installer for %1&lt;/h1&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="251"/>
<location filename="../src/modules/welcome/Config.cpp" line="258"/>
<source>&lt;h1&gt;Welcome to the %1 installer&lt;/h1&gt;</source>
<translation>&lt;h1&gt;Welcome to the %1 installer&lt;/h1&gt;</translation>
</message>
@ -939,15 +939,40 @@ The installer will quit and all changes will be lost.</translation>
<translation>The installation of %1 is complete.</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="85"/>
<location filename="../src/modules/packagechooser/Config.cpp" line="86"/>
<source>Package Selection</source>
<translation>Package Selection</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="87"/>
<location filename="../src/modules/packagechooser/Config.cpp" line="88"/>
<source>Please pick a product from the list. The selected product will be installed.</source>
<translation>Please pick a product from the list. The selected product will be installed.</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="177"/>
<source>Install option: &lt;strong&gt;%1&lt;/strong&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="177"/>
<source>None</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/summary/Config.cpp" line="82"/>
<source>Summary</source>
<translation type="unfinished">Summary</translation>
</message>
<message>
<location filename="../src/modules/summary/Config.cpp" line="86"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished">This is an overview of what will happen once you start the setup procedure.</translation>
</message>
<message>
<location filename="../src/modules/summary/Config.cpp" line="91"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished">This is an overview of what will happen once you start the install procedure.</translation>
</message>
</context>
<context>
<name>ContextualProcessJob</name>
@ -2446,6 +2471,14 @@ The installer will quit and all changes will be lost.</translation>
<translation>Please pick a product from the list. The selected product will be installed.</translation>
</message>
</context>
<context>
<name>PackageChooserQmlViewStep</name>
<message>
<location filename="../src/modules/packagechooserq/PackageChooserQmlViewStep.cpp" line="32"/>
<source>Packages</source>
<translation type="unfinished">Packages</translation>
</message>
</context>
<context>
<name>PackageChooserViewStep</name>
<message>
@ -2729,17 +2762,17 @@ The installer will quit and all changes will be lost.</translation>
<translation>I&amp;nstall boot loader on:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="219"/>
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="228"/>
<source>Are you sure you want to create a new partition table on %1?</source>
<translation>Are you sure you want to create a new partition table on %1?</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="254"/>
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="263"/>
<source>Can not create new partition</source>
<translation>Can not create new partition</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="255"/>
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="264"/>
<source>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.</source>
<translation>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.</translation>
</message>
@ -2757,107 +2790,82 @@ The installer will quit and all changes will be lost.</translation>
<translation>Partitions</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="147"/>
<source>Install %1 &lt;strong&gt;alongside&lt;/strong&gt; another operating system.</source>
<translation>Install %1 &lt;strong&gt;alongside&lt;/strong&gt; another operating system.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="151"/>
<source>&lt;strong&gt;Erase&lt;/strong&gt; disk and install %1.</source>
<translation>&lt;strong&gt;Erase&lt;/strong&gt; disk and install %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="154"/>
<source>&lt;strong&gt;Replace&lt;/strong&gt; a partition with %1.</source>
<translation>&lt;strong&gt;Replace&lt;/strong&gt; a partition with %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="158"/>
<source>&lt;strong&gt;Manual&lt;/strong&gt; partitioning.</source>
<translation>&lt;strong&gt;Manual&lt;/strong&gt; partitioning.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="171"/>
<source>Install %1 &lt;strong&gt;alongside&lt;/strong&gt; another operating system on disk &lt;strong&gt;%2&lt;/strong&gt; (%3).</source>
<translation>Install %1 &lt;strong&gt;alongside&lt;/strong&gt; another operating system on disk &lt;strong&gt;%2&lt;/strong&gt; (%3).</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="178"/>
<source>&lt;strong&gt;Erase&lt;/strong&gt; disk &lt;strong&gt;%2&lt;/strong&gt; (%3) and install %1.</source>
<translation>&lt;strong&gt;Erase&lt;/strong&gt; disk &lt;strong&gt;%2&lt;/strong&gt; (%3) and install %1.</translation>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="301"/>
<source>Current:</source>
<translation>Current:</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="184"/>
<source>&lt;strong&gt;Replace&lt;/strong&gt; a partition on disk &lt;strong&gt;%2&lt;/strong&gt; (%3) with %1.</source>
<translation>&lt;strong&gt;Replace&lt;/strong&gt; a partition on disk &lt;strong&gt;%2&lt;/strong&gt; (%3) with %1.</translation>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="319"/>
<source>After:</source>
<translation>After:</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="191"/>
<source>&lt;strong&gt;Manual&lt;/strong&gt; partitioning on disk &lt;strong&gt;%1&lt;/strong&gt; (%2).</source>
<translation>&lt;strong&gt;Manual&lt;/strong&gt; partitioning on disk &lt;strong&gt;%1&lt;/strong&gt; (%2).</translation>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="528"/>
<source>No EFI system partition configured</source>
<translation>No EFI system partition configured</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="200"/>
<source>Disk &lt;strong&gt;%1&lt;/strong&gt; (%2)</source>
<translation>Disk &lt;strong&gt;%1&lt;/strong&gt; (%2)</translation>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="532"/>
<source>EFI system partition configured incorrectly</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="226"/>
<source>Current:</source>
<translation>Current:</translation>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="536"/>
<source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;To configure an EFI system partition, go back and select or create a suitable filesystem.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="244"/>
<source>After:</source>
<translation>After:</translation>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="544"/>
<source>The filesystem must be mounted on &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="450"/>
<source>No EFI system partition configured</source>
<translation>No EFI system partition configured</translation>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="549"/>
<source>The filesystem must have type FAT32.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="451"/>
<source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;To configure an EFI system partition, go back and select or create a FAT32 filesystem with the &lt;strong&gt;%3&lt;/strong&gt; flag enabled and mount point &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;You can continue without setting up an EFI system partition but your system may fail to start.</source>
<translation>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;To configure an EFI system partition, go back and select or create a FAT32 filesystem with the &lt;strong&gt;%3&lt;/strong&gt; flag enabled and mount point &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;You can continue without setting up an EFI system partition but your system may fail to start.</translation>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="554"/>
<source>The filesystem must be at least %1 MiB in size.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="465"/>
<source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;A partition was configured with mount point &lt;strong&gt;%2&lt;/strong&gt; but its &lt;strong&gt;%3&lt;/strong&gt; flag is not set.&lt;br/&gt;To set the flag, go back and edit the partition.&lt;br/&gt;&lt;br/&gt;You can continue without setting the flag but your system may fail to start.</source>
<translation>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;A partition was configured with mount point &lt;strong&gt;%2&lt;/strong&gt; but its &lt;strong&gt;%3&lt;/strong&gt; flag is not set.&lt;br/&gt;To set the flag, go back and edit the partition.&lt;br/&gt;&lt;br/&gt;You can continue without setting the flag but your system may fail to start.</translation>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="560"/>
<source>The filesystem must have flag &lt;strong&gt;%1&lt;/strong&gt; set.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="464"/>
<source>EFI system partition flag not set</source>
<translation>EFI system partition flag not set</translation>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="564"/>
<source>You can continue without setting up an EFI system partition but your system may fail to start.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="491"/>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="580"/>
<source>Option to use GPT on BIOS</source>
<translation>Option to use GPT on BIOS</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="492"/>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="581"/>
<source>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;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 &lt;strong&gt;bios_grub&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</source>
<translation>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;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 &lt;strong&gt;bios_grub&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="521"/>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="610"/>
<source>Boot partition not encrypted</source>
<translation>Boot partition not encrypted</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="522"/>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="611"/>
<source>A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.&lt;br/&gt;&lt;br/&gt;There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.&lt;br/&gt;You may continue if you wish, but filesystem unlocking will happen later during system startup.&lt;br/&gt;To encrypt the boot partition, go back and recreate it, selecting &lt;strong&gt;Encrypt&lt;/strong&gt; in the partition creation window.</source>
<translation>A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.&lt;br/&gt;&lt;br/&gt;There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.&lt;br/&gt;You may continue if you wish, but filesystem unlocking will happen later during system startup.&lt;br/&gt;To encrypt the boot partition, go back and recreate it, selecting &lt;strong&gt;Encrypt&lt;/strong&gt; in the partition creation window.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="608"/>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="696"/>
<source>has at least one disk device available.</source>
<translation>has at least one disk device available.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="609"/>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="697"/>
<source>There are no partitions to install on.</source>
<translation>There are no partitions to install on.</translation>
</message>
@ -2992,7 +3000,7 @@ Output:
<context>
<name>QObject</name>
<message>
<location filename="../src/libcalamares/locale/Label.cpp" line="29"/>
<location filename="../src/libcalamares/locale/Label.cpp" line="61"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@ -3318,44 +3326,16 @@ Output:
<context>
<name>ResultsListDialog</name>
<message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="138"/>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="137"/>
<source>For best results, please ensure that this computer:</source>
<translation>For best results, please ensure that this computer:</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="139"/>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="138"/>
<source>System requirements</source>
<translation>System requirements</translation>
</message>
</context>
<context>
<name>ResultsListWidget</name>
<message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="263"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
<translation>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="267"/>
<source>This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;Installation cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
<translation>This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;Installation cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="274"/>
<source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
<translation>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="278"/>
<source>This computer does not satisfy some of the recommended requirements for installing %1.&lt;br/&gt;Installation can continue, but some features might be disabled.</source>
<translation>This computer does not satisfy some of the recommended requirements for installing %1.&lt;br/&gt;Installation can continue, but some features might be disabled.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="287"/>
<source>This program will ask you some questions and set up %2 on your computer.</source>
<translation>This program will ask you some questions and set up %2 on your computer.</translation>
</message>
</context>
<context>
<name>ScanningDialog</name>
<message>
@ -3647,27 +3627,6 @@ Output:
<translation>%L1 / %L2</translation>
</message>
</context>
<context>
<name>SummaryPage</name>
<message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="49"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation>This is an overview of what will happen once you start the setup procedure.</translation>
</message>
<message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="51"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>This is an overview of what will happen once you start the install procedure.</translation>
</message>
</context>
<context>
<name>SummaryViewStep</name>
<message>
<location filename="../src/modules/summary/SummaryViewStep.cpp" line="36"/>
<source>Summary</source>
<translation>Summary</translation>
</message>
</context>
<context>
<name>TrackingInstallJob</name>
<message>
@ -3999,7 +3958,7 @@ Output:
<context>
<name>WelcomeQmlViewStep</name>
<message>
<location filename="../src/modules/welcomeq/WelcomeQmlViewStep.cpp" line="41"/>
<location filename="../src/modules/welcomeq/WelcomeQmlViewStep.cpp" line="40"/>
<source>Welcome</source>
<translation>Welcome</translation>
</message>
@ -4007,7 +3966,7 @@ Output:
<context>
<name>WelcomeViewStep</name>
<message>
<location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="48"/>
<location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="46"/>
<source>Welcome</source>
<translation>Welcome</translation>
</message>
@ -4090,21 +4049,21 @@ Output:
<context>
<name>i18n</name>
<message>
<location filename="../src/modules/localeq/i18n.qml" line="46"/>
<location filename="../src/modules/localeq/i18n.qml" line="50"/>
<source>&lt;h1&gt;Languages&lt;/h1&gt; &lt;/br&gt;
The system locale setting affects the language and character set for some command line user interface elements. The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation>&lt;h1&gt;Languages&lt;/h1&gt; &lt;/br&gt;
The system locale setting affects the language and character set for some command line user interface elements. The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</translation>
</message>
<message>
<location filename="../src/modules/localeq/i18n.qml" line="106"/>
<location filename="../src/modules/localeq/i18n.qml" line="123"/>
<source>&lt;h1&gt;Locales&lt;/h1&gt; &lt;/br&gt;
The system locale setting affects the numbers and dates format. The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation>&lt;h1&gt;Locales&lt;/h1&gt; &lt;/br&gt;
The system locale setting affects the numbers and dates format. The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</translation>
</message>
<message>
<location filename="../src/modules/localeq/i18n.qml" line="158"/>
<location filename="../src/modules/localeq/i18n.qml" line="189"/>
<source>Back</source>
<translation>Back</translation>
</message>
@ -4170,6 +4129,45 @@ Output:
&lt;p&gt;These are example release notes.&lt;/p&gt;</translation>
</message>
</context>
<context>
<name>packagechooserq</name>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="45"/>
<source>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.&lt;br/&gt;
Default option.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="59"/>
<source>LibreOffice</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="108"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="121"/>
<source>No Office Suite</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="172"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="185"/>
<source>Minimal Install</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="233"/>
<source>Please select an option for your install, or use the default: LibreOffice included.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>release_notes</name>
<message>
@ -4226,132 +4224,132 @@ Output:
<context>
<name>usersq</name>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/>
<location filename="../src/modules/usersq/usersq.qml" line="43"/>
<source>Pick your user name and credentials to login and perform admin tasks</source>
<translation>Pick your user name and credentials to login and perform admin tasks</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="49"/>
<location filename="../src/modules/usersq/usersq.qml" line="56"/>
<source>What is your name?</source>
<translation>What is your name?</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="56"/>
<location filename="../src/modules/usersq/usersq.qml" line="63"/>
<source>Your Full Name</source>
<translation>Your Full Name</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="71"/>
<location filename="../src/modules/usersq/usersq.qml" line="80"/>
<source>What name do you want to use to log in?</source>
<translation>What name do you want to use to log in?</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="78"/>
<location filename="../src/modules/usersq/usersq.qml" line="87"/>
<source>Login Name</source>
<translation>Login Name</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="98"/>
<location filename="../src/modules/usersq/usersq.qml" line="116"/>
<source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
<translation>If more than one person will use this computer, you can create multiple accounts after installation.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="110"/>
<location filename="../src/modules/usersq/usersq.qml" line="128"/>
<source>Only lowercase letters, numbers, underscore and hyphen are allowed.</source>
<translation>Only lowercase letters, numbers, underscore and hyphen are allowed.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
<location filename="../src/modules/usersq/usersq.qml" line="136"/>
<source>root is not allowed as username.</source>
<translation>root is not allowed as username.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="127"/>
<location filename="../src/modules/usersq/usersq.qml" line="145"/>
<source>What is the name of this computer?</source>
<translation>What is the name of this computer?</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="133"/>
<location filename="../src/modules/usersq/usersq.qml" line="151"/>
<source>Computer Name</source>
<translation>Computer Name</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="154"/>
<location filename="../src/modules/usersq/usersq.qml" line="178"/>
<source>This name will be used if you make the computer visible to others on a network.</source>
<translation>This name will be used if you make the computer visible to others on a network.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="174"/>
<location filename="../src/modules/usersq/usersq.qml" line="198"/>
<source>localhost is not allowed as hostname.</source>
<translation>localhost is not allowed as hostname.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="183"/>
<location filename="../src/modules/usersq/usersq.qml" line="207"/>
<source>Choose a password to keep your account safe.</source>
<translation>Choose a password to keep your account safe.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="193"/>
<location filename="../src/modules/usersq/usersq.qml" line="217"/>
<source>Password</source>
<translation>Password</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="208"/>
<location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Repeat Password</source>
<translation>Repeat Password</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="232"/>
<location filename="../src/modules/usersq/usersq.qml" line="261"/>
<source>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.</source>
<translation>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.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="373"/>
<location filename="../src/modules/usersq/usersq.qml" line="406"/>
<source>Validate passwords quality</source>
<translation>Validate passwords quality</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="383"/>
<location filename="../src/modules/usersq/usersq.qml" line="416"/>
<source>When this box is checked, password-strength checking is done and you will not be able to use a weak password.</source>
<translation>When this box is checked, password-strength checking is done and you will not be able to use a weak password.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="365"/>
<location filename="../src/modules/usersq/usersq.qml" line="398"/>
<source>Log in automatically without asking for the password</source>
<translation>Log in automatically without asking for the password</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="166"/>
<location filename="../src/modules/usersq/usersq.qml" line="190"/>
<source>Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.</source>
<translation>Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="264"/>
<location filename="../src/modules/usersq/usersq.qml" line="293"/>
<source>Reuse user password as root password</source>
<translation>Reuse user password as root password</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="272"/>
<location filename="../src/modules/usersq/usersq.qml" line="301"/>
<source>Use the same password for the administrator account.</source>
<translation>Use the same password for the administrator account.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="285"/>
<location filename="../src/modules/usersq/usersq.qml" line="314"/>
<source>Choose a root password to keep your account safe.</source>
<translation>Choose a root password to keep your account safe.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="295"/>
<location filename="../src/modules/usersq/usersq.qml" line="324"/>
<source>Root Password</source>
<translation>Root Password</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="311"/>
<location filename="../src/modules/usersq/usersq.qml" line="342"/>
<source>Repeat Root Password</source>
<translation>Repeat Root Password</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="335"/>
<location filename="../src/modules/usersq/usersq.qml" line="368"/>
<source>Enter the same password twice, so that it can be checked for typing errors.</source>
<translation>Enter the same password twice, so that it can be checked for typing errors.</translation>
</message>

@ -515,7 +515,7 @@ L'installateur se fermera et les changements seront perdus.</translation>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="39"/>
<source>Set filesystem label &lt;strong&gt;%1&lt;/strong&gt; to partition &lt;strong&gt;%2&lt;/strong&gt;.</source>
<translation type="unfinished"/>
<translation>Mettre le nom du système de fichier &lt;strong&gt;%1&lt;/strong&gt; à la partition &lt;strong&gt;%2&lt;/strong&gt;.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="70"/>
@ -896,7 +896,7 @@ L'installateur se fermera et les changements seront perdus.</translation>
<message>
<location filename="../src/modules/users/Config.cpp" line="548"/>
<source>OK!</source>
<translation type="unfinished"/>
<translation>OK!</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
@ -1889,7 +1889,7 @@ L'installateur se fermera et les changements seront perdus.</translation>
<message>
<location filename="../src/libcalamares/locale/Tests.cpp" line="273"/>
<source>Quit</source>
<translation type="unfinished"/>
<translation>Quiter</translation>
</message>
</context>
<context>
@ -4262,7 +4262,7 @@ Sortie
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
<source>root is not allowed as username.</source>
<translation type="unfinished"/>
<translation>root n'est pas autorisé en tant que nom d'utilisateur.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="127"/>
@ -4282,7 +4282,7 @@ Sortie
<message>
<location filename="../src/modules/usersq/usersq.qml" line="174"/>
<source>localhost is not allowed as hostname.</source>
<translation type="unfinished"/>
<translation>localhost n'est pas autorisé en tant que nom d'utilisateur.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="183"/>
@ -4322,7 +4322,7 @@ Sortie
<message>
<location filename="../src/modules/usersq/usersq.qml" line="166"/>
<source>Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.</source>
<translation type="unfinished"/>
<translation>Seuls les lettres, les chiffres, les underscores et les trait d'union sont autorisés et un minimum de deux caractères.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="264"/>

@ -4312,7 +4312,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="166"/>
<source>Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.</source>
<translation type="unfinished"/>
<translation>, , , 2 .</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="264"/>

File diff suppressed because it is too large Load Diff

@ -232,7 +232,7 @@
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="304"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python klaida užduotyje "%1".</translation>
<translation>Boost.Python klaida užduotyje %1.</translation>
</message>
</context>
<context>
@ -1225,7 +1225,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message>
<location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="48"/>
<source>The installer failed to deactivate a volume group named %1.</source>
<translation>Diegimo programai nepavyko pasyvinti tomų grupės, pavadinimu "%1".</translation>
<translation>Diegimo programai nepavyko pasyvinti tomų grupės, pavadinimu %1.</translation>
</message>
</context>
<context>
@ -1309,7 +1309,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message>
<location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="121"/>
<source>Skip writing LUKS configuration for Dracut: "/" partition is not encrypted</source>
<translation>Praleisti LUKS konfigūracijos, kuri yra skirta Dracut, įrašymą: "/" skaidinys nėra užšifruotas</translation>
<translation>Praleisti LUKS konfigūracijos, kuri yra skirta Dracut, įrašymą: / skaidinys nėra užšifruotas</translation>
</message>
<message>
<location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="138"/>
@ -2162,7 +2162,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="196"/>
<source>Memory allocation error when setting '%1'</source>
<translation>Atminties paskirstymo klaida, nustatant "%1"</translation>
<translation>Atminties paskirstymo klaida, nustatant %1</translation>
</message>
<message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="199"/>
@ -3123,7 +3123,7 @@ Išvestis:
<message>
<location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="48"/>
<source>The installer failed to remove a volume group named '%1'.</source>
<translation>Diegimo programai nepavyko pašalinti tomų grupės, pavadinimu "%1".</translation>
<translation>Diegimo programai nepavyko pašalinti tomų grupės, pavadinimu %1.</translation>
</message>
</context>
<context>

@ -6,7 +6,7 @@
<message>
<location filename="../src/modules/partition/jobs/AutoMountManagementJob.cpp" line="22"/>
<source>Manage auto-mount settings</source>
<translation type="unfinished"/>
<translation>- ി</translation>
</message>
</context>
<context>
@ -4024,7 +4024,7 @@ Output:
<message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/>
<source>Back</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -4082,7 +4082,7 @@ Output:
<message>
<location filename="../src/modules/localeq/i18n.qml" line="158"/>
<source>Back</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -4175,7 +4175,7 @@ Output:
<message>
<location filename="../src/modules/welcomeq/release_notes.qml" line="76"/>
<source>Back</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -4203,7 +4203,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="78"/>
<source>Login Name</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="98"/>
@ -4238,7 +4238,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="174"/>
<source>localhost is not allowed as hostname.</source>
<translation type="unfinished"/>
<translation>localhost ി .</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="183"/>
@ -4263,7 +4263,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="373"/>
<source>Validate passwords quality</source>
<translation type="unfinished"/>
<translation>ി ി </translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="383"/>
@ -4273,17 +4273,17 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="365"/>
<source>Log in automatically without asking for the password</source>
<translation type="unfinished"/>
<translation> ി ി</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="166"/>
<source>Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.</source>
<translation type="unfinished"/>
<translation>, , , ി ിി, ി.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="264"/>
<source>Reuse user password as root password</source>
<translation type="unfinished"/>
<translation> ി ി</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="272"/>
@ -4293,22 +4293,22 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="285"/>
<source>Choose a root password to keep your account safe.</source>
<translation type="unfinished"/>
<translation> ി ി.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="295"/>
<source>Root Password</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="311"/>
<source>Repeat Root Password</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="335"/>
<source>Enter the same password twice, so that it can be checked for typing errors.</source>
<translation type="unfinished"/>
<translation>ി ിി ിിി .</translation>
</message>
</context>
<context>
@ -4322,27 +4322,27 @@ Output:
<message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
<source>About</source>
<translation type="unfinished"/>
<translation>ി</translation>
</message>
<message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
<source>Support</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
<source>Known issues</source>
<translation type="unfinished"/>
<translation>ി </translation>
</message>
<message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
<source>Release notes</source>
<translation type="unfinished"/>
<translation>ി</translation>
</message>
<message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
<source>Donate</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
</TS>

@ -24,7 +24,7 @@
<message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="84"/>
<source>This system was started with a &lt;strong&gt;BIOS&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from a BIOS environment, this installer must install a boot loader, like &lt;strong&gt;GRUB&lt;/strong&gt;, either at the beginning of a partition or on the &lt;strong&gt;Master Boot Record&lt;/strong&gt; 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.</source>
<translation>Este sistema foi iniciado utilizando o &lt;strong&gt;BIOS&lt;/strong&gt; como ambiente de inicialização.&lt;br&gt;&lt;br&gt;Para configurar a inicialização em um ambiente BIOS, este instalador deve instalar um gerenciador de boot, como o &lt;strong&gt;GRUB&lt;/strong&gt;, no começo de uma partição ou no &lt;strong&gt;Master Boot Record&lt;/strong&gt;, perto do começo da tabela de partições (recomendado). Esse processo é automático, a não ser que você escolha o particionamento manual, onde você deverá configurá-lo manualmente.</translation>
<translation>Este sistema foi iniciado utilizando o &lt;strong&gt;BIOS&lt;/strong&gt; como ambiente de inicialização.&lt;br&gt;&lt;br&gt;Para configurar a inicialização em um ambiente BIOS, este instalador deve instalar um gerenciador de inicialização, como o &lt;strong&gt;GRUB&lt;/strong&gt;, no começo de uma partição ou no &lt;strong&gt;Master Boot Record&lt;/strong&gt;, perto do começo da tabela de partições (recomendado). Esse processo é automático, a não ser que você escolha o particionamento manual, onde você deverá configurá-lo manualmente.</translation>
</message>
</context>
<context>
@ -510,12 +510,12 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="32"/>
<source>Set filesystem label on %1.</source>
<translation type="unfinished"/>
<translation>Definir etiqueta do sistema de arquivos em %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="39"/>
<source>Set filesystem label &lt;strong&gt;%1&lt;/strong&gt; to partition &lt;strong&gt;%2&lt;/strong&gt;.</source>
<translation type="unfinished"/>
<translation>Definir etiqueta do sistema de arquivos &lt;strong&gt;%1&lt;/strong&gt; para partição &lt;strong&gt;%2&lt;/strong&gt;.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="70"/>
@ -896,7 +896,7 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<message>
<location filename="../src/modules/users/Config.cpp" line="548"/>
<source>OK!</source>
<translation type="unfinished"/>
<translation>OK!</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
@ -1012,12 +1012,12 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="231"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation>Etiqueta para o sistema de arquivos</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="241"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation>Etiqueta do FS:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="65"/>
@ -1376,12 +1376,12 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="186"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation>Etiqueta para o sistema de arquivos</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="196"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation>Etiqueta do FS:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="291"/>
@ -1889,7 +1889,7 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<message>
<location filename="../src/libcalamares/locale/Tests.cpp" line="273"/>
<source>Quit</source>
<translation type="unfinished"/>
<translation>Sair</translation>
</message>
</context>
<context>
@ -2113,7 +2113,7 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<message>
<location filename="../src/modules/localeq/Offline.qml" line="41"/>
<source>Select your preferred Region, or use the default settings.</source>
<translation type="unfinished"/>
<translation>Selecione sua região preferida ou use as configurações predefinidas.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="98"/>
@ -2653,7 +2653,7 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="304"/>
<source>File System Label</source>
<translation type="unfinished"/>
<translation>Etiqueta do Sistema de Arquivos</translation>
</message>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="306"/>
@ -2844,7 +2844,7 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="521"/>
<source>Boot partition not encrypted</source>
<translation>Partição de boot não criptografada</translation>
<translation>Partição de inicialização não criptografada</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="522"/>
@ -4263,7 +4263,7 @@ Saída:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
<source>root is not allowed as username.</source>
<translation type="unfinished"/>
<translation>root não é permitido como um nome de usuário.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="127"/>
@ -4283,7 +4283,7 @@ Saída:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="174"/>
<source>localhost is not allowed as hostname.</source>
<translation type="unfinished"/>
<translation>localhost não é permitido como hostname.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="183"/>
@ -4323,7 +4323,7 @@ Saída:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="166"/>
<source>Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.</source>
<translation type="unfinished"/>
<translation>São permitidos apenas letras, números, sublinhado e hífen, com no mínimo dois caracteres.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="264"/>

@ -277,7 +277,7 @@
<numerusform>(% секунда)</numerusform>
<numerusform>(% секунд)</numerusform>
<numerusform>(% секунд)</numerusform>
<numerusform>(% секунд)</numerusform>
<numerusform>(%n секунд)</numerusform>
</translation>
</message>
<message>
@ -1011,12 +1011,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="231"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation>Метка файловой системы</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="241"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation>Метка ФС:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="65"/>
@ -1054,7 +1054,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="121"/>
<source>Create new %1MiB partition on %3 (%2).</source>
<translation type="unfinished"/>
<translation>Создать новый раздел %1МиБ на %3 (%2).</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="128"/>
@ -1069,7 +1069,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="154"/>
<source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2).</source>
<translation type="unfinished"/>
<translation>Создать новый раздел &lt;strong&gt;%1МиБ&lt;/strong&gt; на &lt;strong&gt;%3&lt;/strong&gt; (%2).</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="161"/>
@ -1375,12 +1375,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="186"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation>Метка файловой системы</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="196"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation>Метка ФС:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="291"/>
@ -1442,7 +1442,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="221"/>
<source>Set up &lt;strong&gt;new&lt;/strong&gt; %2 partition with mount point &lt;strong&gt;%1&lt;/strong&gt;%3.</source>
<translation type="unfinished"/>
<translation>Настроить &lt;strong&gt;новый&lt;/strong&gt; %2 раздел с точкой монтирования &lt;strong&gt;%1&lt;/strong&gt; %3.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="235"/>
@ -1457,7 +1457,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="263"/>
<source>Set up %3 partition &lt;strong&gt;%1&lt;/strong&gt; with mount point &lt;strong&gt;%2&lt;/strong&gt;%4.</source>
<translation type="unfinished"/>
<translation>Настроить %3 раздел &lt;strong&gt;%1&lt;/strong&gt; с точкой монтирования &lt;strong&gt;%2&lt;/strong&gt;%4.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="244"/>
@ -2525,7 +2525,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="148"/>
<source>login</source>
<translation type="unfinished"/>
<translation>Вход</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="223"/>
@ -2668,7 +2668,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="304"/>
<source>File System Label</source>
<translation type="unfinished"/>
<translation>Метка файловой системы</translation>
</message>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="306"/>
@ -3053,7 +3053,7 @@ Output:
<message>
<location filename="../src/modules/machineid/MachineIdJob.cpp" line="83"/>
<source>Directory not found</source>
<translation type="unfinished"/>
<translation>Папка не найдена</translation>
</message>
<message>
<location filename="../src/modules/machineid/MachineIdJob.cpp" line="84"/>
@ -3088,7 +3088,7 @@ Output:
<location filename="../src/modules/welcomeq/Recommended.qml" line="40"/>
<source>&lt;p&gt;This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;
Setup can continue, but some features might be disabled.&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Этот компьютер соответствует не всем рекомендуемым требованиям для установки %1.&lt;br/&gt;Можно продолжить установку, но некоторые возможности могут быть недоступны.&lt;/p&gt;</translation>
</message>
</context>
<context>
@ -3206,7 +3206,7 @@ Output:
<location filename="../src/modules/welcomeq/Requirements.qml" line="40"/>
<source>&lt;p&gt;This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;
Setup can continue, but some features might be disabled.&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Этот компьютер соответствует не всем рекомендуемым требованиям для установки %1.&lt;br/&gt;Можно продолжить установку, но некоторые возможности могут быть недоступны.&lt;/p&gt;</translation>
</message>
</context>
<context>
@ -3657,7 +3657,7 @@ Output:
<location filename="../src/qml/calamares/slideshow/SlideCounter.qml" line="27"/>
<source>%L1 / %L2</source>
<extracomment>slide counter, %1 of %2 (numeric)</extracomment>
<translation type="unfinished"/>
<translation>%L1 / %L2</translation>
</message>
</context>
<context>
@ -3714,13 +3714,13 @@ Output:
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="128"/>
<source>Configuring KDE user feedback.</source>
<translation type="unfinished"/>
<translation>Настройка обратной связи KDE</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="150"/>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="156"/>
<source>Error in KDE user feedback configuration.</source>
<translation type="unfinished"/>
<translation>Ошибка в настройке обратной связи KDE</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="151"/>
@ -3936,7 +3936,7 @@ Output:
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
<source>&amp;Donate</source>
<translation type="unfinished"/>
<translation>Пожертвовать</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
@ -4062,7 +4062,7 @@ Output:
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
<source>Installation Completed</source>
<translation type="unfinished"/>
<translation>Установка завершена </translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
@ -4073,7 +4073,7 @@ Output:
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
<source>Close Installer</source>
<translation type="unfinished"/>
<translation>Закрыть установщик</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
@ -4117,7 +4117,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="377"/>
<source>Layouts</source>
<translation type="unfinished"/>
<translation>Раскладки</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="148"/>
@ -4127,7 +4127,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
<source>Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.</source>
<translation type="unfinished"/>
<translation>Выберете предпочитаемую модель клавиатуры, чтобы выбрать раскладку и вариант, или используйте модель по умолчанию в зависимости от обнаруженного оборудования.</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -4231,7 +4231,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="98"/>
<source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
<translation type="unfinished"/>
<translation>Если этот компьютер используется несколькими людьми, Вы сможете создать соответствующие учетные записи сразу после установки.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="110"/>
@ -4241,7 +4241,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
<source>root is not allowed as username.</source>
<translation type="unfinished"/>
<translation>root не допускается в качестве имени пользователя.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="127"/>
@ -4261,7 +4261,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="174"/>
<source>localhost is not allowed as hostname.</source>
<translation type="unfinished"/>
<translation>localhost не допускается в качестве имени пользователя.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="183"/>
@ -4296,7 +4296,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="365"/>
<source>Log in automatically without asking for the password</source>
<translation type="unfinished"/>
<translation>Входить автоматически, не спрашивая пароль</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="166"/>
@ -4326,12 +4326,12 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="311"/>
<source>Repeat Root Password</source>
<translation type="unfinished"/>
<translation>Повторите пароль от root</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="335"/>
<source>Enter the same password twice, so that it can be checked for typing errors.</source>
<translation type="unfinished"/>
<translation>Введите пароль повторно, чтобы не допустить ошибок при вводе</translation>
</message>
</context>
<context>

@ -73,7 +73,7 @@
<message>
<location filename="../src/calamares/DebugWindow.ui" line="28"/>
<source>GlobalStorage</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="38"/>
@ -88,7 +88,7 @@
<message>
<location filename="../src/calamares/DebugWindow.ui" line="61"/>
<source>Type:</source>
<translation type="unfinished"/>
<translation>:</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="68"/>
@ -99,7 +99,7 @@
<message>
<location filename="../src/calamares/DebugWindow.ui" line="75"/>
<source>Interface:</source>
<translation type="unfinished"/>
<translation>:</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="102"/>
@ -240,7 +240,7 @@
<message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="67"/>
<source>Loading ...</source>
<translation type="unfinished"/>
<translation> ...</translation>
</message>
<message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="88"/>
@ -308,18 +308,18 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="179"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="519"/>
<source>&amp;Yes</source>
<translation type="unfinished"/>
<translation> (Y)</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="180"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="520"/>
<source>&amp;No</source>
<translation type="unfinished"/>
<translation> (N)</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="186"/>
<source>&amp;Close</source>
<translation type="unfinished"/>
<translation> (C)</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/Paste.cpp" line="170"/>
@ -388,7 +388,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="343"/>
<source>Go &amp;back</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="393"/>
@ -428,7 +428,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="414"/>
<source>&amp;Back</source>
<translation type="unfinished"/>
<translation> (B)</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="420"/>
@ -448,7 +448,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="512"/>
<source>Cancel installation?</source>
<translation type="unfinished"/>
<translation> ?</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="513"/>
@ -543,7 +543,7 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1033"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/>
<source>Current:</source>
<translation type="unfinished"/>
<translation>:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="123"/>
@ -845,7 +845,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/Config.cpp" line="217"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
<translation> .</translation>
</message>
<message>
<location filename="../src/modules/users/Config.cpp" line="223"/>
@ -890,7 +890,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/Config.cpp" line="548"/>
<source>OK!</source>
<translation type="unfinished"/>
<translation>!</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
@ -961,7 +961,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="42"/>
<source>Si&amp;ze:</source>
<translation type="unfinished"/>
<translation>:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="52"/>
@ -986,7 +986,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="123"/>
<source>Fi&amp;le System:</source>
<translation type="unfinished"/>
<translation> :</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="155"/>
@ -1139,12 +1139,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="36"/>
<source>Create user %1</source>
<translation type="unfinished"/>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="43"/>
<source>Create user &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation type="unfinished"/>
<translation>&lt;strong&gt;%1&lt;/strong&gt; .</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="126"/>
@ -1155,12 +1155,12 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/users/CreateUserJob.cpp" line="50"/>
<location filename="../src/modules/users/CreateUserJob.cpp" line="143"/>
<source>Creating user %1</source>
<translation type="unfinished"/>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="151"/>
<source>Configuring user %1</source>
<translation type="unfinished"/>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="159"/>
@ -1280,13 +1280,13 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/partition/core/DeviceModel.cpp" line="84"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
<location filename="../src/modules/partition/core/DeviceModel.cpp" line="95"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
<translation>%1 - (%2)</translation>
</message>
</context>
<context>
@ -1350,7 +1350,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="123"/>
<source>Si&amp;ze:</source>
<translation type="unfinished"/>
<translation>:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="133"/>
@ -1360,7 +1360,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="140"/>
<source>Fi&amp;le System:</source>
<translation type="unfinished"/>
<translation> :</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="153"/>
@ -1706,7 +1706,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/keyboardq/KeyboardQmlViewStep.cpp" line="32"/>
<source>Keyboard</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -1714,7 +1714,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/keyboard/KeyboardViewStep.cpp" line="42"/>
<source>Keyboard</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -1788,7 +1788,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/license/LicenseViewStep.cpp" line="43"/>
<source>License</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -1796,7 +1796,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="88"/>
<source>URL: %1</source>
<translation type="unfinished"/>
<translation>...: %1</translation>
</message>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="109"/>
@ -1833,7 +1833,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="163"/>
<source>File: %1</source>
<translation type="unfinished"/>
<translation>: %1</translation>
</message>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="186"/>
@ -1867,7 +1867,7 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/locale/LocalePage.cpp" line="132"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="133"/>
<source>&amp;Change...</source>
<translation type="unfinished"/>
<translation> ...</translation>
</message>
</context>
<context>
@ -1875,7 +1875,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/localeq/LocaleQmlViewStep.cpp" line="32"/>
<source>Location</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -1883,7 +1883,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/libcalamares/locale/Tests.cpp" line="273"/>
<source>Quit</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
</context>
<context>
@ -1891,7 +1891,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/locale/LocaleViewStep.cpp" line="76"/>
<source>Location</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -1973,27 +1973,27 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="50"/>
<source>Office software</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="51"/>
<source>Office package</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="52"/>
<source>Browser software</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="53"/>
<source>Browser package</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="54"/>
<source>Web browser</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="55"/>
@ -2003,7 +2003,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="56"/>
<source>Services</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="57"/>
@ -2018,32 +2018,32 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="59"/>
<source>Applications</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="60"/>
<source>Communication</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="61"/>
<source>Development</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="62"/>
<source>Office</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="63"/>
<source>Multimedia</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="64"/>
<source>Internet</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="65"/>
@ -2066,7 +2066,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/notesqml/NotesQmlViewStep.cpp" line="23"/>
<source>Notes</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -2135,12 +2135,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="51"/>
<source>Password is too short</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="67"/>
<source>Password is too long</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="188"/>
@ -2223,7 +2223,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="249"/>
<source>The password is too short</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
<message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="258"/>
@ -2796,7 +2796,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="226"/>
<source>Current:</source>
<translation type="unfinished"/>
<translation>:</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="244"/>

@ -787,12 +787,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="57"/>
<source>Network Installation. (Disabled: Internal error)</source>
<translation type="unfinished"/>
<translation>Sieťová inštalácia. (Zakázaná: vnútorná chyba)</translation>
</message>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="61"/>
<source>Network Installation. (Disabled: No package list)</source>
<translation type="unfinished"/>
<translation>Sieťová inštalácia. (Zakázaná: bez zoznamu balíkov)</translation>
</message>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="77"/>
@ -897,7 +897,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<message>
<location filename="../src/modules/users/Config.cpp" line="548"/>
<source>OK!</source>
<translation type="unfinished"/>
<translation>OK!</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
@ -912,12 +912,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<message>
<location filename="../src/modules/finished/Config.cpp" line="147"/>
<source>The setup of %1 did not complete successfully.</source>
<translation type="unfinished"/>
<translation>Inštalácia distribúcie %1 nebola úspešne dokončená.</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="148"/>
<source>The installation of %1 did not complete successfully.</source>
<translation type="unfinished"/>
<translation>Inštalácia distribúcie %1 bola úspešne dokončená.</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="152"/>
@ -1013,12 +1013,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="231"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation>Menovka systému súborov</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="241"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation>Menovka SS:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="65"/>
@ -1051,12 +1051,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="113"/>
<source>Create new %1MiB partition on %3 (%2) with entries %4.</source>
<translation type="unfinished"/>
<translation>Vytvorenie nového %1MiB oddielu na zariadení %3 (%2) so záznamami %4.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="121"/>
<source>Create new %1MiB partition on %3 (%2).</source>
<translation type="unfinished"/>
<translation>Vytvorenie nového %1MiB oddielu na zariadení %3 (%2).</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="128"/>
@ -1066,12 +1066,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="145"/>
<source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2) with entries &lt;em&gt;%4&lt;/em&gt;.</source>
<translation type="unfinished"/>
<translation>Vytvorenie nového &lt;strong&gt;%1MiB&lt;/strong&gt; oddielu na zariadení &lt;strong&gt;%3&lt;/strong&gt; (%2) so záznamami &lt;em&gt;%4&lt;/em&gt;.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="154"/>
<source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2).</source>
<translation type="unfinished"/>
<translation>Vytvorenie nového &lt;strong&gt;%1MiB&lt;/strong&gt; oddielu na zariadení &lt;strong&gt;%3&lt;/strong&gt; (%2).</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="161"/>
@ -1377,12 +1377,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="186"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation>Menovka systému súborov</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="196"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation>Menovka SS:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="291"/>
@ -1890,7 +1890,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<message>
<location filename="../src/libcalamares/locale/Tests.cpp" line="273"/>
<source>Quit</source>
<translation type="unfinished"/>
<translation>Ukončiť</translation>
</message>
</context>
<context>
@ -2113,7 +2113,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="41"/>
<source>Select your preferred Region, or use the default settings.</source>
<translation type="unfinished"/>
<translation>Vyberte vami uprednostňovanú oblasť, alebo použite predvolené nastavenia.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="98"/>
@ -2671,7 +2671,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="304"/>
<source>File System Label</source>
<translation type="unfinished"/>
<translation>Menovka systému súborov</translation>
</message>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="306"/>
@ -4077,23 +4077,24 @@ Výstup:
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
<source>Installation Completed</source>
<translation type="unfinished"/>
<translation>Inštalácia dokončená</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
<source>%1 has been installed on your computer.&lt;br/&gt;
You may now restart into your new system, or continue using the Live environment.</source>
<translation type="unfinished"/>
<translation>Distribúcia %1 bola nainštalovaná do vášho počítača.&lt;br/&gt;
Teraz môžete reštartovať váš počítač a spustiť nový systém, alebo pokračovať v používaní živého prostredia.</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
<source>Close Installer</source>
<translation type="unfinished"/>
<translation>Zavrieť inštalátor</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
<source>Restart System</source>
<translation type="unfinished"/>
<translation>Reštartovať systém</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="89"/>

@ -4321,7 +4321,7 @@ Përfundim:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="166"/>
<source>Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.</source>
<translation type="unfinished"/>
<translation>Lejohen vetëm shkronja, numra, nënvijë dhe vijë ndarëse. minimumi dy shenja.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="264"/>

@ -509,12 +509,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="32"/>
<source>Set filesystem label on %1.</source>
<translation type="unfinished"/>
<translation>Sätt filsystem etikett på %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="39"/>
<source>Set filesystem label &lt;strong&gt;%1&lt;/strong&gt; to partition &lt;strong&gt;%2&lt;/strong&gt;.</source>
<translation type="unfinished"/>
<translation>Sätt filsystem etikett &lt;strong&gt;%1&lt;/strong&gt; på partition &lt;strong&gt;%2&lt;/strong&gt;.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="70"/>
@ -1011,12 +1011,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="231"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation>Etikett för filsystem</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="241"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation>FS Etikett:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="65"/>
@ -1375,12 +1375,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="186"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation>Etikett för filsystem</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="196"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation>FS Etikett:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="291"/>
@ -2653,7 +2653,7 @@ Sök på kartan genom att dra
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="304"/>
<source>File System Label</source>
<translation type="unfinished"/>
<translation>Filsystem etikett</translation>
</message>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="306"/>

@ -37,7 +37,7 @@
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="92"/>
<source>Boot Partition</source>
<translation> Boot</translation>
<translation></translation>
</message>
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="99"/>
@ -60,7 +60,7 @@
<message>
<location filename="../src/libcalamaresui/viewpages/BlankViewStep.cpp" line="61"/>
<source>Blank Page</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -94,7 +94,7 @@
<location filename="../src/calamares/DebugWindow.ui" line="68"/>
<location filename="../src/calamares/DebugWindow.ui" line="82"/>
<source>none</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="75"/>
@ -147,7 +147,7 @@
<message>
<location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="88"/>
<source>Set up</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="88"/>
@ -263,15 +263,15 @@
<message numerus="yes">
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="115"/>
<source>Waiting for %n module(s).</source>
<translation type="unfinished">
<numerusform/>
<translation>
<numerusform> %n </numerusform>
</translation>
</message>
<message numerus="yes">
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="116"/>
<source>(%n second(s))</source>
<translation type="unfinished">
<numerusform/>
<translation>
<numerusform>(%n )</numerusform>
</translation>
</message>
<message>
@ -285,7 +285,7 @@
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="155"/>
<source>Setup Failed</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="155"/>
@ -306,18 +306,18 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="179"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="519"/>
<source>&amp;Yes</source>
<translation type="unfinished"/>
<translation>&amp;</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="180"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="520"/>
<source>&amp;No</source>
<translation type="unfinished"/>
<translation>&amp;</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="186"/>
<source>&amp;Close</source>
<translation type="unfinished"/>
<translation>&amp;</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/Paste.cpp" line="170"/>
@ -361,7 +361,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="327"/>
<source>Continue with installation?</source>
<translation type="unfinished"/>
<translation>?</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="329"/>
@ -376,7 +376,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="335"/>
<source>&amp;Set up now</source>
<translation type="unfinished"/>
<translation>&amp;</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="335"/>
@ -391,12 +391,12 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="393"/>
<source>&amp;Set up</source>
<translation type="unfinished"/>
<translation>&amp;</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="393"/>
<source>&amp;Install</source>
<translation type="unfinished"/>
<translation>&amp;</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="395"/>
@ -534,7 +534,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="121"/>
<source>Select storage de&amp;vice:</source>
<translation type="unfinished"/>
<translation>&amp;:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="122"/>
@ -562,7 +562,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="988"/>
<source>&lt;strong&gt;Select a partition to shrink, then drag the bottom bar to resize&lt;/strong&gt;</source>
<translation type="unfinished"/>
<translation>&lt;strong&gt; &lt;/strong&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1005"/>
@ -577,7 +577,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1115"/>
<source>&lt;strong&gt;Select a partition to install on&lt;/strong&gt;</source>
<translation type="unfinished"/>
<translation>&lt;strong&gt;&lt;/strong&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1174"/>
@ -597,7 +597,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/>
<source>This storage device does not seem to have an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
<translation type="unfinished"/>
<translation> ?&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1330"/>
@ -605,7 +605,7 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1389"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1414"/>
<source>&lt;strong&gt;Erase disk&lt;/strong&gt;&lt;br/&gt;This will &lt;font color="red"&gt;delete&lt;/font&gt; all data currently present on the selected storage device.</source>
<translation type="unfinished"/>
<translation>&lt;strong&gt;&lt;/strong&gt;&lt;br/&gt;&lt;font color="red"&gt;&lt;/font&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1334"/>
@ -626,17 +626,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1357"/>
<source>This storage device has %1 on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
<translation> %1 ?&lt;br/&gt;</translation>
<translation> %1 ?&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1380"/>
<source>This storage device already has an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
<translation> ?&lt;br/&gt;</translation>
<translation> ?&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1405"/>
<source>This storage device has multiple operating systems on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
<translation> ?&lt;br/&gt;</translation>
<translation> ?&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1477"/>
@ -764,7 +764,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/locale/Config.cpp" line="387"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
<translation> %1</translation>
</message>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="53"/>
@ -789,7 +789,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="77"/>
<source>Package selection</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="59"/>
@ -799,12 +799,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="50"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
<translation type="unfinished"/>
<translation> %1&lt;br/&gt; &lt;a href="#details"&gt;...&lt;/a&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="54"/>
<source>This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;Installation cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
<translation> %1.&lt;br/&gt; &lt;a href="#details"&gt;...&lt;/a&gt;</translation>
<translation> %1&lt;br/&gt; &lt;a href="#details"&gt;...&lt;/a&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="61"/>
@ -819,7 +819,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="75"/>
<source>This program will ask you some questions and set up %2 on your computer.</source>
<translation> %2 </translation>
<translation> %2 </translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="244"/>
@ -829,17 +829,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="245"/>
<source>&lt;h1&gt;Welcome to %1 setup&lt;/h1&gt;</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt; %1&lt;/h1&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="250"/>
<source>&lt;h1&gt;Welcome to the Calamares installer for %1&lt;/h1&gt;</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt; Calamares %1&lt;/h1&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="251"/>
<source>&lt;h1&gt;Welcome to the %1 installer&lt;/h1&gt;</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt; %1&lt;/h1&gt;</translation>
</message>
<message>
<location filename="../src/modules/users/Config.cpp" line="217"/>
@ -849,7 +849,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/Config.cpp" line="223"/>
<source>'%1' is not allowed as username.</source>
<translation type="unfinished"/>
<translation> '%1' </translation>
</message>
<message>
<location filename="../src/modules/users/Config.cpp" line="230"/>
@ -889,12 +889,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/Config.cpp" line="548"/>
<source>OK!</source>
<translation type="unfinished"/>
<translation>!</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
<source>Setup Failed</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
@ -934,12 +934,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="85"/>
<source>Package Selection</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="87"/>
<source>Please pick a product from the list. The selected product will be installed.</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
</context>
<context>
@ -1115,17 +1115,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="39"/>
<source>Create new %1 partition table on %2.</source>
<translation type="unfinished"/>
<translation> %1 %2</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="47"/>
<source>Create new &lt;strong&gt;%1&lt;/strong&gt; partition table on &lt;strong&gt;%2&lt;/strong&gt; (%3).</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;%1&lt;/strong&gt; &lt;strong&gt;%2&lt;/strong&gt; (%3)</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="57"/>
<source>Creating new %1 partition table on %2.</source>
<translation type="unfinished"/>
<translation> %1 %2</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="67"/>
@ -1143,7 +1143,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="43"/>
<source>Create user &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;%1&lt;/strong&gt;</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="126"/>
@ -1154,12 +1154,12 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/users/CreateUserJob.cpp" line="50"/>
<location filename="../src/modules/users/CreateUserJob.cpp" line="143"/>
<source>Creating user %1</source>
<translation type="unfinished"/>
<translation> %1</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="151"/>
<source>Configuring user %1</source>
<translation type="unfinished"/>
<translation> %1</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="159"/>
@ -1222,17 +1222,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="31"/>
<source>Delete partition %1.</source>
<translation type="unfinished"/>
<translation> %1</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="38"/>
<source>Delete partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;%1&lt;/strong&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="45"/>
<source>Deleting partition %1.</source>
<translation type="unfinished"/>
<translation> %1</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="56"/>
@ -1245,7 +1245,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="97"/>
<source>This device has a &lt;strong&gt;%1&lt;/strong&gt; partition table.</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;%1&lt;/strong&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="104"/>
@ -1303,7 +1303,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="138"/>
<source>Failed to open %1</source>
<translation type="unfinished"/>
<translation> %1</translation>
</message>
</context>
<context>
@ -1329,7 +1329,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="64"/>
<source>&amp;Keep</source>
<translation type="unfinished"/>
<translation>&amp;</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="74"/>
@ -1494,7 +1494,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="84"/>
<source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been installed on your computer.&lt;br/&gt;You may now restart into your new system, or continue using the %2 Live environment.</source>
<translation>&lt;h1&gt;&lt;/h1&gt;&lt;br/&gt;%1 &lt;br/&gt; %2 Live environment </translation>
<translation>&lt;h1&gt;&lt;/h1&gt;&lt;br/&gt;%1 &lt;br/&gt; %2 (Live) </translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="89"/>
@ -1581,7 +1581,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="178"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="185"/>
@ -1611,7 +1611,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="205"/>
<source>has a screen large enough to show the whole installer</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="208"/>
@ -1621,7 +1621,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="209"/>
<source>The screen is too small to display the installer.</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -1629,7 +1629,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/hostinfo/HostInfoJob.cpp" line="42"/>
<source>Collecting information about your machine.</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -1679,7 +1679,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="44"/>
<source>Konsole not installed</source>
<translation type="unfinished"/>
<translation> Konsole</translation>
</message>
<message>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="44"/>
@ -1721,7 +1721,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="23"/>
<source>System locale setting</source>
<translation> locale </translation>
<translation></translation>
</message>
<message>
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="30"/>
@ -1736,7 +1736,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="55"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
<translation>&amp;O </translation>
</message>
</context>
<context>
@ -1832,7 +1832,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="163"/>
<source>File: %1</source>
<translation type="unfinished"/>
<translation>: %1</translation>
</message>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="186"/>
@ -1882,7 +1882,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/libcalamares/locale/Tests.cpp" line="273"/>
<source>Quit</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -1952,7 +1952,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/localeq/Map.qml" line="243"/>
<source>Timezone: %1</source>
<translation type="unfinished"/>
<translation>: %1</translation>
</message>
<message>
<location filename="../src/modules/localeq/Map.qml" line="264"/>
@ -1967,7 +1967,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="49"/>
<source>Package selection</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="50"/>
@ -2007,52 +2007,52 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="57"/>
<source>Login</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="58"/>
<source>Desktop</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="59"/>
<source>Applications</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="60"/>
<source>Communication</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="61"/>
<source>Development</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="62"/>
<source>Office</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="63"/>
<source>Multimedia</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="64"/>
<source>Internet</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="65"/>
<source>Theming</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="66"/>
<source>Gaming</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="67"/>
@ -2111,7 +2111,7 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/localeq/Offline.qml" line="173"/>
<location filename="../src/modules/localeq/Offline.qml" line="217"/>
<source>Timezone: %1</source>
<translation type="unfinished"/>
<translation>: %1</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="115"/>
@ -2121,7 +2121,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="186"/>
<source>Zones</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="233"/>
@ -2405,7 +2405,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/packagechooser/page_package.ui" line="44"/>
<source>Product Name</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/packagechooser/page_package.ui" line="57"/>
@ -2415,17 +2415,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/packagechooser/page_package.ui" line="73"/>
<source>Long Product Description</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="25"/>
<source>Package Selection</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="26"/>
<source>Please pick a product from the list. The selected product will be installed.</source>
<translation type="unfinished"/>
<translation> </translation>
</message>
</context>
<context>
@ -2433,7 +2433,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/packagechooser/PackageChooserViewStep.cpp" line="51"/>
<source>Packages</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -2477,7 +2477,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="40"/>
<source>What is your name?</source>
<translation>?</translation>
<translation>?</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="55"/>
@ -2487,7 +2487,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="124"/>
<source>What name do you want to use to log in?</source>
<translation>?</translation>
<translation></translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="148"/>
@ -2497,7 +2497,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="223"/>
<source>What is the name of this computer?</source>
<translation>?</translation>
<translation>?</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="247"/>
@ -2781,7 +2781,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="200"/>
<source>Disk &lt;strong&gt;%1&lt;/strong&gt; (%2)</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;%1&lt;/strong&gt; (%2)</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="226"/>
@ -3309,7 +3309,7 @@ Output:
<message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="263"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
<translation type="unfinished"/>
<translation> %1&lt;br/&gt; &lt;a href="#details"&gt;...&lt;/a&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="267"/>
@ -3329,7 +3329,7 @@ Output:
<message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="287"/>
<source>This program will ask you some questions and set up %2 on your computer.</source>
<translation> %2 </translation>
<translation> %2 </translation>
</message>
</context>
<context>
@ -3593,7 +3593,7 @@ Output:
<message>
<location filename="../src/modules/users/MiscJobs.cpp" line="33"/>
<source>Configure &lt;pre&gt;sudo&lt;/pre&gt; users.</source>
<translation type="unfinished"/>
<translation> &lt;pre&gt;sudo&lt;/pre&gt;</translation>
</message>
<message>
<location filename="../src/modules/users/MiscJobs.cpp" line="55"/>
@ -3855,12 +3855,12 @@ Output:
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="86"/>
<source>Total Size:</source>
<translation type="unfinished"/>
<translation>:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="106"/>
<source>Used Size:</source>
<translation type="unfinished"/>
<translation>:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="126"/>
@ -3889,7 +3889,7 @@ Output:
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
<source>&amp;About</source>
<translation>&amp;A </translation>
<translation>&amp;</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
@ -3934,12 +3934,12 @@ Output:
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
<source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt; Calamares %1&lt;/h1&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="217"/>
<source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt; %1&lt;/h1&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="222"/>
@ -3959,7 +3959,7 @@ Output:
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="235"/>
<source>About %1 setup</source>
<translation type="unfinished"/>
<translation> %1</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="235"/>
@ -4009,7 +4009,7 @@ Output:
<message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/>
<source>Back</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -4025,7 +4025,7 @@ Output:
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
<source>Installation Completed</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
@ -4036,12 +4036,12 @@ Output:
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
<source>Close Installer</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
<source>Restart System</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="89"/>
@ -4067,7 +4067,7 @@ Output:
<message>
<location filename="../src/modules/localeq/i18n.qml" line="158"/>
<source>Back</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -4110,7 +4110,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
<source>Test your keyboard</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -4118,7 +4118,7 @@ Output:
<message>
<location filename="../src/modules/localeq/localeq.qml" line="81"/>
<source>Change</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -4160,7 +4160,7 @@ Output:
<message>
<location filename="../src/modules/welcomeq/release_notes.qml" line="76"/>
<source>Back</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -4173,7 +4173,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="49"/>
<source>What is your name?</source>
<translation>?</translation>
<translation>?</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="56"/>
@ -4183,7 +4183,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="71"/>
<source>What name do you want to use to log in?</source>
<translation>?</translation>
<translation></translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="78"/>
@ -4208,7 +4208,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="127"/>
<source>What is the name of this computer?</source>
<translation>?</translation>
<translation>?</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="133"/>

@ -105,17 +105,17 @@
<message>
<location filename="../src/calamares/DebugWindow.ui" line="102"/>
<source>Crashes Calamares, so that Dr. Konqui can look at it.</source>
<translation type="unfinished"/>
<translation>使 Calamares 便 Konqui </translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="115"/>
<source>Reloads the stylesheet from the branding directory.</source>
<translation type="unfinished"/>
<translation>Branding</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="141"/>
<source>Uploads the session log to the configured pastebin.</source>
<translation type="unfinished"/>
<translation>pastebin</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="144"/>
@ -130,7 +130,7 @@
<message>
<location filename="../src/calamares/DebugWindow.ui" line="128"/>
<source>Displays the tree of widget names in the log (for stylesheet debugging).</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="131"/>
@ -337,7 +337,11 @@
%1
Link copied to clipboard</source>
<translation type="unfinished"/>
<translation>
%1
</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="206"/>
@ -505,12 +509,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="32"/>
<source>Set filesystem label on %1.</source>
<translation type="unfinished"/>
<translation>%1</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="39"/>
<source>Set filesystem label &lt;strong&gt;%1&lt;/strong&gt; to partition &lt;strong&gt;%2&lt;/strong&gt;.</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;%1&lt;/strong&gt; &lt;strong&gt;%2&lt;/strong&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="70"/>
@ -781,12 +785,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="57"/>
<source>Network Installation. (Disabled: Internal error)</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="61"/>
<source>Network Installation. (Disabled: No package list)</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="77"/>
@ -893,7 +897,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/Config.cpp" line="548"/>
<source>OK!</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
@ -908,12 +912,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/finished/Config.cpp" line="147"/>
<source>The setup of %1 did not complete successfully.</source>
<translation type="unfinished"/>
<translation>%1</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="148"/>
<source>The installation of %1 did not complete successfully.</source>
<translation type="unfinished"/>
<translation>%1</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="152"/>
@ -1009,12 +1013,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="231"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="241"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="65"/>
@ -1052,7 +1056,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="121"/>
<source>Create new %1MiB partition on %3 (%2).</source>
<translation type="unfinished"/>
<translation> %3 (%2) %1MiB </translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="128"/>
@ -1067,7 +1071,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="154"/>
<source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2).</source>
<translation type="unfinished"/>
<translation>&lt;strong&gt;%3&lt;/strong&gt;(%2)&lt;strong&gt;%1MiB&lt;/strong&gt;</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="161"/>
@ -1374,12 +1378,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="186"/>
<source>Label for the filesystem</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="196"/>
<source>FS Label:</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="291"/>
@ -1441,12 +1445,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="221"/>
<source>Set up &lt;strong&gt;new&lt;/strong&gt; %2 partition with mount point &lt;strong&gt;%1&lt;/strong&gt;%3.</source>
<translation type="unfinished"/>
<translation> &lt;strong&gt;&lt;/strong&gt; &lt;strong&gt;%1&lt;/strong&gt;%3 %2 </translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="235"/>
<source>Install %2 on %3 system partition &lt;strong&gt;%1&lt;/strong&gt; with features &lt;em&gt;%4&lt;/em&gt;.</source>
<translation type="unfinished"/>
<translation>&lt;em&gt;%4&lt;/em&gt; %3 &lt;strong&gt;%1&lt;/strong&gt; %2</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="254"/>
@ -1887,7 +1891,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/libcalamares/locale/Tests.cpp" line="273"/>
<source>Quit</source>
<translation type="unfinished"/>
<translation>退</translation>
</message>
</context>
<context>
@ -2111,7 +2115,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="41"/>
<source>Select your preferred Region, or use the default settings.</source>
<translation type="unfinished"/>
<translation>使</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="98"/>
@ -2642,7 +2646,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="304"/>
<source>File System Label</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="306"/>
@ -4255,7 +4259,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
<source>root is not allowed as username.</source>
<translation type="unfinished"/>
<translation>root</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="127"/>
@ -4275,7 +4279,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="174"/>
<source>localhost is not allowed as hostname.</source>
<translation type="unfinished"/>
<translation>localhost</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="183"/>
@ -4315,7 +4319,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="166"/>
<source>Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.</source>
<translation type="unfinished"/>
<translation>线"_" "-"</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="264"/>

File diff suppressed because it is too large Load Diff

@ -2,406 +2,381 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-14 12:55+0200\n"
"POT-Creation-Date: 2021-09-06 11:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#: src/modules/grubcfg/main.py:28
msgid "Configure GRUB."
msgstr "Configure GRUB."
#: src/modules/mount/main.py:30
msgid "Mounting partitions."
msgstr "Mounting partitions."
#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
#: src/modules/initcpiocfg/main.py:201
#: src/modules/luksopenswaphookcfg/main.py:86
#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
#: src/modules/openrcdmcryptcfg/main.py:72
#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
msgid "Configuration Error"
msgstr "Configuration Error"
#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
#: src/modules/fstab/main.py:356
msgid "No partitions are defined for <pre>{!s}</pre> to use."
msgstr "No partitions are defined for <pre>{!s}</pre> to use."
#: src/modules/services-systemd/main.py:26
msgid "Configure systemd services"
msgstr "Configure systemd services"
#: src/modules/services-systemd/main.py:59
#: src/modules/services-openrc/main.py:93
msgid "Cannot modify service"
msgstr "Cannot modify service"
#: src/modules/services-systemd/main.py:60
msgid ""
"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
#: src/modules/bootloader/main.py:43
msgid "Install bootloader."
msgstr ""
"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
#: src/modules/services-systemd/main.py:63
#: src/modules/services-systemd/main.py:67
msgid "Cannot enable systemd service <code>{name!s}</code>."
msgstr "Cannot enable systemd service <code>{name!s}</code>."
#: src/modules/services-systemd/main.py:65
msgid "Cannot enable systemd target <code>{name!s}</code>."
msgstr "Cannot enable systemd target <code>{name!s}</code>."
#: src/modules/services-systemd/main.py:69
msgid "Cannot disable systemd target <code>{name!s}</code>."
msgstr "Cannot disable systemd target <code>{name!s}</code>."
#: src/modules/services-systemd/main.py:71
msgid "Cannot mask systemd unit <code>{name!s}</code>."
msgstr "Cannot mask systemd unit <code>{name!s}</code>."
#: src/modules/services-systemd/main.py:73
msgid ""
"Unknown systemd commands <code>{command!s}</code> and "
"<code>{suffix!s}</code> for unit {name!s}."
#: src/modules/bootloader/main.py:508
msgid "Bootloader installation error"
msgstr ""
"Unknown systemd commands <code>{command!s}</code> and "
"<code>{suffix!s}</code> for unit {name!s}."
#: src/modules/umount/main.py:31
msgid "Unmount file systems."
msgstr "Unmount file systems."
#: src/modules/unpackfs/main.py:35
msgid "Filling up filesystems."
msgstr "Filling up filesystems."
#: src/modules/unpackfs/main.py:255
msgid "rsync failed with error code {}."
msgstr "rsync failed with error code {}."
#: src/modules/unpackfs/main.py:300
msgid "Unpacking image {}/{}, file {}/{}"
msgstr "Unpacking image {}/{}, file {}/{}"
#: src/modules/unpackfs/main.py:315
msgid "Starting to unpack {}"
msgstr "Starting to unpack {}"
#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
msgid "Failed to unpack image \"{}\""
msgstr "Failed to unpack image \"{}\""
#: src/modules/unpackfs/main.py:431
msgid "No mount point for root partition"
msgstr "No mount point for root partition"
#: src/modules/unpackfs/main.py:432
msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
#: src/modules/unpackfs/main.py:437
msgid "Bad mount point for root partition"
msgstr "Bad mount point for root partition"
#: src/modules/unpackfs/main.py:438
msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing"
#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
#: src/modules/unpackfs/main.py:478
msgid "Bad unsquash configuration"
msgstr "Bad unsquash configuration"
#: src/modules/unpackfs/main.py:455
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel"
#: src/modules/unpackfs/main.py:459
msgid "The source filesystem \"{}\" does not exist"
msgstr "The source filesystem \"{}\" does not exist"
#: src/modules/unpackfs/main.py:465
#: src/modules/bootloader/main.py:509
msgid ""
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
"installed"
"The bootloader could not be installed. The installation command <pre>{!s}</"
"pre> returned error code {!s}."
msgstr ""
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
"installed"
#: src/modules/unpackfs/main.py:479
msgid "The destination \"{}\" in the target system is not a directory"
msgstr "The destination \"{}\" in the target system is not a directory"
#: src/modules/displaymanager/main.py:526
msgid "Cannot write KDM configuration file"
msgstr "Cannot write KDM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:527
msgid "KDM config file {!s} does not exist"
msgstr "KDM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:588
msgid "Cannot write LXDM configuration file"
msgstr "Cannot write LXDM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:589
msgid "LXDM config file {!s} does not exist"
msgstr "LXDM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:672
msgid "Cannot write LightDM configuration file"
msgstr "Cannot write LightDM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:673
msgid "LightDM config file {!s} does not exist"
msgstr "LightDM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:747
msgid "Cannot configure LightDM"
msgstr "Cannot configure LightDM"
msgstr ""
#: src/modules/displaymanager/main.py:748
msgid "No LightDM greeter installed."
msgstr "No LightDM greeter installed."
msgstr ""
#: src/modules/displaymanager/main.py:779
msgid "Cannot write SLIM configuration file"
msgstr "Cannot write SLIM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:780
msgid "SLIM config file {!s} does not exist"
msgstr "SLIM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:906
msgid "No display managers selected for the displaymanager module."
msgstr "No display managers selected for the displaymanager module."
msgstr ""
#: src/modules/displaymanager/main.py:907
msgid ""
"The displaymanagers list is empty or undefined in both globalstorage and "
"displaymanager.conf."
msgstr ""
"The displaymanagers list is empty or undefined in both globalstorage and "
"displaymanager.conf."
#: src/modules/displaymanager/main.py:989
msgid "Display manager configuration was incomplete"
msgstr "Display manager configuration was incomplete"
msgstr ""
#: src/modules/dracut/main.py:27
msgid "Creating initramfs with dracut."
msgstr ""
#: src/modules/dracut/main.py:49
msgid "Failed to run dracut on the target"
msgstr ""
#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
msgid "The exit code was {}"
msgstr ""
#: src/modules/dummypython/main.py:35
msgid "Dummy python job."
msgstr ""
#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
#: src/modules/dummypython/main.py:94
msgid "Dummy python step {}"
msgstr ""
#: src/modules/fstab/main.py:29
msgid "Writing fstab."
msgstr ""
#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
#: src/modules/luksopenswaphookcfg/main.py:86
#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
msgid "Configuration Error"
msgstr ""
#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
#: src/modules/initramfscfg/main.py:86
#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
msgid "No partitions are defined for <pre>{!s}</pre> to use."
msgstr ""
#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
#: src/modules/luksopenswaphookcfg/main.py:91 src/modules/networkcfg/main.py:43
#: src/modules/openrcdmcryptcfg/main.py:77
msgid "No root mount point is given for <pre>{!s}</pre> to use."
msgstr ""
#: src/modules/fstab/main.py:389
msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
msgstr ""
#: src/modules/grubcfg/main.py:28
msgid "Configure GRUB."
msgstr ""
#: src/modules/hwclock/main.py:26
msgid "Setting hardware clock."
msgstr ""
#: src/modules/initcpiocfg/main.py:28
msgid "Configuring mkinitcpio."
msgstr "Configuring mkinitcpio."
msgstr ""
#: src/modules/initcpiocfg/main.py:202
#: src/modules/luksopenswaphookcfg/main.py:91
#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
#: src/modules/networkcfg/main.py:40
msgid "No root mount point is given for <pre>{!s}</pre> to use."
msgstr "No root mount point is given for <pre>{!s}</pre> to use."
#: src/modules/initramfscfg/main.py:32
msgid "Configuring initramfs."
msgstr ""
#: src/modules/localecfg/main.py:30
msgid "Configuring locales."
msgstr ""
#: src/modules/luksopenswaphookcfg/main.py:26
msgid "Configuring encrypted swap."
msgstr "Configuring encrypted swap."
msgstr ""
#: src/modules/mkinitfs/main.py:27
msgid "Creating initramfs with mkinitfs."
msgstr ""
#: src/modules/mkinitfs/main.py:49
msgid "Failed to run mkinitfs on the target"
msgstr ""
#: src/modules/mount/main.py:30
msgid "Mounting partitions."
msgstr ""
#: src/modules/networkcfg/main.py:29
msgid "Saving network configuration."
msgstr ""
#: src/modules/openrcdmcryptcfg/main.py:26
msgid "Configuring OpenRC dmcrypt service."
msgstr ""
#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
#: src/modules/packages/main.py:69
msgid "Install packages."
msgstr ""
#: src/modules/packages/main.py:57
#, python-format
msgid "Processing packages (%(count)d / %(total)d)"
msgstr ""
#: src/modules/packages/main.py:62
#, python-format
msgid "Installing one package."
msgid_plural "Installing %(num)d packages."
msgstr[0] ""
msgstr[1] ""
#: src/modules/packages/main.py:65
#, python-format
msgid "Removing one package."
msgid_plural "Removing %(num)d packages."
msgstr[0] ""
msgstr[1] ""
#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
#: src/modules/packages/main.py:678
msgid "Package Manager error"
msgstr ""
#: src/modules/packages/main.py:639
msgid ""
"The package manager could not prepare updates. The command <pre>{!s}</pre> "
"returned error code {!s}."
msgstr ""
#: src/modules/packages/main.py:651
msgid ""
"The package manager could not update the system. The command <pre>{!s}</pre> "
"returned error code {!s}."
msgstr ""
#: src/modules/packages/main.py:679
msgid ""
"The package manager could not make changes to the installed system. The "
"command <pre>{!s}</pre> returned error code {!s}."
msgstr ""
#: src/modules/plymouthcfg/main.py:27
msgid "Configure Plymouth theme"
msgstr ""
#: src/modules/rawfs/main.py:26
msgid "Installing data."
msgstr "Installing data."
msgstr ""
#: src/modules/services-openrc/main.py:29
msgid "Configure OpenRC services"
msgstr "Configure OpenRC services"
msgstr ""
#: src/modules/services-openrc/main.py:57
msgid "Cannot add service {name!s} to run-level {level!s}."
msgstr "Cannot add service {name!s} to run-level {level!s}."
msgstr ""
#: src/modules/services-openrc/main.py:59
msgid "Cannot remove service {name!s} from run-level {level!s}."
msgstr "Cannot remove service {name!s} from run-level {level!s}."
msgstr ""
#: src/modules/services-openrc/main.py:61
msgid ""
"Unknown service-action <code>{arg!s}</code> for service {name!s} in run-"
"level {level!s}."
msgstr ""
"Unknown service-action <code>{arg!s}</code> for service {name!s} in run-"
"level {level!s}."
#: src/modules/services-openrc/main.py:93
#: src/modules/services-systemd/main.py:59
msgid "Cannot modify service"
msgstr ""
#: src/modules/services-openrc/main.py:94
msgid ""
"<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}."
msgstr ""
"<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}."
#: src/modules/services-openrc/main.py:101
msgid "Target runlevel does not exist"
msgstr "Target runlevel does not exist"
msgstr ""
#: src/modules/services-openrc/main.py:102
msgid ""
"The path for runlevel {level!s} is <code>{path!s}</code>, which does not "
"exist."
msgstr ""
"The path for runlevel {level!s} is <code>{path!s}</code>, which does not "
"exist."
#: src/modules/services-openrc/main.py:110
msgid "Target service does not exist"
msgstr "Target service does not exist"
msgstr ""
#: src/modules/services-openrc/main.py:111
msgid ""
"The path for service {name!s} is <code>{path!s}</code>, which does not "
"exist."
"The path for service {name!s} is <code>{path!s}</code>, which does not exist."
msgstr ""
"The path for service {name!s} is <code>{path!s}</code>, which does not "
"exist."
#: src/modules/plymouthcfg/main.py:27
msgid "Configure Plymouth theme"
msgstr "Configure Plymouth theme"
#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
#: src/modules/packages/main.py:69
msgid "Install packages."
msgstr "Install packages."
#: src/modules/packages/main.py:57
#, python-format
msgid "Processing packages (%(count)d / %(total)d)"
msgstr "Processing packages (%(count)d / %(total)d)"
#: src/modules/packages/main.py:62
#, python-format
msgid "Installing one package."
msgid_plural "Installing %(num)d packages."
msgstr[0] "Installing one package."
msgstr[1] "Installing %(num)d packages."
#: src/modules/packages/main.py:65
#, python-format
msgid "Removing one package."
msgid_plural "Removing %(num)d packages."
msgstr[0] "Removing one package."
msgstr[1] "Removing %(num)d packages."
#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
#: src/modules/packages/main.py:628
msgid "Package Manager error"
msgstr "Package Manager error"
#: src/modules/services-systemd/main.py:26
msgid "Configure systemd services"
msgstr ""
#: src/modules/packages/main.py:589
#: src/modules/services-systemd/main.py:60
msgid ""
"The package manager could not prepare updates. The command <pre>{!s}</pre> "
"returned error code {!s}."
"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
msgstr ""
"The package manager could not prepare updates. The command <pre>{!s}</pre> "
"returned error code {!s}."
#: src/modules/packages/main.py:601
msgid ""
"The package manager could not update the system. The command <pre>{!s}</pre>"
" returned error code {!s}."
#: src/modules/services-systemd/main.py:63
#: src/modules/services-systemd/main.py:67
msgid "Cannot enable systemd service <code>{name!s}</code>."
msgstr ""
"The package manager could not update the system. The command <pre>{!s}</pre>"
" returned error code {!s}."
#: src/modules/packages/main.py:629
msgid ""
"The package manager could not make changes to the installed system. The "
"command <pre>{!s}</pre> returned error code {!s}."
#: src/modules/services-systemd/main.py:65
msgid "Cannot enable systemd target <code>{name!s}</code>."
msgstr ""
"The package manager could not make changes to the installed system. The "
"command <pre>{!s}</pre> returned error code {!s}."
#: src/modules/bootloader/main.py:43
msgid "Install bootloader."
msgstr "Install bootloader."
#: src/modules/services-systemd/main.py:69
msgid "Cannot disable systemd target <code>{name!s}</code>."
msgstr ""
#: src/modules/bootloader/main.py:502
msgid "Bootloader installation error"
msgstr "Bootloader installation error"
#: src/modules/services-systemd/main.py:71
msgid "Cannot mask systemd unit <code>{name!s}</code>."
msgstr ""
#: src/modules/bootloader/main.py:503
#: src/modules/services-systemd/main.py:73
msgid ""
"The bootloader could not be installed. The installation command "
"<pre>{!s}</pre> returned error code {!s}."
"Unknown systemd commands <code>{command!s}</code> and <code>{suffix!s}</"
"code> for unit {name!s}."
msgstr ""
"The bootloader could not be installed. The installation command "
"<pre>{!s}</pre> returned error code {!s}."
#: src/modules/hwclock/main.py:26
msgid "Setting hardware clock."
msgstr "Setting hardware clock."
#: src/modules/umount/main.py:31
msgid "Unmount file systems."
msgstr ""
#: src/modules/mkinitfs/main.py:27
msgid "Creating initramfs with mkinitfs."
msgstr "Creating initramfs with mkinitfs."
#: src/modules/unpackfs/main.py:35
msgid "Filling up filesystems."
msgstr ""
#: src/modules/mkinitfs/main.py:49
msgid "Failed to run mkinitfs on the target"
msgstr "Failed to run mkinitfs on the target"
#: src/modules/unpackfs/main.py:255
msgid "rsync failed with error code {}."
msgstr ""
#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
msgid "The exit code was {}"
msgstr "The exit code was {}"
#: src/modules/unpackfs/main.py:300
msgid "Unpacking image {}/{}, file {}/{}"
msgstr ""
#: src/modules/dracut/main.py:27
msgid "Creating initramfs with dracut."
msgstr "Creating initramfs with dracut."
#: src/modules/unpackfs/main.py:315
msgid "Starting to unpack {}"
msgstr ""
#: src/modules/dracut/main.py:49
msgid "Failed to run dracut on the target"
msgstr "Failed to run dracut on the target"
#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
msgid "Failed to unpack image \"{}\""
msgstr ""
#: src/modules/initramfscfg/main.py:32
msgid "Configuring initramfs."
msgstr "Configuring initramfs."
#: src/modules/unpackfs/main.py:431
msgid "No mount point for root partition"
msgstr ""
#: src/modules/openrcdmcryptcfg/main.py:26
msgid "Configuring OpenRC dmcrypt service."
msgstr "Configuring OpenRC dmcrypt service."
#: src/modules/unpackfs/main.py:432
msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
msgstr ""
#: src/modules/fstab/main.py:29
msgid "Writing fstab."
msgstr "Writing fstab."
#: src/modules/unpackfs/main.py:437
msgid "Bad mount point for root partition"
msgstr ""
#: src/modules/fstab/main.py:389
msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
msgstr "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
#: src/modules/unpackfs/main.py:438
msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
msgstr ""
#: src/modules/dummypython/main.py:35
msgid "Dummy python job."
msgstr "Dummy python job."
#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
#: src/modules/unpackfs/main.py:478
msgid "Bad unsquash configuration"
msgstr ""
#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
#: src/modules/dummypython/main.py:94
msgid "Dummy python step {}"
msgstr "Dummy python step {}"
#: src/modules/unpackfs/main.py:455
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
msgstr ""
#: src/modules/localecfg/main.py:30
msgid "Configuring locales."
msgstr "Configuring locales."
#: src/modules/unpackfs/main.py:459
msgid "The source filesystem \"{}\" does not exist"
msgstr ""
#: src/modules/networkcfg/main.py:28
msgid "Saving network configuration."
msgstr "Saving network configuration."
#: src/modules/unpackfs/main.py:465
msgid ""
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
"installed"
msgstr ""
#: src/modules/unpackfs/main.py:479
msgid "The destination \"{}\" in the target system is not a directory"
msgstr ""

@ -4,7 +4,7 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# xxmn77 <xxmn77@gmail.com>, 2020
# xxmn77 <xxmn77@gmail.com>, 2021
#
#, fuzzy
msgid ""
@ -13,7 +13,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-14 12:55+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: xxmn77 <xxmn77@gmail.com>, 2020\n"
"Last-Translator: xxmn77 <xxmn77@gmail.com>, 2021\n"
"Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -313,25 +313,31 @@ msgstr[1] "%(num)d paket silinir."
#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
#: src/modules/packages/main.py:628
msgid "Package Manager error"
msgstr ""
msgstr "Paket meneceri xətası"
#: src/modules/packages/main.py:589
msgid ""
"The package manager could not prepare updates. The command <pre>{!s}</pre> "
"returned error code {!s}."
msgstr ""
"Bu paket meneceri yenilənmələri hazırlaya bilmədi. <pre>{!s}</pre> əmri xəta"
" kodu {!s} ilə cavab verdi."
#: src/modules/packages/main.py:601
msgid ""
"The package manager could not update the system. The command <pre>{!s}</pre>"
" returned error code {!s}."
msgstr ""
"Paket meneceri sistemi yeniləyə bimədi. <pre>{!s}</pre> əmri xəta kodu {!s} "
"ilə cavab verdi."
#: src/modules/packages/main.py:629
msgid ""
"The package manager could not make changes to the installed system. The "
"command <pre>{!s}</pre> returned error code {!s}."
msgstr ""
"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. <pre>{!s}</pre> "
"əmri xəta kodu {!s} ilə cavab verdi."
#: src/modules/bootloader/main.py:43
msgid "Install bootloader."
@ -339,13 +345,15 @@ msgstr "Önyükləyici qurulur."
#: src/modules/bootloader/main.py:502
msgid "Bootloader installation error"
msgstr ""
msgstr "Önyükləyicinin quraşdırılmasında xəta"
#: src/modules/bootloader/main.py:503
msgid ""
"The bootloader could not be installed. The installation command "
"<pre>{!s}</pre> returned error code {!s}."
msgstr ""
"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri <pre>{!s}</pre>, xəta kodu "
"{!s} ilə cavab verdi."
#: src/modules/hwclock/main.py:26
msgid "Setting hardware clock."
@ -386,6 +394,8 @@ msgstr "fstab yazılır."
#: src/modules/fstab/main.py:389
msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
msgstr ""
"İstifadə etmək üçün, <pre>{!s}</pre> tənzimləməsi, <pre>{!s}</pre> üçün "
"göstərilməyib."
#: src/modules/dummypython/main.py:35
msgid "Dummy python job."

@ -4,7 +4,7 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# xxmn77 <xxmn77@gmail.com>, 2020
# xxmn77 <xxmn77@gmail.com>, 2021
#
#, fuzzy
msgid ""
@ -13,7 +13,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-14 12:55+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: xxmn77 <xxmn77@gmail.com>, 2020\n"
"Last-Translator: xxmn77 <xxmn77@gmail.com>, 2021\n"
"Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -313,25 +313,31 @@ msgstr[1] "%(num)d paket silinir."
#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
#: src/modules/packages/main.py:628
msgid "Package Manager error"
msgstr ""
msgstr "Paket meneceri xətası"
#: src/modules/packages/main.py:589
msgid ""
"The package manager could not prepare updates. The command <pre>{!s}</pre> "
"returned error code {!s}."
msgstr ""
"Bu paket meneceri yenilənmələri hazırlaya bilmədi. <pre>{!s}</pre> əmri xəta"
" kodu {!s} ilə cavab verdi."
#: src/modules/packages/main.py:601
msgid ""
"The package manager could not update the system. The command <pre>{!s}</pre>"
" returned error code {!s}."
msgstr ""
"Paket meneceri sistemi yeniləyə bimədi. <pre>{!s}</pre> əmri xəta kodu {!s} "
"ilə cavab verdi."
#: src/modules/packages/main.py:629
msgid ""
"The package manager could not make changes to the installed system. The "
"command <pre>{!s}</pre> returned error code {!s}."
msgstr ""
"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. <pre>{!s}</pre> "
"əmri xəta kodu {!s} ilə cavab verdi."
#: src/modules/bootloader/main.py:43
msgid "Install bootloader."
@ -339,13 +345,15 @@ msgstr "Önyükləyici qurulur."
#: src/modules/bootloader/main.py:502
msgid "Bootloader installation error"
msgstr ""
msgstr "Önyükləyicinin quraşdırılmasında xəta"
#: src/modules/bootloader/main.py:503
msgid ""
"The bootloader could not be installed. The installation command "
"<pre>{!s}</pre> returned error code {!s}."
msgstr ""
"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri <pre>{!s}</pre>, xəta kodu "
"{!s} ilə cavab verdi."
#: src/modules/hwclock/main.py:26
msgid "Setting hardware clock."
@ -386,6 +394,8 @@ msgstr "fstab yazılır."
#: src/modules/fstab/main.py:389
msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
msgstr ""
"İstifadə etmək üçün, <pre>{!s}</pre> tənzimləməsi, <pre>{!s}</pre> üçün "
"göstərilməyib."
#: src/modules/dummypython/main.py:35
msgid "Dummy python job."

@ -5,7 +5,7 @@
#
# Translators:
# pavelrz, 2017
# LiberteCzech <liberte.czech@gmail.com>, 2020
# LiberteCzech <martin.kriz.czech@gmail.com>, 2020
# Pavel Borecki <pavel.borecki@gmail.com>, 2020
#
#, fuzzy

@ -5,8 +5,8 @@
#
# Translators:
# Adriaan de Groot <groot@kde.org>, 2020
# Gustav Gyges, 2020
# Andreas Eitel <github-aneitel@online.de>, 2020
# Gustav Gyges, 2021
#
#, fuzzy
msgid ""
@ -15,7 +15,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-14 12:55+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Andreas Eitel <github-aneitel@online.de>, 2020\n"
"Last-Translator: Gustav Gyges, 2021\n"
"Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -319,25 +319,31 @@ msgstr[1] "Entferne %(num)d Pakete."
#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
#: src/modules/packages/main.py:628
msgid "Package Manager error"
msgstr ""
msgstr "Fehler im Paketmanager"
#: src/modules/packages/main.py:589
msgid ""
"The package manager could not prepare updates. The command <pre>{!s}</pre> "
"returned error code {!s}."
msgstr ""
"Der Paketmanager konnte die Aktualisierungen nicht vorbereiten. Der Befehl "
"<pre>{!s}</pre> erzeugte Fehlercode {!s}."
#: src/modules/packages/main.py:601
msgid ""
"The package manager could not update the system. The command <pre>{!s}</pre>"
" returned error code {!s}."
msgstr ""
"Der Paketmanager konnte das System nicht aktualisieren. Der Befehl "
"<pre>{!s}</pre> erzeugte Fehlercode {!s}."
#: src/modules/packages/main.py:629
msgid ""
"The package manager could not make changes to the installed system. The "
"command <pre>{!s}</pre> returned error code {!s}."
msgstr ""
"Der Paketmanager konnte das installierte System nicht verändern. Der Befehl "
"<pre>{!s}</pre> erzeugte Fehlercode {!s}."
#: src/modules/bootloader/main.py:43
msgid "Install bootloader."
@ -345,13 +351,15 @@ msgstr "Installiere Bootloader."
#: src/modules/bootloader/main.py:502
msgid "Bootloader installation error"
msgstr ""
msgstr "Fehler beim Installieren des Bootloaders"
#: src/modules/bootloader/main.py:503
msgid ""
"The bootloader could not be installed. The installation command "
"<pre>{!s}</pre> returned error code {!s}."
msgstr ""
"Der Bootloader konnte nicht installiert werden. Der Installationsbefehl "
"<pre>{!s}</pre> erzeugte Fehlercode {!s}."
#: src/modules/hwclock/main.py:26
msgid "Setting hardware clock."
@ -392,6 +400,8 @@ msgstr "Schreibe fstab."
#: src/modules/fstab/main.py:389
msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
msgstr ""
"Keine <pre>{!s}</pre> Konfiguration gegeben die <pre>{!s}</pre> benutzen "
"könnte."
#: src/modules/dummypython/main.py:35
msgid "Dummy python job."

@ -7,7 +7,7 @@
# strel, 2017
# Francisco Sánchez López de Lerma <fslopezlerma@gmail.com>, 2018
# Guido Grasso <cuquiman97@gmail.com>, 2018
# Adolfo Jayme Barrientos, 2019
# Adolfo Jayme-Barrientos, 2019
# Miguel Mayol <mitcoes@gmail.com>, 2020
# Pier Jose Gotta Perez <piegope@protonmail.com>, 2020
#

@ -320,6 +320,7 @@ msgid ""
"The package manager could not make changes to the installed system. The "
"command <pre>{!s}</pre> returned error code {!s}."
msgstr ""
"패키지 관리자가 설치된 시스템을 변경할 수 없습니다. <pre>{!s}</pre> 명령에서 {!s} 오류 코드를 반환했습니다."
#: src/modules/bootloader/main.py:43
msgid "Install bootloader."

@ -0,0 +1,382 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-14 12:55+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Korean (Korea) (https://www.transifex.com/calamares/teams/20061/ko_KR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ko_KR\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: src/modules/grubcfg/main.py:28
msgid "Configure GRUB."
msgstr ""
#: src/modules/mount/main.py:30
msgid "Mounting partitions."
msgstr ""
#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
#: src/modules/initcpiocfg/main.py:201
#: src/modules/luksopenswaphookcfg/main.py:86
#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
#: src/modules/openrcdmcryptcfg/main.py:72
#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
msgid "Configuration Error"
msgstr ""
#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
#: src/modules/fstab/main.py:356
msgid "No partitions are defined for <pre>{!s}</pre> to use."
msgstr ""
#: src/modules/services-systemd/main.py:26
msgid "Configure systemd services"
msgstr ""
#: src/modules/services-systemd/main.py:59
#: src/modules/services-openrc/main.py:93
msgid "Cannot modify service"
msgstr ""
#: src/modules/services-systemd/main.py:60
msgid ""
"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
msgstr ""
#: src/modules/services-systemd/main.py:63
#: src/modules/services-systemd/main.py:67
msgid "Cannot enable systemd service <code>{name!s}</code>."
msgstr ""
#: src/modules/services-systemd/main.py:65
msgid "Cannot enable systemd target <code>{name!s}</code>."
msgstr ""
#: src/modules/services-systemd/main.py:69
msgid "Cannot disable systemd target <code>{name!s}</code>."
msgstr ""
#: src/modules/services-systemd/main.py:71
msgid "Cannot mask systemd unit <code>{name!s}</code>."
msgstr ""
#: src/modules/services-systemd/main.py:73
msgid ""
"Unknown systemd commands <code>{command!s}</code> and "
"<code>{suffix!s}</code> for unit {name!s}."
msgstr ""
#: src/modules/umount/main.py:31
msgid "Unmount file systems."
msgstr ""
#: src/modules/unpackfs/main.py:35
msgid "Filling up filesystems."
msgstr ""
#: src/modules/unpackfs/main.py:255
msgid "rsync failed with error code {}."
msgstr ""
#: src/modules/unpackfs/main.py:300
msgid "Unpacking image {}/{}, file {}/{}"
msgstr ""
#: src/modules/unpackfs/main.py:315
msgid "Starting to unpack {}"
msgstr ""
#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
msgid "Failed to unpack image \"{}\""
msgstr ""
#: src/modules/unpackfs/main.py:431
msgid "No mount point for root partition"
msgstr ""
#: src/modules/unpackfs/main.py:432
msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
msgstr ""
#: src/modules/unpackfs/main.py:437
msgid "Bad mount point for root partition"
msgstr ""
#: src/modules/unpackfs/main.py:438
msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
msgstr ""
#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
#: src/modules/unpackfs/main.py:478
msgid "Bad unsquash configuration"
msgstr ""
#: src/modules/unpackfs/main.py:455
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
msgstr ""
#: src/modules/unpackfs/main.py:459
msgid "The source filesystem \"{}\" does not exist"
msgstr ""
#: src/modules/unpackfs/main.py:465
msgid ""
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
"installed"
msgstr ""
#: src/modules/unpackfs/main.py:479
msgid "The destination \"{}\" in the target system is not a directory"
msgstr ""
#: src/modules/displaymanager/main.py:526
msgid "Cannot write KDM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:527
msgid "KDM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:588
msgid "Cannot write LXDM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:589
msgid "LXDM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:672
msgid "Cannot write LightDM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:673
msgid "LightDM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:747
msgid "Cannot configure LightDM"
msgstr ""
#: src/modules/displaymanager/main.py:748
msgid "No LightDM greeter installed."
msgstr ""
#: src/modules/displaymanager/main.py:779
msgid "Cannot write SLIM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:780
msgid "SLIM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:906
msgid "No display managers selected for the displaymanager module."
msgstr ""
#: src/modules/displaymanager/main.py:907
msgid ""
"The displaymanagers list is empty or undefined in both globalstorage and "
"displaymanager.conf."
msgstr ""
#: src/modules/displaymanager/main.py:989
msgid "Display manager configuration was incomplete"
msgstr ""
#: src/modules/initcpiocfg/main.py:28
msgid "Configuring mkinitcpio."
msgstr ""
#: src/modules/initcpiocfg/main.py:202
#: src/modules/luksopenswaphookcfg/main.py:91
#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
#: src/modules/networkcfg/main.py:40
msgid "No root mount point is given for <pre>{!s}</pre> to use."
msgstr ""
#: src/modules/luksopenswaphookcfg/main.py:26
msgid "Configuring encrypted swap."
msgstr ""
#: src/modules/rawfs/main.py:26
msgid "Installing data."
msgstr ""
#: src/modules/services-openrc/main.py:29
msgid "Configure OpenRC services"
msgstr ""
#: src/modules/services-openrc/main.py:57
msgid "Cannot add service {name!s} to run-level {level!s}."
msgstr ""
#: src/modules/services-openrc/main.py:59
msgid "Cannot remove service {name!s} from run-level {level!s}."
msgstr ""
#: src/modules/services-openrc/main.py:61
msgid ""
"Unknown service-action <code>{arg!s}</code> for service {name!s} in run-"
"level {level!s}."
msgstr ""
#: src/modules/services-openrc/main.py:94
msgid ""
"<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}."
msgstr ""
#: src/modules/services-openrc/main.py:101
msgid "Target runlevel does not exist"
msgstr ""
#: src/modules/services-openrc/main.py:102
msgid ""
"The path for runlevel {level!s} is <code>{path!s}</code>, which does not "
"exist."
msgstr ""
#: src/modules/services-openrc/main.py:110
msgid "Target service does not exist"
msgstr ""
#: src/modules/services-openrc/main.py:111
msgid ""
"The path for service {name!s} is <code>{path!s}</code>, which does not "
"exist."
msgstr ""
#: src/modules/plymouthcfg/main.py:27
msgid "Configure Plymouth theme"
msgstr ""
#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
#: src/modules/packages/main.py:69
msgid "Install packages."
msgstr ""
#: src/modules/packages/main.py:57
#, python-format
msgid "Processing packages (%(count)d / %(total)d)"
msgstr ""
#: src/modules/packages/main.py:62
#, python-format
msgid "Installing one package."
msgid_plural "Installing %(num)d packages."
msgstr[0] ""
#: src/modules/packages/main.py:65
#, python-format
msgid "Removing one package."
msgid_plural "Removing %(num)d packages."
msgstr[0] ""
#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
#: src/modules/packages/main.py:628
msgid "Package Manager error"
msgstr ""
#: src/modules/packages/main.py:589
msgid ""
"The package manager could not prepare updates. The command <pre>{!s}</pre> "
"returned error code {!s}."
msgstr ""
#: src/modules/packages/main.py:601
msgid ""
"The package manager could not update the system. The command <pre>{!s}</pre>"
" returned error code {!s}."
msgstr ""
#: src/modules/packages/main.py:629
msgid ""
"The package manager could not make changes to the installed system. The "
"command <pre>{!s}</pre> returned error code {!s}."
msgstr ""
#: src/modules/bootloader/main.py:43
msgid "Install bootloader."
msgstr ""
#: src/modules/bootloader/main.py:502
msgid "Bootloader installation error"
msgstr ""
#: src/modules/bootloader/main.py:503
msgid ""
"The bootloader could not be installed. The installation command "
"<pre>{!s}</pre> returned error code {!s}."
msgstr ""
#: src/modules/hwclock/main.py:26
msgid "Setting hardware clock."
msgstr ""
#: src/modules/mkinitfs/main.py:27
msgid "Creating initramfs with mkinitfs."
msgstr ""
#: src/modules/mkinitfs/main.py:49
msgid "Failed to run mkinitfs on the target"
msgstr ""
#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
msgid "The exit code was {}"
msgstr ""
#: src/modules/dracut/main.py:27
msgid "Creating initramfs with dracut."
msgstr ""
#: src/modules/dracut/main.py:49
msgid "Failed to run dracut on the target"
msgstr ""
#: src/modules/initramfscfg/main.py:32
msgid "Configuring initramfs."
msgstr ""
#: src/modules/openrcdmcryptcfg/main.py:26
msgid "Configuring OpenRC dmcrypt service."
msgstr ""
#: src/modules/fstab/main.py:29
msgid "Writing fstab."
msgstr ""
#: src/modules/fstab/main.py:389
msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
msgstr ""
#: src/modules/dummypython/main.py:35
msgid "Dummy python job."
msgstr ""
#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
#: src/modules/dummypython/main.py:94
msgid "Dummy python step {}"
msgstr ""
#: src/modules/localecfg/main.py:30
msgid "Configuring locales."
msgstr ""
#: src/modules/networkcfg/main.py:28
msgid "Saving network configuration."
msgstr ""

@ -137,7 +137,7 @@ msgstr "Bloga unsquash konfigūracija"
#: src/modules/unpackfs/main.py:455
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
msgstr "Jūsų branduolys nepalaiko failų sistemos, kuri skirta \"{}\" ({})"
msgstr "Jūsų branduolys nepalaiko failų sistemos, kuri skirta „{}“ ({})"
#: src/modules/unpackfs/main.py:459
msgid "The source filesystem \"{}\" does not exist"

@ -5,7 +5,7 @@
#
# Translators:
# André Marcelo Alvarenga <alvarenga@kde.org>, 2020
# Guilherme Marçal Silva, 2020
# Guilherme Marçal Silva, 2021
#
#, fuzzy
msgid ""
@ -14,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-14 12:55+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Guilherme Marçal Silva, 2020\n"
"Last-Translator: Guilherme Marçal Silva, 2021\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"
@ -317,39 +317,47 @@ msgstr[1] "Removendo %(num)d pacotes."
#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
#: src/modules/packages/main.py:628
msgid "Package Manager error"
msgstr ""
msgstr "Erro do Gerenciador de Pacotes"
#: src/modules/packages/main.py:589
msgid ""
"The package manager could not prepare updates. The command <pre>{!s}</pre> "
"returned error code {!s}."
msgstr ""
"O gerenciador de pacotes não pôde preparar as atualizações. O comando "
"<pre>{!s}</pre> retornou o código de erro {!s}."
#: src/modules/packages/main.py:601
msgid ""
"The package manager could not update the system. The command <pre>{!s}</pre>"
" returned error code {!s}."
msgstr ""
"O gerenciador de pacotes não pôde atualizar o sistema. O comando "
"<pre>{!s}</pre> retornou o código de erro {!s}."
#: src/modules/packages/main.py:629
msgid ""
"The package manager could not make changes to the installed system. The "
"command <pre>{!s}</pre> returned error code {!s}."
msgstr ""
"O gerenciador de pacotes não pôde fazer mudanças no sistema instalado. O "
"comando <pre>{!s}</pre> retornou o código de erro {!s}."
#: src/modules/bootloader/main.py:43
msgid "Install bootloader."
msgstr "Instalar bootloader."
msgstr "Instalar carregador de inicialização."
#: src/modules/bootloader/main.py:502
msgid "Bootloader installation error"
msgstr ""
msgstr "Erro de instalação do carregador de inicialização"
#: src/modules/bootloader/main.py:503
msgid ""
"The bootloader could not be installed. The installation command "
"<pre>{!s}</pre> returned error code {!s}."
msgstr ""
"O carregador de inicialização não pôde ser instalado. O comando de "
"instalação <pre>{!s}</pre> retornou o código de erro {!s}."
#: src/modules/hwclock/main.py:26
msgid "Setting hardware clock."
@ -390,6 +398,8 @@ msgstr "Escrevendo fstab."
#: src/modules/fstab/main.py:389
msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
msgstr ""
"Nenhuma configuração <pre>{!s}</pre> é dada para que <pre>{!s}</pre> possa "
"utilizar."
#: src/modules/dummypython/main.py:35
msgid "Dummy python job."

@ -3,6 +3,9 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Hela Basa, 2021
#
#, fuzzy
msgid ""
msgstr ""
@ -10,6 +13,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-14 12:55+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Hela Basa, 2021\n"
"Language-Team: Sinhala (https://www.transifex.com/calamares/teams/20061/si/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -216,7 +220,7 @@ msgstr ""
#: src/modules/rawfs/main.py:26
msgid "Installing data."
msgstr ""
msgstr "දත්ත ස්ථාපනය වෙමින්."
#: src/modules/services-openrc/main.py:29
msgid "Configure OpenRC services"
@ -268,7 +272,7 @@ msgstr ""
#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
#: src/modules/packages/main.py:69
msgid "Install packages."
msgstr ""
msgstr "ඇසුරුම් ස්ථාපනය කරන්න."
#: src/modules/packages/main.py:57
#, python-format
@ -279,15 +283,15 @@ msgstr ""
#, python-format
msgid "Installing one package."
msgid_plural "Installing %(num)d packages."
msgstr[0] ""
msgstr[1] ""
msgstr[0] "ඇසුරුමක් ස්ථාපනය වෙමින්."
msgstr[1] "ඇසුරුම් %(num)d ක් ස්ථාපනය වෙමින්."
#: src/modules/packages/main.py:65
#, python-format
msgid "Removing one package."
msgid_plural "Removing %(num)d packages."
msgstr[0] ""
msgstr[1] ""
msgstr[0] "ඇසුරුමක් ඉවත් වෙමින්."
msgstr[1] "ඇසුරුම් %(num)d ක් ඉවත් වෙමින්."
#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
#: src/modules/packages/main.py:628
@ -328,7 +332,7 @@ msgstr ""
#: src/modules/hwclock/main.py:26
msgid "Setting hardware clock."
msgstr ""
msgstr "දෘඩාංග ඔරලෝසුව සැකසෙමින්."
#: src/modules/mkinitfs/main.py:27
msgid "Creating initramfs with mkinitfs."
@ -381,4 +385,4 @@ msgstr ""
#: src/modules/networkcfg/main.py:28
msgid "Saving network configuration."
msgstr ""
msgstr "ජාල වින්‍යාසය සුරැකෙමින්."

@ -337,6 +337,8 @@ msgid ""
"The package manager could not make changes to the installed system. The "
"command <pre>{!s}</pre> returned error code {!s}."
msgstr ""
"Përgjegjësi i paketave sbëri dot ndryshime te sistemi i instaluar. Urdhri "
"<pre>{!s}</pre> u përgjigj me kod gabimi {!s}."
#: src/modules/bootloader/main.py:43
msgid "Install bootloader."

@ -8,7 +8,7 @@
# plantman <weihanlin@live.com>, 2017
# Feng Chao <chaofeng111@qq.com>, 2020
# Bobby Rong <admin@bobby285271.top>, 2020
# 玉堂白鹤 <yjwork@qq.com>, 2020
# 玉堂白鹤 <yjwork@qq.com>, 2021
#
#, fuzzy
msgid ""
@ -17,7 +17,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-14 12:55+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: 玉堂白鹤 <yjwork@qq.com>, 2020\n"
"Last-Translator: 玉堂白鹤 <yjwork@qq.com>, 2021\n"
"Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -300,25 +300,25 @@ msgstr[0] "移除%(num)d软件包。"
#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
#: src/modules/packages/main.py:628
msgid "Package Manager error"
msgstr ""
msgstr "软件包管理器错误"
#: src/modules/packages/main.py:589
msgid ""
"The package manager could not prepare updates. The command <pre>{!s}</pre> "
"returned error code {!s}."
msgstr ""
msgstr "软件包管理器无法准备更新。命令<pre>{!s}</pre>返回错误代码{!s}。"
#: src/modules/packages/main.py:601
msgid ""
"The package manager could not update the system. The command <pre>{!s}</pre>"
" returned error code {!s}."
msgstr ""
msgstr "软件包管理器无法更新系统。命令<pre>{!s}</pre>返回错误代码{!s}。"
#: src/modules/packages/main.py:629
msgid ""
"The package manager could not make changes to the installed system. The "
"command <pre>{!s}</pre> returned error code {!s}."
msgstr ""
msgstr "软件包管理器无法对已安装的系统进行更改。命令<pre>{!s}</pre>返回错误代码{!s}。"
#: src/modules/bootloader/main.py:43
msgid "Install bootloader."
@ -326,13 +326,13 @@ msgstr "安装启动加载器。"
#: src/modules/bootloader/main.py:502
msgid "Bootloader installation error"
msgstr ""
msgstr "启动加载器安装出错"
#: src/modules/bootloader/main.py:503
msgid ""
"The bootloader could not be installed. The installation command "
"<pre>{!s}</pre> returned error code {!s}."
msgstr ""
msgstr "无法安装启动加载器。安装命令<pre>{!s}</pre>返回错误代码 {!s}。"
#: src/modules/hwclock/main.py:26
msgid "Setting hardware clock."
@ -372,7 +372,7 @@ msgstr "正在写入 fstab。"
#: src/modules/fstab/main.py:389
msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
msgstr ""
msgstr "无 <pre>{!s}</pre> 配置可供 <pre>{!s}</pre> 使用。"
#: src/modules/dummypython/main.py:35
msgid "Dummy python job."

@ -0,0 +1,382 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-14 12:55+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Chinese (Hong Kong) (https://www.transifex.com/calamares/teams/20061/zh_HK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: src/modules/grubcfg/main.py:28
msgid "Configure GRUB."
msgstr ""
#: src/modules/mount/main.py:30
msgid "Mounting partitions."
msgstr ""
#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
#: src/modules/initcpiocfg/main.py:201
#: src/modules/luksopenswaphookcfg/main.py:86
#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
#: src/modules/openrcdmcryptcfg/main.py:72
#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
msgid "Configuration Error"
msgstr ""
#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
#: src/modules/fstab/main.py:356
msgid "No partitions are defined for <pre>{!s}</pre> to use."
msgstr ""
#: src/modules/services-systemd/main.py:26
msgid "Configure systemd services"
msgstr ""
#: src/modules/services-systemd/main.py:59
#: src/modules/services-openrc/main.py:93
msgid "Cannot modify service"
msgstr ""
#: src/modules/services-systemd/main.py:60
msgid ""
"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
msgstr ""
#: src/modules/services-systemd/main.py:63
#: src/modules/services-systemd/main.py:67
msgid "Cannot enable systemd service <code>{name!s}</code>."
msgstr ""
#: src/modules/services-systemd/main.py:65
msgid "Cannot enable systemd target <code>{name!s}</code>."
msgstr ""
#: src/modules/services-systemd/main.py:69
msgid "Cannot disable systemd target <code>{name!s}</code>."
msgstr ""
#: src/modules/services-systemd/main.py:71
msgid "Cannot mask systemd unit <code>{name!s}</code>."
msgstr ""
#: src/modules/services-systemd/main.py:73
msgid ""
"Unknown systemd commands <code>{command!s}</code> and "
"<code>{suffix!s}</code> for unit {name!s}."
msgstr ""
#: src/modules/umount/main.py:31
msgid "Unmount file systems."
msgstr ""
#: src/modules/unpackfs/main.py:35
msgid "Filling up filesystems."
msgstr ""
#: src/modules/unpackfs/main.py:255
msgid "rsync failed with error code {}."
msgstr ""
#: src/modules/unpackfs/main.py:300
msgid "Unpacking image {}/{}, file {}/{}"
msgstr ""
#: src/modules/unpackfs/main.py:315
msgid "Starting to unpack {}"
msgstr ""
#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
msgid "Failed to unpack image \"{}\""
msgstr ""
#: src/modules/unpackfs/main.py:431
msgid "No mount point for root partition"
msgstr ""
#: src/modules/unpackfs/main.py:432
msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
msgstr ""
#: src/modules/unpackfs/main.py:437
msgid "Bad mount point for root partition"
msgstr ""
#: src/modules/unpackfs/main.py:438
msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
msgstr ""
#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
#: src/modules/unpackfs/main.py:478
msgid "Bad unsquash configuration"
msgstr ""
#: src/modules/unpackfs/main.py:455
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
msgstr ""
#: src/modules/unpackfs/main.py:459
msgid "The source filesystem \"{}\" does not exist"
msgstr ""
#: src/modules/unpackfs/main.py:465
msgid ""
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
"installed"
msgstr ""
#: src/modules/unpackfs/main.py:479
msgid "The destination \"{}\" in the target system is not a directory"
msgstr ""
#: src/modules/displaymanager/main.py:526
msgid "Cannot write KDM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:527
msgid "KDM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:588
msgid "Cannot write LXDM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:589
msgid "LXDM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:672
msgid "Cannot write LightDM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:673
msgid "LightDM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:747
msgid "Cannot configure LightDM"
msgstr ""
#: src/modules/displaymanager/main.py:748
msgid "No LightDM greeter installed."
msgstr ""
#: src/modules/displaymanager/main.py:779
msgid "Cannot write SLIM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:780
msgid "SLIM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:906
msgid "No display managers selected for the displaymanager module."
msgstr ""
#: src/modules/displaymanager/main.py:907
msgid ""
"The displaymanagers list is empty or undefined in both globalstorage and "
"displaymanager.conf."
msgstr ""
#: src/modules/displaymanager/main.py:989
msgid "Display manager configuration was incomplete"
msgstr ""
#: src/modules/initcpiocfg/main.py:28
msgid "Configuring mkinitcpio."
msgstr ""
#: src/modules/initcpiocfg/main.py:202
#: src/modules/luksopenswaphookcfg/main.py:91
#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
#: src/modules/networkcfg/main.py:40
msgid "No root mount point is given for <pre>{!s}</pre> to use."
msgstr ""
#: src/modules/luksopenswaphookcfg/main.py:26
msgid "Configuring encrypted swap."
msgstr ""
#: src/modules/rawfs/main.py:26
msgid "Installing data."
msgstr ""
#: src/modules/services-openrc/main.py:29
msgid "Configure OpenRC services"
msgstr ""
#: src/modules/services-openrc/main.py:57
msgid "Cannot add service {name!s} to run-level {level!s}."
msgstr ""
#: src/modules/services-openrc/main.py:59
msgid "Cannot remove service {name!s} from run-level {level!s}."
msgstr ""
#: src/modules/services-openrc/main.py:61
msgid ""
"Unknown service-action <code>{arg!s}</code> for service {name!s} in run-"
"level {level!s}."
msgstr ""
#: src/modules/services-openrc/main.py:94
msgid ""
"<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}."
msgstr ""
#: src/modules/services-openrc/main.py:101
msgid "Target runlevel does not exist"
msgstr ""
#: src/modules/services-openrc/main.py:102
msgid ""
"The path for runlevel {level!s} is <code>{path!s}</code>, which does not "
"exist."
msgstr ""
#: src/modules/services-openrc/main.py:110
msgid "Target service does not exist"
msgstr ""
#: src/modules/services-openrc/main.py:111
msgid ""
"The path for service {name!s} is <code>{path!s}</code>, which does not "
"exist."
msgstr ""
#: src/modules/plymouthcfg/main.py:27
msgid "Configure Plymouth theme"
msgstr ""
#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
#: src/modules/packages/main.py:69
msgid "Install packages."
msgstr ""
#: src/modules/packages/main.py:57
#, python-format
msgid "Processing packages (%(count)d / %(total)d)"
msgstr ""
#: src/modules/packages/main.py:62
#, python-format
msgid "Installing one package."
msgid_plural "Installing %(num)d packages."
msgstr[0] ""
#: src/modules/packages/main.py:65
#, python-format
msgid "Removing one package."
msgid_plural "Removing %(num)d packages."
msgstr[0] ""
#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
#: src/modules/packages/main.py:628
msgid "Package Manager error"
msgstr ""
#: src/modules/packages/main.py:589
msgid ""
"The package manager could not prepare updates. The command <pre>{!s}</pre> "
"returned error code {!s}."
msgstr ""
#: src/modules/packages/main.py:601
msgid ""
"The package manager could not update the system. The command <pre>{!s}</pre>"
" returned error code {!s}."
msgstr ""
#: src/modules/packages/main.py:629
msgid ""
"The package manager could not make changes to the installed system. The "
"command <pre>{!s}</pre> returned error code {!s}."
msgstr ""
#: src/modules/bootloader/main.py:43
msgid "Install bootloader."
msgstr ""
#: src/modules/bootloader/main.py:502
msgid "Bootloader installation error"
msgstr ""
#: src/modules/bootloader/main.py:503
msgid ""
"The bootloader could not be installed. The installation command "
"<pre>{!s}</pre> returned error code {!s}."
msgstr ""
#: src/modules/hwclock/main.py:26
msgid "Setting hardware clock."
msgstr ""
#: src/modules/mkinitfs/main.py:27
msgid "Creating initramfs with mkinitfs."
msgstr ""
#: src/modules/mkinitfs/main.py:49
msgid "Failed to run mkinitfs on the target"
msgstr ""
#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
msgid "The exit code was {}"
msgstr ""
#: src/modules/dracut/main.py:27
msgid "Creating initramfs with dracut."
msgstr ""
#: src/modules/dracut/main.py:49
msgid "Failed to run dracut on the target"
msgstr ""
#: src/modules/initramfscfg/main.py:32
msgid "Configuring initramfs."
msgstr ""
#: src/modules/openrcdmcryptcfg/main.py:26
msgid "Configuring OpenRC dmcrypt service."
msgstr ""
#: src/modules/fstab/main.py:29
msgid "Writing fstab."
msgstr ""
#: src/modules/fstab/main.py:389
msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
msgstr ""
#: src/modules/dummypython/main.py:35
msgid "Dummy python job."
msgstr ""
#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
#: src/modules/dummypython/main.py:94
msgid "Dummy python step {}"
msgstr ""
#: src/modules/localecfg/main.py:30
msgid "Configuring locales."
msgstr ""
#: src/modules/networkcfg/main.py:28
msgid "Saving network configuration."
msgstr ""

@ -104,6 +104,10 @@ Settings* Settings::s_instance = nullptr;
Settings*
Settings::instance()
{
if ( !s_instance )
{
cWarning() << "Getting nullptr Settings instance.";
}
return s_instance;
}
@ -238,6 +242,9 @@ Settings::Settings( bool debugMode )
, m_disableCancel( false )
, m_disableCancelDuringExec( false )
{
cWarning() << "Using bogus Calamares settings in"
<< ( debugMode ? QStringLiteral( "debug" ) : QStringLiteral( "regular" ) ) << "mode";
s_instance = this;
}
Settings::Settings( const QString& settingsFilePath, bool debugMode )

@ -20,6 +20,8 @@
#include <QThread>
#include <QTimer>
#include <algorithm>
namespace CalamaresUtils
{
namespace Network
@ -27,7 +29,7 @@ namespace Network
void
RequestOptions::applyToRequest( QNetworkRequest* request ) const
{
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
#if QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 )
constexpr const auto RedirectPolicyAttribute = QNetworkRequest::FollowRedirectsAttribute;
#else
constexpr const auto RedirectPolicyAttribute = QNetworkRequest::RedirectPolicyAttribute;
@ -60,8 +62,9 @@ public slots:
void cleanupNam();
public:
QUrl m_hasInternetUrl;
bool m_hasInternet;
QVector< QUrl > m_hasInternetUrls;
bool m_hasInternet = false;
int m_lastCheckedUrlIndex = -1;
Private();
@ -155,14 +158,47 @@ Manager::hasInternet()
bool
Manager::checkHasInternet()
{
if ( d->m_hasInternetUrls.empty() )
{
return false;
}
// It's possible that access was switched off (see below, if the check
// fails) so we want to turn it back on first. Otherwise all the
// checks will fail **anyway**, defeating the point of the checks.
#if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) )
if ( !d->m_hasInternet )
{
d->nam()->setNetworkAccessible( QNetworkAccessManager::Accessible );
}
#endif
if ( d->m_lastCheckedUrlIndex < 0 )
{
d->m_lastCheckedUrlIndex = 0;
}
int attempts = 0;
do
{
// Start by pinging the same one as last time
d->m_hasInternet = synchronousPing( d->m_hasInternetUrls.at( d->m_lastCheckedUrlIndex ) );
// if it's not responding, **then** move on to the next one,
// and wrap around if needed
if ( !d->m_hasInternet )
{
if ( ++( d->m_lastCheckedUrlIndex ) >= d->m_hasInternetUrls.size() )
{
d->m_lastCheckedUrlIndex = 0;
}
}
// keep track of how often we've tried, because there's no point in
// going around more than once.
attempts++;
} while ( !d->m_hasInternet && ( attempts < d->m_hasInternetUrls.size() ) );
d->m_hasInternet = synchronousPing( d->m_hasInternetUrl );
// For earlier Qt versions (< 5.15.0), set the accessibility flag to
// NotAccessible if synchronous ping has failed, so that any module
// using Qt's networkAccessible method to determine whether or not
// internet connection is actually avaialable won't get confused over
// virtualization technologies.
// internet connection is actually available won't get confused.
#if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) )
if ( !d->m_hasInternet )
{
@ -177,7 +213,40 @@ Manager::checkHasInternet()
void
Manager::setCheckHasInternetUrl( const QUrl& url )
{
d->m_hasInternetUrl = url;
d->m_lastCheckedUrlIndex = -1;
d->m_hasInternetUrls.clear();
if ( url.isValid() )
{
d->m_hasInternetUrls.append( url );
}
}
void
Manager::setCheckHasInternetUrl( const QVector< QUrl >& urls )
{
d->m_lastCheckedUrlIndex = -1;
d->m_hasInternetUrls = urls;
auto it = std::remove_if(
d->m_hasInternetUrls.begin(), d->m_hasInternetUrls.end(), []( const QUrl& u ) { return !u.isValid(); } );
if ( it != d->m_hasInternetUrls.end() )
{
d->m_hasInternetUrls.erase( it, d->m_hasInternetUrls.end() );
}
}
void
Manager::addCheckHasInternetUrl( const QUrl& url )
{
if ( url.isValid() )
{
d->m_hasInternetUrls.append( url );
}
}
QVector< QUrl >
Manager::getCheckInternetUrls() const
{
return d->m_hasInternetUrls;
}
/** @brief Does a request asynchronously, returns the (pending) reply
@ -200,6 +269,7 @@ asynchronousRun( QNetworkAccessManager* nam, const QUrl& url, const RequestOptio
// Bail out early if the request is bad
if ( reply->error() )
{
cWarning() << "Early reply error" << reply->error() << reply->errorString();
reply->deleteLater();
return nullptr;
}

@ -16,6 +16,7 @@
#include <QDebug>
#include <QObject>
#include <QUrl>
#include <QVector>
#include <chrono>
#include <memory>
@ -89,6 +90,7 @@ class DLLEXPORT Manager : public QObject
{
Q_OBJECT
Q_PROPERTY( bool hasInternet READ hasInternet NOTIFY hasInternetChanged FINAL )
Q_PROPERTY( QVector< QUrl > checkInternetUrls READ getCheckInternetUrls WRITE setCheckHasInternetUrl )
Manager();
@ -122,6 +124,15 @@ public:
/// @brief Set the URL which is used for the general "is there internet" check.
void setCheckHasInternetUrl( const QUrl& url );
/// @brief Adds an (extra) URL to check
void addCheckHasInternetUrl( const QUrl& url );
/// @brief Set a collection of URLs used for the general "is there internet" check.
void setCheckHasInternetUrl( const QVector< QUrl >& urls );
/// @brief What URLs are used to check for internet connectivity?
QVector< QUrl > getCheckInternetUrls() const;
/** @brief Do a network request asynchronously.
*
* Returns a pointer to the reply-from-the-request.

@ -30,6 +30,7 @@ NetworkTests::testInstance()
{
auto& nam = CalamaresUtils::Network::Manager::instance();
QVERIFY( !nam.hasInternet() );
QCOMPARE( nam.getCheckInternetUrls().count(), 0 );
}
void
@ -60,3 +61,87 @@ NetworkTests::testPing()
QVERIFY( canPing_www_kde_org );
}
}
void
NetworkTests::testCheckUrl()
{
using namespace CalamaresUtils::Network;
Logger::setupLogLevel( Logger::LOGVERBOSE );
auto& nam = Manager::instance();
{
QUrl u( "http://example.com" );
QVERIFY( u.isValid() );
nam.setCheckHasInternetUrl( u );
QVERIFY( nam.checkHasInternet() );
QCOMPARE( nam.getCheckInternetUrls().count(), 1 ); // Valid URL
}
{
QUrl u( "http://nonexistent.example.com" );
QVERIFY( u.isValid() );
nam.setCheckHasInternetUrl( u );
QVERIFY( !nam.checkHasInternet() );
QCOMPARE( nam.getCheckInternetUrls().count(), 1 ); // Valid URL even if it doesn't resolve
}
{
QUrl u;
QVERIFY( !u.isValid() );
nam.setCheckHasInternetUrl( u );
QVERIFY( !nam.checkHasInternet() );
QCOMPARE( nam.getCheckInternetUrls().count(), 0 ); // Invalid URL tried
}
}
void
NetworkTests::testCheckMultiUrl()
{
using namespace CalamaresUtils::Network;
Logger::setupLogLevel( Logger::LOGVERBOSE );
auto& nam = Manager::instance();
{
QUrl u0( "http://example.com" );
QUrl u1( "https://kde.org" );
QVERIFY( u0.isValid() );
QVERIFY( u1.isValid() );
nam.setCheckHasInternetUrl( { u0, u1 } );
QVERIFY( nam.checkHasInternet() );
QCOMPARE( nam.getCheckInternetUrls().count(), 2 );
}
{
QUrl u0( "http://nonexistent.example.com" );
QUrl u1( "http://bogus.example.com" );
QVERIFY( u0.isValid() );
QVERIFY( u1.isValid() );
nam.setCheckHasInternetUrl( { u0, u1 } );
QVERIFY( !nam.checkHasInternet() );
QVERIFY( !nam.checkHasInternet() );
QCOMPARE( nam.getCheckInternetUrls().count(), 2 ); // Both are valid URLs
nam.addCheckHasInternetUrl( QUrl( "http://example.com" ) );
QVERIFY( nam.checkHasInternet() );
QCOMPARE( nam.getCheckInternetUrls().count(), 3 );
}
{
QUrl u0( "http://nonexistent.example.com" );
QUrl u1;
QVERIFY( u0.isValid() );
QVERIFY( !u1.isValid() );
nam.setCheckHasInternetUrl( { u0, u1 } );
QVERIFY( !nam.checkHasInternet() );
QVERIFY( !nam.checkHasInternet() );
QCOMPARE( nam.getCheckInternetUrls().count(), 1 ); // Only valid URL added
nam.addCheckHasInternetUrl( QUrl( "http://example.com" ) );
QVERIFY( nam.checkHasInternet() );
QCOMPARE( nam.getCheckInternetUrls().count(), 2 );
}
{
QUrl u0( "http://nonexistent.example.com" );
QUrl u1;
QVERIFY( u0.isValid() );
QVERIFY( !u1.isValid() );
nam.setCheckHasInternetUrl( { u1, u1, u1, u1 } );
QCOMPARE( nam.getCheckInternetUrls().count(), 0 );
nam.setCheckHasInternetUrl( { u1, u1, u0, u1 } );
QCOMPARE( nam.getCheckInternetUrls().count(), 1 );
}
}

@ -24,6 +24,9 @@ private Q_SLOTS:
void testInstance();
void testPing();
void testCheckUrl();
void testCheckMultiUrl();
};
#endif

@ -92,7 +92,7 @@ struct TemporaryMount::Private
TemporaryMount::TemporaryMount( const QString& devicePath, const QString& filesystemName, const QString& options )
: m_d( new Private )
: m_d( std::make_unique<Private>() )
{
m_d->m_devicePath = devicePath;
m_d->m_mountDir.setAutoRemove( false );
@ -100,8 +100,7 @@ TemporaryMount::TemporaryMount( const QString& devicePath, const QString& filesy
if ( r )
{
cWarning() << "Mount of" << devicePath << "on" << m_d->m_mountDir.path() << "failed, code" << r;
delete m_d;
m_d = nullptr;
m_d.reset();
}
}
@ -115,8 +114,6 @@ TemporaryMount::~TemporaryMount()
cWarning() << "UnMount of temporary" << m_d->m_devicePath << "on" << m_d->m_mountDir.path()
<< "failed, code" << r;
}
delete m_d;
m_d = nullptr;
}
}

@ -17,6 +17,8 @@
#include <QString>
#include <QStringList>
#include <memory>
namespace CalamaresUtils
{
namespace Partition
@ -58,12 +60,12 @@ public:
TemporaryMount& operator=( const TemporaryMount& ) = delete;
~TemporaryMount();
bool isValid() const { return m_d; }
bool isValid() const { return bool( m_d ); }
QString path() const;
private:
struct Private;
Private* m_d = nullptr;
std::unique_ptr< Private > m_d;
};
} // namespace Partition

@ -102,7 +102,7 @@ System::instance()
if ( !s_instance )
{
cError() << "No Calamares system-object has been created.";
cError() << Logger::SubEntry << "using a bogus instance instead.";
cDebug() << Logger::SubEntry << "using a bogus instance instead.";
return new System( true, nullptr );
}
return s_instance;

@ -70,11 +70,42 @@ struct cPointerSetter
std::optional< T > m_value;
T* m_pointer;
cPointerSetter( T* p ) : m_pointer(p) {}
~cPointerSetter() { if ( m_pointer && m_value.has_value() ) { *m_pointer = m_value.value(); } }
/** @brief Create a setter with no value set
*
* Until a value is set via operator=(), this pointer-setter
* will do nothing on destruction, leaving the pointed-to
* value unchanged.
*/
cPointerSetter( T* p )
: m_pointer( p )
{
}
/** @brief Create a setter with a value already set
*
* This ensures that on destruction, the value @p v will be written;
* it is equivalent to assigning @p v immediately. The pointed-to
* value is **not** changed (until destruction).
*/
cPointerSetter( T* p, T v )
: m_value( v )
, m_pointer( p )
{
}
~cPointerSetter()
{
if ( m_pointer && m_value.has_value() )
{
*m_pointer = m_value.value();
}
}
const T& operator=(const T& v) { m_value = v; return v; }
const T& operator=( const T& v )
{
m_value = v;
return v;
}
};
template < typename T > cPointerSetter( T p ) -> cPointerSetter<decltype(*p)>;
template < typename T >
cPointerSetter( T p )->cPointerSetter< decltype( *p ) >;
#endif

@ -34,7 +34,7 @@ DLLEXPORT QString getString( const QVariantMap& map, const QString& key, const Q
/** @brief Get a string list from a mapping with a given key; returns @p d if no value.
*
* This is slightly more lenient that getString(), and a single-string value will
* This is slightly more lenient than getString(), and a single-string value will
* be returned as a 1-item list.
*/
DLLEXPORT QStringList getStringList( const QVariantMap& map, const QString& key, const QStringList& d = QStringList() );

@ -49,6 +49,10 @@ Branding* Branding::s_instance = nullptr;
Branding*
Branding::instance()
{
if ( !s_instance )
{
cWarning() << "No Branding instance created yet.";
}
return s_instance;
}

@ -133,6 +133,12 @@ def create_systemd_boot_conf(install_path, efi_dir, uuid, entry, entry_name, ker
"root=/dev/mapper/"
+ partition["luksMapperName"]]
# systemd-boot with a BTRFS root filesystem needs to be told
# about the root subvolume.
for partition in partitions:
if partition["mountPoint"] == "/" and partition["fs"] == "btrfs":
kernel_params.append("rootflags=subvol=@")
if cryptdevice_params:
kernel_params.extend(cryptdevice_params)
else:

@ -244,9 +244,9 @@ class FstabGenerator(object):
if extra:
options += "," + extra
if mount_point == "/":
if mount_point == "/" and filesystem != "btrfs":
check = 1
elif mount_point and mount_point != "swap":
elif mount_point and mount_point != "swap" and filesystem != "btrfs":
check = 2
else:
check = 0

@ -16,6 +16,7 @@
#include "GlobalStorage.h"
#include "JobQueue.h"
#include "utils/Logger.h"
#include "utils/RAII.h"
#include "utils/Retranslator.h"
#include "utils/String.h"
#include "utils/Variant.h"
@ -168,54 +169,70 @@ Config::Config( QObject* parent )
emit prettyStatusChanged();
} );
connect( m_keyboardVariantsModel, &KeyboardVariantsModel::currentIndexChanged, [&]( int index ) {
// Set Xorg keyboard layout + variant
m_selectedVariant = m_keyboardVariantsModel->key( index );
connect( m_keyboardVariantsModel, &KeyboardVariantsModel::currentIndexChanged, this, &Config::xkbChanged );
if ( m_setxkbmapTimer.isActive() )
{
m_setxkbmapTimer.stop();
m_setxkbmapTimer.disconnect( this );
}
// If the user picks something explicitly -- not a consequence of
// a guess -- then move to UserSelected state and stay there.
connect( m_keyboardModelsModel, &KeyboardModelsModel::currentIndexChanged, this, &Config::selectionChange );
connect( m_keyboardLayoutsModel, &KeyboardLayoutModel::currentIndexChanged, this, &Config::selectionChange );
connect( m_keyboardVariantsModel, &KeyboardVariantsModel::currentIndexChanged, this, &Config::selectionChange );
connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] {
m_additionalLayoutInfo = getAdditionalLayoutInfo( m_selectedLayout );
m_selectedModel = m_keyboardModelsModel->key( m_keyboardModelsModel->currentIndex() );
m_selectedLayout = m_keyboardLayoutsModel->item( m_keyboardLayoutsModel->currentIndex() ).first;
m_selectedVariant = m_keyboardVariantsModel->key( m_keyboardVariantsModel->currentIndex() );
}
if ( !m_additionalLayoutInfo.additionalLayout.isEmpty() )
{
m_additionalLayoutInfo.groupSwitcher = xkbmap_query_grp_option();
void
Config::xkbChanged( int index )
{
// Set Xorg keyboard layout + variant
m_selectedVariant = m_keyboardVariantsModel->key( index );
if ( m_additionalLayoutInfo.groupSwitcher.isEmpty() )
{
m_additionalLayoutInfo.groupSwitcher = "grp:alt_shift_toggle";
}
if ( m_setxkbmapTimer.isActive() )
{
m_setxkbmapTimer.stop();
m_setxkbmapTimer.disconnect( this );
}
QProcess::execute( "setxkbmap",
xkbmap_layout_args( { m_additionalLayoutInfo.additionalLayout, m_selectedLayout },
{ m_additionalLayoutInfo.additionalVariant, m_selectedVariant },
m_additionalLayoutInfo.groupSwitcher ) );
connect( &m_setxkbmapTimer, &QTimer::timeout, this, &Config::xkbApply );
m_setxkbmapTimer.start( QApplication::keyboardInputInterval() );
emit prettyStatusChanged();
}
cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant << "(added "
<< m_additionalLayoutInfo.additionalLayout << "-" << m_additionalLayoutInfo.additionalVariant
<< " since current layout is not ASCII-capable)";
}
else
{
QProcess::execute( "setxkbmap", xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) );
cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant;
}
m_setxkbmapTimer.disconnect( this );
} );
m_setxkbmapTimer.start( QApplication::keyboardInputInterval() );
emit prettyStatusChanged();
} );
void
Config::xkbApply()
{
m_additionalLayoutInfo = getAdditionalLayoutInfo( m_selectedLayout );
m_selectedModel = m_keyboardModelsModel->key( m_keyboardModelsModel->currentIndex() );
m_selectedLayout = m_keyboardLayoutsModel->item( m_keyboardLayoutsModel->currentIndex() ).first;
m_selectedVariant = m_keyboardVariantsModel->key( m_keyboardVariantsModel->currentIndex() );
if ( !m_additionalLayoutInfo.additionalLayout.isEmpty() )
{
m_additionalLayoutInfo.groupSwitcher = xkbmap_query_grp_option();
if ( m_additionalLayoutInfo.groupSwitcher.isEmpty() )
{
m_additionalLayoutInfo.groupSwitcher = "grp:alt_shift_toggle";
}
QProcess::execute( "setxkbmap",
xkbmap_layout_args( { m_additionalLayoutInfo.additionalLayout, m_selectedLayout },
{ m_additionalLayoutInfo.additionalVariant, m_selectedVariant },
m_additionalLayoutInfo.groupSwitcher ) );
cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant << "(added "
<< m_additionalLayoutInfo.additionalLayout << "-" << m_additionalLayoutInfo.additionalVariant
<< " since current layout is not ASCII-capable)";
}
else
{
QProcess::execute( "setxkbmap", xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) );
cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant;
}
m_setxkbmapTimer.disconnect( this );
}
KeyboardModelsModel*
Config::keyboardModels() const
{
@ -254,6 +271,13 @@ findLayout( const KeyboardLayoutModel* klm, const QString& currentLayout )
void
Config::detectCurrentKeyboardLayout()
{
if ( m_state != State::Initial )
{
return;
}
cPointerSetter returnToIntial( &m_state, State::Initial );
m_state = State::Guessing;
//### Detect current keyboard layout and variant
QString currentLayout;
QString currentVariant;
@ -356,22 +380,22 @@ Config::createJobs()
return list;
}
void
Config::guessLayout( const QStringList& langParts )
static void
guessLayout( const QStringList& langParts, KeyboardLayoutModel* layouts, KeyboardVariantsModel* variants )
{
bool foundCountryPart = false;
for ( auto countryPart = langParts.rbegin(); !foundCountryPart && countryPart != langParts.rend(); ++countryPart )
{
cDebug() << Logger::SubEntry << "looking for locale part" << *countryPart;
for ( int i = 0; i < m_keyboardLayoutsModel->rowCount(); ++i )
for ( int i = 0; i < layouts->rowCount(); ++i )
{
QModelIndex idx = m_keyboardLayoutsModel->index( i );
QModelIndex idx = layouts->index( i );
QString name
= idx.isValid() ? idx.data( KeyboardLayoutModel::KeyboardLayoutKeyRole ).toString() : QString();
if ( idx.isValid() && ( name.compare( *countryPart, Qt::CaseInsensitive ) == 0 ) )
{
cDebug() << Logger::SubEntry << "matched" << name;
m_keyboardLayoutsModel->setCurrentIndex( i );
layouts->setCurrentIndex( i );
foundCountryPart = true;
break;
}
@ -382,14 +406,13 @@ Config::guessLayout( const QStringList& langParts )
if ( countryPart != langParts.rend() )
{
cDebug() << "Next level:" << *countryPart;
for ( int variantnumber = 0; variantnumber < m_keyboardVariantsModel->rowCount(); ++variantnumber )
for ( int variantnumber = 0; variantnumber < variants->rowCount(); ++variantnumber )
{
if ( m_keyboardVariantsModel->key( variantnumber ).compare( *countryPart, Qt::CaseInsensitive )
== 0 )
if ( variants->key( variantnumber ).compare( *countryPart, Qt::CaseInsensitive ) == 0 )
{
m_keyboardVariantsModel->setCurrentIndex( variantnumber );
variants->setCurrentIndex( variantnumber );
cDebug() << Logger::SubEntry << "matched variant" << *countryPart << ' '
<< m_keyboardVariantsModel->key( variantnumber );
<< variants->key( variantnumber );
}
}
}
@ -398,8 +421,15 @@ Config::guessLayout( const QStringList& langParts )
}
void
Config::onActivate()
Config::guessLocaleKeyboardLayout()
{
if ( m_state != State::Initial )
{
return;
}
cPointerSetter returnToIntial( &m_state, State::Initial );
m_state = State::Guessing;
/* Guessing a keyboard layout based on the locale means
* mapping between language identifiers in <lang>_<country>
* format to keyboard mappings, which are <country>_<layout>
@ -437,12 +467,12 @@ Config::onActivate()
{ "ar_TN", arabic },
{ "ar_YE", arabic },
{ "ca_ES", "cat_ES" }, /* Catalan */
{ "as_ES", "ast_ES" }, /* Asturian */
{ "en_CA", "us" }, /* Canadian English */
{ "el_CY", "gr" }, /* Greek in Cyprus */
{ "el_GR", "gr" }, /* Greek in Greeze */
{ "el_GR", "gr" }, /* Greek in Greece */
{ "ig_NG", "igbo_NG" }, /* Igbo in Nigeria */
{ "ha_NG", "hausa_NG" } /* Hausa */
{ "ha_NG", "hausa_NG" }, /* Hausa */
{ "en_IN", "eng_in" }, /* India, English with Rupee */
} );
// Try to preselect a layout, depending on language and locale
@ -478,14 +508,7 @@ Config::onActivate()
}
if ( !lang.isEmpty() )
{
const auto langParts = lang.split( '_', SplitSkipEmptyParts );
// Note that this his string is not fit for display purposes!
// It doesn't come from QLocale::nativeCountryName.
QString country = QLocale::countryToString( QLocale( lang ).country() );
cDebug() << Logger::SubEntry << "extracted country" << country << "::" << langParts;
guessLayout( langParts );
guessLayout( lang.split( '_', SplitSkipEmptyParts ), m_keyboardLayoutsModel, m_keyboardVariantsModel );
}
}
@ -547,3 +570,12 @@ Config::retranslate()
{
retranslateKeyboardModels();
}
void
Config::selectionChange()
{
if ( m_state == State::Initial )
{
m_state = State::UserSelected;
}
}

@ -32,16 +32,17 @@ class Config : public QObject
public:
Config( QObject* parent = nullptr );
/// @brief Based on current xkb settings, pick a layout
void detectCurrentKeyboardLayout();
/// @brief Based on current locale, pick a layout
void guessLocaleKeyboardLayout();
Calamares::JobList createJobs();
QString prettyStatus() const;
void onActivate();
/// @brief When leaving the page, write to GS
void finalize();
void setConfigurationMap( const QVariantMap& configurationMap );
static AdditionalLayoutInfo getAdditionalLayoutInfo( const QString& layout );
/* A model is a physical configuration of a keyboard, e.g. 105-key PC
@ -69,13 +70,26 @@ public:
*/
void retranslate();
void setConfigurationMap( const QVariantMap& configurationMap );
signals:
void prettyStatusChanged();
private:
void guessLayout( const QStringList& langParts );
void updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant = QString() );
/* These two methods are used in tandem to apply changes to the
* keyboard layout. This introduces a slight delay between selecting
* a keyboard, and applying it to the system -- so that if you
* scroll through or down-arrow through the list of keyboards,
* you don't get buried under xkbset processes.
*
* xkbChanged() is called when the selection changes, and triggers
* a delayed call to xkbApply() which does the actual work.
*/
void xkbChanged( int index );
void xkbApply();
KeyboardModelsModel* m_keyboardModelsModel;
KeyboardLayoutModel* m_keyboardLayoutsModel;
KeyboardVariantsModel* m_keyboardVariantsModel;
@ -93,6 +107,24 @@ private:
QString m_xOrgConfFileName;
QString m_convertedKeymapPath;
bool m_writeEtcDefaultKeyboard = true;
// The state determines whether we guess settings or preserve them:
// - Initial -> Guessing
// - Initial -> UserSelected
// - Guessing -> Initial
enum class State
{
Initial, // after configuration, nothing special going on
Guessing, // on activation
UserSelected // explicit choice is made, preserve that
};
State m_state = State::Initial;
/** @brief Handles state change when selections in model, variant, layout
*
* This handles the Initial -> UserSelected transition in particular.
*/
void selectionChange();
};

@ -95,7 +95,7 @@ KeyboardViewStep::jobs() const
void
KeyboardViewStep::onActivate()
{
m_config->onActivate();
m_config->guessLocaleKeyboardLayout();
}

@ -124,10 +124,7 @@ KeyBoardPreview::loadCodes()
return false;
}
QStringList param;
param << "-model"
<< "pc106"
<< "-layout" << layout << "-compact";
QStringList param { "-model", "pc106", "-layout", layout, "-compact" };
if ( !variant.isEmpty() )
{
param << "-variant" << variant;
@ -140,13 +137,18 @@ KeyBoardPreview::loadCodes()
process.start( "ckbcomp", param );
if ( !process.waitForStarted() )
{
cWarning() << "ckbcomp not found , keyboard preview disabled";
static bool need_warning = true;
if ( need_warning )
{
cWarning() << "ckbcomp not found , keyboard preview disabled";
need_warning = false;
}
return false;
}
if ( !process.waitForFinished() )
{
cWarning() << "ckbcomp failed, keyboard preview disabled";
cWarning() << "ckbcomp failed, keyboard preview skipped for" << layout << variant;
return false;
}

@ -71,7 +71,7 @@ KeyboardQmlViewStep::jobs() const
void
KeyboardQmlViewStep::onActivate()
{
m_config->onActivate();
m_config->guessLocaleKeyboardLayout();
}
void

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2020 Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2020 - 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
@ -16,19 +16,23 @@ import QtQuick.Layouts 1.3
import org.kde.kirigami 2.7 as Kirigami
Item {
readonly property color backgroundColor: Kirigami.Theme.backgroundColor //"#F5F5F5"
readonly property color headerBackgroundColor: Kirigami.Theme.alternateBackgroundColor //"#d3d3d3"
readonly property color backgroundLighterColor: "#ffffff"
readonly property color highlightColor: Kirigami.Theme.highlightColor //"#3498DB"
readonly property color textColor: Kirigami.Theme.textColor
readonly property color highlightedTextColor: Kirigami.Theme.highlightedTextColor
width: parent.width
height: parent.height
focus: true
MouseArea {
anchors.fill: parent
}
Rectangle {
id: textArea
x: 28
y: 14
anchors.fill: parent
Kirigami.Theme.backgroundColor: Kirigami.Theme.backgroundColor
color: backgroundColor
Column {
id: languages
@ -38,7 +42,7 @@ Item {
Rectangle {
width: 250
height: 140
color: "#d3d3d3"
color: headerBackgroundColor
Text {
anchors.top: parent.top
width: 240
@ -57,30 +61,43 @@ Item {
id: scroll1
anchors.fill: parent
contentHeight: 800
clip: true
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
ListView {
id: list1
focus: true
clip: true
width: parent.width
model: config.supportedLocales
currentIndex: -1
highlight: Rectangle {
color: Kirigami.Theme.highlightColor
}
delegate: Text {
text: modelData
MouseArea {
hoverEnabled: true
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onEntered: {
color: "#0000ff"
currentIndex: -1 //model.currentLanguageCodeIndex
delegate: ItemDelegate {
hoverEnabled: true
width: parent.width
implicitHeight: 18
highlighted: ListView.isCurrentItem
Label {
Layout.fillHeight: true
Layout.fillWidth: true
width: parent.width
height: 18
color: highlighted ? highlightedTextColor : textColor
text: modelData
background: Rectangle {
color: highlighted || hovered ? highlightColor : backgroundLighterColor
opacity: highlighted || hovered ? 0.5 : 0.9
}
onClicked: {
list1.currentIndex = index
MouseArea {
hoverEnabled: true
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
list1.currentIndex = index
}
}
}
}
@ -98,7 +115,7 @@ Item {
Rectangle {
width: 250
height: 140
color: "#d3d3d3"
color: headerBackgroundColor
Text {
anchors.top: parent.top
width: 240
@ -117,28 +134,42 @@ Item {
id: scroll2
anchors.fill: parent
contentHeight: 800
clip: true
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
ListView {
id: list2
width: 180; height: 200
focus: true
clip: true
model: config.supportedLocales
currentIndex: -1
highlight: Rectangle {
color: Kirigami.Theme.highlightColor
}
delegate: Text {
text: modelData
MouseArea {
hoverEnabled: true
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
list2.currentIndex = index
currentIndex: -1 //model.currentLCCodeIndex
delegate: ItemDelegate {
hoverEnabled: true
width: parent.width
implicitHeight: 18
highlighted: ListView.isCurrentItem
Label {
Layout.fillHeight: true
Layout.fillWidth: true
width: parent.width
height: 18
color: highlighted ? highlightedTextColor : textColor
text: modelData
background: Rectangle {
color: highlighted || hovered ? highlightColor : backgroundLighterColor
opacity: highlighted || hovered ? 0.5 : 0.9
}
MouseArea {
hoverEnabled: true
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
list2.currentIndex = index
}
}
}
}

@ -7,6 +7,7 @@
# SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
# SPDX-FileCopyrightText: 2017 Alf Gaida <agaida@siduction.org>
# SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
# SPDX-FileCopyrightText: 2021 Anke boersma <demm@koasx.us>
# SPDX-License-Identifier: GPL-3.0-or-later
#
# Calamares is Free Software: see the License-Identifier above.
@ -33,6 +34,8 @@ def run():
Setup network configuration
"""
root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
user = libcalamares.globalstorage.value("username")
live_user = os.getlogin()
if root_mount_point is None:
libcalamares.utils.warning("rootMountPoint is empty, {!s}".format(root_mount_point))
@ -60,6 +63,16 @@ def run():
try:
shutil.copy(source_network, target_network, follow_symlinks=False)
if live_user in open(target_network).read():
text = []
with open(target_network, "r") as network_conf:
text = network_conf.readlines()
with open(target_network, "w") as network_conf:
for line in text:
if 'permissions=user:{}:;'.format(live_user) in line:
line = 'permissions=user:{}:;\n'.format(user)
network_conf.write(line)
network_conf.close()
except FileNotFoundError:
libcalamares.utils.debug(
"Can't copy network configuration files in "

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
@ -94,14 +95,24 @@ Config::introductionPackage() const
return *defaultIntroduction;
}
static inline QString
make_gs_key( const Calamares::ModuleSystem::InstanceKey& key )
{
return QStringLiteral( "packagechooser_" ) + key.id();
}
void
Config::updateGlobalStorage( const QStringList& selected ) const
{
if ( m_packageChoice.has_value() )
{
cWarning() << "Inconsistent package choices -- both model and single-selection QML";
}
if ( m_method == PackageChooserMethod::Legacy )
{
QString value = selected.join( ',' );
Calamares::JobQueue::instance()->globalStorage()->insert( m_id, value );
cDebug() << m_id<< "selected" << value;
Calamares::JobQueue::instance()->globalStorage()->insert( make_gs_key( m_defaultId ), value );
cDebug() << m_defaultId << "selected" << value;
}
else if ( m_method == PackageChooserMethod::Packages )
{
@ -116,6 +127,55 @@ Config::updateGlobalStorage( const QStringList& selected ) const
}
}
void
Config::updateGlobalStorage() const
{
if ( m_model->packageCount() > 0 )
{
cWarning() << "Inconsistent package choices -- both model and single-selection QML";
}
if ( m_method == PackageChooserMethod::Legacy )
{
auto* gs = Calamares::JobQueue::instance()->globalStorage();
if ( m_packageChoice.has_value() )
{
gs->insert( make_gs_key( m_defaultId ), m_packageChoice.value() );
}
else
{
gs->remove( make_gs_key( m_defaultId ) );
}
}
else if ( m_method == PackageChooserMethod::Packages )
{
cWarning() << "Unsupported single-selection packagechooser method 'Packages'";
}
else
{
cWarning() << "Unknown packagechooser method" << smash( m_method );
}
}
void
Config::setPackageChoice( const QString& packageChoice )
{
if ( packageChoice.isEmpty() )
{
m_packageChoice.reset();
}
else
{
m_packageChoice = packageChoice;
}
emit packageChoiceChanged( m_packageChoice.value_or( QString() ) );
}
QString
Config::prettyStatus() const
{
return tr( "Install option: <strong>%1</strong>" ).arg( m_packageChoice.value_or( tr( "None" ) ) );
}
static void
fillModel( PackageListModel* model, const QVariantList& items )
@ -186,46 +246,35 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
if ( m_method == PackageChooserMethod::Legacy )
{
const QString configId = CalamaresUtils::getString( configurationMap, "id" );
const QString base = QStringLiteral( "packagechooser_" );
if ( configId.isEmpty() )
{
if ( m_defaultId.id().isEmpty() )
{
// We got nothing to work with
m_id = base;
}
else
{
m_id = base + m_defaultId.id();
}
cDebug() << "Using default ID" << m_id << "from" << m_defaultId.toString();
}
else
{
m_id = base + configId;
cDebug() << "Using configured ID" << m_id;
}
cDebug() << "Using module ID" << m_defaultId;
}
if ( configurationMap.contains( "items" ) )
{
fillModel( m_model, configurationMap.value( "items" ).toList() );
}
QString default_item_id = CalamaresUtils::getString( configurationMap, "default" );
if ( !default_item_id.isEmpty() )
{
for ( int item_n = 0; item_n < m_model->packageCount(); ++item_n )
QString default_item_id = CalamaresUtils::getString( configurationMap, "default" );
if ( !default_item_id.isEmpty() )
{
QModelIndex item_idx = m_model->index( item_n, 0 );
QVariant item_id = m_model->data( item_idx, PackageListModel::IdRole );
if ( item_id.toString() == default_item_id )
for ( int item_n = 0; item_n < m_model->packageCount(); ++item_n )
{
m_defaultModelIndex = item_idx;
break;
QModelIndex item_idx = m_model->index( item_n, 0 );
QVariant item_id = m_model->data( item_idx, PackageListModel::IdRole );
if ( item_id.toString() == default_item_id )
{
m_defaultModelIndex = item_idx;
break;
}
}
}
}
else
{
setPackageChoice( CalamaresUtils::getString( configurationMap, "packageChoice" ) );
if ( m_method != PackageChooserMethod::Legacy )
{
cWarning() << "Single-selection QML module must use 'Legacy' method.";
}
}
}

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
@ -16,6 +17,7 @@
#include "modulesystem/InstanceKey.h"
#include <memory>
#include <optional>
enum class PackageChooserMode
{
@ -39,6 +41,18 @@ class Config : public Calamares::ModuleSystem::Config
{
Q_OBJECT
/** @brief This is the single-select package-choice
*
* For (QML) modules that support only a single selection and
* just want to do things in a straightforward pick-this-one
* way, the packageChoice property is a (the) way to go.
*
* Writing to this property means that any other form of package-
* choice or selection is ignored.
*/
Q_PROPERTY( QString packageChoice READ packageChoice WRITE setPackageChoice NOTIFY packageChoiceChanged )
Q_PROPERTY( QString prettyStatus READ prettyStatus NOTIFY prettyStatusChanged FINAL )
public:
Config( QObject* parent = nullptr );
~Config() override;
@ -71,8 +85,22 @@ public:
* (and only) the packages in @p selected as selected.
*/
void updateGlobalStorage( const QStringList& selected ) const;
/// As updateGlobalStorage() with an empty selection list
void fillGSSecondaryConfiguration() const { updateGlobalStorage( QStringList() ); }
/** @brief Write selection to global storage
*
* Updates the GS keys for this packagechooser, marking **only**
* the package choice as selected. This assumes that the single-
* selection QML code is in use.
*/
void updateGlobalStorage() const;
QString packageChoice() const { return m_packageChoice.value_or( QString() ); }
void setPackageChoice( const QString& packageChoice );
QString prettyStatus() const;
signals:
void packageChoiceChanged( QString packageChoice );
void prettyStatusChanged();
private:
PackageListModel* m_model = nullptr;
@ -82,10 +110,14 @@ private:
PackageChooserMode m_mode = PackageChooserMode::Optional;
/// How this module stores to GS
PackageChooserMethod m_method = PackageChooserMethod::Legacy;
/// Id (used to identify settings from this module in GS)
QString m_id;
/// Value to use for id if none is set in the config file
Calamares::ModuleSystem::InstanceKey m_defaultId;
/** @brief QML selection (for single-selection approaches)
*
* If there is no value, then there has been no selection.
* Reading the property will return an empty QString.
*/
std::optional< QString > m_packageChoice;
};

@ -15,11 +15,10 @@ mode: required
#
# - "legacy" or "custom" or "contextualprocess"
# When set to "legacy", writes a GlobalStorage value for the choice that
# has been made. The key is *packagechooser_<id>*. Normally, the module's
# has been made. The key is *packagechooser_<id>*. The module's
# instance name is used; see the *instances* section of `settings.conf`.
# If there is just one packagechooser module, and no special instance is set,
# resulting GS key is probably *packagechooser@packagechooser*.
# You can set *id* to change that, but it is not recommended.
# resulting GS key is probably *packagechooser_packagechooser*.
#
# The GS value is a comma-separated list of the IDs of the selected
# packages, or an empty string if none is selected.
@ -33,15 +32,12 @@ mode: required
# consumption by the *packages* module (which should appear later
# in the `exec` section. These package settings will then be handed
# off to whatever package manager is configured there.
# The *id* key is not used.
#
# There is no need to put this module in the `exec` section. There
# are no jobs that this module provides. You should put **other**
# modules, either *contextualprocess* or *packages* or some custom
# module, in the `exec` section to do the actual work.
method: legacy
# The *id* key is used only in "legacy" mode
# id: ""
# Human-visible strings in this module. These are all optional.
@ -51,13 +47,13 @@ method: legacy
# Each key can have a [locale] added to it, which is used as
# the translated string for that locale. For the strings
# associated with the "no-selection" item, see *items*, below
# with the explicit id "".
# with the explicit item-*id* "".
#
labels:
step: "Packages"
step[nl]: "Pakketten"
# (Optional) 'id' of pre-selected list-view item.
# (Optional) item-*id* of pre-selected list-view item.
# Pre-selects one of the items below.
# default: kde

@ -0,0 +1,69 @@
# === This file is part of Calamares - <https://calamares.io> ===
#
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
# SPDX-License-Identifier: BSD-2-Clause
#
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 )
# Add optional libraries here
set( USER_EXTRA_LIB )
# include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../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 )
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 )
endif()
endif()
### OPTIONAL AppStream support in PackageModel
#
#
option( WITH_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON )
if ( WITH_APPSTREAM )
find_package(AppStreamQt)
set_package_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 )
endif()
endif()
calamares_add_plugin( packagechooserq
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
PackageChooserQmlViewStep.cpp
${_packagechooser}/Config.cpp
${_packagechooser}/PackageModel.cpp
${_extra_src}
RESOURCES
packagechooserq.qrc
LINK_PRIVATE_LIBRARIES
calamaresui
${_extra_libraries}
SHARED_LIB
)

@ -0,0 +1,86 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
*
*/
#include "PackageChooserQmlViewStep.h"
#include "GlobalStorage.h"
#include "JobQueue.h"
#include "locale/TranslatableConfiguration.h"
#include "utils/CalamaresUtilsSystem.h"
#include "utils/Logger.h"
#include "utils/Variant.h"
CALAMARES_PLUGIN_FACTORY_DEFINITION( PackageChooserQmlViewStepFactory, registerPlugin< PackageChooserQmlViewStep >(); )
PackageChooserQmlViewStep::PackageChooserQmlViewStep( QObject* parent )
: Calamares::QmlViewStep( parent )
, m_config( new Config( this ) )
{
emit nextStatusChanged( true );
}
QString
PackageChooserQmlViewStep::prettyName() const
{
return tr( "Packages" );
}
QString
PackageChooserQmlViewStep::prettyStatus() const
{
//QString option = m_pkgc;
//return tr( "Install option: %1" ).arg( option );
return m_config->prettyStatus();
}
bool
PackageChooserQmlViewStep::isNextEnabled() const
{
return true;
}
bool
PackageChooserQmlViewStep::isBackEnabled() const
{
return true;
}
bool
PackageChooserQmlViewStep::isAtBeginning() const
{
return true;
}
bool
PackageChooserQmlViewStep::isAtEnd() const
{
return true;
}
Calamares::JobList
PackageChooserQmlViewStep::jobs() const
{
Calamares::JobList l;
return l;
}
void
PackageChooserQmlViewStep::onLeave()
{
m_config->updateGlobalStorage();
}
void
PackageChooserQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{
m_config->setDefaultId( moduleInstanceKey() );
m_config->setConfigurationMap( configurationMap );
Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last
}

@ -0,0 +1,58 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
*
*/
#ifndef PACKAGECHOOSERQMLVIEWSTEP_H
#define PACKAGECHOOSERQMLVIEWSTEP_H
// Config from packagechooser module
#include "Config.h"
#include "DllMacro.h"
#include "locale/TranslatableConfiguration.h"
#include "utils/PluginFactory.h"
#include "viewpages/QmlViewStep.h"
#include <QVariantMap>
class Config;
class PackageChooserPage;
class PLUGINDLLEXPORT PackageChooserQmlViewStep : public Calamares::QmlViewStep
{
Q_OBJECT
public:
explicit PackageChooserQmlViewStep( QObject* parent = nullptr );
QString prettyName() const override;
QString prettyStatus() const override;
bool isNextEnabled() const override;
bool isBackEnabled() const override;
bool isAtBeginning() const override;
bool isAtEnd() const override;
//void onActivate() override;
void onLeave() override;
Calamares::JobList jobs() const override;
void setConfigurationMap( const QVariantMap& configurationMap ) override;
QObject* getConfig() override { return m_config; }
private:
Config* m_config;
};
CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserQmlViewStepFactory )
#endif // PACKAGECHOOSERQMLVIEWSTEP_H

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: 2020 demmm <anke62@gmail.com>
SPDX-License-Identifier: GPL-3.0-or-later

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 KiB

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: 2020 demmm <anke62@gmail.com>
SPDX-License-Identifier: GPL-3.0-or-later

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: 2021 pngegg <https://www.pngegg.com/>
SPDX-License-Identifier: GPL-3.0-or-later

@ -0,0 +1,53 @@
# SPDX-FileCopyrightText: no
# SPDX-License-Identifier: CC0-1.0
#
# Configuration for the low-density software chooser, QML implementation
#
# The example QML implementation uses single-selection, rather than
# a model for the available packages. That makes it simpler: the
# QML itself codes the available options, descriptions and images
# -- after all, this is **low density** selection, so a custom UI
# can make sense for the few choices that need to be made.
#
#
---
# Software installation method:
#
# - "legacy" or "custom" or "contextualprocess"
# When set to "legacy", writes a GlobalStorage value for the choice that
# has been made. The key is *packagechooser_<id>*. The module's
# instance name is used; see the *instances* section of `settings.conf`.
# If there is just one packagechooserq module, and no special instance is set,
# resulting GS key is probably *packagechooser_packagechooserq*.
# (Do note that the prefix of the GS key remains "packagechooser_")
#
# The GS value is a comma-separated list of the IDs of the selected
# packages, or an empty string if none is selected.
#
# With "legacy" installation, you should have a contextualprocess or similar
# module somewhere in the `exec` phase to process the GlobalStorage key
# and actually **do** something for the packages.
#
# - "packages"
# When set to "packages", writes GlobalStorage values suitable for
# consumption by the *packages* module (which should appear later
# in the `exec` section. These package settings will then be handed
# off to whatever package manager is configured there.
#
# There is no need to put this module in the `exec` section. There
# are no jobs that this module provides. You should put **other**
# modules, either *contextualprocess* or *packages* or some custom
# module, in the `exec` section to do the actual work.
#
method: legacy
# The *packageChoice* value is used for setting the default selection
# in the QML view; this should match one of the keys used in the QML
# module for package names.
#
# (e.g. the sample QML uses "no_office_suite", "minimal_install" and
# "libreoffice" as possible choices).
#
packageChoice: libreoffice

@ -0,0 +1,241 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
*
*/
import io.calamares.core 1.0
import io.calamares.ui 1.0
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3
Item {
width: parent.width
height: parent.height
Rectangle {
anchors.fill: parent
color: "#f2f2f2"
ButtonGroup {
id: switchGroup
}
Column {
id: column
anchors.centerIn: parent
spacing: 5
Rectangle {
//id: rectangle
width: 700
height: 150
color: "#ffffff"
radius: 10
border.width: 0
Text {
width: 450
height: 104
anchors.centerIn: parent
text: qsTr("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.")
font.pointSize: 10
anchors.verticalCenterOffset: -10
anchors.horizontalCenterOffset: 100
wrapMode: Text.WordWrap
}
Switch {
id: element2
x: 500
y: 110
width: 187
height: 14
text: qsTr("LibreOffice")
checked: true
hoverEnabled: true
ButtonGroup.group: switchGroup
indicator: Rectangle {
implicitWidth: 40
implicitHeight: 14
radius: 10
color: element2.checked ? "#3498db" : "#B9B9B9"
border.color: element2.checked ? "#3498db" : "#cccccc"
Rectangle {
x: element2.checked ? parent.width - width : 0
y: (parent.height - height) / 2
width: 20
height: 20
radius: 10
color: element2.down ? "#cccccc" : "#ffffff"
border.color: element2.checked ? (element1.down ? "#3498db" : "#3498db") : "#999999"
}
}
onCheckedChanged: {
if ( checked ) {
config.packageChoice = "libreoffice"
}
}
}
Image {
id: image2
x: 8
y: 25
height: 100
fillMode: Image.PreserveAspectFit
source: "images/libreoffice.jpg"
}
}
Rectangle {
width: 700
height: 150
radius: 10
border.width: 0
Text {
width: 450
height: 104
anchors.centerIn: parent
text: qsTr("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.")
font.pointSize: 10
anchors.verticalCenterOffset: -10
anchors.horizontalCenterOffset: 100
wrapMode: Text.WordWrap
}
Switch {
id: element1
x: 500
y: 110
width: 187
height: 14
text: qsTr("No Office Suite")
checked: false
hoverEnabled: true
ButtonGroup.group: switchGroup
indicator: Rectangle {
implicitWidth: 40
implicitHeight: 14
radius: 10
color: element1.checked ? "#3498db" : "#B9B9B9"
border.color: element1.checked ? "#3498db" : "#cccccc"
Rectangle {
x: element1.checked ? parent.width - width : 0
y: (parent.height - height) / 2
width: 20
height: 20
radius: 10
color: element1.down ? "#cccccc" : "#ffffff"
border.color: element1.checked ? (element1.down ? "#3498db" : "#3498db") : "#999999"
}
}
onCheckedChanged: {
if ( checked ) {
config.packageChoice = "no_office_suite"
}
}
}
Image {
id: image
x: 8
y: 25
height: 100
fillMode: Image.PreserveAspectFit
source: "images/no-selection.png"
}
}
Rectangle {
width: 700
height: 150
color: "#ffffff"
radius: 10
border.width: 0
Text {
width: 450
height: 104
anchors.centerIn: parent
text: qsTr("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.")
font.pointSize: 10
anchors.verticalCenterOffset: -10
anchors.horizontalCenterOffset: 100
wrapMode: Text.WordWrap
}
Switch {
id: element3
x: 500
y: 110
width: 187
height: 14
text: qsTr("Minimal Install")
checked: false
hoverEnabled: true
ButtonGroup.group: switchGroup
indicator: Rectangle {
implicitWidth: 40
implicitHeight: 14
radius: 10
color: element3.checked ? "#3498db" : "#B9B9B9"
border.color: element3.checked ? "#3498db" : "#cccccc"
Rectangle {
x: element3.checked ? parent.width - width : 0
y: (parent.height - height) / 2
width: 20
height: 20
radius: 10
color: element3.down ? "#cccccc" : "#ffffff"
border.color: element3.checked ? (element3.down ? "#3498db" : "#3498db") : "#999999"
}
}
onCheckedChanged: {
if ( checked ) {
config.packageChoice = "minimal_install"
}
}
}
Image {
id: image3
x: 8
y: 25
height: 100
fillMode: Image.PreserveAspectFit
source: "images/plasma.png"
}
}
Rectangle {
width: 700
height: 25
color: "#f2f2f2"
border.width: 0
Text {
height: 25
anchors.centerIn: parent
text: qsTr("Please select an option for your install, or use the default: LibreOffice included.")
font.pointSize: 10
wrapMode: Text.WordWrap
}
}
}
}
}

@ -0,0 +1,8 @@
<RCC>
<qresource>
<file>packagechooserq.qml</file>
<file>images/libreoffice.jpg</file>
<file>images/no-selection.png</file>
<file>images/plasma.png</file>
</qresource>
</RCC>

@ -227,7 +227,8 @@ fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configu
QString firmwareType( PartUtils::isEfiSystem() ? QStringLiteral( "efi" ) : QStringLiteral( "bios" ) );
gs->insert( "firmwareType", firmwareType );
gs->insert( "efiSystemPartition", CalamaresUtils::getString( configurationMap, "efiSystemPartition", QStringLiteral( "/boot/efi" ) ) );
gs->insert( "efiSystemPartition",
CalamaresUtils::getString( configurationMap, "efiSystemPartition", QStringLiteral( "/boot/efi" ) ) );
// Read and parse key efiSystemPartitionSize
if ( configurationMap.contains( "efiSystemPartitionSize" ) )
@ -243,7 +244,7 @@ fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configu
}
void
Config::fillConfigurationFSTypes(const QVariantMap& configurationMap)
Config::fillConfigurationFSTypes( const QVariantMap& configurationMap )
{
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
@ -256,15 +257,16 @@ Config::fillConfigurationFSTypes(const QVariantMap& configurationMap)
if ( fsName.isEmpty() )
{
cWarning() << "Partition-module setting *defaultFileSystemType* is missing, will use ext4";
fsRealName = PartUtils::canonicalFilesystemName( QStringLiteral("ext4"), &fsType );
fsRealName = PartUtils::canonicalFilesystemName( QStringLiteral( "ext4" ), &fsType );
}
else
{
fsRealName = PartUtils::canonicalFilesystemName( fsName, &fsType );
if ( fsType == FileSystem::Type::Unknown )
{
cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << fsName << ") using ext4 instead";
fsRealName = PartUtils::canonicalFilesystemName( QStringLiteral("ext4"), &fsType );
cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << fsName
<< ") using ext4 instead";
fsRealName = PartUtils::canonicalFilesystemName( QStringLiteral( "ext4" ), &fsType );
}
else if ( fsRealName != fsName )
{
@ -326,7 +328,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
m_requiredPartitionTableType = CalamaresUtils::getStringList( configurationMap, "requiredPartitionTableType" );
gs->insert( "requiredPartitionTableType", m_requiredPartitionTableType );
fillGSConfigurationEFI(gs, configurationMap);
fillGSConfigurationEFI( gs, configurationMap );
fillConfigurationFSTypes( configurationMap );
}

@ -27,7 +27,8 @@ class Config : public QObject
Q_PROPERTY( SwapChoice swapChoice READ swapChoice WRITE setSwapChoice NOTIFY swapChoiceChanged )
///@brief Name of the FS that will be used when erasing type disk (e.g. "default filesystem")
Q_PROPERTY( QString eraseModeFilesystem READ eraseFsType WRITE setEraseFsTypeChoice NOTIFY eraseModeFilesystemChanged )
Q_PROPERTY(
QString eraseModeFilesystem READ eraseFsType WRITE setEraseFsTypeChoice NOTIFY eraseModeFilesystemChanged )
Q_PROPERTY( bool allowManualPartitioning READ allowManualPartitioning CONSTANT FINAL )
@ -134,7 +135,7 @@ public Q_SLOTS:
void setInstallChoice( InstallChoice );
void setSwapChoice( int ); ///< Translates a button ID or so to SwapChoice
void setSwapChoice( SwapChoice );
void setEraseFsTypeChoice( const QString& filesystemName ); ///< See property eraseModeFilesystem
void setEraseFsTypeChoice( const QString& filesystemName ); ///< See property eraseModeFilesystem
Q_SIGNALS:
void installChoiceChanged( InstallChoice );

@ -51,7 +51,7 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
m_waitingWidget = new WaitingWidget( QString() );
m_widget->addWidget( m_waitingWidget );
CALAMARES_RETRANSLATE( m_waitingWidget->setText( tr( "Gathering system information..." ) ); );
CALAMARES_RETRANSLATE( if (m_waitingWidget) { m_waitingWidget->setText( tr( "Gathering system information..." ) ); } );
m_core = new PartitionCoreModule( this ); // Unusable before init is complete!
// We're not done loading, but we need the configuration map first.
@ -109,13 +109,142 @@ PartitionViewStep::prettyName() const
return tr( "Partitions" );
}
/** @brief Gather the pretty descriptions of all the partitioning jobs
*
* Returns a QStringList of each job's pretty description, including
* empty strings and duplicates. The list is in-order of how the
* jobs will be run.
*/
static QStringList
jobDescriptions( const Calamares::JobList& jobs )
{
QStringList jobsLines;
for ( const Calamares::job_ptr& job : qAsConst( jobs ) )
{
if ( !job->prettyDescription().isEmpty() )
{
jobsLines.append( job->prettyDescription() );
}
}
return jobsLines;
}
QWidget*
PartitionViewStep::widget()
/** @brief A top-level description of what @p choice does
*
* Returns a (branded) string describing what @p choice will do.
*/
static QString
modeDescription( Config::InstallChoice choice )
{
return m_widget;
const auto* branding = Calamares::Branding::instance();
static const char context[] = "PartitionViewStep";
switch ( choice )
{
case Config::InstallChoice::Alongside:
return QCoreApplication::translate( context, "Install %1 <strong>alongside</strong> another operating system." )
.arg( branding->shortVersionedName() );
break;
case Config::InstallChoice::Erase:
return QCoreApplication::translate( context, "<strong>Erase</strong> disk and install %1." )
.arg( branding->shortVersionedName() );
break;
case Config::InstallChoice::Replace:
return QCoreApplication::translate( context, "<strong>Replace</strong> a partition with %1." )
.arg( branding->shortVersionedName() );
break;
case Config::InstallChoice::NoChoice:
case Config::InstallChoice::Manual:
return QCoreApplication::translate( context, "<strong>Manual</strong> partitioning." );
}
return QString();
}
/** @brief A top-level description of what @p choice does to disk @p info
*
* Returns a (branded, and device-specific) string describing what
* will be done to device @p info when @p choice is made. The @p listLength
* is used to provide context; when more than one disk is in use, the description
* works differently.
*/
static QString
diskDescription( int listLength, const PartitionCoreModule::SummaryInfo& info, Config::InstallChoice choice )
{
const auto* branding = Calamares::Branding::instance();
static const char context[] = "PartitionViewStep";
if ( listLength == 1 ) // this is the only disk preview
{
switch ( choice )
{
case Config::Alongside:
return QCoreApplication::translate(
context,
"Install %1 <strong>alongside</strong> another operating system on disk "
"<strong>%2</strong> (%3)." )
.arg( branding->shortVersionedName() )
.arg( info.deviceNode )
.arg( info.deviceName );
break;
case Config::Erase:
return QCoreApplication::translate( context,
"<strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1." )
.arg( branding->shortVersionedName() )
.arg( info.deviceNode )
.arg( info.deviceName );
break;
case Config::Replace:
return QCoreApplication::translate(
context, "<strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1." )
.arg( branding->shortVersionedName() )
.arg( info.deviceNode )
.arg( info.deviceName );
break;
case Config::NoChoice:
case Config::Manual:
return QCoreApplication::translate(
context, "<strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2)." )
.arg( info.deviceNode )
.arg( info.deviceName );
}
return QString();
}
else // multiple disk previews!
{
return QCoreApplication::translate( context, "Disk <strong>%1</strong> (%2)" )
.arg( info.deviceNode )
.arg( info.deviceName );
}
}
QString
PartitionViewStep::prettyStatus() const
{
QString jobsLabel, modeText, diskInfoLabel;
const Config::InstallChoice choice = m_config->installChoice();
const QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo();
cDebug() << "Summary for Partition" << list.length() << choice;
if ( list.length() > 1 ) // There are changes on more than one disk
{
modeText = modeDescription( choice );
}
for ( const auto& info : list )
{
// TODO: this overwrites each iteration
diskInfoLabel = diskDescription( list.length(), info, choice );
}
const QStringList jobsLines = jobDescriptions( jobs() );
if ( !jobsLines.isEmpty() )
{
jobsLabel = jobsLines.join( "<br/>" );
}
return diskInfoLabel + "<br/>" + jobsLabel;
}
QWidget*
PartitionViewStep::createSummaryWidget() const
@ -132,73 +261,19 @@ PartitionViewStep::createSummaryWidget() const
formLayout->setContentsMargins( MARGIN, 0, MARGIN, MARGIN );
mainLayout->addLayout( formLayout );
const auto* branding = Calamares::Branding::instance();
QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo();
const QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo();
if ( list.length() > 1 ) // There are changes on more than one disk
{
//NOTE: all of this should only happen when Manual partitioning is active.
// Any other choice should result in a list.length() == 1.
QLabel* modeLabel = new QLabel;
formLayout->addRow( modeLabel );
QString modeText;
switch ( choice )
{
case Config::InstallChoice::Alongside:
modeText = tr( "Install %1 <strong>alongside</strong> another operating system." )
.arg( branding->shortVersionedName() );
break;
case Config::InstallChoice::Erase:
modeText = tr( "<strong>Erase</strong> disk and install %1." ).arg( branding->shortVersionedName() );
break;
case Config::InstallChoice::Replace:
modeText = tr( "<strong>Replace</strong> a partition with %1." ).arg( branding->shortVersionedName() );
break;
case Config::InstallChoice::NoChoice:
case Config::InstallChoice::Manual:
modeText = tr( "<strong>Manual</strong> partitioning." );
}
modeLabel->setText( modeText );
modeLabel->setText( modeDescription( choice ) );
}
for ( const auto& info : list )
{
QLabel* diskInfoLabel = new QLabel;
if ( list.length() == 1 ) // this is the only disk preview
{
QString modeText;
switch ( choice )
{
case Config::InstallChoice::Alongside:
modeText = tr( "Install %1 <strong>alongside</strong> another operating system on disk "
"<strong>%2</strong> (%3)." )
.arg( branding->shortVersionedName() )
.arg( info.deviceNode )
.arg( info.deviceName );
break;
case Config::InstallChoice::Erase:
modeText = tr( "<strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1." )
.arg( branding->shortVersionedName() )
.arg( info.deviceNode )
.arg( info.deviceName );
break;
case Config::InstallChoice::Replace:
modeText = tr( "<strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1." )
.arg( branding->shortVersionedName() )
.arg( info.deviceNode )
.arg( info.deviceName );
break;
case Config::InstallChoice::NoChoice:
case Config::InstallChoice::Manual:
modeText = tr( "<strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2)." )
.arg( info.deviceNode )
.arg( info.deviceName );
}
diskInfoLabel->setText( modeText );
}
else // multiple disk previews!
{
diskInfoLabel->setText(
tr( "Disk <strong>%1</strong> (%2)" ).arg( info.deviceNode ).arg( info.deviceName ) );
}
diskInfoLabel->setText( diskDescription( list.length(), info, choice ) );
formLayout->addRow( diskInfoLabel );
PartitionBarsView* preview;
@ -243,14 +318,7 @@ PartitionViewStep::createSummaryWidget() const
field->addWidget( previewLabels );
formLayout->addRow( tr( "After:" ), field );
}
QStringList jobsLines;
foreach ( const Calamares::job_ptr& job, jobs() )
{
if ( !job->prettyDescription().isEmpty() )
{
jobsLines.append( job->prettyDescription() );
}
}
const QStringList jobsLines = jobDescriptions( jobs() );
if ( !jobsLines.isEmpty() )
{
QLabel* jobsLabel = new QLabel( widget );
@ -265,6 +333,11 @@ PartitionViewStep::createSummaryWidget() const
return widget;
}
QWidget*
PartitionViewStep::widget()
{
return m_widget;
}
void
PartitionViewStep::next()
@ -434,50 +507,66 @@ PartitionViewStep::onLeave()
{
const QString espMountPoint
= Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString();
const QString espFlagName = PartitionTable::flagName(
#ifdef WITH_KPMCORE4API
PartitionTable::Flag::Boot
const auto espFlag = PartitionTable::Flag::Boot;
#else
PartitionTable::FlagEsp
const auto espFlag = PartitionTable::FlagEsp;
#endif
);
Partition* esp = m_core->findPartitionByMountPoint( espMountPoint );
QString message;
QString description;
if ( !esp || ( esp && !PartUtils::isEfiFilesystemSuitable( esp ) ) )
Logger::Once o;
const bool okType = esp && PartUtils::isEfiFilesystemSuitableType( esp );
const bool okSize = esp && PartUtils::isEfiFilesystemSuitableSize( esp );
const bool okFlag = esp && PartUtils::isEfiBootable( esp );
if ( !esp )
{
message = tr( "No EFI system partition configured" );
description = tr( "An EFI system partition is necessary to start %1."
"<br/><br/>"
"To configure an EFI system partition, go back and "
"select or create a FAT32 filesystem with the "
"<strong>%3</strong> flag enabled and mount point "
"<strong>%2</strong>.<br/><br/>"
"You can continue without setting up an EFI system "
"partition but your system may fail to start." )
.arg( branding->shortProductName() )
.arg( espMountPoint, espFlagName );
}
else if ( esp && !PartUtils::isEfiBootable( esp ) )
else if ( !(okType && okSize && okFlag ) )
{
message = tr( "EFI system partition flag not set" );
description = tr( "An EFI system partition is necessary to start %1."
"<br/><br/>"
"A partition was configured with mount point "
"<strong>%2</strong> but its <strong>%3</strong> "
"flag is not set.<br/>"
"To set the flag, go back and edit the partition."
"<br/><br/>"
"You can continue without setting the flag but your "
"system may fail to start." )
.arg( branding->shortProductName() )
.arg( espMountPoint, espFlagName );
message = tr( "EFI system partition configured incorrectly" );
}
if ( !esp || !(okType&&okSize &&okFlag)) {
description = tr( "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.").arg( branding->shortProductName() );
}
if (!esp) {
cDebug() << o << "No ESP mounted";
description.append(' ');
description.append(tr("The filesystem must be mounted on <strong>%1</strong>.").arg(espMountPoint));
}
if (!okType) {
cDebug() << o << "ESP wrong type";
description.append(' ');
description.append(tr("The filesystem must have type FAT32."));
}
if (!okSize) {
cDebug() << o << "ESP too small";
description.append(' ');
description.append(tr("The filesystem must be at least %1 MiB in size.").arg( PartUtils::efiFilesystemMinimumSize() ));
}
if (!okFlag)
{
cDebug() << o << "ESP missing flag";
description.append(' ');
description.append(tr("The filesystem must have flag <strong>%1</strong> set.").arg(PartitionTable::flagName( espFlag )));
}
if (!description.isEmpty()) {
description.append( "<br/><br/>" );
description.append( tr(
"You can continue without setting up an EFI system "
"partition but your system may fail to start." ));
}
if ( !message.isEmpty() )
{
cWarning() << message;
QMessageBox::warning( m_manualPartitionPage, message, description );
}
}
@ -583,8 +672,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
QFuture< void > future = QtConcurrent::run( this, &PartitionViewStep::initPartitionCoreModule );
m_future->setFuture( future );
m_core->initLayout( m_config->defaultFsType(),
configurationMap.value( "partitionLayout" ).toList() );
m_core->initLayout( m_config->defaultFsType(), configurationMap.value( "partitionLayout" ).toList() );
}

@ -43,6 +43,7 @@ public:
~PartitionViewStep() override;
QString prettyName() const override;
QString prettyStatus() const override;
QWidget* createSummaryWidget() const override;
QWidget* widget() override;

@ -112,6 +112,11 @@ QList< Device* >
getDevices( DeviceType which )
{
CoreBackend* backend = CoreBackendManager::self()->backend();
if ( !backend )
{
cWarning() << "No KPM backend found.";
return {};
}
#if defined( WITH_KPMCORE4API )
DeviceList devices = backend->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag( 0 ) );
#else

@ -447,31 +447,40 @@ isEfiSystem()
}
bool
isEfiFilesystemSuitable(const Partition* candidate)
isEfiFilesystemSuitableType( const Partition* candidate )
{
auto type = candidate->fileSystem().type();
auto size = candidate->capacity(); // bytes
using CalamaresUtils::Units::operator""_MiB;
switch( type )
switch ( type )
{
case FileSystem::Type::Fat32:
if ( size >= 300_MiB )
{
return true;
}
cWarning() << "FAT32 filesystem is too small (" << size << "bytes)";
return false;
case FileSystem::Type::Fat32:
return true;
#ifdef WITH_KPMCORE4API
case FileSystem::Type::Fat12:
case FileSystem::Type::Fat12:
#endif
case FileSystem::Type::Fat16:
cWarning() << "FAT12 and FAT16 are probably not supported by EFI";
return false;
default:
cWarning() << "EFI boot partition must be FAT32";
return false;
case FileSystem::Type::Fat16:
cWarning() << "FAT12 and FAT16 are probably not supported by EFI";
return false;
default:
cWarning() << "EFI boot partition must be FAT32";
return false;
}
}
bool
isEfiFilesystemSuitableSize( const Partition* candidate )
{
auto size = candidate->capacity(); // bytes
using CalamaresUtils::Units::operator""_MiB;
if ( size >= 300_MiB )
{
return true;
}
else
{
cWarning() << "Filesystem for EFI is too small (" << size << "bytes)";
return false;
}
}
@ -508,6 +517,15 @@ isEfiBootable( const Partition* candidate )
#endif
}
// TODO: this is configurable via the config file **already**
size_t
efiFilesystemMinimumSize()
{
using CalamaresUtils::Units::operator""_MiB;
return 300_MiB;
}
QString
canonicalFilesystemName( const QString& fsName, FileSystem::Type* fsType )
{

@ -84,9 +84,24 @@ bool isEfiSystem();
/**
* @brief Is the @p partition suitable as an EFI boot partition?
* Checks for filesystem type (FAT32) and size (300MiB at least).
* Checks for filesystem type (FAT32).
*/
bool isEfiFilesystemSuitable( const Partition* candidate );
bool isEfiFilesystemSuitableType( const Partition* candidate );
/**
* @brief Is the @p partition suitable as an EFI boot partition?
* Checks for filesystem size (300MiB, see efiFilesystemMinimumSize).
*/
bool isEfiFilesystemSuitableSize( const Partition* candidate );
/** @brief Returns the minimum size of an EFI boot partition.
*
* This is determined as 300MiB, based on the FAT32 standard
* and EFI documentation (and not a little discussion in Calamares
* issues about what works, what is effective, and what is mandated
* by the standard and how all of those are different).
*/
size_t efiFilesystemMinimumSize();
/**
* @brief Is the given @p partition bootable in EFI? Depending on

@ -138,61 +138,63 @@ PartitionLayout::init( FileSystem::Type defaultFsType, const QVariantList& confi
}
void
PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType)
PartitionLayout::setDefaultFsType( FileSystem::Type defaultFsType )
{
using FileSystem = FileSystem::Type;
switch ( defaultFsType )
{
case FileSystem::Unknown:
case FileSystem::Unformatted:
case FileSystem::Extended:
case FileSystem::LinuxSwap:
case FileSystem::Luks:
case FileSystem::Ocfs2:
case FileSystem::Lvm2_PV:
case FileSystem::Udf:
case FileSystem::Iso9660:
case FileSystem::Unknown:
case FileSystem::Unformatted:
case FileSystem::Extended:
case FileSystem::LinuxSwap:
case FileSystem::Luks:
case FileSystem::Ocfs2:
case FileSystem::Lvm2_PV:
case FileSystem::Udf:
case FileSystem::Iso9660:
#ifdef WITH_KPMCORE4API
case FileSystem::Luks2:
case FileSystem::LinuxRaidMember:
case FileSystem::BitLocker:
case FileSystem::Luks2:
case FileSystem::LinuxRaidMember:
case FileSystem::BitLocker:
#endif
// bad bad
cWarning() << "The selected default FS" << defaultFsType << "is not suitable." << "Using ext4 instead.";
defaultFsType = FileSystem::Ext4;
break;
case FileSystem::Ext2:
case FileSystem::Ext3:
case FileSystem::Ext4:
case FileSystem::Fat32:
case FileSystem::Ntfs:
case FileSystem::Reiser4:
case FileSystem::ReiserFS:
case FileSystem::Xfs:
case FileSystem::Jfs:
case FileSystem::Btrfs:
case FileSystem::Exfat:
case FileSystem::F2fs:
// ok
break;
case FileSystem::Fat16:
case FileSystem::Hfs:
case FileSystem::HfsPlus:
case FileSystem::Ufs:
case FileSystem::Hpfs:
case FileSystem::Zfs:
case FileSystem::Nilfs2:
// bad bad
cWarning() << "The selected default FS" << defaultFsType << "is not suitable."
<< "Using ext4 instead.";
defaultFsType = FileSystem::Ext4;
break;
case FileSystem::Ext2:
case FileSystem::Ext3:
case FileSystem::Ext4:
case FileSystem::Fat32:
case FileSystem::Ntfs:
case FileSystem::Reiser4:
case FileSystem::ReiserFS:
case FileSystem::Xfs:
case FileSystem::Jfs:
case FileSystem::Btrfs:
case FileSystem::Exfat:
case FileSystem::F2fs:
// ok
break;
case FileSystem::Fat16:
case FileSystem::Hfs:
case FileSystem::HfsPlus:
case FileSystem::Ufs:
case FileSystem::Hpfs:
case FileSystem::Zfs:
case FileSystem::Nilfs2:
#ifdef WITH_KPMCORE4API
case FileSystem::Fat12:
case FileSystem::Apfs:
case FileSystem::Minix:
case FileSystem::Fat12:
case FileSystem::Apfs:
case FileSystem::Minix:
#endif
// weird
cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong.";
break;
default:
cWarning() << "The selected default FS" << defaultFsType << "is not known to Calamares." << "Using ext4 instead.";
defaultFsType = FileSystem::Ext4;
// weird
cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong.";
break;
default:
cWarning() << "The selected default FS" << defaultFsType << "is not known to Calamares."
<< "Using ext4 instead.";
defaultFsType = FileSystem::Ext4;
}
m_defaultFsType = defaultFsType;
@ -278,7 +280,7 @@ PartitionLayout::createPartitions( Device* dev,
}
}
auto correctFS = [d=m_defaultFsType]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; };
auto correctFS = [d = m_defaultFsType]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; };
// Create the partitions.
currentSector = firstSector;

@ -140,9 +140,8 @@ ChoicePage::retranslate()
m_previewBeforeLabel->setText( tr( "Current:" ) );
m_previewAfterLabel->setText( tr( "After:" ) );
m_somethingElseButton->setText( tr( "<strong>Manual partitioning</strong><br/>"
"You can create or resize partitions yourself." ) );
updateSwapChoicesTr( m_eraseSwapChoiceComboBox );
updateSwapChoicesTr();
updateChoiceButtonsTr();
}
@ -339,6 +338,9 @@ ChoicePage::setupChoices()
this,
&ChoicePage::onEraseSwapChoiceChanged );
}
updateSwapChoicesTr();
updateChoiceButtonsTr();
}
@ -1616,51 +1618,61 @@ ChoicePage::updateNextEnabled()
}
void
ChoicePage::updateSwapChoicesTr( QComboBox* box )
ChoicePage::updateSwapChoicesTr()
{
if ( !box )
if ( !m_eraseSwapChoiceComboBox )
{
return;
}
static_assert( SwapChoice::NoSwap == 0, "Enum values out-of-sync" );
for ( int index = 0; index < box->count(); ++index )
for ( int index = 0; index < m_eraseSwapChoiceComboBox->count(); ++index )
{
bool ok = false;
int value = 0;
switch ( value = box->itemData( index ).toInt( &ok ) )
switch ( value = m_eraseSwapChoiceComboBox->itemData( index ).toInt( &ok ) )
{
// case 0:
case SwapChoice::NoSwap:
// toInt() returns 0 on failure, so check for ok
if ( ok ) // It was explicitly set to 0
{
box->setItemText( index, tr( "No Swap" ) );
m_eraseSwapChoiceComboBox->setItemText( index, tr( "No Swap" ) );
}
else
{
cWarning() << "Box item" << index << box->itemText( index ) << "has non-integer role.";
cWarning() << "Box item" << index << m_eraseSwapChoiceComboBox->itemText( index ) << "has non-integer role.";
}
break;
case SwapChoice::ReuseSwap:
box->setItemText( index, tr( "Reuse Swap" ) );
m_eraseSwapChoiceComboBox->setItemText( index, tr( "Reuse Swap" ) );
break;
case SwapChoice::SmallSwap:
box->setItemText( index, tr( "Swap (no Hibernate)" ) );
m_eraseSwapChoiceComboBox->setItemText( index, tr( "Swap (no Hibernate)" ) );
break;
case SwapChoice::FullSwap:
box->setItemText( index, tr( "Swap (with Hibernate)" ) );
m_eraseSwapChoiceComboBox->setItemText( index, tr( "Swap (with Hibernate)" ) );
break;
case SwapChoice::SwapFile:
box->setItemText( index, tr( "Swap to file" ) );
m_eraseSwapChoiceComboBox->setItemText( index, tr( "Swap to file" ) );
break;
default:
cWarning() << "Box item" << index << box->itemText( index ) << "has role" << value;
cWarning() << "Box item" << index << m_eraseSwapChoiceComboBox->itemText( index ) << "has role" << value;
}
}
}
void
ChoicePage::updateChoiceButtonsTr()
{
if ( m_somethingElseButton )
{
m_somethingElseButton->setText( tr( "<strong>Manual partitioning</strong><br/>"
"You can create or resize partitions yourself." ) );
}
}
int
ChoicePage::lastSelectedDeviceIndex()
{

@ -124,7 +124,8 @@ private:
void setupEfiSystemPartitionSelector();
// Translations support
void updateSwapChoicesTr( QComboBox* box );
void updateSwapChoicesTr();
void updateChoiceButtonsTr();
Config* m_config;
bool m_nextEnabled;

@ -125,8 +125,8 @@ PartitionPage::~PartitionPage() {}
void
PartitionPage::updateButtons()
{
bool create = false, createTable = false, edit = false, del = false, currentDeviceIsVG = false,
isDeactivable = false;
bool allow_create = false, allow_create_table = false, allow_edit = false, allow_delete = false;
bool currentDeviceIsVG = false, isDeactivable = false;
bool isRemovable = false, isVGdeactivated = false;
QModelIndex index = m_ui->partitionTreeView->currentIndex();
@ -136,12 +136,21 @@ PartitionPage::updateButtons()
Q_ASSERT( model );
Partition* partition = model->partitionForIndex( index );
Q_ASSERT( partition );
bool isFree = CalamaresUtils::Partition::isPartitionFreeSpace( partition );
bool isExtended = partition->roles().has( PartitionRole::Extended );
const bool isFree = CalamaresUtils::Partition::isPartitionFreeSpace( partition );
const bool isExtended = partition->roles().has( PartitionRole::Extended );
bool isInVG = m_core->isInVG( partition );
// An extended partition can have a "free space" child; that one does
// not count as a real child. If there are more children, at least one
// is a real one and we should not allow the extended partition to be
// deleted.
const bool hasChildren = isExtended
&& ( partition->children().length() > 1
|| ( partition->children().length() == 1
&& !CalamaresUtils::Partition::isPartitionFreeSpace( partition->children().at( 0 ) ) ) );
create = isFree;
const bool isInVG = m_core->isInVG( partition );
allow_create = isFree;
// Keep it simple for now: do not support editing extended partitions as
// it does not work with our current edit implementation which is
@ -150,8 +159,8 @@ PartitionPage::updateButtons()
// inside them, so an edit must be applied without altering the job
// order.
// TODO: See if LVM PVs can be edited in Calamares
edit = !isFree && !isExtended;
del = !isFree && !isInVG;
allow_edit = !isFree && !isExtended;
allow_delete = !isFree && !isInVG && !hasChildren;
}
if ( m_ui->deviceComboBox->currentIndex() >= 0 )
@ -168,14 +177,14 @@ PartitionPage::updateButtons()
}
else if ( device->type() != Device::Type::LVM_Device )
{
createTable = true;
allow_create_table = true;
#ifdef WITH_KPMCORE4API
if ( device->type() == Device::Type::SoftwareRAID_Device
&& static_cast< SoftwareRAID* >( device )->status() == SoftwareRAID::Status::Inactive )
{
createTable = false;
create = false;
allow_create_table = false;
allow_create = false;
}
#endif
}
@ -197,10 +206,10 @@ PartitionPage::updateButtons()
}
}
m_ui->createButton->setEnabled( create );
m_ui->editButton->setEnabled( edit );
m_ui->deleteButton->setEnabled( del );
m_ui->newPartitionTableButton->setEnabled( createTable );
m_ui->createButton->setEnabled( allow_create );
m_ui->editButton->setEnabled( allow_edit );
m_ui->deleteButton->setEnabled( allow_delete );
m_ui->newPartitionTableButton->setEnabled( allow_create_table );
m_ui->resizeVolumeGroupButton->setEnabled( currentDeviceIsVG && !isVGdeactivated );
m_ui->deactivateVolumeGroupButton->setEnabled( currentDeviceIsVG && isDeactivable && !isVGdeactivated );
m_ui->removeVolumeGroupButton->setEnabled( currentDeviceIsVG && isRemovable );

@ -15,7 +15,7 @@ include_directories(
)
calamares_add_test(
partitionjobtests
partitionjobtest
SOURCES
PartitionJobTests.cpp
${PartitionModule_SOURCE_DIR}/core/KPMHelpers.cpp
@ -31,7 +31,7 @@ calamares_add_test(
)
calamares_add_test(
clearmountsjobtests
partitionclearmountsjobtest
SOURCES
${PartitionModule_SOURCE_DIR}/jobs/ClearMountsJob.cpp
ClearMountsJobTests.cpp
@ -42,27 +42,32 @@ calamares_add_test(
calamares_add_test(
createlayoutstests
partitioncreatelayoutstest
SOURCES
CreateLayoutsTests.cpp
${PartitionModule_SOURCE_DIR}/core/KPMHelpers.cpp
${PartitionModule_SOURCE_DIR}/core/PartitionInfo.cpp
${PartitionModule_SOURCE_DIR}/core/PartitionLayout.cpp
${PartitionModule_SOURCE_DIR}/core/PartUtils.cpp
${PartitionModule_SOURCE_DIR}/core/DeviceModel.cpp
CreateLayoutsTests.cpp
LIBRARIES
kpmcore
calamares
calamaresui
Qt5::Gui
Calamares::calamaresui
DEFINITIONS ${_partition_defs}
)
calamares_add_test(
automounttests
partitionautomounttest
SOURCES
${PartitionModule_SOURCE_DIR}/jobs/AutoMountManagementJob.cpp
AutoMountTests.cpp
)
calamares_add_test(
partitiondevicestest
SOURCES
DevicesTests.cpp
${PartitionModule_SOURCE_DIR}/core/DeviceList.cpp
LIBRARIES
calamares
kpmcore
)

@ -0,0 +1,90 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
*
*/
#include "core/DeviceList.h"
#include "partition/KPMManager.h"
#include "utils/Logger.h"
#include <kpmcore/backend/corebackend.h>
#include <kpmcore/backend/corebackendmanager.h>
#include <QObject>
#include <QtTest/QtTest>
#include <memory>
#include <unistd.h>
class DevicesTests : public QObject
{
Q_OBJECT
public:
DevicesTests();
private Q_SLOTS:
void testKPMScanDevices();
void testPartUtilScanDevices();
private:
std::unique_ptr< CalamaresUtils::Partition::KPMManager > m_d;
bool m_isRoot = false;
};
DevicesTests::DevicesTests()
: m_d( std::make_unique< CalamaresUtils::Partition::KPMManager >() )
, m_isRoot( geteuid() == 0 )
{
}
void
DevicesTests::testKPMScanDevices()
{
Logger::setupLogLevel( Logger::LOGVERBOSE );
cDebug() << "Getting devices via KPMCore";
CoreBackend* backend = CoreBackendManager::self()->backend();
QVERIFY( backend );
#if defined( WITH_KPMCORE4API )
auto flags = ScanFlag( ~0 );
#else
auto flags = true;
#endif
auto devices = backend->scanDevices( flags ); // These flags try to get "all"
cDebug() << Logger::SubEntry << "Done getting devices.";
if ( !m_isRoot )
{
QEXPECT_FAIL( "", "Test invalid when not root", Continue );
}
QVERIFY( devices.count() > 0 );
}
void
DevicesTests::testPartUtilScanDevices()
{
Logger::setupLogLevel( Logger::LOGVERBOSE );
cDebug() << "Getting devices via PartUtils";
auto devices = PartUtils::getDevices();
cDebug() << Logger::SubEntry << "Done getting devices.";
if ( !m_isRoot )
{
QEXPECT_FAIL( "", "Test invalid when not root", Continue );
}
QVERIFY( devices.count() > 0 );
}
QTEST_GUILESS_MAIN( DevicesTests )
#include "utils/moc-warnings.h"
#include "DevicesTests.moc"

@ -42,16 +42,11 @@ ShellProcessTests::testProcessListSampleConfig()
{
YAML::Node doc;
QStringList dirs { "src/modules/shellprocess", "." };
for ( const auto& dir : dirs )
{
QString filename = dir + "/shellprocess.conf";
if ( QFileInfo::exists( filename ) )
{
doc = YAML::LoadFile( filename.toStdString() );
break;
}
}
QString filename = QStringLiteral( "shellprocess.conf" );
QFile fi( QString( "%1/%2" ).arg( BUILD_AS_TEST, filename ) );
QVERIFY( fi.exists() );
doc = YAML::LoadFile( fi.fileName().toStdString() );
CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
QVERIFY( !cl.isEmpty() );

@ -8,8 +8,9 @@ calamares_add_plugin( summary
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
SummaryViewStep.cpp
Config.cpp
SummaryPage.cpp
SummaryViewStep.cpp
UI
SHARED_LIB
NO_CONFIG

@ -0,0 +1,127 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2020, Camilo Higuita <milo.h@aol.com>
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
*
*/
#include "Config.h"
#include "Branding.h"
#include "Settings.h"
#include "ViewManager.h"
#include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h"
#include "utils/Retranslator.h"
#include "viewpages/ExecutionViewStep.h"
SummaryModel::SummaryModel( QObject* parent )
: QAbstractListModel( parent )
{
}
QHash< int, QByteArray >
SummaryModel::roleNames() const
{
return { { Qt::DisplayRole, "title" }, { Qt::UserRole, "message" } };
}
QVariant
SummaryModel::data( const QModelIndex& index, int role ) const
{
if ( !index.isValid() )
{
return QVariant();
}
const auto item = m_summary.at( index.row() );
return role == Qt::DisplayRole ? item.title : item.message;
}
int
SummaryModel::rowCount( const QModelIndex& ) const
{
return m_summary.count();
}
void
SummaryModel::setSummaryList( const Calamares::ViewStepList& steps, bool withWidgets )
{
Q_EMIT beginResetModel();
m_summary.clear();
for ( Calamares::ViewStep* step : steps )
{
QString text = step->prettyStatus();
QWidget* widget = withWidgets ? step->createSummaryWidget() : nullptr;
if ( text.isEmpty() && !widget )
{
continue;
}
m_summary << StepSummary { step->prettyName(), text, widget };
}
Q_EMIT endResetModel();
}
Config::Config( QObject* parent )
: QObject( parent )
, m_summary( new SummaryModel( this ) )
{
CALAMARES_RETRANSLATE_SLOT( &Config::retranslate );
retranslate();
}
void
Config::retranslate()
{
m_title = tr( "Summary" );
if ( Calamares::Settings::instance()->isSetupMode() )
{
m_message = tr( "This is an overview of what will happen once you start "
"the setup procedure." );
}
else
{
m_message = tr( "This is an overview of what will happen once you start "
"the install procedure." );
}
Q_EMIT titleChanged( m_title );
Q_EMIT messageChanged( m_message );
}
void
Config::collectSummaries( const Calamares::ViewStep* upToHere )
{
Calamares::ViewStepList steps;
for ( Calamares::ViewStep* step : Calamares::ViewManager::instance()->viewSteps() )
{
// *Assume* that if there's an exec step in the sequence,
// we don't need a summary for steps before it. This works in
// practice if there's a summary step before each exec --
// and in practice, there's only one of each.
if ( qobject_cast< Calamares::ExecutionViewStep* >( step ) )
{
steps.clear();
continue;
}
// Having reached the parent view-step of the Config object,
// we know we're providing a summary of steps up until this
// view step, so we now have steps since the previous exec, up
// to this summary.
if ( upToHere == step )
{
break;
}
steps.append( step );
}
m_summary->setSummaryList( steps );
}

@ -0,0 +1,96 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2019-2020, Adriaan de Groot <groot@kde.org>
* SPDX-FileCopyrightText: 2020, Camilo Higuita <milo.h@aol.com>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
*
*/
#ifndef SUMMARY_CONFIG_H
#define SUMMARY_CONFIG_H
#include "viewpages/ViewStep.h"
#include <QAbstractListModel>
#include <QObject>
#include <QQmlParserStatus>
class Config;
/** @brief Data for one step
*
* A step generally has a text description, but **may** have a
* QWidget. There is no ownership of the QWidget, that is assumed
* to be handed off to some owning parent-widget.
*/
struct StepSummary
{
QString title;
QString message;
QWidget* widget = nullptr;
};
class SummaryModel : public QAbstractListModel
{
Q_OBJECT
friend class Config;
public:
explicit SummaryModel( QObject* parent = nullptr );
int rowCount( const QModelIndex& = QModelIndex() ) const override;
QVariant data( const QModelIndex& index, int role ) const override;
protected:
QHash< int, QByteArray > roleNames() const override;
private:
/** @brief Sets the model data from @p steps
*
* Replaces the list of summaries with summaries given by
* the jobs and ViewSteps objects in @p steps. If @p withWidgets
* is @c true, then also queries for widget summaries alongside
* the text summaries for each step.
*/
void setSummaryList( const Calamares::ViewStepList& steps, bool withWidgets = false );
QVector< StepSummary > m_summary;
};
class Config : public QObject
{
Q_OBJECT
///@brief Name of this summary (generally, "Summary")
Q_PROPERTY( QString title READ title NOTIFY titleChanged )
///@brief Description of what the summary means
Q_PROPERTY( QString message READ message NOTIFY messageChanged )
Q_PROPERTY( QAbstractListModel* summaryModel READ summaryModel CONSTANT FINAL )
public:
explicit Config( QObject* parent = nullptr );
///@brief Called later, to load the model once all viewsteps are there
void collectSummaries( const Calamares::ViewStep* upToHere );
QAbstractListModel* summaryModel() const { return m_summary; }
QString title() const { return m_title; }
QString message() const { return m_message; }
private:
Calamares::ViewStepList stepsForSummary( const Calamares::ViewStepList& allSteps ) const;
void retranslate();
SummaryModel* m_summary;
QString m_title;
QString m_message;
Q_SIGNALS:
void titleChanged( QString title );
void messageChanged( QString message );
};
#endif

@ -29,7 +29,7 @@
static const int SECTION_SPACING = 12;
SummaryPage::SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent )
SummaryPage::SummaryPage( Config* config, const SummaryViewStep* thisViewStep, QWidget* parent )
: QWidget()
, m_thisViewStep( thisViewStep )
, m_contentWidget( nullptr )
@ -37,6 +37,7 @@ SummaryPage::SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent )
{
Q_UNUSED( parent )
this->setObjectName( "summaryStep" );
Q_ASSERT( m_thisViewStep );
@ -45,11 +46,8 @@ SummaryPage::SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent )
QLabel* headerLabel = new QLabel( this );
headerLabel->setObjectName( "summaryTitle" );
CALAMARES_RETRANSLATE( if ( Calamares::Settings::instance()->isSetupMode() )
headerLabel->setText( tr( "This is an overview of what will happen once you start "
"the setup procedure." ) );
else headerLabel->setText( tr( "This is an overview of what will happen once you start "
"the install procedure." ) ); );
headerLabel->setText( config->message() );
connect( config, &Config::messageChanged, headerLabel, &QLabel::setText );
layout->addWidget( headerLabel );
layout->addWidget( m_scrollArea );
m_scrollArea->setWidgetResizable( true );
@ -63,12 +61,45 @@ SummaryPage::SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent )
}
static QLabel*
createTitleLabel( const QString& text, const QFont& titleFont )
{
QLabel* label = new QLabel( text );
label->setObjectName( "summaryItemTitle" );
label->setFont( titleFont );
label->setContentsMargins( 0, 0, 0, 0 );
return label;
}
static QLabel*
createBodyLabel( const QString& text, const QPalette& bodyPalette )
{
QLabel* label = new QLabel;
label->setObjectName( "summaryItemBody" );
label->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
label->setAutoFillBackground( true );
label->setPalette( bodyPalette );
label->setText( text );
return label;
}
// Adds a widget for those ViewSteps that want a summary;
// see SummaryPage documentation and also ViewStep docs.
void
SummaryPage::onActivate()
{
createContentWidget();
delete m_contentWidget; // It might have been created previously
m_contentWidget = new QWidget;
m_layout = new QVBoxLayout( m_contentWidget );
CalamaresUtils::unmarginLayout( m_layout );
QFont titleFont = font();
titleFont.setWeight( QFont::Light );
titleFont.setPointSize( CalamaresUtils::defaultFontSize() * 2 );
QPalette bodyPalette( palette() );
bodyPalette.setColor( WindowBackground, palette().window().color().lighter( 108 ) );
bool first = true;
const Calamares::ViewStepList steps = stepsForSummary( Calamares::ViewManager::instance()->viewSteps() );
@ -92,7 +123,7 @@ SummaryPage::onActivate()
m_layout->addSpacing( SECTION_SPACING );
}
m_layout->addWidget( createTitleLabel( step->prettyName() ) );
m_layout->addWidget( createTitleLabel( step->prettyName(), titleFont ) );
QHBoxLayout* itemBodyLayout = new QHBoxLayout;
m_layout->addSpacing( CalamaresUtils::defaultFontHeight() / 2 );
m_layout->addLayout( itemBodyLayout );
@ -102,7 +133,7 @@ SummaryPage::onActivate()
CalamaresUtils::unmarginLayout( itemBodyLayout );
if ( !text.isEmpty() )
{
itemBodyCoreLayout->addWidget( createBodyLabel( text ) );
itemBodyCoreLayout->addWidget( createBodyLabel( text, bodyPalette ) );
}
if ( widget )
{
@ -156,40 +187,9 @@ SummaryPage::stepsForSummary( const Calamares::ViewStepList& allSteps ) const
return steps;
}
void
SummaryPage::createContentWidget()
SummaryPage::onLeave()
{
delete m_contentWidget;
m_contentWidget = new QWidget;
m_layout = new QVBoxLayout( m_contentWidget );
CalamaresUtils::unmarginLayout( m_layout );
}
QLabel*
SummaryPage::createTitleLabel( const QString& text ) const
{
QLabel* label = new QLabel( text );
label->setObjectName( "summaryItemTitle" );
QFont fnt = font();
fnt.setWeight( QFont::Light );
fnt.setPointSize( CalamaresUtils::defaultFontSize() * 2 );
label->setFont( fnt );
label->setContentsMargins( 0, 0, 0, 0 );
return label;
}
QLabel*
SummaryPage::createBodyLabel( const QString& text ) const
{
QLabel* label = new QLabel;
label->setObjectName( "summaryItemBody" );
label->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
QPalette pal( palette() );
pal.setColor( WindowBackground, palette().window().color().lighter( 108 ) );
label->setAutoFillBackground( true );
label->setPalette( pal );
label->setText( text );
return label;
m_contentWidget = nullptr;
}

@ -14,10 +14,13 @@
#include <QWidget>
class Config;
class SummaryViewStep;
class QLabel;
class QScrollArea;
class QVBoxLayout;
class SummaryViewStep;
/** @brief Provide a summary view with to-be-done action descriptions.
*
@ -42,10 +45,12 @@ class SummaryPage : public QWidget
{
Q_OBJECT
public:
explicit SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent = nullptr );
explicit SummaryPage( Config* config, const SummaryViewStep* thisViewStep, QWidget* parent = nullptr );
/// @brief Create contents showing all of the summary
void onActivate();
void createContentWidget();
/// @brief Clean up the widgets
void onLeave();
private:
Calamares::ViewStepList stepsForSummary( const Calamares::ViewStepList& allSteps ) const;
@ -55,9 +60,6 @@ private:
QVBoxLayout* m_layout = nullptr;
QWidget* m_contentWidget = nullptr;
QLabel* createTitleLabel( const QString& text ) const;
QLabel* createBodyLabel( const QString& text ) const;
QScrollArea* m_scrollArea;
};

@ -15,7 +15,8 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( SummaryViewStepFactory, registerPlugin< Sum
SummaryViewStep::SummaryViewStep( QObject* parent )
: Calamares::ViewStep( parent )
, m_widget( new SummaryPage( this ) )
, m_config( new Config( this ) )
, m_widget( new SummaryPage( m_config, this ) )
{
emit nextStatusChanged( true );
}
@ -27,13 +28,14 @@ SummaryViewStep::~SummaryViewStep()
{
m_widget->deleteLater();
}
delete m_config;
}
QString
SummaryViewStep::prettyName() const
{
return tr( "Summary" );
return m_config->title();
}
@ -72,16 +74,17 @@ SummaryViewStep::isAtEnd() const
}
QList< Calamares::job_ptr >
Calamares::JobList
SummaryViewStep::jobs() const
{
return QList< Calamares::job_ptr >();
return {};
}
void
SummaryViewStep::onActivate()
{
m_config->collectSummaries( this );
m_widget->onActivate();
}
@ -89,5 +92,5 @@ SummaryViewStep::onActivate()
void
SummaryViewStep::onLeave()
{
m_widget->createContentWidget();
m_widget->onLeave();
}

@ -10,13 +10,12 @@
#ifndef SUMMARYPAGEPLUGIN_H
#define SUMMARYPAGEPLUGIN_H
#include <QObject>
#include "Config.h"
#include "DllMacro.h"
#include "utils/PluginFactory.h"
#include "viewpages/ViewStep.h"
#include "DllMacro.h"
class SummaryPage;
class PLUGINDLLEXPORT SummaryViewStep : public Calamares::ViewStep
@ -37,13 +36,14 @@ public:
bool isAtBeginning() const override;
bool isAtEnd() const override;
QList< Calamares::job_ptr > jobs() const override;
Calamares::JobList jobs() const override;
void onActivate() override;
void onLeave() override;
private:
SummaryPage* m_widget;
Config* m_config = nullptr;
SummaryPage* m_widget = nullptr;
};
CALAMARES_PLUGIN_FACTORY_DECLARATION( SummaryViewStepFactory )

@ -0,0 +1,26 @@
# === This file is part of Calamares - <https://calamares.io> ===
#
# SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
# SPDX-License-Identifier: BSD-2-Clause
#
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} )
calamares_add_plugin( summaryq
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
SummaryQmlViewStep.cpp
${_summary}/Config.cpp
UI
RESOURCES
summaryq.qrc
LINK_PRIVATE_LIBRARIES
calamaresui
SHARED_LIB
)

@ -0,0 +1,73 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2014-2015, Teo Mrnjavac <teo@kde.org>
* SPDX-FileCopyrightText: 2020, Camilo Higuita <milo.h@aol.com>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
*
*/
#include "SummaryQmlViewStep.h"
CALAMARES_PLUGIN_FACTORY_DEFINITION( SummaryQmlViewStepFactory, registerPlugin< SummaryQmlViewStep >(); )
SummaryQmlViewStep::SummaryQmlViewStep( QObject* parent )
: Calamares::QmlViewStep( parent )
, m_config( new Config( this ) )
{
emit nextStatusChanged( true );
}
SummaryQmlViewStep::~SummaryQmlViewStep() {}
QString
SummaryQmlViewStep::prettyName() const
{
return m_config->title();
}
bool
SummaryQmlViewStep::isNextEnabled() const
{
return true;
}
bool
SummaryQmlViewStep::isBackEnabled() const
{
return true;
}
bool
SummaryQmlViewStep::isAtBeginning() const
{
return true;
}
bool
SummaryQmlViewStep::isAtEnd() const
{
return true;
}
Calamares::JobList
SummaryQmlViewStep::jobs() const
{
return {};
}
void
SummaryQmlViewStep::onActivate()
{
// Collect the steps before this one: those need to have their
// summary (text or widget) displayed.
m_config->collectSummaries( this );
}

@ -0,0 +1,49 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2014-2015, Teo Mrnjavac <teo@kde.org>
* SPDX-FileCopyrightText: 2020, Camilo Higuita <milo.h@aol.com>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
*
*/
#ifndef SUMMARYQMLVIEWSTEP_H
#define SUMMARYQMLVIEWSTEP_H
#include "Config.h"
#include "DllMacro.h"
#include "utils/PluginFactory.h"
#include "viewpages/QmlViewStep.h"
class PLUGINDLLEXPORT SummaryQmlViewStep : public Calamares::QmlViewStep
{
Q_OBJECT
public:
explicit SummaryQmlViewStep( QObject* parent = nullptr );
virtual ~SummaryQmlViewStep() override;
QString prettyName() const override;
bool isNextEnabled() const override;
bool isBackEnabled() const override;
bool isAtBeginning() const override;
bool isAtEnd() const override;
Calamares::JobList jobs() const override;
void onActivate() override;
QObject* getConfig() override { return m_config; }
private:
Config* m_config;
};
CALAMARES_PLUGIN_FACTORY_DECLARATION( SummaryQmlViewStepFactory )
#endif // SUMMARYQMLVIEWSTEP_H

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg width="64" version="1.1" xmlns="http://www.w3.org/2000/svg" height="64" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
<defs id="defs5455">
<linearGradient inkscape:collect="always" id="linearGradient4876">
<stop style="stop-color:#b0b8b8" id="stop4878"/>
<stop offset="1" style="stop-color:#eff1f1" id="stop4880"/>
</linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient4876" id="linearGradient4185" y1="539.79797" y2="506.47214" x2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.81249961 0 0 0.88235295 76.6073 64.50563)"/>
</defs>
<metadata id="metadata5458"/>
<g inkscape:label="Capa 1" inkscape:groupmode="layer" id="g4882" transform="matrix(1 0 0 1 -376.57144 -493.79798)">
<rect width="52" x="382.57144" y="510.79797" height="30" style="fill:url(#linearGradient4185)" id="rect4177"/>
<path style="fill:#334545" id="path4245" d="M 7 21 L 7 23 L 12 23 L 12 21 L 7 21 z M 13 21 L 13 23 L 17 23 L 17 21 L 13 21 z M 18 21 L 18 23 L 22 23 L 22 21 L 18 21 z M 23 21 L 23 23 L 27 23 L 27 21 L 23 21 z M 28 21 L 28 23 L 32 23 L 32 21 L 28 21 z M 33 21 L 33 23 L 37 23 L 37 21 L 33 21 z M 38 21 L 38 23 L 42 23 L 42 21 L 38 21 z M 43 21 L 43 23 L 47 23 L 47 21 L 43 21 z M 48 21 L 48 23 L 52 23 L 52 21 L 48 21 z M 53 21 L 53 23 L 57 23 L 57 21 L 53 21 z M 7 24 L 7 28 L 11 28 L 11 24 L 7 24 z M 12 24 L 12 28 L 16 28 L 16 24 L 12 24 z M 17 24 L 17 28 L 21 28 L 21 24 L 17 24 z M 22 24 L 22 28 L 26 28 L 26 24 L 22 24 z M 27 24 L 27 28 L 31 28 L 31 24 L 27 24 z M 32 24 L 32 28 L 36 28 L 36 24 L 32 24 z M 37 24 L 37 28 L 41 28 L 41 24 L 37 24 z M 42 24 L 42 28 L 46 28 L 46 24 L 42 24 z M 47 24 L 47 28 L 51 28 L 51 24 L 47 24 z M 52 24 L 52 28 L 57 28 L 57 24 L 52 24 z M 7 29 L 7 33 L 13 33 L 13 29 L 7 29 z M 14 29 L 14 33 L 18 33 L 18 29 L 14 29 z M 19 29 L 19 33 L 23 33 L 23 29 L 19 29 z M 24 29 L 24 33 L 28 33 L 28 29 L 24 29 z M 29 29 L 29 33 L 33 33 L 33 29 L 29 29 z M 34 29 L 34 33 L 38 33 L 38 29 L 34 29 z M 39 29 L 39 33 L 43 33 L 43 29 L 39 29 z M 44 29 L 44 33 L 48 33 L 48 29 L 44 29 z M 49 29 L 49 33 L 57 33 L 57 29 L 49 29 z M 7 34 L 7 38 L 17 38 L 17 34 L 7 34 z M 18 34 L 18 38 L 22 38 L 22 34 L 18 34 z M 23 34 L 23 38 L 27 38 L 27 34 L 23 34 z M 28 34 L 28 38 L 32 38 L 32 34 L 28 34 z M 33 34 L 33 38 L 37 38 L 37 34 L 33 34 z M 38 34 L 38 38 L 42 38 L 42 34 L 38 34 z M 43 34 L 43 38 L 47 38 L 47 34 L 43 34 z M 48 34 L 48 38 L 57 38 L 57 34 L 48 34 z M 7 39 L 7 43 L 13.099609 43 L 13.099609 39 L 7 39 z M 14 39 L 14 43 L 18 43 L 18 39 L 14 39 z M 19 39 L 19 43 L 37 43 L 37 39 L 19 39 z M 38 39 L 38 43 L 42 43 L 42 39 L 38 39 z M 48 39 L 48 43 L 52 43 L 52 39 L 48 39 z M 43 41 L 43 43 L 47 43 L 47 41 L 43 41 z M 53 41 L 53 43 L 57 43 L 57 41 L 53 41 z " transform="matrix(1 0 0 1 376.57144 493.79798)"/>
<rect width="51.999973" x="382.57144" y="539.79797" height="1" style="fill:#909c9c" id="rect4187"/>
<rect width="1" x="431.57141" y="511.79797" height="1" style="fill:#31c281" id="rect4462-0-90"/>
<rect width="1" x="428.57135" y="511.79797" height="1" style="fill:#31c281" id="rect4975"/>
<rect width="1" x="425.57141" y="511.79797" height="1" style="fill:#31c281" id="rect4977"/>
<path style="fill:#172525" id="path4245-5" d="M 7 22 L 7 23 L 11 23 L 12 23 L 12 22 L 7 22 z M 13 22 L 13 23 L 16 23 L 17 23 L 17 22 L 13 22 z M 18 22 L 18 23 L 21 23 L 22 23 L 22 22 L 18 22 z M 23 22 L 23 23 L 26 23 L 27 23 L 27 22 L 23 22 z M 28 22 L 28 23 L 31 23 L 32 23 L 32 22 L 28 22 z M 33 22 L 33 23 L 36 23 L 37 23 L 37 22 L 33 22 z M 38 22 L 38 23 L 41 23 L 42 23 L 42 22 L 38 22 z M 43 22 L 43 23 L 46 23 L 47 23 L 47 22 L 43 22 z M 48 22 L 48 23 L 51 23 L 52 23 L 52 22 L 48 22 z M 53 22 L 53 23 L 57 23 L 57 22 L 53 22 z M 7 27 L 7 28 L 11 28 L 11 27 L 7 27 z M 12 27 L 12 28 L 13 28 L 14 28 L 16 28 L 16 27 L 12 27 z M 17 27 L 17 28 L 18 28 L 19 28 L 21 28 L 21 27 L 17 27 z M 22 27 L 22 28 L 23 28 L 24 28 L 26 28 L 26 27 L 22 27 z M 27 27 L 27 28 L 28 28 L 29 28 L 31 28 L 31 27 L 27 27 z M 32 27 L 32 28 L 33 28 L 34 28 L 36 28 L 36 27 L 32 27 z M 37 27 L 37 28 L 38 28 L 39 28 L 41 28 L 41 27 L 37 27 z M 42 27 L 42 28 L 43 28 L 44 28 L 46 28 L 46 27 L 42 27 z M 47 27 L 47 28 L 48 28 L 49 28 L 51 28 L 51 27 L 47 27 z M 52 27 L 52 28 L 57 28 L 57 27 L 52 27 z M 7 32 L 7 33 L 13 33 L 13 32 L 7 32 z M 14 32 L 14 33 L 17 33 L 18 33 L 18 32 L 14 32 z M 19 32 L 19 33 L 22 33 L 23 33 L 23 32 L 19 32 z M 24 32 L 24 33 L 27 33 L 28 33 L 28 32 L 24 32 z M 29 32 L 29 33 L 32 33 L 33 33 L 33 32 L 29 32 z M 34 32 L 34 33 L 37 33 L 38 33 L 38 32 L 34 32 z M 39 32 L 39 33 L 42 33 L 43 33 L 43 32 L 39 32 z M 44 32 L 44 33 L 47 33 L 48 33 L 48 32 L 44 32 z M 49 32 L 49 33 L 57 33 L 57 32 L 49 32 z M 7 37 L 7 38 L 13.099609 38 L 14 38 L 17 38 L 17 37 L 7 37 z M 18 37 L 18 38 L 19 38 L 22 38 L 22 37 L 18 37 z M 23 37 L 23 38 L 27 38 L 27 37 L 23 37 z M 28 37 L 28 38 L 32 38 L 32 37 L 28 37 z M 33 37 L 33 38 L 37 38 L 37 37 L 33 37 z M 38 37 L 38 38 L 42 38 L 42 37 L 38 37 z M 43 37 L 43 38 L 47 38 L 47 37 L 43 37 z M 48 37 L 48 38 L 52 38 L 57 38 L 57 37 L 48 37 z M 48 40 L 48 41 L 52 41 L 52 40 L 48 40 z M 7 42 L 7 43 L 13.099609 43 L 13.099609 42 L 7 42 z M 14 42 L 14 43 L 18 43 L 18 42 L 14 42 z M 19 42 L 19 43 L 37 43 L 37 42 L 19 42 z M 38 42 L 38 43 L 42 43 L 42 42 L 38 42 z M 43 42 L 43 43 L 47 43 L 47 42 L 43 42 z M 48 42 L 48 43 L 52 43 L 52 42 L 48 42 z M 53 42 L 53 43 L 57 43 L 57 42 L 53 42 z " transform="matrix(1 0 0 1 376.57144 493.79798)"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.5 KiB

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: 2021 KDE Visual Design Group <visual-design@kde.org>
SPDX-License-Identifier: GPL-3.0-or-later

@ -0,0 +1,39 @@
<svg width="48" xmlns="http://www.w3.org/2000/svg" height="48" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>
<linearGradient id="a" y1="22" y2="8" x2="0" gradientUnits="userSpaceOnUse" gradientTransform="translate(429.57 508.8)">
<stop stop-color="#2e3436"/>
<stop offset="1" stop-color="#555753"/>
</linearGradient>
<linearGradient id="b" y1="543.8" y2="502.66" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(.66667 0 0 .63518 139.19 192.52)">
<stop stop-color="#c6cdd1"/>
<stop offset="1" stop-color="#e0e5e7"/>
</linearGradient>
<linearGradient id="c" y1="529.8" x1="400.57" y2="548.8" gradientUnits="userSpaceOnUse" x2="418.57" gradientTransform="translate(11-6)">
<stop/>
<stop offset="1" stop-opacity="0"/>
</linearGradient>
<linearGradient xlink:href="#b" id="d" y1="543.8" y2="502.66" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(.66667 0 0 .63518 124.19 185.52)"/>
<linearGradient xlink:href="#c" id="e" y1="523.8" x1="388.57" y2="538.8" gradientUnits="userSpaceOnUse" x2="400.57" gradientTransform="translate(11-7)"/>
</defs>
<g transform="translate(-384.57-499.8)">
<rect width="20" x="392.57" y="504.8" fill="url(#d)" rx="0" height="28"/>
<rect width="20" x="392.57" y="504.8" fill="#566069" height="4"/>
<rect width="20" x="392.57" y="508.8" fill="#3daee9" height="1"/>
<rect width="18" x="394.57" y="509.8" fill="#ffffff" height="21"/>
<path fill="#464e55" d="m412.57 504.8l-5 7v4l5-7z"/>
<g color-rendering="auto" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" text-rendering="auto" color-interpolation="sRGB" color="#000000">
<path fill="#1583bd" d="m412.57 508.8l-5 7v1l5-7z"/>
<path fill="#a1aeb4" d="m412.57 509.8l-5 7v1l5-7z"/>
</g>
<rect width="20" x="407.57" y="511.8" fill="url(#b)" rx="0" height="28"/>
<rect width="20" x="407.57" y="511.8" fill="#566069" height="4"/>
<rect width="20" x="407.57" y="515.8" fill="#3daee9" height="1"/>
<rect width="18" x="407.57" y="516.8" fill="#ffffff" height="21"/>
<path opacity=".117" color-interpolation-filters="linearRGB" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" d="m417.57 522.8l1 1h3l6 6v10l-5-.039-8.59-8.584 2.372-2.595-3.782-3.782 4-1z" color-interpolation="sRGB" text-rendering="auto" fill="url(#c)" shape-rendering="auto"/>
<rect width="2" x="424.57" y="512.8" fill="#eff0f1" rx="1" height="2"/>
<rect color-interpolation-filters="linearRGB" x="504.8" y="-392.57" color="#000000" image-rendering="auto" color-rendering="auto" width="41" color-interpolation="sRGB" text-rendering="auto" fill="url(#a)" height="2" shape-rendering="auto" transform="rotate(90)"/>
<path fill="#555753" d="m416.57 522.8v1h-4v1h6.125v.25c0 .226-.141.768-.299 1.143-.174.414-.556.977-.926 1.365l-.307.32-.221-.24c-.302-.33-.752-1.01-.92-1.391l-.141-.314h-1.205l.125.303c.234.568.749 1.348 1.244 1.883.44.476.454.38-.113.801-.851.632-1.508 1.016-2.256 1.32l-.404.164.707.773.27-.135c.834-.417 1.801-1.031 2.488-1.578l.385-.305.293.238c.14.113.36.276.531.4.026.019.059.046.082.063.161.114.236.167.275.178.564.386 1.164.766 1.738 1.053l.283.141.369-.406.371-.404-.424-.172c-.682-.278-1.313-.652-2.049-1.174-.062-.051-.142-.114-.314-.236-.228-.162-.414-.311-.414-.332 0-.021.13-.181.291-.355.867-.942 1.39-1.902 1.535-2.814l.072-.537h1.807v-1h-4v-1z"/>
<path opacity=".117" color-interpolation-filters="linearRGB" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" d="m402.63 515.81l4.988 4.988-.05 12h-.254l-8.973-8.973 3.06-8.01z" color-interpolation="sRGB" text-rendering="auto" fill="url(#e)" shape-rendering="auto"/>
<path fill="#555753" d="m402.02 516.88l-1.444 3.922h2.885zm-.612-1.068h1.229l3.055 8.01h-1.127l-.726-2.025-3.617.004-.73 2.02h-1.143z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.8 KiB

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: 2021 KDE Visual Design Group <visual-design@kde.org>
SPDX-License-Identifier: GPL-3.0-or-later

@ -0,0 +1,112 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
*
*/
import io.calamares.core 1.0
import io.calamares.ui 1.0
import QtQuick 2.15
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.3
import org.kde.kirigami 2.7 as Kirigami
import QtGraphicalEffects 1.0
import QtQuick.Window 2.3
Kirigami.ScrollablePage {
width: 860 //parent.width //860
height: 640 //parent.height //640
Kirigami.Theme.backgroundColor: "#EFF0F1"
Kirigami.Theme.textColor: "#1F1F1F"
header: Kirigami.Heading {
Layout.fillWidth: true
height: 100
horizontalAlignment: Qt.AlignHCenter
color: Kirigami.Theme.textColor
font.weight: Font.Medium
font.pointSize: 12
text: config.message
}
RowLayout {
width: parent.width
Component {
id: _delegate
Rectangle {
id: rect
border.color: "#BDC3C7"
width: parent.width - 80
implicitHeight: message.implicitHeight + title.implicitHeight + 20
anchors.horizontalCenter: parent.horizontalCenter
Item {
width: parent.width - 80
implicitHeight: message.implicitHeight + title.implicitHeight + 20
Kirigami.FormLayout {
GridLayout {
anchors {
//left: parent.left
top: parent.top
right: parent.right
}
rowSpacing: Kirigami.Units.largeSpacing
columnSpacing: Kirigami.Units.largeSpacing
columns: width > Kirigami.Units.gridUnit * 20 ? 4 : 2
Image {
id: image
Layout.maximumHeight: Kirigami.Units.iconSizes.huge
Layout.preferredWidth: height
Layout.alignment: Qt.AlignTop
fillMode: Image.PreserveAspectFit
source: index === 0 ? "img/lokalize.svg"
: ( index === 1 ? "img/keyboard.svg"
: ( index === 2 ? "qrc:/data/images/partition-manual.svg"
: "qrc:/data/images/partition-partition.svg" ) )
}
ColumnLayout {
Label {
id: title
Layout.fillWidth: true
wrapMode: Text.WordWrap
text: model.title
font.weight: Font.Medium
font.pointSize: 16
}
Rectangle {
height: 2
width: 200
border.color: "#BDC3C7"
}
Label {
id: message
Layout.fillWidth: true
text: model.message
}
}
}
}
}
}
}
}
ListView {
anchors.fill: parent
spacing: 20
model: config.summaryModel
delegate: _delegate
}
}

@ -0,0 +1,7 @@
<RCC>
<qresource>
<file>summaryq.qml</file>
<file>img/keyboard.svg</file>
<file>img/lokalize.svg</file>
</qresource>
</RCC>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save