Bumpitybump.

Write crypto_keyfile into mkinicpio configuration.
luksbootkeyfile module, mandatory if installing with encrypted GRUB2.
2016-05-06 19:01:27 +02:00 · 2016-05-06 18:59:51 +02:00 · 2016-05-06 18:59:51 +02:00 · 2016-05-06 18:59:51 +02:00 · 2016-05-06 18:59:51 +02:00 · 2016-05-06 18:59:51 +02:00
30 changed files with 1022 additions and 428 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 90 )
 set( CALAMARES_VERSION_RC 0 )

 set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} )
--- a/lang/calamares_bg.ts
+++ b/lang/calamares_bg.ts
@@ -14,7 +14,7 @@
    <message>
        <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
        <source>With this operation, the partition &lt;strong&gt;%1&lt;/strong&gt; which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
-        <translation>С това действие, делът &lt;strong&gt;%1&lt;/strong&gt;, който съдържа %4, ще бъде смален до %2МБ и нов %3МБ дял ще бъде създаден за %5.</translation>
+        <translation>С това действие, дялът &lt;strong&gt;%1&lt;/strong&gt;, който съдържа %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 &lt;strong&gt;boot environment&lt;/strong&gt; of this system.&lt;br&gt;&lt;br&gt;Older x86 systems only support &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Modern systems usually use &lt;strong&gt;EFI&lt;/strong&gt;, but may also show up as BIOS if started in compatibility mode.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;strong&gt;Среда за начално зареждане&lt;/strong&gt; на тази система.&lt;br&gt;&lt;br&gt;Старите x86 системи поддържат само &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Модерните системи обикновено използват &lt;strong&gt;EFI&lt;/strong&gt;, но може също така да използват BIOS, ако са стартирани в режим на съвместимост.</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="75"/>
        <source>This system was started with an &lt;strong&gt;EFI&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from an EFI environment, this installer must deploy a boot loader application, like &lt;strong&gt;GRUB&lt;/strong&gt; or &lt;strong&gt;systemd-boot&lt;/strong&gt; on an &lt;strong&gt;EFI System Partition&lt;/strong&gt;. 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>Тази система беше стартирана с &lt;strong&gt;EFI&lt;/strong&gt; среда за начално зареждане.&lt;br&gt;&lt;br&gt;За да се настрои стартирането от EFI, инсталаторът трябва да разположи програма за начално зареждане като &lt;strong&gt;GRUB&lt;/strong&gt; или &lt;strong&gt;systemd-boot&lt;/strong&gt; на &lt;strong&gt;EFI Системен Дял&lt;/strong&gt;. Това се прави автоматично, освен ако не се избере ръчно поделяне, в такъв случай вие трябва да свършите тази работа.</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="87"/>
        <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 type="unfinished"/>
+        <translation>Тази система беше стартирана с &lt;strong&gt;BIOS&lt;/strong&gt; среда за начално зареждане.&lt;br&gt;&lt;br&gt;За да се настрои стартирането от BIOS, инсталаторът трябва да разположи програма за начално зареждане като &lt;strong&gt;GRUB&lt;/strong&gt; в началото на дяла или на &lt;strong&gt;Сектора за Начално Зареждане&lt;/strong&gt; близо до началото на таблицата на дяловете (предпочитано). Това се прави автоматично, освен ако не се избере ръчно поделяне, в такъв случай вие трябва да свършите тази работа.</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.&lt;br/&gt;Installation can continue, but some features might be disabled.</source>
-        <translation>Този компютър не отговаря на някои от препоръчителните изисквания за инсталиране %1.&lt;br/&gt;Инсталацията може да продължи, но някои свойства могат да бъдат неналични.</translation>
+        <translation>Този компютър не отговаря на някои от препоръчителните изисквания за инсталиране %1.&lt;br/&gt;Инсталацията може да продължи, но някои свойства могат да бъдат недостъпни.</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&amp;vice:</source>
-        <translation type="unfinished"/>
+        <translation>Изберете ус&amp;тройство за съхранение:</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>&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="846"/>
        <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="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?&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="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>&lt;strong&gt;Erase disk&lt;/strong&gt;&lt;br/&gt;This will &lt;font color=&quot;red&quot;&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=&quot;red&quot;&gt;изтрие&lt;/font&gt; всички данни върху устройството за съхранение.</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?&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>Това устройство за съхранение има инсталиран %1. Какво ще правите?&lt;br/&gt;Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.</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>&lt;strong&gt;Install alongside&lt;/strong&gt;&lt;br/&gt;The installer will shrink a partition to make room for %1.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;strong&gt;Инсталирайте покрай&lt;/strong&gt;&lt;br/&gt;Инсталатора ще раздроби дяла за да направи място за %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?&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="1102"/>
        <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 type="unfinished"/>
+        <translation>Това устройство за съхранение има инсталирани операционни системи. Какво ще правите?&lt;br/&gt;Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.</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 &lt;strong&gt;%2MB&lt;/strong&gt; partition on &lt;strong&gt;%4&lt;/strong&gt; (%3) with file system &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation>Създай нов  &lt;strong&gt;%2MB&lt;/strong&gt; дял върху &lt;strong&gt;%4&lt;/strong&gt; (%3) със файлова система &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+        <translation>Създай нов  &lt;strong&gt;%2МБ&lt;/strong&gt; дял върху &lt;strong&gt;%4&lt;/strong&gt; (%3) със файлова система &lt;strong&gt;%1&lt;/strong&gt;.</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 &lt;strong&gt;partition table&lt;/strong&gt; on the selected storage device.&lt;br&gt;&lt;br&gt;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.&lt;br&gt;This installer will keep the current partition table unless you explicitly choose otherwise.&lt;br&gt;If unsure, on modern systems GPT is preferred.</source>
-        <translation type="unfinished"/>
+        <translation>Типа на &lt;strong&gt;таблицата на дяловете&lt;/strong&gt; на избраното устройство за съхранение.&lt;br&gt;&lt;br&gt;Единствения начин да се промени е като се изчисти и пресъздаде таблицата на дяловете, като по този начин всички данни върху устройството ще бъдат унищожени.&lt;br&gt;Инсталатора ще запази сегашната таблица на дяловете, освен ако не изберете обратното.&lt;br&gt;Ако не сте сигурни - за модерни системи се препоръчва GPT.</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="107"/>
        <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="114"/>
        <source>This is a &lt;strong&gt;loop&lt;/strong&gt; device.&lt;br&gt;&lt;br&gt;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>Това е &lt;strong&gt;loop&lt;/strong&gt; устройство.&lt;br&gt;&lt;br&gt;Представлява псевдо-устройство, без таблица на дяловете, което прави файловете достъпни като блок устройства. Обикновено съдържа само една файлова система.</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="121"/>
        <source>This installer &lt;strong&gt;cannot detect a partition table&lt;/strong&gt; on the selected storage device.&lt;br&gt;&lt;br&gt;The device either has no partition table, or the partition table is corrupted or of an unknown type.&lt;br&gt;This installer can create a new partition table for you, either automatically, or through the manual partitioning page.</source>
-        <translation type="unfinished"/>
+        <translation>Инсталатора &lt;strong&gt;не може да открие таблица на дяловете&lt;/strong&gt; на избраното устройство за съхранение.&lt;br&gt;&lt;br&gt;Таблицата на дяловете липсва, повредена е или е от неизвестен тип.&lt;br&gt;Инсталатора може да създаде нова таблица на дяловете автоматично или ръчно, чрез програмата за подялба.</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="131"/>
        <source>&lt;br&gt;&lt;br&gt;This is the recommended partition table type for modern systems which start from an &lt;strong&gt;EFI&lt;/strong&gt; boot environment.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;br&gt;&lt;br&gt;Това е препоръчаният тип на таблицата на дяловете за модерни системи, които стартират от &lt;strong&gt;EFI&lt;/strong&gt; среда за начално зареждане.</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="137"/>
        <source>&lt;br&gt;&lt;br&gt;This partition table type is only advisable on older systems which start from a &lt;strong&gt;BIOS&lt;/strong&gt; boot environment. GPT is recommended in most other cases.&lt;br&gt;&lt;br&gt;&lt;strong&gt;Warning:&lt;/strong&gt; the MBR partition table is an obsolete MS-DOS era standard.&lt;br&gt;Only 4 &lt;em&gt;primary&lt;/em&gt; partitions may be created, and of those 4, one can be an &lt;em&gt;extended&lt;/em&gt; partition, which may in turn contain many &lt;em&gt;logical&lt;/em&gt; partitions.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;br&gt;&lt;br&gt;Тази таблица на дяловете е препоръчителна само за стари системи, които стартират с &lt;strong&gt;BIOS&lt;/strong&gt; среда за начално зареждане. GPT е препоръчителна в повечето случаи.&lt;br&gt;&lt;br&gt;&lt;strong&gt;Внимание:&lt;/strong&gt; MBR таблица на дяловете е остарял стандарт от времето на MS-DOS.&lt;br&gt;Само 4 &lt;em&gt;главни&lt;/em&gt; дяла могат да бъдат създадени и от тях само един може да е &lt;em&gt;разширен&lt;/em&gt; дял, който може да съдържа много &lt;em&gt;логически&lt;/em&gt; дялове.</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 &lt;strong&gt;%3MB&lt;/strong&gt; partition &lt;strong&gt;%1&lt;/strong&gt; with file system &lt;strong&gt;%2&lt;/strong&gt;.</source>
-        <translation>Форматирай &lt;strong&gt;%3MB&lt;/strong&gt; дял &lt;strong&gt;%1&lt;/strong&gt; с файлова система &lt;strong&gt;%2&lt;/strong&gt;.</translation>
+        <translation>Форматирай &lt;strong&gt;%3МБ&lt;/strong&gt; дял &lt;strong&gt;%1&lt;/strong&gt; с файлова система &lt;strong&gt;%2&lt;/strong&gt;.</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.&lt;br/&gt;The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation>Местността на системата засяга езика и символите зададени за някои елементи на командния потребителски интерфейс.&lt;br/&gt;Текущата настройка е &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+        <translation>Локацията на системата засяга езика и символите зададени за някои елементи на командния ред.&lt;br/&gt;Текущата настройка е &lt;strong&gt;%1&lt;/strong&gt;.</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&amp;vice:</source>
-        <translation type="unfinished"/>
+        <translation>Ус&amp;тройство за съхранение&quot;</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 &amp;loader on:</source>
-        <translation>Инсталирай &amp;зареждача върху:</translation>
+        <translation>Инсталирай &amp;устройството за начално зареждане върху:</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.&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;esp&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 type="unfinished"/>
+        <translation>EFI системен дял е нужен за стартиране на %1.&lt;br/&gt;&lt;br/&gt;За настройка на EFI системен дял се върнете назад и изберете или създайте FAT32 файлова система с включен &lt;strong&gt;esp&lt;/strong&gt; флаг и точка на монтиране &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;Може да продължите без 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.&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;esp&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 type="unfinished"/>
+        <translation>EFI системен дял е нужен за стартиране на %1.&lt;br/&gt;&lt;br/&gt;Дялът беше конфигуриран с точка на монтиране &lt;strong&gt;%2&lt;/strong&gt;, но неговия &lt;strong&gt;esp&lt;/strong&gt; флаг не е включен.&lt;br/&gt;За да включите флага се върнете назад и редактирайте дяла.&lt;br/&gt;&lt;br/&gt;Може да продължите без флага, но системата може да не успее да стартира.</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>&lt;strong&gt;%4&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
-        <translation>&lt;strong&gt;%4&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Дялът %1 е твърде малък за %2. Моля изберете дял с капацитет поне %3 GiB.</translation>
+        <translation>&lt;strong&gt;%4&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Дялът %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 &lt;strong&gt;%2MB&lt;/strong&gt; partition &lt;strong&gt;%1&lt;/strong&gt; to &lt;strong&gt;%3MB&lt;/strong&gt;.</source>
-        <translation>Преоразмери &lt;strong&gt;%2MB&lt;/strong&gt; дял &lt;strong&gt;%1&lt;/strong&gt; на &lt;strong&gt;%3MB&lt;/strong&gt;.</translation>
+        <translation>Преоразмери &lt;strong&gt;%2МБ&lt;/strong&gt; дял &lt;strong&gt;%1&lt;/strong&gt; на &lt;strong&gt;%3МБ&lt;/strong&gt;.</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 &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/SetPartitionFlagsJob.cpp" line="59"/>
        <source>Flag partition &lt;strong&gt;%1&lt;/strong&gt; as &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/SetPartitionFlagsJob.cpp" line="71"/>
        <source>Clearing flags on 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/SetPartitionFlagsJob.cpp" line="74"/>
        <source>Setting flags &lt;strong&gt;%2&lt;/strong&gt; on partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Задаване на флагове &lt;strong&gt;%2&lt;/strong&gt; на дял &lt;strong&gt;%1&lt;/strong&gt;.</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>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2015 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;http://calamares.io/&quot;&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;за %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Авторско право 2014-2015 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Благодарение на: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg и &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;преводачите на Calamares&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;http://calamares.io/&quot;&gt;Calamares&lt;/a&gt; е спонсориран от &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
    </message>
    <message>
        <location filename="../src/modules/welcome/WelcomePage.cpp" line="195"/>
--- a/lang/calamares_es.ts
+++ b/lang/calamares_es.ts
@@ -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>&lt;strong&gt;Replace a partition&lt;/strong&gt;&lt;br/&gt;Replaces a partition with %1.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;strong&gt;Reemplazar una partición&lt;/strong&gt;&lt;br/&gt;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 &lt;strong&gt;%1&lt;/strong&gt; partition table.</source>
-        <translation type="unfinished"/>
+        <translation>Este dispositivo tiene un &lt;strong&gt;% 1 &lt;/ strong&gt; 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 &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>No se pudo abrir el dispositivo &apos;%1&apos;.</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/>
        <source>Could not open partition table on device &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>No se pudo abrir la tabla de particiones en el dispositivo &apos;%1&apos;.</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="119"/>
        <source>Could not find partition &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>No se pudo encontrar la partición &apos;%1&apos;.</translation>
    </message>
 </context>
 <context>
--- a/lang/calamares_fr.ts
+++ b/lang/calamares_fr.ts
@@ -1254,7 +1254,7 @@ L&apos;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"/>
--- a/lang/calamares_hr.ts
+++ b/lang/calamares_hr.ts
--- a/lang/calamares_pt_BR.ts
+++ b/lang/calamares_pt_BR.ts
@@ -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&amp;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>
--- a/lang/calamares_ru.ts
+++ b/lang/calamares_ru.ts
@@ -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>&lt;strong&gt;Select a partition to shrink, then drag the bottom bar to resize&lt;/strong&gt;</source>
-        <translation>&lt;strong&gt;Выберите раздел для уменьшения, затем передвигайте ползунок для изменения размера&lt;/strong&gt;</translation>
+        <translation>&lt;strong&gt;Выберите раздел для уменьшения, затем двигайте ползунок, изменяя размер&lt;/strong&gt;</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="846"/>
        <source>&lt;strong&gt;Select a partition to install on&lt;/strong&gt;</source>
-        <translation>&lt;strong&gt;Выберите, на какой раздел установить&lt;/strong&gt;</translation>
+        <translation>&lt;strong&gt;Выберите раздел для установки&lt;/strong&gt;</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>&lt;strong&gt;Replace a partition&lt;/strong&gt;&lt;br/&gt;Replaces a partition with %1.</source>
-        <translation>&lt;strong&gt;Заменить раздел&lt;/strong&gt;&lt;br/&gt;Заменяет раздел на %1.</translation>
+        <translation>&lt;strong&gt;Заменить раздел&lt;/strong&gt;&lt;br/&gt;Меняет раздел на %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.&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;esp&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>Необходим системный раздел EFI, чтобы загрузить %1.&lt;br/&gt;&lt;br/&gt;Для настройки системного раздела EFI вернитесь и выберите или создайте файловую систему FAT32 с установленным флагом &lt;strong&gt;esp&lt;/strong&gt; и точкой монтирования &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;Вы можете продолжить и без настройки системного раздела EFI, но Ваша система может не загрузиться.</translation>
+        <translation>Чтобы начать, необходим системный раздел EFI %1.&lt;br/&gt;&lt;br/&gt;Для настройки системного раздела EFI, вернитесь, выберите или создайте файловую систему FAT32 с установленным флагом &lt;strong&gt;esp&lt;/strong&gt; и точкой монтирования &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;Вы можете продолжить и без настройки системного раздела 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.&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;esp&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>Необходим системный раздел EFI, чтобы загрузить %1.&lt;br/&gt;&lt;br/&gt;Был настроен раздел с точкой монтирования &lt;strong&gt;%2&lt;/strong&gt;, но его флаг &lt;strong&gt;esp&lt;/strong&gt; не установлен.&lt;br/&gt;Для установки флага вернитесь и отредактируйте раздел.&lt;br/&gt;&lt;br/&gt;Вы можете продолжить и без установки флага, но Ваша система может не загрузиться.</translation>
+        <translation>Чтобы начать, необходим системный раздел EFI %1.&lt;br/&gt;&lt;br/&gt;Был настроен раздел с точкой монтирования &lt;strong&gt;%2&lt;/strong&gt;, но его флаг &lt;strong&gt;esp&lt;/strong&gt; не установлен.&lt;br/&gt;Для установки флага вернитесь и отредактируйте раздел.&lt;br/&gt;&lt;br/&gt;Вы можете продолжить и без установки флага, но Ваша система может не загрузиться.</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 &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation>Очистить флаги на разделе &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+        <translation>Очистить флаги раздела &lt;strong&gt;%1&lt;/strong&gt;.</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="59"/>
        <source>Flag partition &lt;strong&gt;%1&lt;/strong&gt; as &lt;strong&gt;%2&lt;/strong&gt;.</source>
-        <translation>Пометить раздел &lt;strong&gt;%1&lt;/strong&gt; флагом как &lt;strong&gt;%2&lt;/strong&gt;.</translation>
+        <translation>Отметить раздел &lt;strong&gt;%1&lt;/strong&gt; флагом как &lt;strong&gt;%2&lt;/strong&gt;.</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/>
        <source>Clearing flags on partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation>Очистка флагов на разделе &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+        <translation>Очистка флагов раздела &lt;strong&gt;%1&lt;/strong&gt;.</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="74"/>
        <source>Setting flags &lt;strong&gt;%2&lt;/strong&gt; on partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation>Установка флагов &lt;strong&gt;%2&lt;/strong&gt; на разделе &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+        <translation>Установка флагов &lt;strong&gt;%2&lt;/strong&gt; на раздел &lt;strong&gt;%1&lt;/strong&gt;.</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 &apos;%1&apos;.</source>
-        <translation>Не удалось открыть таблицу разделов на устройстве &apos;%1&apos;.</translation>
+        <translation>Не удалось открыть таблицу разделов устройства &apos;%1&apos;.</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>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2015 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;http://calamares.io/&quot;&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Правообладатель 2014-2015 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Благодарим: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg и &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;команду переводчиков Calamares&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;http://calamares.io/&quot;&gt;Calamares&lt;/a&gt; разработка спонсируется&lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
    </message>
    <message>
        <location filename="../src/modules/welcome/WelcomePage.cpp" line="195"/>
--- a/lang/calamares_tr_TR.ts
+++ b/lang/calamares_tr_TR.ts
@@ -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>&lt;strong&gt;Replace a partition&lt;/strong&gt;&lt;br/&gt;Replaces a partition with %1.</source>
-        <translation>&lt;strong&gt;Disk bölümü üzerine yaz&lt;/strong&gt;&lt;br/&gt;Disk bölümü üzerinde %1 ile yaz.</translation>
+        <translation>&lt;strong&gt;Varolan bir disk bölümüne kur&lt;/strong&gt;&lt;br/&gt;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 &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation>&lt;strong&gt;%1&lt;/strong&gt; üzerine sistem yükleyici kur.</translation>
+        <translation>&lt;strong&gt;%1&lt;/strong&gt; ü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.&lt;br/&gt;</source>
-        <translation>Bölge ve zaman dilimi olarak %1/%2 ayarlandı.&lt;br/&gt;</translation>
+        <translation>Bölge ve zaman dilimi %1/%2 olarak ayarlandı.&lt;br/&gt;</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>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2015 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;http://calamares.io/&quot;&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Telif Hakkı 2014-2015 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Teşekkürler: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg ve &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares çeviri takımı&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;http://calamares.io/&quot;&gt;Calamares&lt;/a&gt; gelişim sponsoru &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Özgür Yazılım.</translation>
    </message>
    <message>
        <location filename="../src/modules/welcome/WelcomePage.cpp" line="195"/>
--- a/lang/calamares_zh_CN.ts
+++ b/lang/calamares_zh_CN.ts
@@ -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.&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;esp&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 type="unfinished"/>
+        <translation>必须有 EFI 系统分区才能启动 %1 。&lt;br/&gt;&lt;br/&gt;要配置 EFI 系统分区，后退一步，然后创建或选中一个 FAT32 分区并为之设置 &lt;strong&gt;esp&lt;/strong&gt; 标记及挂载点 &lt;strong&gt;%2&lt;/strong&gt;。&lt;br/&gt;&lt;br/&gt;你可以不创建 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.&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;esp&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 type="unfinished"/>
+        <translation>必须有 EFI 系统分区才能启动 %1 。&lt;br/&gt;&lt;br/&gt;已有挂载点为 &lt;strong&gt;%2&lt;/strong&gt; 的分区，但是未设置 &lt;strong&gt;esp&lt;/strong&gt; 标记。&lt;br/&gt;要设置此标记，后退并编辑分区。&lt;br/&gt;&lt;br/&gt;你可以不创建 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>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2015 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;http://calamares.io/&quot;&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2015 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;感谢：Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini, Rohan Garg 及 &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares 翻译团队&lt;/a&gt;。&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;http://calamares.io/&quot;&gt;Calamares&lt;/a&gt; 的开发由 &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software 赞助。</translation>
    </message>
    <message>
        <location filename="../src/modules/welcome/WelcomePage.cpp" line="195"/>
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -89,12 +89,31 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line):
    distribution = get_bootloader_entry_name()
    kernel = libcalamares.job.configuration["kernel"]
    img = libcalamares.job.configuration["img"]
+    kernel_params = ["quiet"]
+
    partitions = libcalamares.globalstorage.value("partitions")
-    swap = ""
+    swap_uuid = ""
+
+    cryptdevice_params = []

    for partition in partitions:
        if partition["fs"] == "linuxswap":
-            swap = partition["uuid"]
+            swap_uuid = partition["uuid"]
+
+        if partition["mountPoint"] == "/" and "luksMapperName" in partition:
+            cryptdevice_params = [
+                "cryptdevice=UUID={!s}:{!s}".format(partition["luksUuid"],
+                                                    partition["luksMapperName"]),
+                "root=/dev/mapper/{!s}".format(partition["luksMapperName"])
+            ]
+
+    if cryptdevice_params:
+        kernel_params.extend(cryptdevice_params)
+    else:
+        kernel_params.append("root=UUID={!s}".format(uuid))
+
+    if swap_uuid:
+        kernel_params.append("resume=UUID={!s}".format(swap_uuid))

    lines = [
        '## This is just an example config file.\n',
@@ -103,12 +122,12 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line):
        "title   {!s}{!s}\n".format(distribution, kernel_line),
        "linux   {!s}\n".format(kernel),
        "initrd  {!s}\n".format(img),
-        "options root=UUID={!s} quiet resume=UUID={!s} rw\n".format(uuid, swap),
+        "options {!s} rw\n".format(" ".join(kernel_params)),
    ]

-    with open(conf_path, 'w') as f:
-        for l in lines:
-            f.write(l)
+    with open(conf_path, 'w') as conf_file:
+        for line in lines:
+            conf_file.write(line)


 def create_loader(loader_path):
@@ -125,9 +144,9 @@ def create_loader(loader_path):
        "default {!s}\n".format(distribution_translated),
    ]

-    with open(loader_path, 'w') as f:
-        for l in lines:
-            f.write(l)
+    with open(loader_path, 'w') as loader_file:
+        for line in lines:
+            loader_file.write(line)


 def install_systemd_boot(efi_directory):
@@ -138,17 +157,24 @@ def install_systemd_boot(efi_directory):
    print("Bootloader: systemd-boot")
    install_path = libcalamares.globalstorage.value("rootMountPoint")
    install_efi_directory = install_path + efi_directory
-    fallback_kernel_line = libcalamares.job.configuration["fallbackKernelLine"]
    uuid = get_uuid()
    distribution = get_bootloader_entry_name()
    file_name_sanitizer = str.maketrans(" /", "_-")
    distribution_translated = distribution.translate(file_name_sanitizer)
-    conf_path = os.path.join(install_efi_directory, "loader", "entries",
+    conf_path = os.path.join(install_efi_directory,
+                             "loader",
+                             "entries",
                             "{!s}.conf".format(distribution_translated))
-    fallback_path = os.path.join(install_efi_directory, "loader", "entries",
+    fallback_path = os.path.join(install_efi_directory,
+                                 "loader",
+                                 "entries",
                                 "{!s}-fallback.conf".format(distribution_translated))
-    loader_path = os.path.join(install_efi_directory, "loader", "loader.conf")
-    subprocess.call(["bootctl", "--path={!s}".format(install_efi_directory), "install"])
+    loader_path = os.path.join(install_efi_directory,
+                               "loader",
+                               "loader.conf")
+    subprocess.call(["bootctl",
+                     "--path={!s}".format(install_efi_directory),
+                     "install"])
    kernel_line = get_kernel_line("default")
    print("Configure: \"{!s}\"".format(kernel_line))
    create_systemd_boot_conf(uuid, conf_path, kernel_line)
@@ -178,29 +204,37 @@ def install_grub(efi_directory, fw_type):
            efi_bootloader_id = distribution.translate(file_name_sanitizer)
        # get bitness of the underlying UEFI
        try:
-            f = open("/sys/firmware/efi/fw_platform_size", "r")
-            efi_bitness = f.read(2)
-        except:
-            # if the kernel is older than 4.0, the UEFI bitness likely isn't exposed to the userspace
-            # so we assume a 64 bit UEFI here
+            sysfile = open("/sys/firmware/efi/fw_platform_size", "r")
+            efi_bitness = sysfile.read(2)
+        except Exception:
+            # if the kernel is older than 4.0, the UEFI bitness likely isn't
+            # exposed to the userspace so we assume a 64 bit UEFI here
            efi_bitness = "64"
        bitness_translate = {"32": "--target=i386-efi", "64": "--target=x86_64-efi"}
-        check_target_env_call([libcalamares.job.configuration["grubInstall"], bitness_translate[efi_bitness],
-                           "--efi-directory={!s}".format(efi_directory),
-                           "--bootloader-id={!s}".format(efi_bootloader_id),
-                           "--force"])
+        check_target_env_call([libcalamares.job.configuration["grubInstall"],
+                               bitness_translate[efi_bitness],
+                               "--efi-directory={!s}".format(efi_directory),
+                               "--bootloader-id={!s}".format(efi_bootloader_id),
+                               "--force"])
        # Workaround for some UEFI firmwares
        check_target_env_call(["mkdir", "-p", "{!s}/boot".format(efi_directory_firmware)])
-        check_target_env_call(["cp", "{!s}/{!s}/grubx64.efi".format(efi_directory_firmware, efi_bootloader_id),
-                           "{!s}/boot/bootx64.efi".format(efi_directory_firmware)])
+        check_target_env_call(["cp", "{!s}/{!s}/grubx64.efi".format(efi_directory_firmware,
+                                                                    efi_bootloader_id),
+                               "{!s}/boot/bootx64.efi".format(efi_directory_firmware)])
    else:
        print("Bootloader: grub (bios)")
        boot_loader = libcalamares.globalstorage.value("bootLoader")
-        check_target_env_call([libcalamares.job.configuration["grubInstall"], "--target=i386-pc",
-                           "--recheck", "--force", boot_loader["installPath"]])
+        check_target_env_call([libcalamares.job.configuration["grubInstall"],
+                               "--target=i386-pc",
+                               "--recheck",
+                               "--force",
+                               boot_loader["installPath"]])

-    check_target_env_call([libcalamares.job.configuration["grubMkconfig"], "-o",
-                       libcalamares.job.configuration["grubCfg"]])
+    # The file specified in grubCfg should already be filled out
+    # by the grubcfg job module.
+    check_target_env_call([libcalamares.job.configuration["grubMkconfig"],
+                           "-o",
+                           libcalamares.job.configuration["grubCfg"]])


 def prepare_bootloader(fw_type):
--- a/src/modules/grubcfg/main.py
+++ b/src/modules/grubcfg/main.py
@@ -44,12 +44,24 @@ def modify_grub_default(partitions, root_mount_point, distributor):
    if plymouth_bin == 0:
        use_splash = "splash"

+    cryptdevice_params = []
+
    for partition in partitions:
        if partition["fs"] == "linuxswap":
            swap_uuid = partition["uuid"]

+        if partition["mountPoint"] == "/" and "luksMapperName" in partition:
+            cryptdevice_params = [
+                "cryptdevice=UUID={!s}:{!s}".format(partition["luksUuid"],
+                                                    partition["luksMapperName"]),
+                "root=/dev/mapper/{!s}".format(partition["luksMapperName"])
+            ]
+
    kernel_params = ["quiet"]

+    if cryptdevice_params:
+        kernel_params.extend(cryptdevice_params)
+
    if use_splash:
        kernel_params.append(use_splash)

@@ -123,6 +135,9 @@ def modify_grub_default(partitions, root_mount_point, distributor):
    if not have_distributor_line:
        lines.append(distributor_line)

+    if cryptdevice_params:
+        lines.append("GRUB_ENABLE_CRYPTODISK=y")
+
    with open(default_grub, 'w') as grub_file:
        grub_file.write("\n".join(lines) + "\n")

--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -22,7 +22,6 @@
 import libcalamares
 import os
 from collections import OrderedDict
-from libcalamares.utils import check_target_env_call


 def cpuinfo():
@@ -36,8 +35,8 @@ def cpuinfo():

    nprocs = 0

-    with open('/proc/cpuinfo') as f:
-        for line in f:
+    with open('/proc/cpuinfo') as cpuinfo_file:
+        for line in cpuinfo_file:
            if not line.strip():
                # end of one processor
                cpu_info["proc{!s}".format(nprocs)] = procinfo
@@ -53,11 +52,12 @@ def cpuinfo():
    return cpu_info


-def set_mkinitcpio_hooks_and_modules(hooks, modules, root_mount_point):
+def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
    """ Set up mkinitcpio.conf.

    :param hooks:
    :param modules:
+    :param files:
    :param root_mount_point:
    """
    with open("/etc/mkinitcpio.conf", "r") as mkinitcpio_file:
@@ -70,6 +70,9 @@ def set_mkinitcpio_hooks_and_modules(hooks, modules, root_mount_point):
        elif mklins[i].startswith("MODULES"):
            joined_modules = ' '.join(modules)
            mklins[i] = "MODULES=\"{!s}\"".format(joined_modules)
+        elif mklins[i].startswith("FILES"):
+            joined_files = ' '.join(files)
+            mklins[i] = "FILES=\"{!s}\"".format(joined_files)

    path = os.path.join(root_mount_point, "etc/mkinitcpio.conf")

@@ -88,6 +91,8 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
    btrfs = ""
    hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard", "keymap"]
    modules = []
+    files = []
+    encrypt_hook = False

    # It is important that the plymouth hook comes before any encrypt hook
    plymouth_bin = os.path.join(root_mount_point, "usr/bin/plymouth")
@@ -101,6 +106,14 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
        if partition["fs"] == "btrfs":
            btrfs = "yes"

+        if partition["mountPoint"] == "/" and partition["luksMapperName"]:
+            encrypt_hook = True
+
+    if encrypt_hook:
+        hooks.append("encrypt")
+        if os.path.isfile(os.path.join(root_mount_point, "crypto_keyfile.bin")):
+            files.append("/crypto_keyfile.bin")
+
    if swap_uuid is not "":
        hooks.extend(["resume", "filesystems"])
    else:
@@ -113,7 +126,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
    else:
        hooks.append("fsck")

-    set_mkinitcpio_hooks_and_modules(hooks, modules, root_mount_point)
+    write_mkinitcpio_lines(hooks, modules, files, root_mount_point)


 def run():
--- a/src/modules/luksbootkeyfile/main.py
+++ b/src/modules/luksbootkeyfile/main.py
@@ -0,0 +1,67 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# === 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/>.
+
+import libcalamares
+
+from libcalamares.utils import check_target_env_call
+
+
+def run():
+    """
+    This module sets up a file crypto_keyfile.bin on the rootfs, assuming the rootfs
+    is LUKS encrypted and a passphrase is provided. This file is then included in the
+    initramfs and used for unlocking the rootfs from a previously unlocked GRUB2
+    session.
+    :return:
+    """
+
+    partitions = libcalamares.globalstorage.value("partitions")
+
+    luks_device = ""
+    luks_passphrase = ""
+
+    for partition in partitions:
+        if partition["mountPoint"] == "/" and "luksMapperName" in partition:
+            luks_device = partition["device"]
+            luks_passphrase = partition["luksPassphrase"]
+
+    if not luks_device:
+        return None
+
+    if not luks_passphrase:
+        return ("Encrypted rootfs setup error",
+                "Rootfs partition {!s} is LUKS but no passphrase found.".format(luks_device))
+
+    # Generate random keyfile
+    check_target_env_call(["dd",
+                           "bs=512",
+                           "count=4",
+                           "if=/dev/urandom",
+                           "of=/crypto_keyfile.bin"])
+    check_target_env_call(["cryptsetup",
+                           "luksAddKey",
+                           luks_device,
+                           "/crypto_keyfile.bin"],
+                          luks_passphrase)
+    check_target_env_call(["chmod",
+                           "g-rwx,o-rwx",
+                           "/crypto_keyfile.bin"])
+
+    return None
--- a/src/modules/luksbootkeyfile/module.desc
+++ b/src/modules/luksbootkeyfile/module.desc
@@ -0,0 +1,5 @@
+---
+type:       "job"
+name:       "luksbootkeyfile"
+interface:  "python"
+script:     "main.py"
--- a/src/modules/mount/main.py
+++ b/src/modules/mount/main.py
@@ -30,7 +30,7 @@ def mount_partitions(root_mount_point, partitions):
    :param partitions:
    """
    for partition in partitions:
-        if not partition["mountPoint"]:
+        if "mountPoint" not in partition or not partition["mountPoint"]:
            continue
        # Create mount point with `+` rather than `os.path.join()` because
        # `partition["mountPoint"]` starts with a '/'.
@@ -40,11 +40,20 @@ def mount_partitions(root_mount_point, partitions):
        if fstype == "fat16" or fstype == "fat32":
            fstype = "vfat"

-        libcalamares.utils.mount(partition["device"],
-                                 mount_point,
-                                 fstype,
-                                 partition.get("options", ""),
-                                 )
+        if "luksMapperName" in partition:
+            libcalamares.utils.debug("about to mount {!s}".format(partition["luksMapperName"]))
+            libcalamares.utils.mount("/dev/mapper/{!s}".format(partition["luksMapperName"]),
+                                     mount_point,
+                                     fstype,
+                                     partition.get("options", ""),
+                                     )
+
+        else:
+            libcalamares.utils.mount(partition["device"],
+                                     mount_point,
+                                     fstype,
+                                     partition.get("options", ""),
+                                     )


 def run():
--- a/src/modules/partition/CMakeLists.txt
+++ b/src/modules/partition/CMakeLists.txt
@@ -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
@@ -30,11 +31,12 @@ calamares_add_plugin( partition
        core/PartitionIterator.cpp
        core/PartitionModel.cpp
        core/PartUtils.cpp
+        gui/BootInfoWidget.cpp
        gui/ChoicePage.cpp
        gui/CreatePartitionDialog.cpp
-        gui/EditExistingPartitionDialog.cpp
-        gui/BootInfoWidget.cpp
        gui/DeviceInfoWidget.cpp
+        gui/EditExistingPartitionDialog.cpp
+        gui/EncryptWidget.cpp
        gui/PartitionPage.cpp
        gui/PartitionBarsView.cpp
        gui/PartitionLabelsView.cpp
@@ -61,6 +63,7 @@ calamares_add_plugin( partition
        gui/CreatePartitionDialog.ui
        gui/CreatePartitionTableDialog.ui
        gui/EditExistingPartitionDialog.ui
+        gui/EncryptWidget.ui
        gui/PartitionPage.ui
        gui/ReplaceWidget.ui
    LINK_LIBRARIES
--- a/src/modules/partition/core/KPMHelpers.cpp
+++ b/src/modules/partition/core/KPMHelpers.cpp
@@ -26,6 +26,7 @@
 #include <kpmcore/core/partition.h>
 #include <kpmcore/fs/filesystemfactory.h>
 #include <kpmcore/backend/corebackendmanager.h>
+#include <kpmcore/fs/luks.h>

 #include <QDebug>

@@ -132,6 +133,40 @@ createNewPartition( PartitionNode* parent,
 }


+Partition*
+createNewEncryptedPartition( PartitionNode* parent,
+                             const Device& device,
+                             const PartitionRole& role,
+                             FileSystem::Type fsType,
+                             qint64 firstSector,
+                             qint64 lastSector,
+                             const QString& passphrase,
+                             PartitionTable::Flags flags )
+{
+    PartitionRole::Roles newRoles = role.roles();
+    if ( !role.has( PartitionRole::Luks ) )
+        newRoles |= PartitionRole::Luks;
+
+    FS::luks* fs = dynamic_cast< FS::luks* >(
+                           FileSystemFactory::create( FileSystem::Luks,
+                                                      firstSector,
+                                                      lastSector ) );
+    fs->createInnerFileSystem( fsType );
+    fs->setPassphrase( passphrase );
+    Partition* p = new Partition( parent,
+                                  device,
+                                  PartitionRole( newRoles ),
+                                  fs, fs->firstSector(), fs->lastSector(),
+                                  QString() /* path */,
+                                  PartitionTable::FlagNone /* availableFlags */,
+                                  QString() /* mountPoint */,
+                                  false /* mounted */,
+                                  flags /* activeFlags */,
+                                  Partition::StateNew );
+    return p;
+}
+
+
 Partition*
 clonePartition( Device* device, Partition* partition )
 {
@@ -163,7 +198,7 @@ prettyNameForFileSystemType( FileSystem::Type t )
    case FileSystem::Unformatted:
        return QObject::tr( "unformatted" );
    case FileSystem::LinuxSwap:
-        return "swap";
+        return QObject::tr( "swap" );
    case FileSystem::Fat16:
    case FileSystem::Fat32:
    case FileSystem::Ntfs:
--- a/src/modules/partition/core/KPMHelpers.h
+++ b/src/modules/partition/core/KPMHelpers.h
@@ -91,6 +91,15 @@ Partition* createNewPartition( PartitionNode* parent,
                               qint64 lastSector,
                               PartitionTable::Flags flags = PartitionTable::FlagNone );

+Partition* createNewEncryptedPartition( PartitionNode* parent,
+                                        const Device& device,
+                                        const PartitionRole& role,
+                                        FileSystem::Type fsType,
+                                        qint64 firstSector,
+                                        qint64 lastSector,
+                                        const QString& passphrase,
+                                        PartitionTable::Flags flags = PartitionTable::FlagNone );
+
 Partition* clonePartition( Device* device, Partition* partition );

 QString prettyNameForFileSystemType( FileSystem::Type t );
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -98,7 +98,7 @@ swapSuggestion( const qint64 availableSpaceB )


 void
-doAutopartition( PartitionCoreModule* core, Device* dev )
+doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPassphrase )
 {
    bool isEfi = false;
    if ( QDir( "/sys/firmware/efi/efivars" ).exists() )
@@ -167,28 +167,60 @@ doAutopartition( PartitionCoreModule* core, Device* dev )
        lastSectorForRoot -= suggestedSwapSizeB / dev->logicalSectorSize() + 1;
    }

-    Partition* rootPartition = KPMHelpers::createNewPartition(
-        dev->partitionTable(),
-        *dev,
-        PartitionRole( PartitionRole::Primary ),
-        FileSystem::Ext4,
-        firstFreeSector,
-        lastSectorForRoot
-    );
+    Partition* rootPartition = nullptr;
+    if ( luksPassphrase.isEmpty() )
+    {
+        rootPartition = KPMHelpers::createNewPartition(
+            dev->partitionTable(),
+            *dev,
+            PartitionRole( PartitionRole::Primary ),
+            FileSystem::Ext4,
+            firstFreeSector,
+            lastSectorForRoot
+        );
+    }
+    else
+    {
+        rootPartition = KPMHelpers::createNewEncryptedPartition(
+            dev->partitionTable(),
+            *dev,
+            PartitionRole( PartitionRole::Primary ),
+            FileSystem::Ext4,
+            firstFreeSector,
+            lastSectorForRoot,
+            luksPassphrase
+       );
+    }
    PartitionInfo::setFormat( rootPartition, true );
    PartitionInfo::setMountPoint( rootPartition, "/" );
    core->createPartition( dev, rootPartition );

    if ( shouldCreateSwap )
    {
-        Partition* swapPartition = KPMHelpers::createNewPartition(
-            dev->partitionTable(),
-            *dev,
-            PartitionRole( PartitionRole::Primary ),
-            FileSystem::LinuxSwap,
-            lastSectorForRoot + 1,
-            dev->totalSectors() - 1
-        );
+        Partition* swapPartition = nullptr;
+        if ( luksPassphrase.isEmpty() )
+        {
+            swapPartition = KPMHelpers::createNewPartition(
+                dev->partitionTable(),
+                *dev,
+                PartitionRole( PartitionRole::Primary ),
+                FileSystem::LinuxSwap,
+                lastSectorForRoot + 1,
+                dev->totalSectors() - 1
+            );
+        }
+        else
+        {
+            swapPartition = KPMHelpers::createNewEncryptedPartition(
+                dev->partitionTable(),
+                *dev,
+                PartitionRole( PartitionRole::Primary ),
+                FileSystem::LinuxSwap,
+                lastSectorForRoot + 1,
+                dev->totalSectors() - 1,
+                luksPassphrase
+            );
+        }
        PartitionInfo::setFormat( swapPartition, true );
        core->createPartition( dev, swapPartition );
    }
--- a/src/modules/partition/core/PartitionActions.h
+++ b/src/modules/partition/core/PartitionActions.h
@@ -19,14 +19,21 @@
 #ifndef PARTITIONACTIONS_H
 #define PARTITIONACTIONS_H

+#include <QString>
+
 class PartitionCoreModule;
 class Device;
 class Partition;

 namespace PartitionActions
 {
-void doAutopartition( PartitionCoreModule* core, Device* dev );
-void doReplacePartition( PartitionCoreModule* core, Device* dev, Partition* partition );
+void doAutopartition( PartitionCoreModule* core,
+                      Device* dev,
+                      const QString& luksPassphrase = QString() );
+
+void doReplacePartition( PartitionCoreModule* core,
+                         Device* dev,
+                         Partition* partition );
 }

 #endif // PARTITIONACTIONS_H
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -121,6 +121,7 @@ ChoicePage::ChoicePage( QWidget* parent )
    m_previewAfterFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
    m_previewAfterLabel->hide();
    m_previewAfterFrame->hide();
+    m_encryptWidget->hide();
    // end
 }

@@ -157,6 +158,9 @@ ChoicePage::init( PartitionCoreModule* core )
             static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ),
             this, &ChoicePage::applyDeviceChoice );

+    connect( m_encryptWidget, &EncryptWidget::stateChanged,
+             this, &ChoicePage::onEncryptWidgetStateChanged );
+
    ChoicePage::applyDeviceChoice();
 }

@@ -238,14 +242,8 @@ ChoicePage::setupChoices()
        if ( checked )  // An action was picked.
        {
            m_choice = static_cast< Choice >( id );
-            if ( m_choice == Replace )
-            {
-                setNextEnabled( false );
-            }
-            else
-            {
-                setNextEnabled( true );
-            }
+            updateNextEnabled();
+
            emit actionChosen();
        }
        else    // An action was unpicked, either on its own or because of another selection.
@@ -253,7 +251,8 @@ ChoicePage::setupChoices()
            if ( m_grp->checkedButton() == nullptr )  // If no other action is chosen, we must
            {                                         // set m_choice to NoChoice and reset previews.
                m_choice = NoChoice;
-                setNextEnabled( false );
+                updateNextEnabled();
+
                emit actionChosen();
            }
        }
@@ -369,14 +368,14 @@ ChoicePage::applyActionChoice( ChoicePage::Choice choice )
            } ),
            [ = ]
            {
-                PartitionActions::doAutopartition( m_core, selectedDevice() );
+                PartitionActions::doAutopartition( m_core, selectedDevice(), m_encryptWidget->passphrase() );
                emit deviceChosen();
            },
            this );
        }
        else
        {
-            PartitionActions::doAutopartition( m_core, selectedDevice() );
+            PartitionActions::doAutopartition( m_core, selectedDevice(), m_encryptWidget->passphrase() );
            emit deviceChosen();
        }

@@ -392,7 +391,7 @@ ChoicePage::applyActionChoice( ChoicePage::Choice choice )
            []{},
            this );
        }
-        setNextEnabled( !m_beforePartitionBarsView->selectionModel()->selectedRows().isEmpty() );
+        updateNextEnabled();

        connect( m_beforePartitionBarsView->selectionModel(), SIGNAL( currentRowChanged( QModelIndex, QModelIndex ) ),
                 this, SLOT( doReplaceSelectedPartition( QModelIndex, QModelIndex ) ),
@@ -415,7 +414,7 @@ ChoicePage::applyActionChoice( ChoicePage::Choice choice )
            },
            this );
        }
-        setNextEnabled( !m_beforePartitionBarsView->selectionModel()->selectedRows().isEmpty() );
+        updateNextEnabled();

        connect( m_beforePartitionBarsView->selectionModel(), SIGNAL( currentRowChanged( QModelIndex, QModelIndex ) ),
                 this, SLOT( doAlongsideSetupSplitter( QModelIndex, QModelIndex ) ),
@@ -466,7 +465,7 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
                Calamares::Branding::instance()->
                    string( Calamares::Branding::ProductName ) );

-    setNextEnabled( m_beforePartitionBarsView->selectionModel()->currentIndex().isValid() );
+    updateNextEnabled();

    if ( m_isEfi )
        setupEfiSystemPartitionSelector();
@@ -475,6 +474,20 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
 }


+void
+ChoicePage::onEncryptWidgetStateChanged()
+{
+    EncryptWidget::State state = m_encryptWidget->state();
+    if ( m_choice == Erase )
+    {
+        if ( state == EncryptWidget::EncryptionConfirmed ||
+             state == EncryptWidget::EncryptionDisabled )
+            applyActionChoice( m_choice );
+    }
+    updateNextEnabled();
+}
+
+
 void
 ChoicePage::onLeave()
 {
@@ -628,7 +641,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current,
        if ( m_isEfi )
            setupEfiSystemPartitionSelector();

-        setNextEnabled( !m_beforePartitionBarsView->selectionModel()->selectedRows().isEmpty() );
+        updateNextEnabled();
        if ( !m_bootloaderComboBox.isNull() &&
             m_bootloaderComboBox->currentIndex() < 0 )
            m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex );
@@ -770,10 +783,12 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice )
            };
            m_beforePartitionBarsView->setSelectionFilter( filter );
            m_beforePartitionLabelsView->setSelectionFilter( filter );
+            m_encryptWidget->hide();

            break;
        }
    case Erase:
+        m_encryptWidget->show();
    case Replace:
        {
            m_previewBeforeLabel->setText( tr( "Current:" ) );
@@ -854,6 +869,7 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice )
        m_previewAfterFrame->hide();
        m_previewBeforeLabel->setText( tr( "Current:" ) );
        m_previewAfterLabel->hide();
+        m_encryptWidget->hide();
        break;
    }

@@ -903,7 +919,7 @@ ChoicePage::setupEfiSystemPartitionSelector()
                        "partitioning to set up %1." )
                    .arg( Calamares::Branding::instance()->
                          string( Calamares::Branding::ShortProductName ) ) );
-        setNextEnabled( false );
+        updateNextEnabled();
    }
    else if ( efiSystemPartitions.count() == 1 ) //probably most usual situation
    {
@@ -1193,8 +1209,42 @@ ChoicePage::currentChoice() const


 void
-ChoicePage::setNextEnabled( bool enabled )
+ChoicePage::updateNextEnabled()
 {
+    bool enabled = false;
+
+    switch ( m_choice )
+    {
+    case NoChoice:
+        enabled = false;
+        break;
+    case Replace:
+        enabled = !m_beforePartitionBarsView->selectionModel()->
+                  selectedRows().isEmpty();
+        break;
+    case Alongside:
+        enabled = !m_beforePartitionBarsView->selectionModel()->
+                  selectedRows().isEmpty() &&
+                  m_beforePartitionBarsView->selectionModel()->
+                  currentIndex().isValid();
+        break;
+    case Erase:
+    case Manual:
+        enabled = true;
+    }
+
+    if ( m_isEfi &&
+         ( m_choice == Alongside ||
+           m_choice == Replace ) )
+    {
+        if ( m_core->efiSystemPartitions().count() == 0 )
+            enabled = false;
+    }
+
+    if ( m_encryptWidget->isVisible() &&
+         m_encryptWidget->state() == EncryptWidget::EncryptionUnconfirmed )
+        enabled = false;
+
    if ( enabled == m_nextEnabled )
        return;

--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -74,9 +74,10 @@ signals:
 private slots:
    void doReplaceSelectedPartition( const QModelIndex& current, const QModelIndex& previous );
    void doAlongsideSetupSplitter( const QModelIndex& current, const QModelIndex& previous );
+    void onEncryptWidgetStateChanged();

 private:
-    void setNextEnabled( bool enabled );
+    void updateNextEnabled();
    void setupChoices();
    QComboBox* createBootloaderComboBox( QWidget* parentButton );
    Device* selectedDevice();
--- a/src/modules/partition/gui/ChoicePage.ui
+++ b/src/modules/partition/gui/ChoicePage.ui
@@ -32,7 +32,7 @@
    </layout>
   </item>
   <item>
-    <layout class="QVBoxLayout" name="m_rightLayout" stretch="0,1,0,0,0">
+    <layout class="QVBoxLayout" name="m_rightLayout" stretch="0,1,0,0,0,0">
     <item>
      <widget class="QLabel" name="m_messageLabel">
       <property name="toolTip">
@@ -63,7 +63,7 @@
          <x>0</x>
          <y>0</y>
          <width>729</width>
-          <height>327</height>
+          <height>276</height>
         </rect>
        </property>
        <layout class="QVBoxLayout" name="m_itemsLayout">
@@ -93,6 +93,9 @@
       </property>
      </widget>
     </item>
+     <item>
+      <widget class="EncryptWidget" name="m_encryptWidget" native="true"/>
+     </item>
     <item>
      <widget class="QLabel" name="m_selectLabel">
       <property name="text">
@@ -197,6 +200,14 @@
   </item>
  </layout>
 </widget>
+ <customwidgets>
+  <customwidget>
+   <class>EncryptWidget</class>
+   <extends>QWidget</extends>
+   <header>gui/EncryptWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
 <resources/>
 <connections/>
 </ui>
--- a/src/modules/partition/gui/EncryptWidget.cpp
+++ b/src/modules/partition/gui/EncryptWidget.cpp
@@ -0,0 +1,150 @@
+/* === 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 "EncryptWidget.h"
+
+#include <utils/CalamaresUtilsGui.h>
+
+EncryptWidget::EncryptWidget( QWidget* parent )
+    : QWidget( parent )
+{
+    setupUi( this );
+
+    m_iconLabel->setFixedWidth( m_iconLabel->height() );
+    m_passphraseLineEdit->hide();
+    m_confirmLineEdit->hide();
+    m_iconLabel->hide();
+
+    connect( m_encryptCheckBox, &QCheckBox::stateChanged,
+             this, &EncryptWidget::onCheckBoxStateChanged );
+    connect( m_passphraseLineEdit, &QLineEdit::textEdited,
+             this, &EncryptWidget::onPassphraseEdited );
+    connect( m_confirmLineEdit, &QLineEdit::textEdited,
+             this, &EncryptWidget::onPassphraseEdited );
+
+    updateState();
+}
+
+
+EncryptWidget::State
+EncryptWidget::state() const
+{
+    return m_state;
+}
+
+
+QString
+EncryptWidget::passphrase() const
+{
+    if ( m_state == EncryptionConfirmed )
+        return m_passphraseLineEdit->text();
+    return QString();
+}
+
+
+void
+EncryptWidget::changeEvent( QEvent* e )
+{
+    QWidget::changeEvent( e );
+    switch ( e->type() )
+    {
+    case QEvent::LanguageChange:
+        retranslateUi( this );
+        break;
+    default:
+        break;
+    }
+}
+
+
+void
+EncryptWidget::updateState()
+{
+    State newState;
+    if ( m_encryptCheckBox->isChecked() )
+    {
+        if ( !m_passphraseLineEdit->text().isEmpty() &&
+             m_passphraseLineEdit->text() == m_confirmLineEdit->text() )
+        {
+            newState = EncryptionConfirmed;
+        }
+        else
+        {
+            newState = EncryptionUnconfirmed;
+        }
+    }
+    else
+    {
+        newState = EncryptionDisabled;
+    }
+
+    if ( newState != m_state )
+    {
+        m_state = newState;
+        emit stateChanged( m_state );
+    }
+}
+
+
+void
+EncryptWidget::onPassphraseEdited()
+{
+    if ( !m_iconLabel->isVisible() )
+        m_iconLabel->show();
+
+    QString p1 = m_passphraseLineEdit->text();
+    QString p2 = m_confirmLineEdit->text();
+
+    m_iconLabel->setToolTip( QString() );
+    if ( p1.isEmpty() && p2.isEmpty() )
+    {
+        m_iconLabel->clear();
+    }
+    else if ( p1 == p2 )
+    {
+        m_iconLabel->setFixedWidth( m_iconLabel->height() );
+        m_iconLabel->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Yes,
+                                                               CalamaresUtils::Original,
+                                                               m_iconLabel->size() ) );
+    }
+    else
+    {
+        m_iconLabel->setFixedWidth( m_iconLabel->height() );
+        m_iconLabel->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::No,
+                                                               CalamaresUtils::Original,
+                                                               m_iconLabel->size() ) );
+        m_iconLabel->setToolTip( "Please enter the same passphrase in both boxes." );
+    }
+
+    updateState();
+}
+
+
+void
+EncryptWidget::onCheckBoxStateChanged( int state )
+{
+    m_passphraseLineEdit->setVisible( state );
+    m_confirmLineEdit->setVisible( state );
+    m_iconLabel->setVisible( state );
+    m_passphraseLineEdit->clear();
+    m_confirmLineEdit->clear();
+    m_iconLabel->clear();
+
+    updateState();
+}
--- a/src/modules/partition/gui/EncryptWidget.h
+++ b/src/modules/partition/gui/EncryptWidget.h
@@ -0,0 +1,57 @@
+/* === 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 ENCRYPTWIDGET_H
+#define ENCRYPTWIDGET_H
+
+#include "ui_EncryptWidget.h"
+
+class EncryptWidget : public QWidget, private Ui::EncryptWidget
+{
+    Q_OBJECT
+
+public:
+    enum State : unsigned short
+    {
+        EncryptionDisabled = 0,
+        EncryptionUnconfirmed,
+        EncryptionConfirmed
+    };
+
+    explicit EncryptWidget( QWidget* parent = nullptr );
+
+    State state() const;
+
+    QString passphrase() const;
+
+signals:
+    void stateChanged( State );
+
+protected:
+    void changeEvent( QEvent* e );
+
+private:
+    void updateState();
+    void onPassphraseEdited();
+    void onCheckBoxStateChanged( int state );
+
+    State m_state;
+};
+
+#endif // ENCRYPTWIDGET_H
--- a/src/modules/partition/gui/EncryptWidget.ui
+++ b/src/modules/partition/gui/EncryptWidget.ui
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>EncryptWidget</class>
+ <widget class="QWidget" name="EncryptWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>822</width>
+    <height>59</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QCheckBox" name="m_encryptCheckBox">
+     <property name="text">
+      <string>En&amp;crypt system</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="m_passphraseLineEdit">
+     <property name="echoMode">
+      <enum>QLineEdit::Password</enum>
+     </property>
+     <property name="placeholderText">
+      <string>Passphrase</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="m_confirmLineEdit">
+     <property name="echoMode">
+      <enum>QLineEdit::Password</enum>
+     </property>
+     <property name="placeholderText">
+      <string>Confirm passphrase</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="m_iconLabel">
+     <property name="text">
+      <string/>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
--- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp
+++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
@@ -31,11 +31,13 @@
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>
 #include <kpmcore/fs/filesystem.h>
+#include <kpmcore/fs/luks.h>

 // Qt
 #include <QDebug>
 #include <QDir>
 #include <QFileInfo>
+#include <QProcess>

 typedef QHash<QString, QString> UuidForPartitionHash;

@@ -61,6 +63,22 @@ findPartitionUuids( QList < Device* > devices )
    return hash;
 }

+
+static QString
+getLuksUuid( const QString& path )
+{
+    QProcess process;
+    process.setProgram( "cryptsetup" );
+    process.setArguments( { "luksUUID", path } );
+    process.start();
+    process.waitForFinished();
+    if ( process.exitStatus() != QProcess::NormalExit || process.exitCode() )
+        return QString();
+    QString uuid = QString::fromLocal8Bit( process.readAllStandardOutput() ).trimmed();
+    return uuid;
+}
+
+
 static QVariant
 mapForPartition( Partition* partition, const QString& uuid )
 {
@@ -73,6 +91,20 @@ mapForPartition( Partition* partition, const QString& uuid )
             << "mtpoint:" << PartitionInfo::mountPoint( partition )
             << "fs:" << partition->fileSystem().name()
             << uuid;
+
+    if ( partition->roles().has( PartitionRole::Luks ) )
+    {
+        const FileSystem& fsRef = partition->fileSystem();
+        const FS::luks* luksFs = dynamic_cast< const FS::luks* >( &fsRef );
+        if ( luksFs )
+        {
+            map[ "luksMapperName" ] = luksFs->mapperName( partition->partitionPath() ).split( "/" ).last();
+            map[ "luksUuid" ] = getLuksUuid( partition->partitionPath() );
+            map[ "luksPassphrase" ] = luksFs->passphrase();
+            cDebug() << "luksMapperName:" << map[ "luksMapperName" ];
+        }
+    }
+
    return map;
 }

--- a/src/modules/unpackfs/main.py
+++ b/src/modules/unpackfs/main.py
@@ -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])

--- a/src/modules/webview/CMakeLists.txt
+++ b/src/modules/webview/CMakeLists.txt
@@ -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
--- a/src/modules/welcome/checker/RequirementsChecker.cpp
+++ b/src/modules/welcome/checker/RequirementsChecker.cpp
@@ -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 );
Author	SHA1	Message	Date
Teo Mrnjavac	fb04800d4a	Bumpitybump.	2016-05-06 19:01:27 +02:00
Teo Mrnjavac	108b83cfd7	Write crypto_keyfile into mkinicpio configuration.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	017aa1ec86	luksbootkeyfile module, mandatory if installing with encrypted GRUB2.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	31106629cb	Passphrase in storage.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	db63109539	Mount correctly.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	43ae4eac80	Get the mapper name, not the whole path.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	db9454d199	Allow installing grub on an encrypted fs.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	beb16a77f0	use actual mapperName, not suggestedMapperName.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	5ddd0f523b	Use luksMapperName as check.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	0b9c9022dd	Yeah, partition["isLuks"], how about no.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	f861c13dad	Improve LUKS check and use luksUuid instead of uuid.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	c83e67b421	Always declare whether a partition is LUKS in the map.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	cd304b7a6f	Get luksUuid instead of innerFs UUID.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	e1ee6e181a	Proper check for luksMapperName key.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	b792ea0216	Rebuild autopartition proposal when encryption choice changes.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	b6c2e0f4d7	Documentation	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	a0350bbaaa	Useless variable is useless.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	dd7cd42118	Fixes suggested by linter.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	282f1f9135	Add LUKS support to systemd-boot configuration.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	105c8990eb	Better list init.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	cc792d03a6	Add cryptdevice param to kernel line in grubcfg.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	0bc33645fa	Add encrypt hook to initrd if needed.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	f5f73fbd4d	Use the mapper name to mount if it's a LUKS partition.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	126ad300ae	Write mapperName for LUKS volumes in GlobalStorage.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	759ccae9f6	Tentative LUKS support for EraseAutopartition. Partitioning only, install doesn't work yet.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	0cc9560a99	Hook up EncryptWidget in ChoicePage, plus improve next status handling.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	0dfe627d52	Add KPMHelpers::createNewEncryptedPartition.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	6e92a04320	Say hello to EncryptWidget.	2016-05-06 18:59:51 +02:00
Teo Mrnjavac	e090463545	Bumpitybump.	2016-05-06 18:37:11 +02:00
Calamares CI	bba16efcfc	Automatic merge of Transifex translations	2016-05-06 00:31:15 +00:00
Teo Mrnjavac	e122600689	Make sure to add KPMcore to include directories.	2016-05-05 07:57:56 +02:00
Teo Mrnjavac	a9c87e2f14	Fix bug with RAM/storage required settings being ignored if set as int.	2016-05-02 18:08:29 +02:00
Calamares CI	2dcfdc0170	Automatic merge of Transifex translations	2016-04-30 00:31:03 +00:00
Calamares CI	c7f8a09cc0	Automatic merge of Transifex translations	2016-04-29 00:30:57 +00:00
Teo Mrnjavac	98b5085e6e	Make sure we print the error message before the finally: kicks in.	2016-04-28 16:37:21 +02:00
Calamares CI	69b72e8a76	Automatic merge of Transifex translations	2016-04-28 00:31:17 +00:00
Calamares CI	77afb7796c	Automatic merge of Transifex translations	2016-04-27 02:44:57 +00:00
Teo Mrnjavac	c1992f8062	WEBVIEW_FORCE_WEBKIT option for webview module.	2016-04-22 15:56:37 +02:00
Calamares CI	10aa5a5653	Automatic merge of Transifex translations	2016-04-20 00:31:00 +00:00
Calamares CI	523b9332bd	Automatic merge of Transifex translations	2016-04-18 00:31:08 +00:00
Calamares CI	7e451e9345	Automatic merge of Transifex translations	2016-04-17 00:31:14 +00:00
Calamares CI	fc7e4a232e	Automatic merge of Transifex translations	2016-04-16 00:31:06 +00:00
Calamares CI	78315de3b6	Automatic merge of Transifex translations	2016-04-15 00:31:05 +00:00
Calamares CI	50751e7bac	Automatic merge of Transifex translations	2016-04-14 00:33:28 +00:00
Calamares CI	1df3c75a29	Automatic merge of Transifex translations	2016-04-12 00:51:28 +00:00
Calamares CI	9c100dab67	Automatic merge of Transifex translations	2016-04-10 00:31:01 +00:00