[Merge] with upstream

CMakeLists.txt

@@ -237,6 +237,11 @@ set_package_properties(
 find_package(ECM ${ECM_VERSION} NO_MODULE)
 if( ECM_FOUND )
     set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
+    if ( BUILD_TESTING )
+        # ECM implies that we can build the tests, too
+        find_package( Qt5 COMPONENTS Test REQUIRED )
+        include( ECMAddTests )
+    endif()
 endif()
 
 find_package( KF5 COMPONENTS CoreAddons Crash )

calamares.desktop

@@ -14,165 +14,165 @@ Categories=Qt;System;
 X-AppStream-Ignore=true
 
 Name[ar]=نظام التثبيت
-Icon[be]=calamares
-GenericName[be]=Усталёўшчык сістэмы
 Comment[be]=Calamares — усталёўшчык сістэмы
+Icon[be]=calamares
 Name[be]=Усталяваць сістэму
-Icon[bg]=calamares
+GenericName[be]=Усталёўшчык сістэмы
-GenericName[bg]=Системен Инсталатор
 Comment[bg]=Calamares — Системен Инсталатор
+Icon[bg]=calamares
 Name[bg]=Инсталирай системата
-Icon[ca]=calamares
+GenericName[bg]=Системен Инсталатор
-GenericName[ca]=Instal·lador de sistema
 Comment[ca]=Calamares — Instal·lador de sistema
+Icon[ca]=calamares
 Name[ca]=Instal·la el sistema
-Icon[da]=calamares
+GenericName[ca]=Instal·lador de sistema
-GenericName[da]=Systeminstallationsprogram
 Comment[da]=Calamares — Systeminstallationsprogram
+Icon[da]=calamares
 Name[da]=Installér system
-Icon[de]=calamares
+GenericName[da]=Systeminstallationsprogram
-GenericName[de]=Installation des Betriebssystems
 Comment[de]=Calamares - Installation des Betriebssystems
+Icon[de]=calamares
 Name[de]=System installieren
-Icon[el]=calamares
+GenericName[de]=Installation des Betriebssystems
-GenericName[el]=Εγκατάσταση συστήματος
 Comment[el]=Calamares — Εγκατάσταση συστήματος
+Icon[el]=calamares
 Name[el]=Εγκατάσταση συστήματος
-Icon[en_GB]=calamares
+GenericName[el]=Εγκατάσταση συστήματος
-GenericName[en_GB]=System Installer
 Comment[en_GB]=Calamares — System Installer
+Icon[en_GB]=calamares
 Name[en_GB]=Install System
-Icon[es]=calamares
+GenericName[en_GB]=System Installer
-GenericName[es]=Instalador del Sistema
 Comment[es]=Calamares — Instalador del Sistema
+Icon[es]=calamares
 Name[es]=Instalar Sistema
-Icon[et]=calamares
+GenericName[es]=Instalador del Sistema
-GenericName[et]=Süsteemipaigaldaja
 Comment[et]=Calamares — süsteemipaigaldaja
+Icon[et]=calamares
 Name[et]=Paigalda süsteem
+GenericName[et]=Süsteemipaigaldaja
 Name[eu]=Sistema instalatu
 Name[es_PR]=Instalar el sistema
-Icon[fr]=calamares
-GenericName[fr]=Installateur système
 Comment[fr]=Calamares - Installateur système
+Icon[fr]=calamares
 Name[fr]=Installer le système
+GenericName[fr]=Installateur système
 Name[gl]=Instalación do Sistema
-Icon[he]=calamares
-GenericName[he]=אשף התקנה
 Comment[he]=Calamares - אשף התקנה
+Icon[he]=calamares
 Name[he]=התקנת מערכת
-Icon[hi]=calamares
+GenericName[he]=אשף התקנה
-GenericName[hi]=सिस्टम इंस्टॉलर
 Comment[hi]=Calamares — सिस्टम इंस्टॉलर
+Icon[hi]=calamares
 Name[hi]=सिस्टम इंस्टॉल करें
-Icon[hr]=calamares
+GenericName[hi]=सिस्टम इंस्टॉलर
-GenericName[hr]=Instalacija sustava
 Comment[hr]=Calamares — Instalacija sustava
+Icon[hr]=calamares
 Name[hr]=Instaliraj sustav
-Icon[hu]=calamares
+GenericName[hr]=Instalacija sustava
-GenericName[hu]=Rendszer Telepítő
 Comment[hu]=Calamares — Rendszer Telepítő
+Icon[hu]=calamares
 Name[hu]=Rendszer telepítése 
-Icon[id]=calamares
+GenericName[hu]=Rendszer Telepítő
-GenericName[id]=Pemasang
 Comment[id]=Calamares — Pemasang Sistem
+Icon[id]=calamares
 Name[id]=Instal Sistem
-Icon[is]=calamares
+GenericName[id]=Pemasang
-GenericName[is]=Kerfis uppsetning
 Comment[is]=Calamares — Kerfis uppsetning
+Icon[is]=calamares
 Name[is]=Setja upp kerfið
-Icon[cs_CZ]=calamares
+GenericName[is]=Kerfis uppsetning
-GenericName[cs_CZ]=Instalátor systému
 Comment[cs_CZ]=Calamares – instalátor operačních systémů
+Icon[cs_CZ]=calamares
 Name[cs_CZ]=Nainstalovat
-Icon[ja]=calamares
+GenericName[cs_CZ]=Instalátor systému
-GenericName[ja]=システムインストーラー
 Comment[ja]=Calamares — システムインストーラー
+Icon[ja]=calamares
 Name[ja]=システムをインストール
-Icon[ko]=깔라마레스
+GenericName[ja]=システムインストーラー
-GenericName[ko]=시스템 설치 관리자
 Comment[ko]=깔라마레스 — 시스템 설치 관리자
+Icon[ko]=깔라마레스
 Name[ko]=시스템 설치
-Icon[lt]=calamares
+GenericName[ko]=시스템 설치 관리자
-GenericName[lt]=Sistemos diegimas į kompiuterį
 Comment[lt]=Calamares — Sistemos diegimo programa
+Icon[lt]=calamares
 Name[lt]=Įdiegti Sistemą
-Icon[it_IT]=calamares
+GenericName[lt]=Sistemos diegimas į kompiuterį
-GenericName[it_IT]=Programma d'installazione del sistema
 Comment[it_IT]=Calamares — Programma d'installazione del sistema
+Icon[it_IT]=calamares
 Name[it_IT]=Installa il sistema
-Icon[nb]=calamares
+GenericName[it_IT]=Programma d'installazione del sistema
-GenericName[nb]=Systeminstallatør
 Comment[nb]=Calamares-systeminstallatør
+Icon[nb]=calamares
 Name[nb]=Installer System
-Icon[nl]=calamares
+GenericName[nb]=Systeminstallatør
-GenericName[nl]=Installatieprogramma
 Comment[nl]=Calamares — Installatieprogramma
+Icon[nl]=calamares
 Name[nl]=Installeer systeem
-Icon[pl]=calamares
+GenericName[nl]=Installatieprogramma
-GenericName[pl]=Instalator systemu
 Comment[pl]=Calamares — Instalator systemu
+Icon[pl]=calamares
 Name[pl]=Zainstaluj system
-Icon[pt_BR]=calamares
+GenericName[pl]=Instalator systemu
-GenericName[pt_BR]=Instalador de Sistema
 Comment[pt_BR]=Calamares — Instalador de Sistema
+Icon[pt_BR]=calamares
 Name[pt_BR]=Sistema de Instalação
-Icon[ro]=calamares
+GenericName[pt_BR]=Instalador de Sistema
-GenericName[ro]=Instalator de sistem
 Comment[ro]=Calamares — Instalator de sistem
+Icon[ro]=calamares
 Name[ro]=Instalează sistemul
-Icon[ru]=calamares
+GenericName[ro]=Instalator de sistem
-GenericName[ru]=Установщик системы
 Comment[ru]=Calamares - Установщик системы
+Icon[ru]=calamares
 Name[ru]=Установить систему
-Icon[sk]=calamares
+GenericName[ru]=Установщик системы
-GenericName[sk]=Inštalátor systému
 Comment[sk]=Calamares — Inštalátor systému
+Icon[sk]=calamares
 Name[sk]=Inštalovať systém
+GenericName[sk]=Inštalátor systému
 Name[sl]=Namesti sistem
-Icon[sq]=calamares
-GenericName[sq]=Instalues Sistemi
 Comment[sq]=Calamares — Instalues Sistemi
+Icon[sq]=calamares
 Name[sq]=Instalo Sistemin
-Icon[fi_FI]=calamares
+GenericName[sq]=Instalues Sistemi
-GenericName[fi_FI]=Järjestelmän Asennusohjelma
 Comment[fi_FI]=Calamares — Järjestelmän Asentaja
+Icon[fi_FI]=calamares
 Name[fi_FI]=Asenna Järjestelmä
+GenericName[fi_FI]=Järjestelmän Asennusohjelma
 Name[sr@latin]=Instaliraj sistem
 Name[sr]=Инсталирај систем
-Icon[sv]=calamares
-GenericName[sv]=Systeminstallerare
 Comment[sv]=Calamares — Systeminstallerare
+Icon[sv]=calamares
 Name[sv]=Installera system
+GenericName[sv]=Systeminstallerare
 Name[th]=ติดตั้งระบบ
-GenericName[uk]=Встановлювач системи
 Comment[uk]=Calamares - Встановлювач системи
 Name[uk]=Встановити Систему
-Icon[zh_CN]=calamares
+GenericName[uk]=Встановлювач системи
-GenericName[zh_CN]=系统安装程序
 Comment[zh_CN]=Calamares — 系统安装程序
+Icon[zh_CN]=calamares
 Name[zh_CN]=安装系统
-Icon[zh_TW]=calamares
+GenericName[zh_CN]=系统安装程序
-GenericName[zh_TW]=系統安裝程式
 Comment[zh_TW]=Calamares ── 系統安裝程式
+Icon[zh_TW]=calamares
 Name[zh_TW]=安裝系統
-Icon[ast]=calamares
+GenericName[zh_TW]=系統安裝程式
-GenericName[ast]=Instalador del sistema
 Comment[ast]=Calamares — Instalador del sistema
+Icon[ast]=calamares
 Name[ast]=Instalar sistema
-Icon[eo]=calamares
+GenericName[ast]=Instalador del sistema
-GenericName[eo]=Sistema Instalilo
 Comment[eo]=Calamares — Sistema Instalilo
+Icon[eo]=calamares
 Name[eo]=Instali Sistemo
-Icon[es_MX]=calamares
+GenericName[eo]=Sistema Instalilo
-GenericName[es_MX]=Instalador del sistema
 Comment[es_MX]=Calamares - Instalador del sistema
+Icon[es_MX]=calamares
 Name[es_MX]=Instalar el Sistema
-Icon[pt_PT]=calamares
+GenericName[es_MX]=Instalador del sistema
-GenericName[pt_PT]=Instalador de Sistema
 Comment[pt_PT]=Calamares - Instalador de Sistema
+Icon[pt_PT]=calamares
 Name[pt_PT]=Instalar Sistema
-Icon[tr_TR]=calamares
+GenericName[pt_PT]=Instalador de Sistema
-GenericName[tr_TR]=Sistem Yükleyici
 Comment[tr_TR]=Calamares — Sistem Yükleyici
+Icon[tr_TR]=calamares
 Name[tr_TR]=Sistemi Yükle
+GenericName[tr_TR]=Sistem Yükleyici

lang/calamares_da.ts

@@ -1693,7 +1693,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="196"/>
         <source>The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.</source>
-        <translation>Partitionstabellen på %1 har allerede %2 primære partitioner, og der kan ikke tilføjes flere. Fjern venligst en primær partition og tilføj i stedet en udviddet partition.</translation>
+        <translation>Partitionstabellen på %1 har allerede %2 primære partitioner, og der kan ikke tilføjes flere. Fjern venligst en primær partition og tilføj i stedet en udvidet partition.</translation>
     </message>
 </context>
 <context>

lang/calamares_fr.ts

@@ -4,7 +4,7 @@
     <message>
         <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="69"/>
         <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>L&apos;&lt;strong&gt;environnement de démarrage&lt;/strong&gt; de ce système.&lt;br&gt;&lt;br&gt;Les anciens systèmes x86 supportent uniquement le &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Les systèmes récents utilisent habituellement &lt;strong&gt;EFI&lt;/strong&gt;, mais peuvent également afficher BIOS s&apos;ils sont démarrés en mode de compatibilité.</translation>
+        <translation>L&apos;&lt;strong&gt;environnement de démarrage&lt;/strong&gt; de ce système.&lt;br&gt;&lt;br&gt;Les anciens systèmes x86 supportent uniquement &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Les systèmes récents utilisent habituellement &lt;strong&gt;EFI&lt;/strong&gt;, mais peuvent également afficher BIOS s&apos;ils sont démarrés en mode de compatibilité.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="79"/>

lang/calamares_he.ts

@@ -521,7 +521,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/contextualprocess/ContextualProcessJob.cpp" line="117"/>
         <source>Contextual Processes Job</source>
-        <translation type="unfinished"/>
+        <translation>משימת תהליכי הקשר</translation>
     </message>
 </context>
 <context>
@@ -2358,7 +2358,7 @@ Output:
     <message>
         <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
         <source>Shell Processes Job</source>
-        <translation type="unfinished"/>
+        <translation>משימת תהליכי מעטפת</translation>
     </message>
 </context>
 <context>

lang/calamares_hu.ts

@@ -207,7 +207,7 @@
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="277"/>
         <source>&amp;Install</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Telepítés</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="325"/>
@@ -229,7 +229,7 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="332"/>
         <source>&amp;No</source>
-        <translation>@Nem</translation>
+        <translation>&amp;Nem</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="163"/>
@@ -944,7 +944,7 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
         <source>&amp;Restart now</source>
-        <translation>$Újraindítás most</translation>
+        <translation>Új&amp;raindítás most</translation>
     </message>
     <message>
         <location filename="../src/modules/finished/FinishedPage.cpp" line="51"/>

lang/calamares_lt.ts

@@ -244,7 +244,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="238"/>
         <source>The %1 installer is about to make changes to your disk in order to install %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
-        <translation>%1 diegimo programa, siekdama įdiegti %2, ketina atlikti pakeitimus diske.&lt;br/&gt;&lt;strong&gt;Šių pakeitimų atšaukti nebegalėsite.&lt;/strong&gt;</translation>
+        <translation>%1 diegimo programa, siekdama įdiegti %2, ketina atlikti pakeitimus diske.&lt;br/&gt;&lt;strong&gt;Šių pakeitimų nebegalėsite atšaukti.&lt;/strong&gt;</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="243"/>

lang/calamares_nl.ts

@@ -50,7 +50,7 @@
     <message>
         <location filename="../src/libcalamaresui/viewpages/BlankViewStep.cpp" line="69"/>
         <source>Blank Page</source>
-        <translation type="unfinished"/>
+        <translation>Lege pagina</translation>
     </message>
 </context>
 <context>
@@ -192,7 +192,7 @@
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="179"/>
         <source>Calamares Initialization Failed</source>
-        <translation type="unfinished"/>
+        <translation>Calamares Initialisatie mislukt</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="180"/>
@@ -202,7 +202,7 @@
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="185"/>
         <source>&lt;br/&gt;The following modules could not be loaded:</source>
-        <translation type="unfinished"/>
+        <translation>&lt;br/&gt;The volgende modules konden niet worden geladen:</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="277"/>
@@ -1244,7 +1244,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="151"/>
         <source>Password is too weak</source>
-        <translation type="unfinished"/>
+        <translation>Wachtwoord is te zwak</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="158"/>
@@ -1259,12 +1259,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="164"/>
         <source>The password is the same as the old one</source>
-        <translation type="unfinished"/>
+        <translation>Het wachtwoord is hetzelfde als het oude wachtwoord</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="166"/>
         <source>The password is a palindrome</source>
-        <translation type="unfinished"/>
+        <translation>Het wachtwoord is een palindroom</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="168"/>
@@ -1274,12 +1274,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="170"/>
         <source>The password is too similar to the old one</source>
-        <translation type="unfinished"/>
+        <translation>Het wachtwoord lijkt te veel op het oude wachtwoord</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="172"/>
         <source>The password contains the user name in some form</source>
-        <translation type="unfinished"/>
+        <translation>Het wachtwoord bevat de gebruikersnaam op een of andere manier</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="174"/>

lang/calamares_zh_CN.ts

@@ -9,7 +9,7 @@
     <message>
         <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="79"/>
         <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>这个系统从 &lt;strong&gt;EFI&lt;/strong&gt; 引导环境启动。&lt;br&gt;&lt;br&gt;目前市面上大多数的民用设备都使用 EFI，并同时与之使用 GPT 分区表。&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>
+        <translation>这个系统是从 &lt;strong&gt;EFI&lt;/strong&gt; 引导环境启动的。&lt;br&gt;&lt;br&gt;目前市面上大多数的民用设备都使用 EFI，并同时对硬盘使用 GPT 分区表分区。&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;。这个步骤将会由本安装程序自动执行，除非您选择自己创建分区——此时您必须选择让本安装程序自动创建EFI分区或您自己手动创建EFI分区。</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="91"/>
@@ -51,7 +51,7 @@
     <message>
         <location filename="../src/libcalamaresui/viewpages/BlankViewStep.cpp" line="69"/>
         <source>Blank Page</source>
-        <translation type="unfinished"/>
+        <translation>空白页</translation>
     </message>
 </context>
 <context>
@@ -193,17 +193,17 @@
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="179"/>
         <source>Calamares Initialization Failed</source>
-        <translation type="unfinished"/>
+        <translation>Calamares安装失败</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="180"/>
         <source>%1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.</source>
-        <translation type="unfinished"/>
+        <translation>％1无法安装。 Calamares无法加载所有已配置的模块。这是分配使用Calamares的方式的问题。</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="185"/>
         <source>&lt;br/&gt;The following modules could not be loaded:</source>
-        <translation type="unfinished"/>
+        <translation>&lt;br/&gt;无法加载以下模块：</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="277"/>
@@ -265,7 +265,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="284"/>
         <source>The installation is complete. Close the installer.</source>
-        <translation>安装过程已完毕。请关闭安装器。</translation>
+        <translation>安装已完成。请关闭安装程序。</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="160"/>
@@ -334,7 +334,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="174"/>
         <source>For best results, please ensure that this computer:</source>
-        <translation>为了更好的体验，请确定这台电脑: </translation>
+        <translation>为了更好的体验，请确保这台电脑: </translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="202"/>
@@ -509,12 +509,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
         <source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
-        <translation type="unfinished"/>
+        <translation>该命令在主机环境中运行，且需要知道根路径，但没有定义root挂载点。</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
         <source>The command needs to know the user&apos;s name, but no username is defined.</source>
-        <translation type="unfinished"/>
+        <translation>命令行需要知道用户的名字，但用户名没有被设置</translation>
     </message>
 </context>
 <context>
@@ -1665,7 +1665,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="107"/>
         <source>Cre&amp;ate</source>
-        <translation type="unfinished"/>
+        <translation>创建</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="114"/>
@@ -1690,12 +1690,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="195"/>
         <source>Can not create new partition</source>
-        <translation type="unfinished"/>
+        <translation>无法创建新分区</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="196"/>
         <source>The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.</source>
-        <translation type="unfinished"/>
+        <translation>％1上的分区表已经有％2个主分区，并且不能再添加。请删除一个主分区并添加扩展分区。</translation>
     </message>
 </context>
 <context>
@@ -1841,17 +1841,17 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="83"/>
         <source>Saving files for later ...</source>
-        <translation type="unfinished"/>
+        <translation>保存文件以供日后使用</translation>
     </message>
     <message>
         <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="89"/>
         <source>No files configured to save for later.</source>
-        <translation type="unfinished"/>
+        <translation>没有已保存且供日后使用的配置文件。</translation>
     </message>
     <message>
         <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="145"/>
         <source>Not all of the configured files could be preserved.</source>
-        <translation type="unfinished"/>
+        <translation>并不是所有配置文件都可以被保留</translation>
     </message>
 </context>
 <context>

lang/python/hu/LC_MESSAGES/python.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-18 07:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: miku84, 2017\n"
+"Last-Translator: Adriaan de Groot <groot@kde.org>, 2018\n"
 "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: src/modules/umount/main.py:40
 msgid "Unmount file systems."
-msgstr ""
+msgstr "Fájlrendszerek leválasztása."
 
 #: src/modules/dummypython/main.py:44
 msgid "Dummy python job."
@@ -47,12 +47,12 @@ msgstr "Csomagok telepítése."
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
+msgstr[0] "Egy csomag telepítése."
-msgstr[1] ""
+msgstr[1] "%(num)d csomag telepítése."
 
 #: src/modules/packages/main.py:70
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
+msgstr[0] "Egy csomag eltávolítása."
-msgstr[1] ""
+msgstr[1] "%(num)d csomag eltávolítása."

src/libcalamares/CMakeLists.txt

@@ -105,6 +105,19 @@ install( TARGETS calamares
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
+if ( ECM_FOUND AND BUILD_TESTING )
+    ecm_add_test(
+            Tests.cpp
+        TEST_NAME
+            libcalamarestest
+        LINK_LIBRARIES
+            calamares
+            Qt5::Core
+            Qt5::Test
+    )
+    set_target_properties( libcalamarestest PROPERTIES AUTOMOC TRUE )
+endif()
+
 # Make symlink lib/calamares/libcalamares.so to lib/libcalamares.so.VERSION so
 # lib/calamares can be used as module path for the Python interpreter.
 install( CODE "

src/libcalamares/Tests.cpp

@@ -0,0 +1,59 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2018, Adriaan de Groot <groot@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 "Tests.h"
+
+#include "utils/Logger.h"
+
+#include <QtTest/QtTest>
+
+QTEST_GUILESS_MAIN( LibCalamaresTests )
+
+LibCalamaresTests::LibCalamaresTests()
+{
+}
+
+LibCalamaresTests::~LibCalamaresTests()
+{
+}
+
+void
+LibCalamaresTests::initTestCase()
+{
+}
+
+void
+LibCalamaresTests::testDebugLevels()
+{
+    Logger::setupLogLevel( Logger::LOG_DISABLE );
+
+    QCOMPARE( Logger::logLevel(), Logger::LOG_DISABLE );
+
+    for ( unsigned int level = 0; level <= Logger::LOGVERBOSE ; ++level )
+    {
+        Logger::setupLogLevel( level );
+        QCOMPARE( Logger::logLevel(), level );
+        QVERIFY( Logger::logLevelEnabled( level ) );
+
+        for ( unsigned int xlevel = 0; xlevel <= Logger::LOGVERBOSE; ++xlevel )
+        {
+            QCOMPARE( Logger::logLevelEnabled( xlevel ), xlevel <= level );
+        }
+    }
+}
+

src/libcalamares/Tests.h

@@ -0,0 +1,36 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2018, Adriaan de Groot <groot@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 TESTS_H
+#define TESTS_H
+
+#include <QObject>
+
+class LibCalamaresTests : public QObject
+{
+    Q_OBJECT
+public:
+    LibCalamaresTests();
+    ~LibCalamaresTests() override;
+
+private Q_SLOTS:
+    void initTestCase();
+    void testDebugLevels();
+};
+
+#endif

src/libcalamares/utils/Logger.cpp

@@ -55,6 +55,18 @@ setupLogLevel(unsigned int level)
     s_threshold = level + 1;  // Comparison is < in log() function
 }
 
+bool
+logLevelEnabled(unsigned int level)
+{
+    return level < s_threshold;
+}
+
+unsigned int
+logLevel()
+{
+    return s_threshold > 0 ? s_threshold - 1 : 0;
+}
+
 static void
 log( const char* msg, unsigned int debugLevel, bool toDisk = true )
 {

src/libcalamares/utils/Logger.h

@@ -89,6 +89,12 @@ namespace Logger
      */
     DLLEXPORT void setupLogLevel( unsigned int level );
 
+    /** @brief Return the configured log-level. */
+    DLLEXPORT unsigned int logLevel();
+
+    /** @brief Would the given @p level really be logged? */
+    DLLEXPORT bool logLevelEnabled( unsigned int level );
+
     /**
      * @brief Row-oriented formatted logging.
      *

src/modules/contextualprocess/CMakeLists.txt

@@ -8,10 +8,7 @@ calamares_add_plugin( contextualprocess
     SHARED_LIB
 )
 
-if( ECM_FOUND )
+if( ECM_FOUND AND BUILD_TESTING )
-    find_package( Qt5 COMPONENTS Test REQUIRED )
-    include( ECMAddTests )
-
     ecm_add_test(
             Tests.cpp
             ContextualProcessJob.cpp  # Builds it a second time

src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-04 08:16-0400\n"
+"POT-Creation-Date: 2018-06-18 07:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>, 2017\n"
+"Last-Translator: soenggam <senggemg@gmail.com>, 2017\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr "按我按我！"
 
 #: src/modules/dummypythonqt/main.py:94
 msgid "A new QLabel."
-msgstr "一个平淡无奇的 QLabel。"
+msgstr "一个新的QLabel。"
 
 #: src/modules/dummypythonqt/main.py:97
 msgid "Dummy PythonQt ViewStep"

src/modules/fsresizer/CMakeLists.txt

@@ -20,10 +20,7 @@ if ( KPMcore_FOUND )
         SHARED_LIB
     )
 
-    if( ECM_FOUND )
+    if( ECM_FOUND AND BUILD_TESTING )
-        find_package( Qt5 COMPONENTS Test REQUIRED )
-        include( ECMAddTests )
-
         ecm_add_test(
                 Tests.cpp
             TEST_NAME

src/modules/fsresizer/ResizeFSJob.cpp

@@ -302,7 +302,7 @@ ResizeFSJob::exec()
             return Calamares::JobResult::error(
                 tr( "Resize Failed" ),
                 !m_fsname.isEmpty() ? tr( "The filesystem %1 must be resized, but cannot." ).arg( m_fsname )
-                                    : tr( "The device %11 must be resized, but cannot" ).arg( m_fsname ) );
+                                    : tr( "The device %1 must be resized, but cannot" ).arg( m_fsname ) );
 
         return Calamares::JobResult::ok();
     }

src/modules/locale/CMakeLists.txt

@@ -1,9 +1,3 @@
-find_package(ECM ${ECM_VERSION} NO_MODULE)
-if( ECM_FOUND AND BUILD_TESTING )
-    include( ECMAddTests )
-    find_package( Qt5 COMPONENTS Core Test REQUIRED )
-endif()
-
 # When debugging the timezone widget, add this debugging definition
 # to have a debugging-friendly timezone widget, debug logging,
 # and no intrusive timezone-setting while clicking around.

src/modules/partition/core/PartitionCoreModule.cpp

@@ -509,18 +509,8 @@ PartitionCoreModule::jobs() const
         lst << info->jobs;
         devices << info->device.data();
     }
-    cDebug() << "Creating FillGlobalStorageJob with bootLoader path" << m_bootLoaderInstallPath;
     lst << Calamares::job_ptr( new FillGlobalStorageJob( devices, m_bootLoaderInstallPath ) );
 
-
-    QStringList jobsDebug;
-    foreach ( auto job, lst )
-        jobsDebug.append( job->prettyName() );
-
-    cDebug() << "PartitionCodeModule has been asked for jobs. About to return:";
-    for ( const auto item: jobsDebug )
-        cDebug() << "  .." << item;
-
     return lst;
 }
 
@@ -573,9 +563,9 @@ PartitionCoreModule::dumpQueue() const
     cDebug() << "# Queue:";
     for ( auto info : m_deviceInfos )
     {
-        cDebug() << "  .. Device:" << info->device->name();
+        cDebug() << "## Device:" << info->device->name();
         for ( auto job : info->jobs )
-            cDebug() << "  .." << job->prettyName();
+            cDebug() << "-" << job->prettyName();
     }
 }
 

src/modules/partition/jobs/CreatePartitionTableJob.cpp

@@ -20,6 +20,8 @@
 
 #include "jobs/CreatePartitionTableJob.h"
 
+#include "core/PartitionIterator.h"
+
 #include "utils/Logger.h"
 
 // KPMcore
@@ -65,6 +67,14 @@ CreatePartitionTableJob::prettyStatusMessage() const
 }
 
 
+static inline QDebug&
+operator <<( QDebug& s, PartitionIterator& it )
+{
+    s << ( ( *it ) ? ( *it )->deviceNode() : QString( "<null device>" ) );
+    return s;
+}
+
+
 Calamares::JobResult
 CreatePartitionTableJob::exec()
 {
@@ -73,33 +83,28 @@ CreatePartitionTableJob::exec()
 
     PartitionTable* table = m_device->partitionTable();
     cDebug() << "Creating new partition table of type" << table->typeName()
-             << " - Uncommitted yet: " << table;
+             << ", uncommitted yet:";
 
-    QProcess lsblk;
+    if ( Logger::logLevelEnabled( Logger::LOGDEBUG ) )
-    lsblk.setProgram( "lsblk" );
+    {
-    lsblk.setProcessChannelMode( QProcess::MergedChannels );
+        for ( auto it = PartitionIterator::begin( table );
-    lsblk.start();
+            it != PartitionIterator::end( table ); ++it )
-    lsblk.waitForFinished();
+            cDebug() << *it;
 
-    QByteArray byte = lsblk.readAllStandardOutput();
+        QProcess lsblk;
-    QStringList lines = QString(byte).split(("\n"),QString::SkipEmptyParts);
+        lsblk.setProgram( "lsblk" );
-    cDebug() << "CreatePartitionTableJob asked for lsblk output:";
+        lsblk.setProcessChannelMode( QProcess::MergedChannels );
+        lsblk.start();
+        lsblk.waitForFinished();
+        cDebug() << "lsblk:\n" << lsblk.readAllStandardOutput();
 
-    for (const auto line: lines)
+        QProcess mount;
-        cDebug() << "  .." << line;
+        mount.setProgram( "mount" );
-
+        mount.setProcessChannelMode( QProcess::MergedChannels );
-    QProcess mount;
+        mount.start();
-    mount.setProgram( "mount" );
+        mount.waitForFinished();
-    mount.setProcessChannelMode( QProcess::MergedChannels );
+        cDebug() << "mount:\n" << mount.readAllStandardOutput();
-    mount.start();
+    }
-    mount.waitForFinished();
-
-    QByteArray mbyte = mount.readAllStandardOutput();
-    QStringList mlines = QString(mbyte).split(("\n"),QString::SkipEmptyParts);
-    cDebug() << "CreatePartitionTableJob asked for mount output:";
-
-    for (const auto mline: mlines)
-        cDebug() << "  .." << mline;
 
     CreatePartitionTableOperation op(*m_device, table);
     op.setStatus(Operation::StatusRunning);

src/modules/partition/jobs/FillGlobalStorageJob.cpp

@@ -56,9 +56,12 @@ findPartitionUuids( QList < Device* > devices )
             QString path = p->partitionPath();
             QString uuid = p->fileSystem().readUUID( p->partitionPath() );
             hash.insert( path, uuid );
+            cDebug() << ".. added path=" << path << "UUID=" << uuid;
         }
     }
-    cDebug() << hash;
+
+    if ( hash.isEmpty() )
+        cDebug() << ".. no UUIDs found.";
     return hash;
 }
 
@@ -90,10 +93,16 @@ mapForPartition( Partition* partition, const QString& uuid )
          dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() )
         map[ "fs" ] = dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS()->name();
     map[ "uuid" ] = uuid;
-    cDebug() << partition->partitionPath()
+
-             << "mtpoint:" << PartitionInfo::mountPoint( partition )
+    // Debugging for inside the loop in createPartitionList(),
-             << "fs:" << map[ "fs" ] << '(' << map[ "fsName" ] << ')'
+    // so indent a bit
-             << uuid;
+    Logger::CLog deb = cDebug();
+    using TR = Logger::DebugRow<const char *const, const QString&>;
+    deb << "  .. mapping for" << partition->partitionPath() << partition->deviceNode()
+        << TR( "mtpoint:", PartitionInfo::mountPoint( partition ) )
+        << TR( "fs:", map[ "fs" ].toString() )
+        << TR( "fsname", map[ "fsName" ].toString() )
+        << TR( "uuid", uuid );
 
     if ( partition->roles().has( PartitionRole::Luks ) )
     {
@@ -104,7 +113,7 @@ mapForPartition( Partition* partition, const QString& uuid )
             map[ "luksMapperName" ] = luksFs->mapperName().split( "/" ).last();
             map[ "luksUuid" ] = getLuksUuid( partition->partitionPath() );
             map[ "luksPassphrase" ] = luksFs->passphrase();
-            cDebug() << "luksMapperName:" << map[ "luksMapperName" ];
+            deb << TR( "luksMapperName:", map[ "luksMapperName" ].toString() );
         }
     }
 
@@ -215,9 +224,11 @@ FillGlobalStorageJob::createPartitionList() const
     cDebug() << "Writing to GlobalStorage[\"partitions\"]";
     for ( auto device : m_devices )
     {
+        cDebug() << ".. partitions on" << device->deviceNode();
         for ( auto it = PartitionIterator::begin( device );
               it != PartitionIterator::end( device ); ++it )
         {
+            // Debug-logging is done when creating the map
             lst << mapForPartition( *it, hash.value( ( *it )->partitionPath() ) );
         }
     }

src/modules/partition/jobs/SetPartitionFlagsJob.cpp

@@ -132,6 +132,10 @@ SetPartFlagsJob::prettyStatusMessage() const
 Calamares::JobResult
 SetPartFlagsJob::exec()
 {
+    cDebug() << "Setting flags on" << m_device->deviceNode()
+        << "partition" << partition()->deviceNode()
+        << "to" << m_flags;
+
     Report report ( nullptr );
     SetPartFlagsOperation op( *m_device, *partition(), m_flags );
     op.setStatus( Operation::StatusRunning );

src/modules/partition/tests/CMakeLists.txt

@@ -1,6 +1,4 @@
-find_package( Qt5 COMPONENTS Gui Test REQUIRED )
+find_package( Qt5 COMPONENTS Gui REQUIRED )
-
-include( ECMAddTests )
 
 set( PartitionModule_SOURCE_DIR .. )
 
@@ -23,13 +21,15 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-ecm_add_test( ${partitionjobtests_SRCS}
+if( ECM_FOUND AND BUILD_TESTING )
-    TEST_NAME partitionjobtests
+    ecm_add_test( ${partitionjobtests_SRCS}
-    LINK_LIBRARIES
+        TEST_NAME partitionjobtests
-        ${CALAMARES_LIBRARIES}
+        LINK_LIBRARIES
-        kpmcore
+            ${CALAMARES_LIBRARIES}
-        Qt5::Core
+            kpmcore
-        Qt5::Test
+            Qt5::Core
-)
+            Qt5::Test
+    )
 
-set_target_properties( partitionjobtests PROPERTIES AUTOMOC TRUE )
+    set_target_properties( partitionjobtests PROPERTIES AUTOMOC TRUE )
+endif()

src/modules/shellprocess/CMakeLists.txt

@@ -8,10 +8,7 @@ calamares_add_plugin( shellprocess
     SHARED_LIB
 )
 
-if( ECM_FOUND )
+if( ECM_FOUND AND BUILD_TESTING )
-    find_package( Qt5 COMPONENTS Test REQUIRED )
-    include( ECMAddTests )
-
     ecm_add_test(
             Tests.cpp
         TEST_NAME

src/modules/users/CMakeLists.txt

@@ -1,9 +1,4 @@
-find_package(ECM ${ECM_VERSION} NO_MODULE)
+find_package( Qt5 COMPONENTS Core REQUIRED )
-if( ECM_FOUND )
-    include( ECMAddTests )
-endif()
-
-find_package( Qt5 COMPONENTS Core Test REQUIRED )
 find_package( Crypt REQUIRED )
 
 # Add optional libraries here
@@ -44,7 +39,7 @@ calamares_add_plugin( users
     SHARED_LIB
 )
 
-if( ECM_FOUND )
+if( ECM_FOUND AND BUILD_TESTING )
     ecm_add_test(
             PasswordTests.cpp
             SetPasswordJob.cpp