Compare commits
33 Commits
v2.2.1
...
2.2.x-stab
| Author | SHA1 | Date | |
|---|---|---|---|
|
90097f6bcb | ||
|
|
d11b3fb4c8 | ||
|
|
a30683ea61 | ||
|
|
8577821884 | ||
|
|
8161e77d1f | ||
|
|
ad5226c8f7 | ||
|
|
06bd19be90 | ||
|
|
4c9faf3c98 | ||
|
|
7947a06b60 | ||
|
|
d4b84cd9a8 | ||
|
|
3accd30ad1 | ||
|
|
3b88b45c9f | ||
|
|
14869bec6a | ||
|
|
1161b169ee | ||
|
|
a9b9fcd9ad | ||
|
|
e090463545 | ||
|
|
bba16efcfc | ||
|
|
e122600689 | ||
|
|
a9c87e2f14 | ||
|
|
2dcfdc0170 | ||
|
|
c7f8a09cc0 | ||
|
|
98b5085e6e | ||
|
|
69b72e8a76 | ||
|
|
77afb7796c | ||
|
|
c1992f8062 | ||
|
|
10aa5a5653 | ||
|
|
523b9332bd | ||
|
|
7e451e9345 | ||
|
|
fc7e4a232e | ||
|
|
78315de3b6 | ||
|
|
50751e7bac | ||
|
|
1df3c75a29 | ||
|
|
9c100dab67 |
@@ -101,7 +101,7 @@ set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX
|
||||
|
||||
set( CALAMARES_VERSION_MAJOR 2 )
|
||||
set( CALAMARES_VERSION_MINOR 2 )
|
||||
set( CALAMARES_VERSION_PATCH 1 )
|
||||
set( CALAMARES_VERSION_PATCH 3 )
|
||||
set( CALAMARES_VERSION_RC 0 )
|
||||
|
||||
set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} )
|
||||
|
||||
@@ -8,5 +8,5 @@ Exec=pkexec /usr/bin/calamares
|
||||
Comment=Calamares — System Installer
|
||||
Icon=calamares
|
||||
Terminal=false
|
||||
StartupNotify=false
|
||||
StartupNotify=true
|
||||
Categories=Qt;System;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
|
||||
<source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
|
||||
<translation>С това действие, делът <strong>%1</strong>, който съдържа %4, ще бъде смален до %2МБ и нов %3МБ дял ще бъде създаден за %5.</translation>
|
||||
<translation>С това действие, дялът <strong>%1</strong>, който съдържа %4, ще бъде смален до %2МБ и нов %3МБ дял ще бъде създаден за %5.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
|
||||
@@ -37,17 +37,17 @@
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="61"/>
|
||||
<source>The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><strong>Среда за начално зареждане</strong> на тази система.<br><br>Старите x86 системи поддържат само <strong>BIOS</strong>.<br>Модерните системи обикновено използват <strong>EFI</strong>, но може също така да използват BIOS, ако са стартирани в режим на съвместимост.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="75"/>
|
||||
<source>This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Тази система беше стартирана с <strong>EFI</strong> среда за начално зареждане.<br><br>За да се настрои стартирането от EFI, инсталаторът трябва да разположи програма за начално зареждане като <strong>GRUB</strong> или <strong>systemd-boot</strong> на <strong>EFI Системен Дял</strong>. Това се прави автоматично, освен ако не се избере ръчно поделяне, в такъв случай вие трябва да свършите тази работа.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="87"/>
|
||||
<source>This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Тази система беше стартирана с <strong>BIOS</strong> среда за начално зареждане.<br><br>За да се настрои стартирането от BIOS, инсталаторът трябва да разположи програма за начално зареждане като <strong>GRUB</strong> в началото на дяла или на <strong>Сектора за Начално Зареждане</strong> близо до началото на таблицата на дяловете (предпочитано). Това се прави автоматично, освен ако не се избере ръчно поделяне, в такъв случай вие трябва да свършите тази работа.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -55,12 +55,12 @@
|
||||
<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="76"/>
|
||||
<source>Boot Partition</source>
|
||||
<translation>Дял за зареждане</translation>
|
||||
<translation>Дял за начално зареждане</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="81"/>
|
||||
@@ -103,7 +103,7 @@
|
||||
<message>
|
||||
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="57"/>
|
||||
<source>Tools</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Инструменти</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="102"/>
|
||||
@@ -171,7 +171,7 @@ Output:
|
||||
<message>
|
||||
<location filename="../src/libcalamares/ProcessJob.cpp" line="101"/>
|
||||
<source>Bad parameters for process job call.</source>
|
||||
<translation>Лоши параметри за извикване на задача за процес.</translation>
|
||||
<translation>Невалидни параметри за извикване на задача за процес.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libcalamares/ProcessJob.cpp" line="104"/>
|
||||
@@ -222,7 +222,7 @@ Output:
|
||||
<message>
|
||||
<location filename="../src/libcalamares/PythonJob.cpp" line="265"/>
|
||||
<source>Bad main script file</source>
|
||||
<translation>Погрешен файл на главен скрипт</translation>
|
||||
<translation>Невалиден файл на главен скрипт</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libcalamares/PythonJob.cpp" line="266"/>
|
||||
@@ -361,7 +361,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="113"/>
|
||||
<source>This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.</source>
|
||||
<translation>Този компютър не отговаря на някои от препоръчителните изисквания за инсталиране %1.<br/>Инсталацията може да продължи, но някои свойства могат да бъдат неналични.</translation>
|
||||
<translation>Този компютър не отговаря на някои от препоръчителните изисквания за инсталиране %1.<br/>Инсталацията може да продължи, но някои свойства могат да бъдат недостъпни.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="142"/>
|
||||
@@ -399,17 +399,17 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="808"/>
|
||||
<source>Boot loader location:</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Локация на програмата за начално зареждане:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="755"/>
|
||||
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>%1 ще се смали до %2МБ и нов %3МБ дял ще бъде създаден за %4.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="115"/>
|
||||
<source>Select storage de&vice:</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Изберете ус&тройство за съхранение:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="116"/>
|
||||
@@ -422,12 +422,12 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="741"/>
|
||||
<source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><strong>Изберете дял за смаляване, после влачете долната лента за преоразмеряване</strong></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="846"/>
|
||||
<source><strong>Select a partition to install on</strong></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><strong>Изберете дял за инсталацията</strong></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="901"/>
|
||||
@@ -447,7 +447,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1005"/>
|
||||
<source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Това устройство за съхранение няма инсталирана операционна система. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1010"/>
|
||||
@@ -455,12 +455,12 @@ The installer will quit and all changes will be lost.</source>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1074"/>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1112"/>
|
||||
<source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><strong>Изтриване на диска</strong><br/>Това ще <font color="red">изтрие</font> всички данни върху устройството за съхранение.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1039"/>
|
||||
<source>This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Това устройство за съхранение има инсталиран %1. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1014"/>
|
||||
@@ -468,7 +468,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1069"/>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1107"/>
|
||||
<source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><strong>Инсталирайте покрай</strong><br/>Инсталатора ще раздроби дяла за да направи място за %1.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1019"/>
|
||||
@@ -481,12 +481,12 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1064"/>
|
||||
<source>This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Това устройство за съхранение има инсталирана операционна система. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1102"/>
|
||||
<source>This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Това устройство за съхранение има инсталирани операционни системи. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -598,12 +598,12 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="48"/>
|
||||
<source>Create new %2MB partition on %4 (%3) with file system %1.</source>
|
||||
<translation>Създай нов %2MB дял върху %4 (%3) със файлова система %1.</translation>
|
||||
<translation>Създай нов %2МБ дял върху %4 (%3) със файлова система %1.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="59"/>
|
||||
<source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source>
|
||||
<translation>Създай нов <strong>%2MB</strong> дял върху <strong>%4</strong> (%3) със файлова система <strong>%1</strong>.</translation>
|
||||
<translation>Създай нов <strong>%2МБ</strong> дял върху <strong>%4</strong> (%3) със файлова система <strong>%1</strong>.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="71"/>
|
||||
@@ -803,32 +803,32 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="63"/>
|
||||
<source>The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Типа на <strong>таблицата на дяловете</strong> на избраното устройство за съхранение.<br><br>Единствения начин да се промени е като се изчисти и пресъздаде таблицата на дяловете, като по този начин всички данни върху устройството ще бъдат унищожени.<br>Инсталатора ще запази сегашната таблица на дяловете, освен ако не изберете обратното.<br>Ако не сте сигурни - за модерни системи се препоръчва GPT.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="107"/>
|
||||
<source>This device has a <strong>%1</strong> partition table.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Устройството има <strong>%1</strong> таблица на дяловете.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="114"/>
|
||||
<source>This is a <strong>loop</strong> device.<br><br>It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Това е <strong>loop</strong> устройство.<br><br>Представлява псевдо-устройство, без таблица на дяловете, което прави файловете достъпни като блок устройства. Обикновено съдържа само една файлова система.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="121"/>
|
||||
<source>This installer <strong>cannot detect a partition table</strong> on the selected storage device.<br><br>The device either has no partition table, or the partition table is corrupted or of an unknown type.<br>This installer can create a new partition table for you, either automatically, or through the manual partitioning page.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Инсталатора <strong>не може да открие таблица на дяловете</strong> на избраното устройство за съхранение.<br><br>Таблицата на дяловете липсва, повредена е или е от неизвестен тип.<br>Инсталатора може да създаде нова таблица на дяловете автоматично или ръчно, чрез програмата за подялба.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="131"/>
|
||||
<source><br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><br><br>Това е препоръчаният тип на таблицата на дяловете за модерни системи, които стартират от <strong>EFI</strong> среда за начално зареждане.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="137"/>
|
||||
<source><br><br>This partition table type is only advisable on older systems which start from a <strong>BIOS</strong> boot environment. GPT is recommended in most other cases.<br><br><strong>Warning:</strong> the MBR partition table is an obsolete MS-DOS era standard.<br>Only 4 <em>primary</em> partitions may be created, and of those 4, one can be an <em>extended</em> partition, which may in turn contain many <em>logical</em> partitions.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><br><br>Тази таблица на дяловете е препоръчителна само за стари системи, които стартират с <strong>BIOS</strong> среда за начално зареждане. GPT е препоръчителна в повечето случаи.<br><br><strong>Внимание:</strong> MBR таблица на дяловете е остарял стандарт от времето на MS-DOS.<br>Само 4 <em>главни</em> дяла могат да бъдат създадени и от тях само един може да е <em>разширен</em> дял, който може да съдържа много <em>логически</em> дялове.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -961,7 +961,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="59"/>
|
||||
<source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source>
|
||||
<translation>Форматирай <strong>%3MB</strong> дял <strong>%1</strong> с файлова система <strong>%2</strong>.</translation>
|
||||
<translation>Форматирай <strong>%3МБ</strong> дял <strong>%1</strong> с файлова система <strong>%2</strong>.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="70"/>
|
||||
@@ -1050,12 +1050,12 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
|
||||
<source>System locale setting</source>
|
||||
<translation>Настройка на местността на системата</translation>
|
||||
<translation>Настройка на локацията на системата</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
|
||||
<source>The system locale setting affects the language and character set for some command line user interface elements.<br/>The current setting is <strong>%1</strong>.</source>
|
||||
<translation>Местността на системата засяга езика и символите зададени за някои елементи на командния потребителски интерфейс.<br/>Текущата настройка е <strong>%1</strong>.</translation>
|
||||
<translation>Локацията на системата засяга езика и символите зададени за някои елементи на командния ред.<br/>Текущата настройка е <strong>%1</strong>.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -1142,7 +1142,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<location filename="../src/modules/locale/LocalePage.cpp" line="158"/>
|
||||
<location filename="../src/modules/locale/LocalePage.cpp" line="169"/>
|
||||
<source>The system locale is set to %1.</source>
|
||||
<translation>Местността на системата е поставена на %1.</translation>
|
||||
<translation>Локацията на системата е поставена на %1.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/locale/LocalePage.cpp" line="166"/>
|
||||
@@ -1321,17 +1321,17 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="191"/>
|
||||
<source>Root</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Основен</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="194"/>
|
||||
<source>Home</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Домашен</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="196"/>
|
||||
<source>Boot</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Зареждане</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="199"/>
|
||||
@@ -1341,7 +1341,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/>
|
||||
<source>Swap</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Swap</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="203"/>
|
||||
@@ -1399,7 +1399,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="22"/>
|
||||
<source>Storage de&vice:</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Ус&тройство за съхранение"</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="51"/>
|
||||
@@ -1429,7 +1429,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="145"/>
|
||||
<source>Install boot &loader on:</source>
|
||||
<translation>Инсталирай &зареждача върху:</translation>
|
||||
<translation>Инсталирай &устройството за начално зареждане върху:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="147"/>
|
||||
@@ -1507,22 +1507,22 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="386"/>
|
||||
<source>No EFI system partition configured</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Няма конфигуриран EFI системен дял</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="387"/>
|
||||
<source>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>esp</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.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>EFI системен дял е нужен за стартиране на %1.<br/><br/>За настройка на EFI системен дял се върнете назад и изберете или създайте FAT32 файлова система с включен <strong>esp</strong> флаг и точка на монтиране <strong>%2</strong>.<br/><br/>Може да продължите без EFI системен дял, но системата може да не успее да стартира.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="401"/>
|
||||
<source>EFI system partition flag not set</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Не е зададен флаг на EFI системен дял</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="402"/>
|
||||
<source>An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</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.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>EFI системен дял е нужен за стартиране на %1.<br/><br/>Дялът беше конфигуриран с точка на монтиране <strong>%2</strong>, но неговия <strong>esp</strong> флаг не е включен.<br/>За да включите флага се върнете назад и редактирайте дяла.<br/><br/>Може да продължите без флага, но системата може да не успее да стартира.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -1556,7 +1556,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/>
|
||||
<source>Unpartitioned space or unknown partition table</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Неразделено пространство или неизвестна таблица на дяловете</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -1609,7 +1609,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="231"/>
|
||||
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
|
||||
<translation><strong>%4</strong><br/><br/>Дялът %1 е твърде малък за %2. Моля изберете дял с капацитет поне %3 GiB.</translation>
|
||||
<translation><strong>%4</strong><br/><br/>Дялът %1 е твърде малък за %2. Моля изберете дял с капацитет поне %3 ГБ.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="255"/>
|
||||
@@ -1649,7 +1649,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="100"/>
|
||||
<source>There is not enough drive space. At least %1 GB is required.</source>
|
||||
<translation>Няма достатъчно дисково пространство.Необходимо е поне %1 GB.</translation>
|
||||
<translation>Няма достатъчно дисково пространство. Необходимо е поне %1 ГБ.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
|
||||
@@ -1659,7 +1659,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
|
||||
<source>The system does not have enough working memory. At least %1 GB is required.</source>
|
||||
<translation>Системата не разполага с достатъчно работна памет.Необходима е поне %1 GB.</translation>
|
||||
<translation>Системата не разполага с достатъчно работна памет. Необходима е поне %1 ГБ.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
|
||||
@@ -1715,12 +1715,12 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="194"/>
|
||||
<source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source>
|
||||
<translation>Преоразмери <strong>%2MB</strong> дял <strong>%1</strong> на <strong>%3MB</strong>.</translation>
|
||||
<translation>Преоразмери <strong>%2МБ</strong> дял <strong>%1</strong> на <strong>%3МБ</strong>.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="205"/>
|
||||
<source>Resizing %2MB partition %1 to %3MB.</source>
|
||||
<translation>Преоразмеряване от %2MB дял %1 на %3MB.</translation>
|
||||
<translation>Преоразмеряване от %2МБ дял %1 на %3МБ.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="232"/>
|
||||
@@ -1739,12 +1739,12 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="83"/>
|
||||
<source>Scanning storage devices...</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Сканиране на устройствата за съхранение</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="84"/>
|
||||
<source>Partitioning</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Разделяне</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -1806,32 +1806,32 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="47"/>
|
||||
<source>Set flags on partition %1.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Задай флагове на дял %1.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/>
|
||||
<source>Clear flags on partition <strong>%1</strong>.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Изчисти флаговете на дял <strong>%1</strong>.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="59"/>
|
||||
<source>Flag partition <strong>%1</strong> as <strong>%2</strong>.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Сложи флаг на дял <strong>%1</strong> като <strong>%2</strong>.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/>
|
||||
<source>Clearing flags on partition <strong>%1</strong>.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Изчистване на флаговете на дял <strong>%1</strong>.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="74"/>
|
||||
<source>Setting flags <strong>%2</strong> on partition <strong>%1</strong>.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Задаване на флагове <strong>%2</strong> на дял <strong>%1</strong>.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="90"/>
|
||||
<source>The installer failed to set flags on partition %1.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Инсталатора не успя да зададе флагове на дял %1.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="98"/>
|
||||
@@ -1854,7 +1854,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="144"/>
|
||||
<source>Update geometry of partition %1.</source>
|
||||
<translation>Актуализирай геометрията на дял %1.</translation>
|
||||
<translation>Обнови геометрията на дял %1.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="156"/>
|
||||
@@ -1867,7 +1867,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
|
||||
<source>Set password for user %1</source>
|
||||
<translation>Постави парола за потребител %1</translation>
|
||||
<translation>Задай парола за потребител %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
|
||||
@@ -1905,12 +1905,12 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="71"/>
|
||||
<source>Cannot access selected timezone path.</source>
|
||||
<translation>Няма достъп до избраната траектория за часова зона.</translation>
|
||||
<translation>Няма достъп до избрания път за часова зона.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="72"/>
|
||||
<source>Bad path: %1</source>
|
||||
<translation>Лоша траектория: %1</translation>
|
||||
<translation>Лош път: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="86"/>
|
||||
@@ -2036,7 +2036,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
|
||||
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2015 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><h1>%1</h1><br/><strong>%2<br/>за %3</strong><br/><br/>Авторско право 2014-2015 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Благодарение на: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg и <a href="https://www.transifex.com/calamares/calamares/">преводачите на Calamares</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> е спонсориран от <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/welcome/WelcomePage.cpp" line="195"/>
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
<message>
|
||||
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="57"/>
|
||||
<source>Tools</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Herramientas</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="102"/>
|
||||
@@ -475,7 +475,7 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1078"/>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1116"/>
|
||||
<source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><strong>Reemplazar una partición</strong><br/>Reemplazar una partición con %1.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1064"/>
|
||||
@@ -807,7 +807,7 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="107"/>
|
||||
<source>This device has a <strong>%1</strong> partition table.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Este dispositivo tiene un <strong>% 1 </ strong> tabla de particiones.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="114"/>
|
||||
@@ -1583,7 +1583,7 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="180"/>
|
||||
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>%1 no se puede instalar en una partición extendida. Por favor, seleccione una partición primaria o lógica existente.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="191"/>
|
||||
@@ -1625,7 +1625,7 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="277"/>
|
||||
<source>The EFI system partition at %1 will be used for starting %2.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>La partición del sistema EFI en %1 se utilizará para iniciar %2.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="295"/>
|
||||
@@ -1805,7 +1805,7 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="47"/>
|
||||
<source>Set flags on partition %1.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Establecer indicadores en la partición %1.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/>
|
||||
@@ -1835,17 +1835,17 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="98"/>
|
||||
<source>Could not open device '%1'.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>No se pudo abrir el dispositivo '%1'.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/>
|
||||
<source>Could not open partition table on device '%1'.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>No se pudo abrir la tabla de particiones en el dispositivo '%1'.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="119"/>
|
||||
<source>Could not find partition '%1'.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>No se pudo encontrar la partición '%1'.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
||||
@@ -1254,7 +1254,7 @@ L'installateur se fermera et les changements seront perdus.</translation>
|
||||
<message>
|
||||
<location filename="../src/modules/users/page_usersetup.ui" line="36"/>
|
||||
<source>What is your name?</source>
|
||||
<translation>Quel est vote nom ?</translation>
|
||||
<translation>Quel est votre nom ?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/users/page_usersetup.ui" line="117"/>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -103,7 +103,7 @@
|
||||
<message>
|
||||
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="57"/>
|
||||
<source>Tools</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Ferramentas</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="102"/>
|
||||
@@ -556,12 +556,12 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="89"/>
|
||||
<source>Fi&le System:</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Sistema de Arquivos</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="181"/>
|
||||
<source>Flags:</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Bandeiras</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="118"/>
|
||||
@@ -885,7 +885,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="145"/>
|
||||
<source>Flags:</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Bandeiras:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
||||
@@ -420,12 +420,12 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="741"/>
|
||||
<source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source>
|
||||
<translation><strong>Выберите раздел для уменьшения, затем передвигайте ползунок для изменения размера</strong></translation>
|
||||
<translation><strong>Выберите раздел для уменьшения, затем двигайте ползунок, изменяя размер</strong></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="846"/>
|
||||
<source><strong>Select a partition to install on</strong></source>
|
||||
<translation><strong>Выберите, на какой раздел установить</strong></translation>
|
||||
<translation><strong>Выберите раздел для установки</strong></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="901"/>
|
||||
@@ -474,7 +474,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1078"/>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1116"/>
|
||||
<source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source>
|
||||
<translation><strong>Заменить раздел</strong><br/>Заменяет раздел на %1.</translation>
|
||||
<translation><strong>Заменить раздел</strong><br/>Меняет раздел на %1.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1064"/>
|
||||
@@ -1286,7 +1286,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/users/page_usersetup.ui" line="226"/>
|
||||
<source>What is the name of this computer?</source>
|
||||
<translation>Какое имя для этого компьютера?</translation>
|
||||
<translation>Какое имя у компьютера?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/users/page_usersetup.ui" line="309"/>
|
||||
@@ -1510,17 +1510,17 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="387"/>
|
||||
<source>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>esp</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.</source>
|
||||
<translation>Необходим системный раздел EFI, чтобы загрузить %1.<br/><br/>Для настройки системного раздела EFI вернитесь и выберите или создайте файловую систему FAT32 с установленным флагом <strong>esp</strong> и точкой монтирования <strong>%2</strong>.<br/><br/>Вы можете продолжить и без настройки системного раздела EFI, но Ваша система может не загрузиться.</translation>
|
||||
<translation>Чтобы начать, необходим системный раздел EFI %1.<br/><br/>Для настройки системного раздела EFI, вернитесь, выберите или создайте файловую систему FAT32 с установленным флагом <strong>esp</strong> и точкой монтирования <strong>%2</strong>.<br/><br/>Вы можете продолжить и без настройки системного раздела EFI, но Ваша система может не загрузиться.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="401"/>
|
||||
<source>EFI system partition flag not set</source>
|
||||
<translation>Не установлен флаг системного раздела EFI:</translation>
|
||||
<translation>Не установлен флаг системного раздела EFI</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="402"/>
|
||||
<source>An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</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.</source>
|
||||
<translation>Необходим системный раздел EFI, чтобы загрузить %1.<br/><br/>Был настроен раздел с точкой монтирования <strong>%2</strong>, но его флаг <strong>esp</strong> не установлен.<br/>Для установки флага вернитесь и отредактируйте раздел.<br/><br/>Вы можете продолжить и без установки флага, но Ваша система может не загрузиться.</translation>
|
||||
<translation>Чтобы начать, необходим системный раздел EFI %1.<br/><br/>Был настроен раздел с точкой монтирования <strong>%2</strong>, но его флаг <strong>esp</strong> не установлен.<br/>Для установки флага вернитесь и отредактируйте раздел.<br/><br/>Вы можете продолжить и без установки флага, но Ваша система может не загрузиться.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -1809,27 +1809,27 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/>
|
||||
<source>Clear flags on partition <strong>%1</strong>.</source>
|
||||
<translation>Очистить флаги на разделе <strong>%1</strong>.</translation>
|
||||
<translation>Очистить флаги раздела <strong>%1</strong>.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="59"/>
|
||||
<source>Flag partition <strong>%1</strong> as <strong>%2</strong>.</source>
|
||||
<translation>Пометить раздел <strong>%1</strong> флагом как <strong>%2</strong>.</translation>
|
||||
<translation>Отметить раздел <strong>%1</strong> флагом как <strong>%2</strong>.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/>
|
||||
<source>Clearing flags on partition <strong>%1</strong>.</source>
|
||||
<translation>Очистка флагов на разделе <strong>%1</strong>.</translation>
|
||||
<translation>Очистка флагов раздела <strong>%1</strong>.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="74"/>
|
||||
<source>Setting flags <strong>%2</strong> on partition <strong>%1</strong>.</source>
|
||||
<translation>Установка флагов <strong>%2</strong> на разделе <strong>%1</strong>.</translation>
|
||||
<translation>Установка флагов <strong>%2</strong> на раздел <strong>%1</strong>.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="90"/>
|
||||
<source>The installer failed to set flags on partition %1.</source>
|
||||
<translation>Программе установки не удалось установить флаги на разделе %1.</translation>
|
||||
<translation>Установщик не смог установить флаги на раздел %1.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="98"/>
|
||||
@@ -1839,7 +1839,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/>
|
||||
<source>Could not open partition table on device '%1'.</source>
|
||||
<translation>Не удалось открыть таблицу разделов на устройстве '%1'.</translation>
|
||||
<translation>Не удалось открыть таблицу разделов устройства '%1'.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="119"/>
|
||||
@@ -2034,7 +2034,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
|
||||
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2015 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Правообладатель 2014-2015 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Благодарим: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg и <a href="https://www.transifex.com/calamares/calamares/">команду переводчиков Calamares</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> разработка спонсируется<br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/welcome/WelcomePage.cpp" line="195"/>
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
<message>
|
||||
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="57"/>
|
||||
<source>Tools</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Araçlar</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="102"/>
|
||||
@@ -477,7 +477,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1078"/>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1116"/>
|
||||
<source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source>
|
||||
<translation><strong>Disk bölümü üzerine yaz</strong><br/>Disk bölümü üzerinde %1 ile yaz.</translation>
|
||||
<translation><strong>Varolan bir disk bölümüne kur</strong><br/>Varolan bir disk bölümü üzerine %1 kur.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1064"/>
|
||||
@@ -918,7 +918,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="142"/>
|
||||
<source>Install boot loader on <strong>%1</strong>.</source>
|
||||
<translation><strong>%1</strong> üzerine sistem yükleyici kur.</translation>
|
||||
<translation><strong>%1</strong> üzerine sistem ön yükleyiciyi kur.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="152"/>
|
||||
@@ -1163,7 +1163,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
|
||||
<message>
|
||||
<location filename="../src/modules/locale/LocalePage.cpp" line="271"/>
|
||||
<source>Set timezone to %1/%2.<br/></source>
|
||||
<translation>Bölge ve zaman dilimi olarak %1/%2 ayarlandı.<br/></translation>
|
||||
<translation>Bölge ve zaman dilimi %1/%2 olarak ayarlandı.<br/></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -2038,7 +2038,7 @@ Sistem güç kaynağına bağlı değil.</translation>
|
||||
<message>
|
||||
<location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
|
||||
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2015 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Telif Hakkı 2014-2015 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Teşekkürler: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg ve <a href="https://www.transifex.com/calamares/calamares/">Calamares çeviri takımı</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> gelişim sponsoru <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Özgür Yazılım.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/welcome/WelcomePage.cpp" line="195"/>
|
||||
|
||||
@@ -1513,7 +1513,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="387"/>
|
||||
<source>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>esp</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.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>必须有 EFI 系统分区才能启动 %1 。<br/><br/>要配置 EFI 系统分区，后退一步，然后创建或选中一个 FAT32 分区并为之设置 <strong>esp</strong> 标记及挂载点 <strong>%2</strong>。<br/><br/>你可以不创建 EFI 系统分区并继续安装，但是你的系统可能无法启动。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="401"/>
|
||||
@@ -1523,7 +1523,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="402"/>
|
||||
<source>An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</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.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>必须有 EFI 系统分区才能启动 %1 。<br/><br/>已有挂载点为 <strong>%2</strong> 的分区，但是未设置 <strong>esp</strong> 标记。<br/>要设置此标记，后退并编辑分区。<br/><br/>你可以不创建 EFI 系统分区并继续安装，但是你的系统可能无法启动。</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -2037,7 +2037,7 @@ The installer will quit and all changes will be lost.</source>
|
||||
<message>
|
||||
<location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
|
||||
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2015 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2015 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>感谢：Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg 及 <a href="https://www.transifex.com/calamares/calamares/">Calamares 翻译团队</a>。<br/><br/><a href="http://calamares.io/">Calamares</a> 的开发由 <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software 赞助。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/modules/welcome/WelcomePage.cpp" line="195"/>
|
||||
|
||||
@@ -86,7 +86,11 @@ CalamaresApplication::init()
|
||||
setWindowIcon( QIcon( Calamares::Branding::instance()->
|
||||
imagePath( Calamares::Branding::ProductIcon ) ) );
|
||||
|
||||
cDebug() << "STARTUP: initQmlPath, initSettings, initBranding done";
|
||||
|
||||
initModuleManager(); //also shows main window
|
||||
|
||||
cDebug() << "STARTUP: initModuleManager: module init started";
|
||||
}
|
||||
|
||||
|
||||
@@ -328,7 +332,9 @@ CalamaresApplication::initModuleManager()
|
||||
void
|
||||
CalamaresApplication::initView()
|
||||
{
|
||||
cDebug() << "STARTUP: initModuleManager: all modules init done";
|
||||
initJobQueue();
|
||||
cDebug() << "STARTUP: initJobQueue done";
|
||||
|
||||
m_mainwindow = new CalamaresWindow(); //also creates ViewManager
|
||||
|
||||
@@ -340,15 +346,19 @@ CalamaresApplication::initView()
|
||||
m_mainwindow->move(
|
||||
this->desktop()->availableGeometry().center() -
|
||||
m_mainwindow->rect().center() );
|
||||
|
||||
cDebug() << "STARTUP: CalamaresWindow created; loadModules started";
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
CalamaresApplication::initViewSteps()
|
||||
{
|
||||
cDebug() << "STARTUP: loadModules for all modules done";
|
||||
m_mainwindow->show();
|
||||
ProgressTreeModel* m = new ProgressTreeModel( this );
|
||||
ProgressTreeView::instance()->setModel( m );
|
||||
cDebug() << "STARTUP: Window now visible and ProgressTreeView populated";
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@ calamares_add_plugin( keyboard
|
||||
SOURCES
|
||||
KeyboardViewStep.cpp
|
||||
KeyboardPage.cpp
|
||||
KeyboardLayoutModel.cpp
|
||||
SetKeyboardLayoutJob.cpp
|
||||
keyboardwidget/keyboardglobal.cpp
|
||||
keyboardwidget/keyboardpreview.cpp
|
||||
|
||||
72
src/modules/keyboard/KeyboardLayoutModel.cpp
Normal file
72
src/modules/keyboard/KeyboardLayoutModel.cpp
Normal file
@@ -0,0 +1,72 @@
|
||||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 2016, Teo Mrnjavac <teo@kde.org>
|
||||
*
|
||||
* Calamares is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Calamares is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "KeyboardLayoutModel.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
|
||||
KeyboardLayoutModel::KeyboardLayoutModel( QObject* parent )
|
||||
: QAbstractListModel( parent )
|
||||
{
|
||||
init();
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
KeyboardLayoutModel::rowCount( const QModelIndex& parent ) const
|
||||
{
|
||||
Q_UNUSED( parent );
|
||||
return m_layouts.count();
|
||||
}
|
||||
|
||||
|
||||
QVariant
|
||||
KeyboardLayoutModel::data( const QModelIndex& index, int role ) const
|
||||
{
|
||||
if ( !index.isValid() )
|
||||
return QVariant();
|
||||
|
||||
switch ( role )
|
||||
{
|
||||
case Qt::DisplayRole:
|
||||
return m_layouts.at( index.row() ).second.description;
|
||||
case KeyboardVariantsRole:
|
||||
return QVariant::fromValue( m_layouts.at( index.row() ).second.variants );
|
||||
case KeyboardLayoutKeyRole:
|
||||
return m_layouts.at( index.row() ).first;
|
||||
}
|
||||
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
KeyboardLayoutModel::init()
|
||||
{
|
||||
auto layouts = KeyboardGlobal::getKeyboardLayouts();
|
||||
for ( auto it = layouts.constBegin(); it != layouts.constEnd(); ++it )
|
||||
{
|
||||
m_layouts.append( qMakePair( it.key(), it.value() ) );
|
||||
}
|
||||
|
||||
std::stable_sort( m_layouts.begin(), m_layouts.end(), []( auto a, auto b )
|
||||
{
|
||||
return a.second.description < b.second.description;
|
||||
} );
|
||||
}
|
||||
51
src/modules/keyboard/KeyboardLayoutModel.h
Normal file
51
src/modules/keyboard/KeyboardLayoutModel.h
Normal file
@@ -0,0 +1,51 @@
|
||||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 2016, Teo Mrnjavac <teo@kde.org>
|
||||
*
|
||||
* Calamares is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Calamares is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef KEYBOARDLAYOUTMODEL_H
|
||||
#define KEYBOARDLAYOUTMODEL_H
|
||||
|
||||
#include "keyboardwidget/keyboardglobal.h"
|
||||
|
||||
#include <QAbstractListModel>
|
||||
#include <QMap>
|
||||
#include <QMetaType>
|
||||
|
||||
class KeyboardLayoutModel : public QAbstractListModel
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
enum Roles : int
|
||||
{
|
||||
KeyboardVariantsRole = Qt::UserRole,
|
||||
KeyboardLayoutKeyRole
|
||||
};
|
||||
|
||||
KeyboardLayoutModel( QObject* parent = nullptr );
|
||||
|
||||
int rowCount( const QModelIndex& parent = QModelIndex() ) const override;
|
||||
|
||||
QVariant data( const QModelIndex& index, int role ) const override;
|
||||
|
||||
private:
|
||||
void init();
|
||||
|
||||
QList< QPair< QString, KeyboardGlobal::KeyboardInfo > > m_layouts;
|
||||
};
|
||||
|
||||
#endif // KEYBOARDLAYOUTMODEL_H
|
||||
@@ -1,6 +1,6 @@
|
||||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
|
||||
* Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
|
||||
*
|
||||
* Portions from the Manjaro Installation Framework
|
||||
* by Roland Singer <roland@manjaro.org>
|
||||
@@ -25,6 +25,7 @@
|
||||
#include "ui_KeyboardPage.h"
|
||||
#include "keyboardwidget/keyboardpreview.h"
|
||||
#include "SetKeyboardLayoutJob.h"
|
||||
#include "KeyboardLayoutModel.h"
|
||||
|
||||
#include "GlobalStorage.h"
|
||||
#include "JobQueue.h"
|
||||
@@ -47,9 +48,9 @@ KeyboardPage::KeyboardPage( QWidget* parent )
|
||||
// Keyboard Preview
|
||||
ui->KBPreviewLayout->addWidget( m_keyboardPreview );
|
||||
|
||||
m_setxkbmapTimer.setSingleShot( true );
|
||||
|
||||
// Connect signals and slots
|
||||
connect( ui->listLayout, &QListWidget::currentItemChanged,
|
||||
this, &KeyboardPage::onListLayoutCurrentItemChanged );
|
||||
connect( ui->listVariant, &QListWidget::currentItemChanged,
|
||||
this, &KeyboardPage::onListVariantCurrentItemChanged );
|
||||
|
||||
@@ -150,37 +151,28 @@ KeyboardPage::init()
|
||||
|
||||
//### Layouts and Variants
|
||||
|
||||
KeyboardLayoutModel* klm = new KeyboardLayoutModel( this );
|
||||
ui->listLayout->setModel( klm );
|
||||
connect( ui->listLayout->selectionModel(), &QItemSelectionModel::currentChanged,
|
||||
this, &KeyboardPage::onListLayoutCurrentItemChanged );
|
||||
|
||||
// Block signals
|
||||
ui->listLayout->blockSignals( true );
|
||||
|
||||
QMap< QString, KeyboardGlobal::KeyboardInfo > layouts =
|
||||
KeyboardGlobal::getKeyboardLayouts();
|
||||
QMapIterator< QString, KeyboardGlobal::KeyboardInfo > li( layouts );
|
||||
LayoutItem* currentLayoutItem = nullptr;
|
||||
QPersistentModelIndex currentLayoutItem;
|
||||
|
||||
while ( li.hasNext() )
|
||||
for ( int i = 0; i < klm->rowCount(); ++i )
|
||||
{
|
||||
li.next();
|
||||
|
||||
LayoutItem* item = new LayoutItem();
|
||||
KeyboardGlobal::KeyboardInfo info = li.value();
|
||||
|
||||
item->setText( info.description );
|
||||
item->data = li.key();
|
||||
item->info = info;
|
||||
ui->listLayout->addItem( item );
|
||||
|
||||
// Find current layout index
|
||||
if ( li.key() == currentLayout )
|
||||
currentLayoutItem = item;
|
||||
QModelIndex idx = klm->index( i );
|
||||
if ( idx.isValid() &&
|
||||
idx.data( KeyboardLayoutModel::KeyboardLayoutKeyRole ).toString() == currentLayout )
|
||||
currentLayoutItem = idx;
|
||||
}
|
||||
|
||||
ui->listLayout->sortItems();
|
||||
|
||||
// Set current layout and variant
|
||||
if ( currentLayoutItem )
|
||||
if ( currentLayoutItem.isValid() )
|
||||
{
|
||||
ui->listLayout->setCurrentItem( currentLayoutItem );
|
||||
ui->listLayout->setCurrentIndex( currentLayoutItem );
|
||||
updateVariants( currentLayoutItem, currentVariant );
|
||||
}
|
||||
|
||||
@@ -189,8 +181,8 @@ KeyboardPage::init()
|
||||
|
||||
// Default to the first available layout if none was set
|
||||
// Do this after unblocking signals so we get the default variant handling.
|
||||
if ( !currentLayoutItem && ui->listLayout->count() > 0 )
|
||||
ui->listLayout->setCurrentRow( 0 );
|
||||
if ( !currentLayoutItem.isValid() && klm->rowCount() > 0 )
|
||||
ui->listLayout->setCurrentIndex( klm->index( 0 ) );
|
||||
}
|
||||
|
||||
|
||||
@@ -201,7 +193,7 @@ KeyboardPage::prettyStatus() const
|
||||
status += tr( "Set keyboard model to %1.<br/>" )
|
||||
.arg( ui->comboBoxModel->currentText() );
|
||||
status += tr( "Set keyboard layout to %1/%2." )
|
||||
.arg( ui->listLayout->currentItem()->text() )
|
||||
.arg( ui->listLayout->currentIndex().data().toString() )
|
||||
.arg( ui->listVariant->currentItem()->text() );
|
||||
|
||||
return status;
|
||||
@@ -249,12 +241,15 @@ KeyboardPage::finalize()
|
||||
|
||||
|
||||
void
|
||||
KeyboardPage::updateVariants( LayoutItem* currentItem, QString currentVariant )
|
||||
KeyboardPage::updateVariants( const QPersistentModelIndex& currentItem,
|
||||
QString currentVariant )
|
||||
{
|
||||
// Block signals
|
||||
ui->listVariant->blockSignals( true );
|
||||
|
||||
QMap< QString, QString > variants = currentItem->info.variants;
|
||||
QMap< QString, QString > variants =
|
||||
currentItem.data( KeyboardLayoutModel::KeyboardVariantsRole )
|
||||
.value< QMap< QString, QString > >();
|
||||
QMapIterator< QString, QString > li( variants );
|
||||
LayoutItem* defaultItem = nullptr;
|
||||
|
||||
@@ -285,26 +280,27 @@ KeyboardPage::updateVariants( LayoutItem* currentItem, QString currentVariant )
|
||||
|
||||
|
||||
void
|
||||
KeyboardPage::onListLayoutCurrentItemChanged( QListWidgetItem* current, QListWidgetItem* previous )
|
||||
KeyboardPage::onListLayoutCurrentItemChanged( const QModelIndex& current,
|
||||
const QModelIndex& previous )
|
||||
{
|
||||
LayoutItem* item = dynamic_cast< LayoutItem* >( current );
|
||||
if ( !item )
|
||||
return;
|
||||
Q_UNUSED( previous );
|
||||
if ( !current.isValid() )
|
||||
return;
|
||||
|
||||
updateVariants( item );
|
||||
updateVariants( QPersistentModelIndex( current ) );
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWidgetItem* previous )
|
||||
{
|
||||
LayoutItem* layoutItem = dynamic_cast< LayoutItem* >( ui->listLayout->currentItem() );
|
||||
QPersistentModelIndex layoutIndex = ui->listLayout->currentIndex();
|
||||
LayoutItem* variantItem = dynamic_cast< LayoutItem* >( current );
|
||||
|
||||
if ( !layoutItem || !variantItem )
|
||||
if ( !layoutIndex.isValid() || !variantItem )
|
||||
return;
|
||||
|
||||
QString layout = layoutItem->data;
|
||||
QString layout = layoutIndex.data( KeyboardLayoutModel::KeyboardLayoutKeyRole ).toString();
|
||||
QString variant = variantItem->data;
|
||||
|
||||
m_keyboardPreview->setLayout( layout );
|
||||
@@ -313,11 +309,22 @@ KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWi
|
||||
//emit checkReady();
|
||||
|
||||
// Set Xorg keyboard layout
|
||||
QProcess::execute( QString( "setxkbmap -layout \"%1\" -variant \"%2\"" )
|
||||
.arg( layout, variant ).toUtf8() );
|
||||
if ( m_setxkbmapTimer.isActive() )
|
||||
{
|
||||
m_setxkbmapTimer.stop();
|
||||
m_setxkbmapTimer.disconnect( this );
|
||||
}
|
||||
|
||||
connect( &m_setxkbmapTimer, &QTimer::timeout,
|
||||
this, [=]
|
||||
{
|
||||
QProcess::execute( QString( "setxkbmap -layout \"%1\" -variant \"%2\"" )
|
||||
.arg( layout, variant ).toUtf8() );
|
||||
cDebug() << "xkbmap selection changed to: " << layout << "-" << variant;
|
||||
} );
|
||||
m_setxkbmapTimer.start( QApplication::keyboardInputInterval() );
|
||||
|
||||
m_selectedLayout = layout;
|
||||
m_selectedVariant = variant;
|
||||
cDebug() << "xkbmap selection changed to: " << layout << "-" << variant;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
|
||||
* Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
|
||||
*
|
||||
* Portions from the Manjaro Installation Framework
|
||||
* by Roland Singer <roland@manjaro.org>
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
#include <QListWidgetItem>
|
||||
#include <QWidget>
|
||||
#include <QTimer>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
@@ -55,8 +56,8 @@ public:
|
||||
void finalize();
|
||||
|
||||
protected slots:
|
||||
void onListLayoutCurrentItemChanged( QListWidgetItem* current,
|
||||
QListWidgetItem* previous );
|
||||
void onListLayoutCurrentItemChanged( const QModelIndex& current,
|
||||
const QModelIndex& previous );
|
||||
void onListVariantCurrentItemChanged( QListWidgetItem* current,
|
||||
QListWidgetItem* previous );
|
||||
|
||||
@@ -68,7 +69,8 @@ private:
|
||||
KeyboardGlobal::KeyboardInfo info;
|
||||
};
|
||||
|
||||
void updateVariants( LayoutItem* currentItem, QString currentVariant = QString() );
|
||||
void updateVariants( const QPersistentModelIndex& currentItem,
|
||||
QString currentVariant = QString() );
|
||||
|
||||
Ui::Page_Keyboard* ui;
|
||||
KeyBoardPreview* m_keyboardPreview;
|
||||
@@ -77,6 +79,7 @@ private:
|
||||
|
||||
QString m_selectedLayout;
|
||||
QString m_selectedVariant;
|
||||
QTimer m_setxkbmapTimer;
|
||||
};
|
||||
|
||||
#endif // KEYBOARDPAGE_H
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<iconset resource="keyboard.qrc">
|
||||
<normaloff>:/images/restore.png</normaloff>:/images/restore.png</iconset>
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
@@ -106,7 +106,7 @@
|
||||
<number>9</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QListWidget" name="listLayout"/>
|
||||
<widget class="QListView" name="listLayout"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QListWidget" name="listVariant"/>
|
||||
@@ -141,6 +141,8 @@
|
||||
<tabstop>LE_TestKeyboard</tabstop>
|
||||
<tabstop>buttonRestore</tabstop>
|
||||
</tabstops>
|
||||
<resources/>
|
||||
<resources>
|
||||
<include location="keyboard.qrc"/>
|
||||
</resources>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
|
||||
* Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
|
||||
*
|
||||
* Calamares is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@@ -225,41 +225,60 @@ LocalePage::init( const QString& initialRegion,
|
||||
}
|
||||
emit m_tzWidget->locationChanged( m_tzWidget->getCurrentLocation() );
|
||||
|
||||
// Fill in meaningful locale/charset lines from locale.gen
|
||||
// Some distros come with a meaningfully commented and easy to parse locale.gen,
|
||||
// and others ship a separate file /usr/share/i18n/SUPPORTED with a clean list of
|
||||
// supported locales. We first try that one, and if it doesn't exist, we fall back
|
||||
// to parsing the lines from locale.gen
|
||||
m_localeGenLines.clear();
|
||||
QFile localeGen( localeGenPath );
|
||||
QFile supported( "/usr/share/i18n/SUPPORTED" );
|
||||
QByteArray ba;
|
||||
if ( localeGen.open( QIODevice::ReadOnly | QIODevice::Text ) )
|
||||
|
||||
if ( supported.exists() &&
|
||||
supported.open( QIODevice::ReadOnly | QIODevice::Text ) )
|
||||
{
|
||||
ba = localeGen.readAll();
|
||||
localeGen.close();
|
||||
ba = supported.readAll();
|
||||
supported.close();
|
||||
|
||||
foreach ( QByteArray line, ba.split( '\n' ) )
|
||||
{
|
||||
m_localeGenLines.append( QString::fromLatin1( line.simplified() ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
cDebug() << "Cannot open file" << localeGenPath
|
||||
<< ". Assuming the supported languages are already built into "
|
||||
"the locale archive.";
|
||||
QProcess localeA;
|
||||
localeA.start( "locale", QStringList() << "-a" );
|
||||
localeA.waitForFinished();
|
||||
ba = localeA.readAllStandardOutput();
|
||||
}
|
||||
foreach ( QByteArray line, ba.split( '\n' ) )
|
||||
{
|
||||
if ( line.startsWith( "## " ) ||
|
||||
line.startsWith( "# " ) ||
|
||||
line.simplified() == "#" )
|
||||
continue;
|
||||
QFile localeGen( localeGenPath );
|
||||
if ( localeGen.open( QIODevice::ReadOnly | QIODevice::Text ) )
|
||||
{
|
||||
ba = localeGen.readAll();
|
||||
localeGen.close();
|
||||
}
|
||||
else
|
||||
{
|
||||
cDebug() << "Cannot open file" << localeGenPath
|
||||
<< ". Assuming the supported languages are already built into "
|
||||
"the locale archive.";
|
||||
QProcess localeA;
|
||||
localeA.start( "locale", QStringList() << "-a" );
|
||||
localeA.waitForFinished();
|
||||
ba = localeA.readAllStandardOutput();
|
||||
}
|
||||
foreach ( QByteArray line, ba.split( '\n' ) )
|
||||
{
|
||||
if ( line.startsWith( "## " ) ||
|
||||
line.startsWith( "# " ) ||
|
||||
line.simplified() == "#" )
|
||||
continue;
|
||||
|
||||
QString lineString = QString::fromLatin1( line.simplified() );
|
||||
if ( lineString.startsWith( "#" ) )
|
||||
lineString.remove( '#' );
|
||||
lineString = lineString.simplified();
|
||||
QString lineString = QString::fromLatin1( line.simplified() );
|
||||
if ( lineString.startsWith( "#" ) )
|
||||
lineString.remove( '#' );
|
||||
lineString = lineString.simplified();
|
||||
|
||||
if ( lineString.isEmpty() )
|
||||
continue;
|
||||
if ( lineString.isEmpty() )
|
||||
continue;
|
||||
|
||||
m_localeGenLines.append( lineString );
|
||||
m_localeGenLines.append( lineString );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ import libcalamares
|
||||
|
||||
def run():
|
||||
""" Create locale """
|
||||
us = '#en_US'
|
||||
en_us_locale = '#en_US'
|
||||
locale = libcalamares.globalstorage.value("lcLocale")
|
||||
|
||||
if not locale:
|
||||
@@ -50,23 +50,30 @@ def run():
|
||||
# always enable en_US
|
||||
with open("{!s}/etc/locale.gen".format(install_path), "w") as gen:
|
||||
for line in text:
|
||||
if us in line and line[0] == "#":
|
||||
if en_us_locale in line and line[0] == "#":
|
||||
# uncomment line
|
||||
line = line[1:]
|
||||
line = line[1:].lstrip()
|
||||
|
||||
if locale in line and line[0] == "#":
|
||||
# uncomment line
|
||||
line = line[1:]
|
||||
line = line[1:].lstrip()
|
||||
|
||||
gen.write(line)
|
||||
|
||||
libcalamares.utils.target_env_call(['locale-gen'])
|
||||
print('locale.gen done')
|
||||
|
||||
# write /etc/locale.conf
|
||||
locale_conf_path = os.path.join(install_path, "etc/locale.conf")
|
||||
|
||||
with open(locale_conf_path, "w") as locale_conf:
|
||||
locale_split = locale.split(' ')[0]
|
||||
locale_conf.write("LANG={!s}\n".format(locale_split))
|
||||
|
||||
# write /etc/default/locale if /etc/default exists and is a dir
|
||||
etc_default_path = os.path.join(install_path, "etc/default")
|
||||
if os.path.isdir(etc_default_path):
|
||||
with open(os.path.join(etc_default_path, "locale"), "w") as etc_default_locale:
|
||||
locale_split = locale.split(' ')[0]
|
||||
etc_default_locale.write("LANG={!s}\n".format(locale_split))
|
||||
|
||||
return None
|
||||
|
||||
@@ -15,6 +15,7 @@ find_package( KPMcore 2.1 REQUIRED )
|
||||
add_subdirectory( tests )
|
||||
|
||||
include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
|
||||
include_directories( ${KPMCORE_INCLUDE_DIR} )
|
||||
|
||||
calamares_add_plugin( partition
|
||||
TYPE viewmodule
|
||||
|
||||
@@ -112,11 +112,12 @@ void
|
||||
PartitionCoreModule::init()
|
||||
{
|
||||
CoreBackend* backend = CoreBackendManager::self()->backend();
|
||||
auto devices = backend->scanDevices( true );
|
||||
QList< Device* > devices = backend->scanDevices( true );
|
||||
|
||||
// Remove the device which contains / from the list
|
||||
for ( auto it = devices.begin(); it != devices.end(); )
|
||||
if ( hasRootPartition( *it ) )
|
||||
for ( QList< Device* >::iterator it = devices.begin(); it != devices.end(); )
|
||||
if ( hasRootPartition( *it ) ||
|
||||
(*it)->deviceNode().startsWith( "/dev/zram") )
|
||||
it = devices.erase( it );
|
||||
else
|
||||
++it;
|
||||
|
||||
@@ -54,6 +54,7 @@
|
||||
PartitionPage::PartitionPage( PartitionCoreModule* core, QWidget* parent )
|
||||
: QWidget( parent )
|
||||
, m_ui( new Ui_PartitionPage )
|
||||
, m_lastSelectedBootLoaderIndex(-1)
|
||||
, m_core( core )
|
||||
{
|
||||
m_ui->setupUi( this );
|
||||
@@ -74,6 +75,11 @@ PartitionPage::PartitionPage( PartitionCoreModule* core, QWidget* parent )
|
||||
{
|
||||
updateFromCurrentDevice();
|
||||
} );
|
||||
connect( m_ui->bootLoaderComboBox, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::activated),
|
||||
[ this ]( const QString& /* text */ )
|
||||
{
|
||||
m_lastSelectedBootLoaderIndex = m_ui->bootLoaderComboBox->currentIndex();
|
||||
} );
|
||||
|
||||
connect( m_ui->bootLoaderComboBox, &QComboBox::currentTextChanged,
|
||||
[ this ]( const QString& /* text */ )
|
||||
@@ -94,7 +100,7 @@ PartitionPage::PartitionPage( PartitionCoreModule* core, QWidget* parent )
|
||||
m_ui->bootLoaderComboBox->hide();
|
||||
m_ui->label_3->hide();
|
||||
}
|
||||
|
||||
|
||||
CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); )
|
||||
}
|
||||
|
||||
@@ -152,6 +158,9 @@ PartitionPage::onNewPartitionTableClicked()
|
||||
m_core->createPartitionTable( device, type );
|
||||
}
|
||||
delete dlg;
|
||||
// PartionModelReset isn't emmited after createPartitionTable, so we have to manually update
|
||||
// the bootLoader index after the reset.
|
||||
updateBootLoaderIndex();
|
||||
}
|
||||
|
||||
void
|
||||
@@ -188,6 +197,7 @@ PartitionPage::onEditClicked()
|
||||
updatePartitionToCreate( model->device(), partition );
|
||||
else
|
||||
editExistingPartition( model->device(), partition );
|
||||
|
||||
}
|
||||
|
||||
void
|
||||
@@ -217,7 +227,12 @@ PartitionPage::onRevertClicked()
|
||||
m_ui->deviceComboBox->setCurrentIndex( oldIndex );
|
||||
updateFromCurrentDevice();
|
||||
} ),
|
||||
[]{},
|
||||
[ this ]{
|
||||
m_lastSelectedBootLoaderIndex = -1;
|
||||
if( m_ui->bootLoaderComboBox->currentIndex() < 0 ) {
|
||||
m_ui->bootLoaderComboBox->setCurrentIndex( 0 );
|
||||
}
|
||||
},
|
||||
this );
|
||||
}
|
||||
|
||||
@@ -336,4 +351,14 @@ PartitionPage::onPartitionModelReset()
|
||||
{
|
||||
m_ui->partitionTreeView->expandAll();
|
||||
updateButtons();
|
||||
updateBootLoaderIndex();
|
||||
}
|
||||
|
||||
void
|
||||
PartitionPage::updateBootLoaderIndex()
|
||||
{
|
||||
// set bootloader back to user selected index
|
||||
if ( m_lastSelectedBootLoaderIndex >= 0 && m_ui->bootLoaderComboBox->count() ) {
|
||||
m_ui->bootLoaderComboBox->setCurrentIndex( m_lastSelectedBootLoaderIndex );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,8 +60,10 @@ private:
|
||||
void editExistingPartition( Device*, Partition* );
|
||||
void updateBootLoaderInstallPath();
|
||||
void updateFromCurrentDevice();
|
||||
void updateBootLoaderIndex();
|
||||
|
||||
QMutex m_revertMutex;
|
||||
int m_lastSelectedBootLoaderIndex;
|
||||
};
|
||||
|
||||
#endif // PARTITIONPAGE_H
|
||||
|
||||
@@ -52,13 +52,15 @@
|
||||
#include <QProcess>
|
||||
#include <QStackedWidget>
|
||||
#include <QTimer>
|
||||
#include <QtConcurrent/QtConcurrent>
|
||||
#include <QFutureWatcher>
|
||||
|
||||
PartitionViewStep::PartitionViewStep( QObject* parent )
|
||||
: Calamares::ViewStep( parent )
|
||||
, m_widget( new QStackedWidget() )
|
||||
, m_core( new PartitionCoreModule( this ) )
|
||||
, m_core( nullptr )
|
||||
, m_choicePage( nullptr )
|
||||
, m_manualPartitionPage( new PartitionPage( m_core ) )
|
||||
, m_manualPartitionPage( nullptr )
|
||||
{
|
||||
m_widget->setContentsMargins( 0, 0, 0, 0 );
|
||||
|
||||
@@ -70,10 +72,21 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
PartitionViewStep::initPartitionCoreModule()
|
||||
{
|
||||
Q_ASSERT( !m_core );
|
||||
m_core = new PartitionCoreModule( this );
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
PartitionViewStep::continueLoading()
|
||||
{
|
||||
Q_ASSERT( !m_choicePage );
|
||||
Q_ASSERT( !m_manualPartitionPage );
|
||||
|
||||
m_manualPartitionPage = new PartitionPage( m_core );
|
||||
m_choicePage = new ChoicePage();
|
||||
|
||||
m_choicePage->init( m_core );
|
||||
@@ -463,7 +476,20 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
|
||||
gs->insert( "drawNestedPartitions", false );
|
||||
}
|
||||
|
||||
QTimer::singleShot( 0, this, &PartitionViewStep::continueLoading );
|
||||
// Now that we have the config, we load the PartitionCoreModule in the background
|
||||
// because it could take a while. Then when it's done, we can set up the widgets
|
||||
// and remove the spinner.
|
||||
QFutureWatcher< void >* watcher = new QFutureWatcher< void >();
|
||||
connect( watcher, &QFutureWatcher< void >::finished,
|
||||
this, [ this, watcher ]
|
||||
{
|
||||
continueLoading();
|
||||
watcher->deleteLater();
|
||||
} );
|
||||
|
||||
QFuture< void > future =
|
||||
QtConcurrent::run( this, &PartitionViewStep::initPartitionCoreModule );
|
||||
watcher->setFuture( future );
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -44,8 +44,6 @@ public:
|
||||
explicit PartitionViewStep( QObject* parent = 0 );
|
||||
virtual ~PartitionViewStep();
|
||||
|
||||
void continueLoading();
|
||||
|
||||
QString prettyName() const override;
|
||||
QWidget* createSummaryWidget() const override;
|
||||
|
||||
@@ -68,6 +66,9 @@ public:
|
||||
QList< Calamares::job_ptr > jobs() const override;
|
||||
|
||||
private:
|
||||
void initPartitionCoreModule();
|
||||
void continueLoading();
|
||||
|
||||
PartitionCoreModule* m_core;
|
||||
QStackedWidget* m_widget;
|
||||
ChoicePage* m_choicePage;
|
||||
|
||||
@@ -169,9 +169,11 @@ class UnpackOperation:
|
||||
|
||||
if entry.sourcefs == "squashfs":
|
||||
if shutil.which("unsquashfs") is None:
|
||||
msg = ("Failed to find unsquashfs, make sure you have "
|
||||
"the squashfs-tools package installed")
|
||||
print(msg)
|
||||
return ("Failed to unpack image",
|
||||
"Failed to find unsquashfs, make sure you have "
|
||||
"the squashfs-tools package installed")
|
||||
msg)
|
||||
|
||||
fslist = subprocess.check_output(["unsquashfs", "-l", entry.source])
|
||||
|
||||
|
||||
@@ -5,8 +5,9 @@ list( APPEND CALA_WEBVIEW_LINK_LIBRARIES
|
||||
calamaresui
|
||||
)
|
||||
|
||||
option( WEBVIEW_FORCE_WEBKIT "Always build webview with WebKit instead of WebEngine regardless of Qt version." OFF)
|
||||
|
||||
if ( Qt5Core_VERSION VERSION_LESS 5.6 )
|
||||
if ( Qt5Core_VERSION VERSION_LESS 5.6 OR WEBVIEW_FORCE_WEBKIT )
|
||||
find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED WebKit WebKitWidgets )
|
||||
|
||||
list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES
|
||||
|
||||
@@ -186,7 +186,8 @@ void
|
||||
RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
|
||||
{
|
||||
if ( configurationMap.contains( "requiredStorage" ) &&
|
||||
configurationMap.value( "requiredStorage" ).type() == QVariant::Double )
|
||||
( configurationMap.value( "requiredStorage" ).type() == QVariant::Double ||
|
||||
configurationMap.value( "requiredStorage" ).type() == QVariant::Int ) )
|
||||
{
|
||||
bool ok = false;
|
||||
m_requiredStorageGB = configurationMap.value( "requiredStorage" ).toDouble( &ok );
|
||||
@@ -201,7 +202,8 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
|
||||
}
|
||||
|
||||
if ( configurationMap.contains( "requiredRam" ) &&
|
||||
configurationMap.value( "requiredRam" ).type() == QVariant::Double )
|
||||
( configurationMap.value( "requiredRam" ).type() == QVariant::Double ||
|
||||
configurationMap.value( "requiredRam" ).type() == QVariant::Int ) )
|
||||
{
|
||||
bool ok = false;
|
||||
m_requiredRamGB = configurationMap.value( "requiredRam" ).toDouble( &ok );
|
||||
|
||||
Reference in New Issue
Block a user