napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/calamares/calamares into development

Browse Source
This commit is contained in:
Philip Müller 2020-02-28 10:04:17 +01:00
commit 42b065b1fc
32 changed files with 839 additions and 482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CHANGES
View File

@ -3,16 +3,29 @@ contributors are listed. Note that Calamares does not have a historical
changelog -- this log starts with version 3.2.0. The release notes on the changelog -- this log starts with version 3.2.0. The release notes on the
website will have to do for older versions. website will have to do for older versions.
# 3.2.20 (unreleased) # # 3.2.20 (2020-02-27) #
This release contains contributions from (alphabetically by first name): This release contains contributions from (alphabetically by first name):
- No external contributors yet - Bart Ribbers
## Core ## ## Core ##
- No core changes yet - When logging level is set to 8 (eight), for instance via the `-D8`
logging flag, or the `-d` debug flag, the *Show debug information*
button will appear in the progress view. This helps with debugging
issues where the `-d` flag would be inappropriate.
- Calamares now starts at logging level 1 (warnings and errors to
the console) by default. Previously it (wrongly) started at level 8.
## Modules ## ## Modules ##
- No module changes yet - The *partition* module now stores which filesystems are in use in
global storage.
- The *contextualprocess* module now understands "compound variable
names", where a dot (.) is used to index into structured data
stored in global storage. This allows it to use the map stored
by the partition module (but also other things, like looking into
the branding information).
- The *packages* module now understands "apk", the Alpine Linux
package manager.
# 3.2.19.1 (2020-02-24) # # 3.2.19.1 (2020-02-24) #

2
CMakeLists.txt
View File

@ -43,7 +43,7 @@ project( CALAMARES
VERSION 3.2.20 VERSION 3.2.20
LANGUAGES C CXX ) LANGUAGES C CXX )
set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development
### OPTIONS ### OPTIONS
# #

4
calamares.desktop
View File

@ -103,9 +103,9 @@ Icon[ja]=calamares
GenericName[ja]=システムインストーラー GenericName[ja]=システムインストーラー
Comment[ja]=Calamares — システムインストーラー Comment[ja]=Calamares — システムインストーラー
Name[ko]=시스템 설치 Name[ko]=시스템 설치
Icon[ko]=깔라마레스 (Calamares) Icon[ko]=깔라마레스
GenericName[ko]=시스템 설치 관리자 GenericName[ko]=시스템 설치 관리자
Comment[ko]=깔라마레스 (Calamares) — 시스템 설치 관리자 Comment[ko]=깔라마레스 — 시스템 설치 관리자
Name[lt]=Įdiegti Sistemą Name[lt]=Įdiegti Sistemą
Icon[lt]=calamares Icon[lt]=calamares
GenericName[lt]=Sistemos diegimas į kompiuterį GenericName[lt]=Sistemos diegimas į kompiuterį

40
lang/calamares_it_IT.ts
View File

@ -2471,7 +2471,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/>
<source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source> <source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source>
<translation type="unfinished"/> <translation>Scegliere il tema per l'ambiente desktop KDE Plasma. Si può anche saltare questa scelta e configurare il tema dopo aver installato il sistema. Cliccando su selezione del tema, ne sarà mostrata un'anteprima. </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/>
@ -2620,7 +2620,7 @@ Output:
<message> <message>
<location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="65"/> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="65"/>
<source>Requirements checking for module &lt;i&gt;%1&lt;/i&gt; is complete.</source> <source>Requirements checking for module &lt;i&gt;%1&lt;/i&gt; is complete.</source>
<translation type="unfinished"/> <translation>Il controllo dei requisiti per il modulo &lt;i&gt;%1&lt;/i&gt; è completo.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/locale/Label.cpp" line="39"/> <location filename="../src/libcalamares/locale/Label.cpp" line="39"/>
@ -2778,7 +2778,7 @@ Output:
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/>
<source>Calamares cannot start KPMCore for the file-system resize job.</source> <source>Calamares cannot start KPMCore for the file-system resize job.</source>
<translation type="unfinished"/> <translation>Calamares non riesce ad avviare KPMCore per ridimensionare il file-system.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/>
@ -2832,7 +2832,7 @@ Output:
<message> <message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/>
<source>Resize &lt;strong&gt;%2MiB&lt;/strong&gt; partition &lt;strong&gt;%1&lt;/strong&gt; to &lt;strong&gt;%3MiB&lt;/strong&gt;.</source> <source>Resize &lt;strong&gt;%2MiB&lt;/strong&gt; partition &lt;strong&gt;%1&lt;/strong&gt; to &lt;strong&gt;%3MiB&lt;/strong&gt;.</source>
<translation type="unfinished"/> <translation>Ridimensionare la partizione &lt;strong&gt;%1&lt;/strong&gt; da &lt;strong&gt;%2MiB&lt;/strong&gt; a &lt;strong&gt;%3MiB&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/>
@ -2996,7 +2996,7 @@ Output:
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="57"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="57"/>
<source>Set flags on %1MiB %2 partition.</source> <source>Set flags on %1MiB %2 partition.</source>
<translation type="unfinished"/> <translation>Impostare le flag sulla partizione %2 da %1MiB.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="61"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="61"/>
@ -3011,22 +3011,22 @@ Output:
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="77"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="77"/>
<source>Clear flags on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source> <source>Clear flags on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
<translation type="unfinished"/> <translation>Rimuovere le flag dalla partizione &lt;strong&gt;%2&lt;/strong&gt; da %1MiB.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="92"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="92"/>
<source>Flag %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition as &lt;strong&gt;%3&lt;/strong&gt;.</source> <source>Flag %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition as &lt;strong&gt;%3&lt;/strong&gt;.</source>
<translation type="unfinished"/> <translation>Flag della partizione &lt;strong&gt;%2&lt;/strong&gt; da %1MiB impostate come &lt;strong&gt;%3&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="115"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="115"/>
<source>Clearing flags on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source> <source>Clearing flags on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
<translation type="unfinished"/> <translation>Rimozione delle flag sulla partizione &lt;strong&gt;%2&lt;/strong&gt; da %1MiB in corso.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="130"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="130"/>
<source>Setting flags &lt;strong&gt;%3&lt;/strong&gt; on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source> <source>Setting flags &lt;strong&gt;%3&lt;/strong&gt; on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
<translation type="unfinished"/> <translation>Impostazione delle flag &lt;strong&gt;%3&lt;/strong&gt; sulla partizione &lt;strong&gt;%2&lt;/strong&gt; da %1MiB in corso.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="81"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="81"/>
@ -3172,7 +3172,7 @@ Output:
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="57"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source> <source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/> <translation>Questa è una panoramica di quello che succederà una volta avviata la procedura di configurazione.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="60"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
@ -3296,12 +3296,12 @@ Output:
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="139"/> <location filename="../src/modules/users/UsersPage.cpp" line="139"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;Se più di una persona utilizzerà questo computer, puoi creare ulteriori account dopo la configurazione.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="145"/> <location filename="../src/modules/users/UsersPage.cpp" line="145"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;Se più di una persona utilizzerà questo computer, puoi creare ulteriori account dopo l'installazione.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="385"/> <location filename="../src/modules/users/UsersPage.cpp" line="385"/>
@ -3311,17 +3311,17 @@ Output:
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="392"/> <location filename="../src/modules/users/UsersPage.cpp" line="392"/>
<source>Your username must start with a lowercase letter or underscore.</source> <source>Your username must start with a lowercase letter or underscore.</source>
<translation type="unfinished"/> <translation>Il tuo username deve iniziare con una lettera minuscola o un trattino basso.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="399"/> <location filename="../src/modules/users/UsersPage.cpp" line="399"/>
<source>Only lowercase letters, numbers, underscore and hyphen are allowed.</source> <source>Only lowercase letters, numbers, underscore and hyphen are allowed.</source>
<translation type="unfinished"/> <translation>Solo lettere minuscole, numeri, trattini e trattini bassi sono permessi.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="447"/> <location filename="../src/modules/users/UsersPage.cpp" line="447"/>
<source>Only letters, numbers, underscore and hyphen are allowed.</source> <source>Only letters, numbers, underscore and hyphen are allowed.</source>
<translation type="unfinished"/> <translation>Solo lettere, numeri, trattini e trattini bassi sono permessi.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="435"/> <location filename="../src/modules/users/UsersPage.cpp" line="435"/>
@ -3385,7 +3385,7 @@ Output:
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="56"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="56"/>
<source>Physical Extent Size:</source> <source>Physical Extent Size:</source>
<translation type="unfinished"/> <translation>Dimensione fisica dell'estensione:</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/>
@ -3410,7 +3410,7 @@ Output:
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="142"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="142"/>
<source>Quantity of LVs:</source> <source>Quantity of LVs:</source>
<translation type="unfinished"/> <translation>Numero di LV:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3424,7 +3424,7 @@ Output:
<location filename="../src/modules/welcome/WelcomePage.ui" line="69"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="69"/>
<location filename="../src/modules/welcome/WelcomePage.ui" line="82"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="82"/>
<source>Select application and system language</source> <source>Select application and system language</source>
<translation type="unfinished"/> <translation>Selezionare lingua per l'applicazione e il sistema</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="140"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
@ -3444,7 +3444,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="166"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
<source>Open issues and bug-tracking website</source> <source>Open issues and bug-tracking website</source>
<translation type="unfinished"/> <translation>Apri il sito per la gestione di problemi e bug</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="179"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
@ -3494,7 +3494,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="266"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="266"/>
<source>About %1 setup</source> <source>About %1 setup</source>
<translation type="unfinished"/> <translation>Informazioni sul sistema di configurazione %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="266"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="266"/>

49
lang/calamares_ko.ts
View File

@ -132,7 +132,7 @@
<message> <message>
<location filename="../src/libcalamares/JobExample.cpp" line="39"/> <location filename="../src/libcalamares/JobExample.cpp" line="39"/>
<source>Job failed (%1)</source> <source>Job failed (%1)</source>
<translation>(% 1) 작업 실패</translation> <translation>(%1) 작업 실패</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/JobExample.cpp" line="40"/> <location filename="../src/libcalamares/JobExample.cpp" line="40"/>
@ -212,17 +212,17 @@
<message> <message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="108"/> <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="108"/>
<source>Loading ...</source> <source>Loading ...</source>
<translation type="unfinished"/> <translation>로딩 중 ...</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="129"/> <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="129"/>
<source>QML Step &lt;i&gt;%1&lt;/i&gt;.</source> <source>QML Step &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/> <translation>QML 단계 &lt;i&gt;%1&lt;/i&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="347"/> <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="347"/>
<source>Loading failed.</source> <source>Loading failed.</source>
<translation type="unfinished"/> <translation>로딩하지 못했습니다.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1630,7 +1630,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="208"/> <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="208"/>
<source>Could not configure LUKS key file on partition %1.</source> <source>Could not configure LUKS key file on partition %1.</source>
<translation type="unfinished"/> <translation>파티션 %1에 LUKS 키 파일을 설정할 수 없습니다.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1690,52 +1690,52 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="65"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="65"/>
<source>Office software</source> <source>Office software</source>
<translation type="unfinished"/> <translation>오피스 소프트웨어</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="66"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="66"/>
<source>Office package</source> <source>Office package</source>
<translation type="unfinished"/> <translation>오피스 패키지</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="67"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="67"/>
<source>Browser software</source> <source>Browser software</source>
<translation type="unfinished"/> <translation>브라우저 소프트웨어</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="68"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="68"/>
<source>Browser package</source> <source>Browser package</source>
<translation type="unfinished"/> <translation>브라우저 패키지</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="69"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="69"/>
<source>Web browser</source> <source>Web browser</source>
<translation type="unfinished"/> <translation>웹 브라우저</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="70"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="70"/>
<source>Kernel</source> <source>Kernel</source>
<translation type="unfinished"/> <translation>커널</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="71"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="71"/>
<source>Services</source> <source>Services</source>
<translation type="unfinished"/> <translation>서비스</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="72"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="72"/>
<source>Login</source> <source>Login</source>
<translation type="unfinished"/> <translation>로그인</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="73"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="73"/>
<source>Desktop</source> <source>Desktop</source>
<translation type="unfinished"/> <translation>데스크탑</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="74"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="74"/>
<source>Applications</source> <source>Applications</source>
<translation type="unfinished"/> <translation>애플리케이션</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1743,7 +1743,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/notesqml/NotesQmlViewStep.cpp" line="34"/> <location filename="../src/modules/notesqml/NotesQmlViewStep.cpp" line="34"/>
<source>Notes</source> <source>Notes</source>
<translation type="unfinished"/> <translation>노트</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2443,7 +2443,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="651"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="651"/>
<source>There are no partitions to install on.</source> <source>There are no partitions to install on.</source>
<translation type="unfinished"/> <translation>설치를 위한 파티션이 없습니다.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3533,7 +3533,8 @@ Output:
<location filename="../src/modules/notesqml/notesqml.qml" line="60"/> <location filename="../src/modules/notesqml/notesqml.qml" line="60"/>
<source>&lt;h3&gt;%1&lt;/h3&gt; <source>&lt;h3&gt;%1&lt;/h3&gt;
&lt;p&gt;These are example release notes.&lt;/p&gt;</source> &lt;p&gt;These are example release notes.&lt;/p&gt;</source>
<translation type="unfinished"/> <translation>&lt;h3&gt;%1&lt;/h3&gt;
&lt;p&gt;릴리즈 노트의 예제입니다.&lt;/p&gt;</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3541,32 +3542,32 @@ Output:
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="42"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="42"/>
<source>&lt;h3&gt;%1 &lt;quote&gt;%2&lt;/quote&gt;&lt;/h3&gt;</source> <source>&lt;h3&gt;%1 &lt;quote&gt;%2&lt;/quote&gt;&lt;/h3&gt;</source>
<translation type="unfinished"/> <translation>&lt;h3&gt;%1 &lt;quote&gt;%2&lt;/quote&gt;&lt;/h3&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="75"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="75"/>
<source>About</source> <source>About</source>
<translation type="unfinished"/> <translation>Calamares에 대하여</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="86"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="86"/>
<source>Support</source> <source>Support</source>
<translation type="unfinished"/> <translation>지원</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="97"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="97"/>
<source>Known issues</source> <source>Known issues</source>
<translation type="unfinished"/> <translation>알려진 이슈들</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="108"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="108"/>
<source>Release notes</source> <source>Release notes</source>
<translation type="unfinished"/> <translation>릴리즈 노트</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="119"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="119"/>
<source>Donate</source> <source>Donate</source>
<translation type="unfinished"/> <translation>기부</translation>
</message> </message>
</context> </context>
</TS> </TS>

273
lang/calamares_sv.ts
View File

@ -153,7 +153,7 @@
<message> <message>
<location filename="../src/libcalamares/JobExample.cpp" line="27"/> <location filename="../src/libcalamares/JobExample.cpp" line="27"/>
<source>Example job (%1)</source> <source>Example job (%1)</source>
<translation type="unfinished"/> <translation>Exempel jobb (%1)</translation>
</message> </message>
</context> </context>
<context> <context>
@ -212,12 +212,12 @@
<message> <message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="108"/> <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="108"/>
<source>Loading ...</source> <source>Loading ...</source>
<translation type="unfinished"/> <translation>Laddar ...</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="129"/> <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="129"/>
<source>QML Step &lt;i&gt;%1&lt;/i&gt;.</source> <source>QML Step &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/> <translation>QML steg &lt;i&gt;%1&lt;/i&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="347"/> <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="347"/>
@ -327,22 +327,22 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="333"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="333"/>
<source>&amp;Set up now</source> <source>&amp;Set up now</source>
<translation type="unfinished"/> <translation>&amp;Installera nu </translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="389"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="389"/>
<source>&amp;Set up</source> <source>&amp;Set up</source>
<translation type="unfinished"/> <translation>&amp;Installera</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="389"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="389"/>
<source>&amp;Install</source> <source>&amp;Install</source>
<translation type="unfinished"/> <translation>&amp;Installera</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="391"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="391"/>
<source>Setup is complete. Close the setup program.</source> <source>Setup is complete. Close the setup program.</source>
<translation type="unfinished"/> <translation>Installationen är klar. Du kan avsluta installationsprogrammet.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="490"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="490"/>
@ -371,18 +371,18 @@ Alla ändringar kommer att gå förlorade.</translation>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="220"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="220"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="497"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="497"/>
<source>&amp;Yes</source> <source>&amp;Yes</source>
<translation type="unfinished"/> <translation>&amp;Ja</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="221"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="221"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="498"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="498"/>
<source>&amp;No</source> <source>&amp;No</source>
<translation type="unfinished"/> <translation>&amp;Nej</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="227"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="227"/>
<source>&amp;Close</source> <source>&amp;Close</source>
<translation type="unfinished"/> <translation>&amp;Stäng</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="325"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="325"/>
@ -407,7 +407,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="415"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="415"/>
<source>&amp;Done</source> <source>&amp;Done</source>
<translation type="unfinished"/> <translation>&amp;Klar</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="392"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="392"/>
@ -462,7 +462,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="72"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="72"/>
<source>%1 Setup Program</source> <source>%1 Setup Program</source>
<translation type="unfinished"/> <translation>%1 Installationsprogram</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="73"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="73"/>
@ -574,12 +574,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/>
<source>No Swap</source> <source>No Swap</source>
<translation type="unfinished"/> <translation>Ingen Swap</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/>
<source>Reuse Swap</source> <source>Reuse Swap</source>
<translation type="unfinished"/> <translation>Återanvänd Swap</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/>
@ -701,7 +701,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="48"/> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="48"/>
<source> MiB</source> <source> MiB</source>
<translation type="unfinished"/> <translation>MiB</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="55"/> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="55"/>
@ -726,7 +726,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="151"/> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="151"/>
<source>LVM LV name</source> <source>LVM LV name</source>
<translation type="unfinished"/> <translation>LVM LV namn</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="188"/> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="188"/>
@ -774,12 +774,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="49"/> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="49"/>
<source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <source>Create new %2MiB partition on %4 (%3) with file system %1.</source>
<translation type="unfinished"/> <translation>Skapa ny %2MiB partition på %4 (%3) med filsystem %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="60"/> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="60"/>
<source>Create new &lt;strong&gt;%2MiB&lt;/strong&gt; partition on &lt;strong&gt;%4&lt;/strong&gt; (%3) with file system &lt;strong&gt;%1&lt;/strong&gt;.</source> <source>Create new &lt;strong&gt;%2MiB&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 type="unfinished"/> <translation>Skapa ny &lt;strong&gt;%2MiB&lt;/strong&gt;partition på &lt;strong&gt;%4&lt;/strong&gt; (%3) med filsystem &lt;strong&gt;%1&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="72"/> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="72"/>
@ -1007,7 +1007,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="136"/> <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="136"/>
<source>Write LUKS configuration for Dracut to %1</source> <source>Write LUKS configuration for Dracut to %1</source>
<translation type="unfinished"/> <translation>Skriv LUKS konfiguration för Dracut till %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="140"/> <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="140"/>
@ -1068,7 +1068,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="129"/> <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="129"/>
<source> MiB</source> <source> MiB</source>
<translation type="unfinished"/> <translation>MiB</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="136"/> <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="136"/>
@ -1096,7 +1096,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/EncryptWidget.ui" line="32"/> <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="32"/>
<source>En&amp;crypt system</source> <source>En&amp;crypt system</source>
<translation type="unfinished"/> <translation>Kryptera system</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/EncryptWidget.ui" line="42"/> <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="42"/>
@ -1124,7 +1124,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="163"/> <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="163"/>
<source>Install %1 on &lt;strong&gt;new&lt;/strong&gt; %2 system partition.</source> <source>Install %1 on &lt;strong&gt;new&lt;/strong&gt; %2 system partition.</source>
<translation type="unfinished"/> <translation>Installera %1 på &lt;strong&gt;ny&lt;/strong&gt; %2 system partition.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="169"/> <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="169"/>
@ -1134,7 +1134,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="179"/> <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="179"/>
<source>Install %2 on %3 system partition &lt;strong&gt;%1&lt;/strong&gt;.</source> <source>Install %2 on %3 system partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation type="unfinished"/> <translation>Installera %2 på %3 system partition &lt;strong&gt;%1&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="186"/> <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="186"/>
@ -1233,12 +1233,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="46"/> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="46"/>
<source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source>
<translation type="unfinished"/> <translation>Formatera partition %1 (filsystem: %2, storlek: %3 MiB) på %4.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="57"/> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="57"/>
<source>Format &lt;strong&gt;%3MiB&lt;/strong&gt; partition &lt;strong&gt;%1&lt;/strong&gt; with file system &lt;strong&gt;%2&lt;/strong&gt;.</source> <source>Format &lt;strong&gt;%3MiB&lt;/strong&gt; partition &lt;strong&gt;%1&lt;/strong&gt; with file system &lt;strong&gt;%2&lt;/strong&gt;.</source>
<translation type="unfinished"/> <translation>Formatera &lt;strong&gt;%3MiB&lt;/strong&gt; partition &lt;strong&gt;%1&lt;/strong&gt; med filsystem &lt;strong&gt;%2&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="68"/> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="68"/>
@ -1256,7 +1256,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="126"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="126"/>
<source>has at least %1 GiB available drive space</source> <source>has at least %1 GiB available drive space</source>
<translation type="unfinished"/> <translation>har minst %1 GiB tillgängligt på hårddisken</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="128"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="128"/>
@ -1266,7 +1266,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="137"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="137"/>
<source>has at least %1 GiB working memory</source> <source>has at least %1 GiB working memory</source>
<translation type="unfinished"/> <translation>har minst %1 GiB arbetsminne</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="139"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="139"/>
@ -1329,7 +1329,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/hostinfo/HostInfoJob.cpp" line="51"/> <location filename="../src/modules/hostinfo/HostInfoJob.cpp" line="51"/>
<source>Collecting information about your machine.</source> <source>Collecting information about your machine.</source>
<translation type="unfinished"/> <translation>Samlar in information om din maskin.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1345,17 +1345,17 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/oemid/IDJob.cpp" line="48"/> <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
<source>Could not create directories &lt;code&gt;%1&lt;/code&gt;.</source> <source>Could not create directories &lt;code&gt;%1&lt;/code&gt;.</source>
<translation type="unfinished"/> <translation>Kunde inte skapa mappar &lt;code&gt;%1&lt;/code&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/oemid/IDJob.cpp" line="60"/> <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
<source>Could not open file &lt;code&gt;%1&lt;/code&gt;.</source> <source>Could not open file &lt;code&gt;%1&lt;/code&gt;.</source>
<translation type="unfinished"/> <translation>Kunde inte öppna fil &lt;code&gt;%1&lt;/code&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/oemid/IDJob.cpp" line="68"/> <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
<source>Could not write to file &lt;code&gt;%1&lt;/code&gt;.</source> <source>Could not write to file &lt;code&gt;%1&lt;/code&gt;.</source>
<translation type="unfinished"/> <translation>Kunde inte skriva till fil &lt;code&gt;%1&lt;/code&gt;.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1363,7 +1363,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/initcpio/InitcpioJob.cpp" line="40"/> <location filename="../src/modules/initcpio/InitcpioJob.cpp" line="40"/>
<source>Creating initramfs with mkinitcpio.</source> <source>Creating initramfs with mkinitcpio.</source>
<translation type="unfinished"/> <translation>Skapar initramfs med mkinitcpio.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1371,7 +1371,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/initramfs/InitramfsJob.cpp" line="37"/> <location filename="../src/modules/initramfs/InitramfsJob.cpp" line="37"/>
<source>Creating initramfs.</source> <source>Creating initramfs.</source>
<translation type="unfinished"/> <translation>Skapar initramfs.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1454,7 +1454,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/license/LicensePage.ui" line="22"/> <location filename="../src/modules/license/LicensePage.ui" line="22"/>
<source>&lt;h1&gt;License Agreement&lt;/h1&gt;</source> <source>&lt;h1&gt;License Agreement&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Licensavtal&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicensePage.cpp" line="149"/> <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
@ -1500,7 +1500,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="96"/> <location filename="../src/modules/license/LicenseWidget.cpp" line="96"/>
<source>URL: %1</source> <source>URL: %1</source>
<translation type="unfinished"/> <translation>URL: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="117"/> <location filename="../src/modules/license/LicenseWidget.cpp" line="117"/>
@ -1537,22 +1537,22 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="171"/> <location filename="../src/modules/license/LicenseWidget.cpp" line="171"/>
<source>File: %1</source> <source>File: %1</source>
<translation type="unfinished"/> <translation>Fil: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="194"/> <location filename="../src/modules/license/LicenseWidget.cpp" line="194"/>
<source>Show the license text</source> <source>Show the license text</source>
<translation type="unfinished"/> <translation>Visa licens text</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="198"/> <location filename="../src/modules/license/LicenseWidget.cpp" line="198"/>
<source>Open license agreement in browser.</source> <source>Open license agreement in browser.</source>
<translation type="unfinished"/> <translation>Öppna licensavtal i en webbläsare.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="194"/> <location filename="../src/modules/license/LicenseWidget.cpp" line="194"/>
<source>Hide license text</source> <source>Hide license text</source>
<translation type="unfinished"/> <translation>Dölj licens text </translation>
</message> </message>
</context> </context>
<context> <context>
@ -1602,13 +1602,13 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="39"/> <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="39"/>
<source>Configuring LUKS key file.</source> <source>Configuring LUKS key file.</source>
<translation type="unfinished"/> <translation>Konfigurerar LUKS nyckel fil.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="156"/> <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="156"/>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="164"/> <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="164"/>
<source>No partitions are defined.</source> <source>No partitions are defined.</source>
<translation type="unfinished"/> <translation>Inga partitioner är definerade.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="192"/> <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="192"/>
@ -1638,12 +1638,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/machineid/MachineIdJob.cpp" line="46"/> <location filename="../src/modules/machineid/MachineIdJob.cpp" line="46"/>
<source>Generate machine-id.</source> <source>Generate machine-id.</source>
<translation type="unfinished"/> <translation>Generera maskin-id.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/machineid/MachineIdJob.cpp" line="62"/> <location filename="../src/modules/machineid/MachineIdJob.cpp" line="62"/>
<source>Configuration Error</source> <source>Configuration Error</source>
<translation type="unfinished"/> <translation>Konfigurationsfel</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/machineid/MachineIdJob.cpp" line="63"/> <location filename="../src/modules/machineid/MachineIdJob.cpp" line="63"/>
@ -1690,12 +1690,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="65"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="65"/>
<source>Office software</source> <source>Office software</source>
<translation type="unfinished"/> <translation>Kontors programvara</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="66"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="66"/>
<source>Office package</source> <source>Office package</source>
<translation type="unfinished"/> <translation>Kontors paket</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="67"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="67"/>
@ -1710,32 +1710,32 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="69"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="69"/>
<source>Web browser</source> <source>Web browser</source>
<translation type="unfinished"/> <translation>Webbläsare</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="70"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="70"/>
<source>Kernel</source> <source>Kernel</source>
<translation type="unfinished"/> <translation>Kärna</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="71"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="71"/>
<source>Services</source> <source>Services</source>
<translation type="unfinished"/> <translation>Tjänster</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="72"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="72"/>
<source>Login</source> <source>Login</source>
<translation type="unfinished"/> <translation>Inloggning</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="73"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="73"/>
<source>Desktop</source> <source>Desktop</source>
<translation type="unfinished"/> <translation>Skrivbord</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="74"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="74"/>
<source>Applications</source> <source>Applications</source>
<translation type="unfinished"/> <translation>Program</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1743,7 +1743,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/notesqml/NotesQmlViewStep.cpp" line="34"/> <location filename="../src/modules/notesqml/NotesQmlViewStep.cpp" line="34"/>
<source>Notes</source> <source>Notes</source>
<translation type="unfinished"/> <translation>Anteckningar</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1769,7 +1769,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/oemid/OEMViewStep.cpp" line="121"/> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="121"/>
<source>OEM Configuration</source> <source>OEM Configuration</source>
<translation type="unfinished"/> <translation>OEM Konfiguration</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/oemid/OEMViewStep.cpp" line="126"/> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="126"/>
@ -1782,17 +1782,17 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="57"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="57"/>
<source>Password is too short</source> <source>Password is too short</source>
<translation type="unfinished"/> <translation>Lösenordet är för kort </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="73"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="73"/>
<source>Password is too long</source> <source>Password is too long</source>
<translation type="unfinished"/> <translation>Lösenordet är för långt </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="149"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="149"/>
<source>Password is too weak</source> <source>Password is too weak</source>
<translation type="unfinished"/> <translation>Lösenordet är för svagt </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="157"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="157"/>
@ -1802,7 +1802,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="162"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="162"/>
<source>Memory allocation error</source> <source>Memory allocation error</source>
<translation type="unfinished"/> <translation>Minnesallokerings fel</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="164"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="164"/>
@ -1812,7 +1812,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="166"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="166"/>
<source>The password is a palindrome</source> <source>The password is a palindrome</source>
<translation type="unfinished"/> <translation>Lösenordet är en palindrom</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="168"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="168"/>
@ -1887,7 +1887,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="213"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="213"/>
<source>The password is too short</source> <source>The password is too short</source>
<translation type="unfinished"/> <translation>Detta lösenordet är för kort </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="215"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="215"/>
@ -1937,7 +1937,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="250"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="250"/>
<source>No password supplied</source> <source>No password supplied</source>
<translation type="unfinished"/> <translation>Inget lösenord angivit</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="252"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="252"/>
@ -1962,12 +1962,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="267"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="267"/>
<source>Unknown setting - %1</source> <source>Unknown setting - %1</source>
<translation type="unfinished"/> <translation>Okänd inställning - %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="271"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="271"/>
<source>Unknown setting</source> <source>Unknown setting</source>
<translation type="unfinished"/> <translation>Okänd inställning</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="275"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="275"/>
@ -1977,27 +1977,27 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="280"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="280"/>
<source>Bad integer value</source> <source>Bad integer value</source>
<translation type="unfinished"/> <translation>Dåligt heltals värde</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="284"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="284"/>
<source>Setting %1 is not of integer type</source> <source>Setting %1 is not of integer type</source>
<translation type="unfinished"/> <translation>Inställning %1 är inte av heltals typ</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="289"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="289"/>
<source>Setting is not of integer type</source> <source>Setting is not of integer type</source>
<translation type="unfinished"/> <translation>Inställning är inte av heltals typ</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="293"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="293"/>
<source>Setting %1 is not of string type</source> <source>Setting %1 is not of string type</source>
<translation type="unfinished"/> <translation>Inställning %1 är inte av sträng typ </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="298"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="298"/>
<source>Setting is not of string type</source> <source>Setting is not of string type</source>
<translation type="unfinished"/> <translation>Inställning %1 är inte av sträng typ </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="300"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="300"/>
@ -2017,7 +2017,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="306"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="306"/>
<source>Unknown error</source> <source>Unknown error</source>
<translation type="unfinished"/> <translation>Okänt fel </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="571"/> <location filename="../src/modules/users/UsersPage.cpp" line="571"/>
@ -2035,7 +2035,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/packagechooser/page_package.ui" line="40"/> <location filename="../src/modules/packagechooser/page_package.ui" line="40"/>
<source>Product Name</source> <source>Product Name</source>
<translation type="unfinished"/> <translation>Produktnamn</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/packagechooser/page_package.ui" line="53"/> <location filename="../src/modules/packagechooser/page_package.ui" line="53"/>
@ -2045,12 +2045,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/packagechooser/page_package.ui" line="69"/> <location filename="../src/modules/packagechooser/page_package.ui" line="69"/>
<source>Long Product Description</source> <source>Long Product Description</source>
<translation type="unfinished"/> <translation>Lång produktbeskrivning</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="34"/> <location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="34"/>
<source>Package Selection</source> <source>Package Selection</source>
<translation type="unfinished"/> <translation>Paketval</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="35"/> <location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="35"/>
@ -2063,7 +2063,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/packagechooser/PackageChooserViewStep.cpp" line="70"/> <location filename="../src/modules/packagechooser/PackageChooserViewStep.cpp" line="70"/>
<source>Packages</source> <source>Packages</source>
<translation type="unfinished"/> <translation>Paket</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2125,7 +2125,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="144"/> <location filename="../src/modules/users/page_usersetup.ui" line="144"/>
<source>login</source> <source>login</source>
<translation type="unfinished"/> <translation>inloggning</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="243"/> <location filename="../src/modules/users/page_usersetup.ui" line="243"/>
@ -2135,19 +2135,19 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="246"/> <location filename="../src/modules/users/page_usersetup.ui" line="246"/>
<source>Computer Name</source> <source>Computer Name</source>
<translation type="unfinished"/> <translation>Datornamn</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="351"/> <location filename="../src/modules/users/page_usersetup.ui" line="351"/>
<location filename="../src/modules/users/page_usersetup.ui" line="521"/> <location filename="../src/modules/users/page_usersetup.ui" line="521"/>
<source>Password</source> <source>Password</source>
<translation type="unfinished"/> <translation>Lösenord</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="376"/> <location filename="../src/modules/users/page_usersetup.ui" line="376"/>
<location filename="../src/modules/users/page_usersetup.ui" line="546"/> <location filename="../src/modules/users/page_usersetup.ui" line="546"/>
<source>Repeat Password</source> <source>Repeat Password</source>
<translation type="unfinished"/> <translation>Repetera Lösenord</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="451"/> <location filename="../src/modules/users/page_usersetup.ui" line="451"/>
@ -2157,7 +2157,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="454"/> <location filename="../src/modules/users/page_usersetup.ui" line="454"/>
<source>Require strong passwords.</source> <source>Require strong passwords.</source>
<translation type="unfinished"/> <translation>Kräv starkt lösenord.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="461"/> <location filename="../src/modules/users/page_usersetup.ui" line="461"/>
@ -2285,7 +2285,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="107"/> <location filename="../src/modules/partition/gui/PartitionPage.ui" line="107"/>
<source>Cre&amp;ate</source> <source>Cre&amp;ate</source>
<translation type="unfinished"/> <translation>Skapa</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="114"/> <location filename="../src/modules/partition/gui/PartitionPage.ui" line="114"/>
@ -2300,27 +2300,27 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="132"/> <location filename="../src/modules/partition/gui/PartitionPage.ui" line="132"/>
<source>New Volume Group</source> <source>New Volume Group</source>
<translation type="unfinished"/> <translation>Ny volymgrupp</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="139"/> <location filename="../src/modules/partition/gui/PartitionPage.ui" line="139"/>
<source>Resize Volume Group</source> <source>Resize Volume Group</source>
<translation type="unfinished"/> <translation>Ändra storlek på volymgrupp</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="146"/> <location filename="../src/modules/partition/gui/PartitionPage.ui" line="146"/>
<source>Deactivate Volume Group</source> <source>Deactivate Volume Group</source>
<translation type="unfinished"/> <translation>Deaktivera volymgrupp</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="153"/> <location filename="../src/modules/partition/gui/PartitionPage.ui" line="153"/>
<source>Remove Volume Group</source> <source>Remove Volume Group</source>
<translation type="unfinished"/> <translation>Ta bort volymgrupp</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="180"/> <location filename="../src/modules/partition/gui/PartitionPage.ui" line="180"/>
<source>I&amp;nstall boot loader on:</source> <source>I&amp;nstall boot loader on:</source>
<translation type="unfinished"/> <translation>Installera uppstartshanterare på:</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="209"/> <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="209"/>
@ -2330,7 +2330,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/> <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source> <source>Can not create new partition</source>
<translation type="unfinished"/> <translation>Kan inte skapa ny partition</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/> <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
@ -2418,7 +2418,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="429"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="429"/>
<source>EFI system partition flag not set</source> <source>EFI system partition flag not set</source>
<translation type="unfinished"/> <translation>EFI system partitionsflagga inte satt</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="430"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="430"/>
@ -2428,7 +2428,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="465"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="465"/>
<source>Boot partition not encrypted</source> <source>Boot partition not encrypted</source>
<translation type="unfinished"/> <translation>Boot partition inte krypterad</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="466"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="466"/>
@ -2491,7 +2491,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message> <message>
<location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/> <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source> <source>Saving files for later ...</source>
<translation type="unfinished"/> <translation>Sparar filer tills senare ...</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/> <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
@ -2517,17 +2517,19 @@ There was no output from the command.</source>
<source> <source>
Output: Output:
</source> </source>
<translation type="unfinished"/> <translation>
Utdata:
</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="469"/> <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="469"/>
<source>External command crashed.</source> <source>External command crashed.</source>
<translation type="unfinished"/> <translation>Externt kommando kraschade.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="470"/> <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="470"/>
<source>Command &lt;i&gt;%1&lt;/i&gt; crashed.</source> <source>Command &lt;i&gt;%1&lt;/i&gt; crashed.</source>
<translation type="unfinished"/> <translation>Kommando &lt;i&gt;%1&lt;/i&gt; kraschade.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="475"/> <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="475"/>
@ -2537,7 +2539,7 @@ Output:
<message> <message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="476"/> <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="476"/>
<source>Command &lt;i&gt;%1&lt;/i&gt; failed to start.</source> <source>Command &lt;i&gt;%1&lt;/i&gt; failed to start.</source>
<translation type="unfinished"/> <translation>Kommando &lt;i&gt;%1&lt;/i&gt; misslyckades med att starta. </translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="480"/> <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="480"/>
@ -2601,7 +2603,7 @@ Output:
<message> <message>
<location filename="../src/modules/partition/core/KPMHelpers.cpp" line="213"/> <location filename="../src/modules/partition/core/KPMHelpers.cpp" line="213"/>
<source>swap</source> <source>swap</source>
<translation type="unfinished"/> <translation>swap</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/>
@ -2611,7 +2613,7 @@ Output:
<message> <message>
<location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="47"/> <location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="47"/>
<source>(no mount point)</source> <source>(no mount point)</source>
<translation type="unfinished"/> <translation>(ingen monteringspunkt)</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="65"/> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="65"/>
@ -2627,7 +2629,7 @@ Output:
<message> <message>
<location filename="../src/modules/packagechooser/PackageModel.cpp" line="79"/> <location filename="../src/modules/packagechooser/PackageModel.cpp" line="79"/>
<source>No product</source> <source>No product</source>
<translation type="unfinished"/> <translation>Ingen produkt</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/packagechooser/PackageModel.cpp" line="87"/> <location filename="../src/modules/packagechooser/PackageModel.cpp" line="87"/>
@ -2640,7 +2642,7 @@ Output:
<location filename="../src/modules/machineid/Workers.cpp" line="85"/> <location filename="../src/modules/machineid/Workers.cpp" line="85"/>
<location filename="../src/modules/machineid/Workers.cpp" line="102"/> <location filename="../src/modules/machineid/Workers.cpp" line="102"/>
<source>File not found</source> <source>File not found</source>
<translation type="unfinished"/> <translation>Filen hittades inte </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/machineid/Workers.cpp" line="74"/> <location filename="../src/modules/machineid/Workers.cpp" line="74"/>
@ -2650,7 +2652,7 @@ Output:
<message> <message>
<location filename="../src/modules/machineid/Workers.cpp" line="103"/> <location filename="../src/modules/machineid/Workers.cpp" line="103"/>
<source>Could not create new random file &lt;pre&gt;%1&lt;/pre&gt;.</source> <source>Could not create new random file &lt;pre&gt;%1&lt;/pre&gt;.</source>
<translation type="unfinished"/> <translation>Kunde inte skapa ny slumpmässig fil &lt;pre&gt;%1&lt;/pre&gt;.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2757,7 +2759,7 @@ Output:
<message> <message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/>
<source>Invalid configuration</source> <source>Invalid configuration</source>
<translation type="unfinished"/> <translation>Ogiltig konfiguration</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/>
@ -2846,7 +2848,7 @@ Output:
<message> <message>
<location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/> <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source> <source>Resize Volume Group</source>
<translation type="unfinished"/> <translation>Ändra storlek på volymgrupp</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2987,57 +2989,57 @@ Output:
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="53"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="53"/>
<source>Set flags on partition %1.</source> <source>Set flags on partition %1.</source>
<translation type="unfinished"/> <translation>Sätt flaggor på partition %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="57"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="57"/>
<source>Set flags on %1MiB %2 partition.</source> <source>Set flags on %1MiB %2 partition.</source>
<translation type="unfinished"/> <translation>Sätt flaggor på %1MiB %2 partition.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="61"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="61"/>
<source>Set flags on new partition.</source> <source>Set flags on new partition.</source>
<translation type="unfinished"/> <translation>Sätt flaggor på ny partition.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="72"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="72"/>
<source>Clear flags on partition &lt;strong&gt;%1&lt;/strong&gt;.</source> <source>Clear flags on partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation type="unfinished"/> <translation>Rensa flaggor på partition &lt;strong&gt;%1&lt;/strong&gt;,</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="77"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="77"/>
<source>Clear flags on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source> <source>Clear flags on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
<translation type="unfinished"/> <translation>Rensa flaggor på %1MiB &lt;strong&gt;%2&lt;/strong&gt;partition.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="92"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="92"/>
<source>Flag %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition as &lt;strong&gt;%3&lt;/strong&gt;.</source> <source>Flag %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition as &lt;strong&gt;%3&lt;/strong&gt;.</source>
<translation type="unfinished"/> <translation>Flagga %1MiB &lt;strong&gt;%2&lt;/strong&gt;partition som &lt;strong&gt;%3&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="115"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="115"/>
<source>Clearing flags on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source> <source>Clearing flags on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
<translation type="unfinished"/> <translation>Rensa flaggor på %1MiB &lt;strong&gt;%2&lt;/strong&gt;partition.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="130"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="130"/>
<source>Setting flags &lt;strong&gt;%3&lt;/strong&gt; on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source> <source>Setting flags &lt;strong&gt;%3&lt;/strong&gt; on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
<translation type="unfinished"/> <translation>Sätter flaggor &lt;strong&gt;%3&lt;/strong&gt; på %11MiB &lt;strong&gt;%2&lt;/strong&gt;partition.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="81"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="81"/>
<source>Clear flags on new partition.</source> <source>Clear flags on new partition.</source>
<translation type="unfinished"/> <translation>Rensa flaggor på ny partition.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/>
<source>Flag partition &lt;strong&gt;%1&lt;/strong&gt; as &lt;strong&gt;%2&lt;/strong&gt;.</source> <source>Flag partition &lt;strong&gt;%1&lt;/strong&gt; as &lt;strong&gt;%2&lt;/strong&gt;.</source>
<translation type="unfinished"/> <translation>Flagga partition &lt;strong&gt;%1&lt;/strong&gt; som &lt;strong&gt;%2&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="98"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="98"/>
<source>Flag new partition as &lt;strong&gt;%1&lt;/strong&gt;.</source> <source>Flag new partition as &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation type="unfinished"/> <translation>Flagga ny partition som &lt;strong&gt;%1&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="110"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="110"/>
@ -3090,7 +3092,7 @@ Output:
<message> <message>
<location filename="../src/modules/users/SetPasswordJob.cpp" line="97"/> <location filename="../src/modules/users/SetPasswordJob.cpp" line="97"/>
<source>Cannot disable root account.</source> <source>Cannot disable root account.</source>
<translation type="unfinished"/> <translation>Kunde inte inaktivera root konto.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/SetPasswordJob.cpp" line="98"/> <location filename="../src/modules/users/SetPasswordJob.cpp" line="98"/>
@ -3160,7 +3162,7 @@ Output:
<location filename="../src/qml/calamares/slideshow/SlideCounter.qml" line="36"/> <location filename="../src/qml/calamares/slideshow/SlideCounter.qml" line="36"/>
<source>%L1 / %L2</source> <source>%L1 / %L2</source>
<extracomment>slide counter, %1 of %2 (numeric)</extracomment> <extracomment>slide counter, %1 of %2 (numeric)</extracomment>
<translation type="unfinished"/> <translation>%L1 / %L2</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3212,12 +3214,12 @@ Output:
<message> <message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="80"/> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="80"/>
<source>Machine feedback</source> <source>Machine feedback</source>
<translation type="unfinished"/> <translation>Maskin feedback</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="92"/> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="92"/>
<source>Configuring machine feedback.</source> <source>Configuring machine feedback.</source>
<translation type="unfinished"/> <translation>Konfigurerar maskin feedback</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="117"/> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="117"/>
@ -3228,12 +3230,12 @@ Output:
<message> <message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="118"/> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="118"/>
<source>Could not configure machine feedback correctly, script error %1.</source> <source>Could not configure machine feedback correctly, script error %1.</source>
<translation type="unfinished"/> <translation>Kunde inte konfigurera maskin feedback korrekt, script fel %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="124"/> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="124"/>
<source>Could not configure machine feedback correctly, Calamares error %1.</source> <source>Could not configure machine feedback correctly, Calamares error %1.</source>
<translation type="unfinished"/> <translation>Kunde inte konfigurera maskin feedback korrekt, Calamares fel %1.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3284,7 +3286,7 @@ Output:
<message> <message>
<location filename="../src/modules/tracking/TrackingViewStep.cpp" line="64"/> <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="64"/>
<source>Feedback</source> <source>Feedback</source>
<translation type="unfinished"/> <translation>Feedback</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3307,17 +3309,17 @@ Output:
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="392"/> <location filename="../src/modules/users/UsersPage.cpp" line="392"/>
<source>Your username must start with a lowercase letter or underscore.</source> <source>Your username must start with a lowercase letter or underscore.</source>
<translation type="unfinished"/> <translation>Ditt användarnamn måste börja med en liten bokstav eller ett understreck.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="399"/> <location filename="../src/modules/users/UsersPage.cpp" line="399"/>
<source>Only lowercase letters, numbers, underscore and hyphen are allowed.</source> <source>Only lowercase letters, numbers, underscore and hyphen are allowed.</source>
<translation type="unfinished"/> <translation>Endast små bokstäver, nummer, understreck och bindestreck är tillåtet.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="447"/> <location filename="../src/modules/users/UsersPage.cpp" line="447"/>
<source>Only letters, numbers, underscore and hyphen are allowed.</source> <source>Only letters, numbers, underscore and hyphen are allowed.</source>
<translation type="unfinished"/> <translation>Endast bokstäver, nummer, understreck och bindestreck är tillåtet. </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="435"/> <location filename="../src/modules/users/UsersPage.cpp" line="435"/>
@ -3366,17 +3368,17 @@ Output:
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="20"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="20"/>
<source>List of Physical Volumes</source> <source>List of Physical Volumes</source>
<translation type="unfinished"/> <translation>Lista på fysiska volymer</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="30"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="30"/>
<source>Volume Group Name:</source> <source>Volume Group Name:</source>
<translation type="unfinished"/> <translation>Volymgrupp namn:</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="43"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="43"/>
<source>Volume Group Type:</source> <source>Volume Group Type:</source>
<translation type="unfinished"/> <translation>Volymgrupp typ:</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="56"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="56"/>
@ -3386,22 +3388,22 @@ Output:
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/>
<source> MiB</source> <source> MiB</source>
<translation type="unfinished"/> <translation>MiB</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="82"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="82"/>
<source>Total Size:</source> <source>Total Size:</source>
<translation type="unfinished"/> <translation>Total storlek:</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="102"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="102"/>
<source>Used Size:</source> <source>Used Size:</source>
<translation type="unfinished"/> <translation>Använd storlek:</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="122"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="122"/>
<source>Total Sectors:</source> <source>Total Sectors:</source>
<translation type="unfinished"/> <translation>Totala sektorer:</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="142"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="142"/>
@ -3420,7 +3422,7 @@ Output:
<location filename="../src/modules/welcome/WelcomePage.ui" line="69"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="69"/>
<location filename="../src/modules/welcome/WelcomePage.ui" line="82"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="82"/>
<source>Select application and system language</source> <source>Select application and system language</source>
<translation type="unfinished"/> <translation>Välj program och system språk </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="140"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
@ -3430,7 +3432,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="143"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
<source>&amp;Donate</source> <source>&amp;Donate</source>
<translation type="unfinished"/> <translation>&amp;Donera</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="153"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
@ -3530,7 +3532,8 @@ Output:
<location filename="../src/modules/notesqml/notesqml.qml" line="60"/> <location filename="../src/modules/notesqml/notesqml.qml" line="60"/>
<source>&lt;h3&gt;%1&lt;/h3&gt; <source>&lt;h3&gt;%1&lt;/h3&gt;
&lt;p&gt;These are example release notes.&lt;/p&gt;</source> &lt;p&gt;These are example release notes.&lt;/p&gt;</source>
<translation type="unfinished"/> <translation>&lt;h3&gt;%1&lt;/h3&gt;
&lt;p&gt;Detta är exempel versionsinformation.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3538,32 +3541,32 @@ Output:
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="42"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="42"/>
<source>&lt;h3&gt;%1 &lt;quote&gt;%2&lt;/quote&gt;&lt;/h3&gt;</source> <source>&lt;h3&gt;%1 &lt;quote&gt;%2&lt;/quote&gt;&lt;/h3&gt;</source>
<translation type="unfinished"/> <translation>&lt;h3&gt;%1 &lt;quote&gt;%2&lt;/quote&gt;&lt;/h3&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="75"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="75"/>
<source>About</source> <source>About</source>
<translation type="unfinished"/> <translation>Om</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="86"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="86"/>
<source>Support</source> <source>Support</source>
<translation type="unfinished"/> <translation>Support</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="97"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="97"/>
<source>Known issues</source> <source>Known issues</source>
<translation type="unfinished"/> <translation>Kända problem</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="108"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="108"/>
<source>Release notes</source> <source>Release notes</source>
<translation type="unfinished"/> <translation>Versionsinformation</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="119"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="119"/>
<source>Donate</source> <source>Donate</source>
<translation type="unfinished"/> <translation>Donera</translation>
</message> </message>
</context> </context>
</TS> </TS>

164
lang/calamares_zh_CN.ts
View File

@ -6,7 +6,7 @@
<message> <message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="71"/> <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="71"/>
<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> <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>这个系统的&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> <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>
<message> <message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="81"/> <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="81"/>
@ -138,7 +138,7 @@
<message> <message>
<location filename="../src/libcalamares/JobExample.cpp" line="40"/> <location filename="../src/libcalamares/JobExample.cpp" line="40"/>
<source>Programmed job failure was explicitly requested.</source> <source>Programmed job failure was explicitly requested.</source>
<translation type="unfinished"/> <translation>出现明确抛出的任务执行失败。</translation>
</message> </message>
</context> </context>
<context> <context>
@ -154,7 +154,7 @@
<message> <message>
<location filename="../src/libcalamares/JobExample.cpp" line="27"/> <location filename="../src/libcalamares/JobExample.cpp" line="27"/>
<source>Example job (%1)</source> <source>Example job (%1)</source>
<translation type="unfinished"/> <translation>示例任务 (%1)</translation>
</message> </message>
</context> </context>
<context> <context>
@ -162,12 +162,12 @@
<message> <message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="52"/> <location filename="../src/libcalamares/ProcessJob.cpp" line="52"/>
<source>Run command '%1' in target system.</source> <source>Run command '%1' in target system.</source>
<translation type="unfinished"/> <translation>在目标系统上执行 '%1'。</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="52"/> <location filename="../src/libcalamares/ProcessJob.cpp" line="52"/>
<source> Run command '%1'.</source> <source> Run command '%1'.</source>
<translation type="unfinished"/> <translation>运行命令 '%1'.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="59"/> <location filename="../src/libcalamares/ProcessJob.cpp" line="59"/>
@ -213,17 +213,17 @@
<message> <message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="108"/> <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="108"/>
<source>Loading ...</source> <source>Loading ...</source>
<translation type="unfinished"/> <translation>正在加载...</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="129"/> <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="129"/>
<source>QML Step &lt;i&gt;%1&lt;/i&gt;.</source> <source>QML Step &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/> <translation>QML 步骤 &lt;i&gt;%1&lt;/i&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="347"/> <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="347"/>
<source>Loading failed.</source> <source>Loading failed.</source>
<translation type="unfinished"/> <translation>加载失败。</translation>
</message> </message>
</context> </context>
<context> <context>
@ -231,21 +231,21 @@
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="166"/> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="166"/>
<source>Waiting for %n module(s).</source> <source>Waiting for %n module(s).</source>
<translation type="unfinished"> <translation>
<numerusform/> <numerusform>等待 %n 模块。</numerusform>
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="167"/> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="167"/>
<source>(%n second(s))</source> <source>(%n second(s))</source>
<translation type="unfinished"> <translation>
<numerusform/> <numerusform>(%n 秒)</numerusform>
</translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="172"/> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="172"/>
<source>System-requirements checking is complete.</source> <source>System-requirements checking is complete.</source>
<translation type="unfinished"/> <translation>已经完成系统需求检查。</translation>
</message> </message>
</context> </context>
<context> <context>
@ -271,7 +271,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="394"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="394"/>
<source>Cancel setup without changing the system.</source> <source>Cancel setup without changing the system.</source>
<translation type="unfinished"/> <translation>取消安装，保持系统不变。</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="395"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="395"/>
@ -281,22 +281,22 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="199"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="199"/>
<source>Setup Failed</source> <source>Setup Failed</source>
<translation type="unfinished"/> <translation>安装失败</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="200"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="200"/>
<source>Would you like to paste the install log to the web?</source> <source>Would you like to paste the install log to the web?</source>
<translation type="unfinished"/> <translation>需要将安装日志粘贴到网页吗？</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="238"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="238"/>
<source>Install Log Paste URL</source> <source>Install Log Paste URL</source>
<translation type="unfinished"/> <translation>安装日志粘贴 URL</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="241"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="241"/>
<source>The upload was unsuccessful. No web-paste was done.</source> <source>The upload was unsuccessful. No web-paste was done.</source>
<translation type="unfinished"/> <translation>上传失败，未完成网页粘贴。</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="257"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="257"/>
@ -316,22 +316,22 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="325"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="325"/>
<source>Continue with installation?</source> <source>Continue with installation?</source>
<translation type="unfinished"/> <translation>继续安装？</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="327"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="327"/>
<source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source> <source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
<translation type="unfinished"/> <translation>为了安装%2, %1 安装程序即将对磁盘进行更改。&lt;br/&gt;&lt;strong&gt;这些更改无法撤销。&lt;/strong&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="333"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="333"/>
<source>&amp;Set up now</source> <source>&amp;Set up now</source>
<translation type="unfinished"/> <translation>现在安装(&amp;S)</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="389"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="389"/>
<source>&amp;Set up</source> <source>&amp;Set up</source>
<translation type="unfinished"/> <translation>安装(&amp;S)</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="389"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="389"/>
@ -341,12 +341,12 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="391"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="391"/>
<source>Setup is complete. Close the setup program.</source> <source>Setup is complete. Close the setup program.</source>
<translation type="unfinished"/> <translation>安装完成。关闭安装程序。</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="490"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="490"/>
<source>Cancel setup?</source> <source>Cancel setup?</source>
<translation type="unfinished"/> <translation>取消安装？</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="490"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="490"/>
@ -357,7 +357,8 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="491"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="491"/>
<source>Do you really want to cancel the current setup process? <source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source> The setup program will quit and all changes will be lost.</source>
<translation type="unfinished"/> <translation>确定要取消当前安装吗?
安装程序将会退出，所有修改都会丢失。</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="493"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="493"/>
@ -453,7 +454,8 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/libcalamaresui/utils/Paste.cpp" line="34"/> <location filename="../src/libcalamaresui/utils/Paste.cpp" line="34"/>
<source>Install log posted to: <source>Install log posted to:
%1</source> %1</source>
<translation type="unfinished"/> <translation>安装日志发布到：
%1</translation>
</message> </message>
</context> </context>
<context> <context>
@ -461,7 +463,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="72"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="72"/>
<source>%1 Setup Program</source> <source>%1 Setup Program</source>
<translation type="unfinished"/> <translation>%1 安装程序</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="73"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="73"/>
@ -530,7 +532,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="967"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="967"/>
<source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source>
<translation type="unfinished"/> <translation>%1 将会缩减未 %2MiB，然后为 %4 创建一个 %3MiB 分区。</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
@ -573,27 +575,27 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/>
<source>No Swap</source> <source>No Swap</source>
<translation type="unfinished"/> <translation>无交换分区</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/>
<source>Reuse Swap</source> <source>Reuse Swap</source>
<translation type="unfinished"/> <translation>重用交换分区</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/>
<source>Swap (no Hibernate)</source> <source>Swap (no Hibernate)</source>
<translation type="unfinished"/> <translation>交换分区(无休眠)</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1512"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1512"/>
<source>Swap (with Hibernate)</source> <source>Swap (with Hibernate)</source>
<translation type="unfinished"/> <translation>交换分区(带休眠)</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1515"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1515"/>
<source>Swap to file</source> <source>Swap to file</source>
<translation type="unfinished"/> <translation>交换到文件</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1273"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1273"/>
@ -773,7 +775,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="49"/> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="49"/>
<source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <source>Create new %2MiB partition on %4 (%3) with file system %1.</source>
<translation type="unfinished"/> <translation>在 %4 (%3) 上创建新的 %2MiB 分区，文件系统为 %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="60"/> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="60"/>
@ -885,7 +887,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/CreateVolumeGroupDialog.cpp" line="37"/> <location filename="../src/modules/partition/gui/CreateVolumeGroupDialog.cpp" line="37"/>
<source>Create Volume Group</source> <source>Create Volume Group</source>
<translation type="unfinished"/> <translation>创建存储组</translation>
</message> </message>
</context> </context>
<context> <context>
@ -893,7 +895,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="38"/> <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="38"/>
<source>Create new volume group named %1.</source> <source>Create new volume group named %1.</source>
<translation type="unfinished"/> <translation>创建新存储组 %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="45"/> <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="45"/>
@ -999,7 +1001,7 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/> <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source> <source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment> <extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/> <translation>%1 - (%2)</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1162,7 +1164,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="95"/> <location filename="../src/modules/finished/FinishedPage.ui" line="95"/>
<source>&lt;Restart checkbox tooltip&gt;</source> <source>&lt;Restart checkbox tooltip&gt;</source>
<translation type="unfinished"/> <translation>&lt;Restart checkbox tooltip&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="98"/> <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
@ -1210,7 +1212,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/>
<source>Setup Complete</source> <source>Setup Complete</source>
<translation type="unfinished"/> <translation>安装完成</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/>
@ -1220,7 +1222,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/>
<source>The setup of %1 is complete.</source> <source>The setup of %1 is complete.</source>
<translation type="unfinished"/> <translation>%1 安装完成。</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/>
@ -1500,7 +1502,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="96"/> <location filename="../src/modules/license/LicenseWidget.cpp" line="96"/>
<source>URL: %1</source> <source>URL: %1</source>
<translation type="unfinished"/> <translation>URL: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="117"/> <location filename="../src/modules/license/LicenseWidget.cpp" line="117"/>
@ -1537,22 +1539,22 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="171"/> <location filename="../src/modules/license/LicenseWidget.cpp" line="171"/>
<source>File: %1</source> <source>File: %1</source>
<translation type="unfinished"/> <translation>文件：%1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="194"/> <location filename="../src/modules/license/LicenseWidget.cpp" line="194"/>
<source>Show the license text</source> <source>Show the license text</source>
<translation type="unfinished"/> <translation>显示协议文本</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="198"/> <location filename="../src/modules/license/LicenseWidget.cpp" line="198"/>
<source>Open license agreement in browser.</source> <source>Open license agreement in browser.</source>
<translation type="unfinished"/> <translation>在浏览器中打开许可协议。</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="194"/> <location filename="../src/modules/license/LicenseWidget.cpp" line="194"/>
<source>Hide license text</source> <source>Hide license text</source>
<translation type="unfinished"/> <translation>隐藏协议文本</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1602,13 +1604,13 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="39"/> <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="39"/>
<source>Configuring LUKS key file.</source> <source>Configuring LUKS key file.</source>
<translation type="unfinished"/> <translation>配置 LUKS key 文件。</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="156"/> <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="156"/>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="164"/> <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="164"/>
<source>No partitions are defined.</source> <source>No partitions are defined.</source>
<translation type="unfinished"/> <translation>未定义分区。</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="192"/> <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="192"/>
@ -1643,7 +1645,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/machineid/MachineIdJob.cpp" line="62"/> <location filename="../src/modules/machineid/MachineIdJob.cpp" line="62"/>
<source>Configuration Error</source> <source>Configuration Error</source>
<translation type="unfinished"/> <translation>配置错误</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/machineid/MachineIdJob.cpp" line="63"/> <location filename="../src/modules/machineid/MachineIdJob.cpp" line="63"/>
@ -1690,52 +1692,52 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="65"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="65"/>
<source>Office software</source> <source>Office software</source>
<translation type="unfinished"/> <translation>办公软件</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="66"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="66"/>
<source>Office package</source> <source>Office package</source>
<translation type="unfinished"/> <translation>办公软件包</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="67"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="67"/>
<source>Browser software</source> <source>Browser software</source>
<translation type="unfinished"/> <translation>浏览器软件</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="68"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="68"/>
<source>Browser package</source> <source>Browser package</source>
<translation type="unfinished"/> <translation>浏览器安装包</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="69"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="69"/>
<source>Web browser</source> <source>Web browser</source>
<translation type="unfinished"/> <translation>网页浏览器</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="70"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="70"/>
<source>Kernel</source> <source>Kernel</source>
<translation type="unfinished"/> <translation>内核</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="71"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="71"/>
<source>Services</source> <source>Services</source>
<translation type="unfinished"/> <translation>服务</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="72"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="72"/>
<source>Login</source> <source>Login</source>
<translation type="unfinished"/> <translation>登录</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="73"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="73"/>
<source>Desktop</source> <source>Desktop</source>
<translation type="unfinished"/> <translation>桌面</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="74"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="74"/>
<source>Applications</source> <source>Applications</source>
<translation type="unfinished"/> <translation>应用程序</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1743,7 +1745,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/notesqml/NotesQmlViewStep.cpp" line="34"/> <location filename="../src/modules/notesqml/NotesQmlViewStep.cpp" line="34"/>
<source>Notes</source> <source>Notes</source>
<translation type="unfinished"/> <translation>备注</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1751,7 +1753,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/oemid/OEMPage.ui" line="28"/> <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
<source>Ba&amp;tch:</source> <source>Ba&amp;tch:</source>
<translation type="unfinished"/> <translation>批量(&amp;T)：</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/oemid/OEMPage.ui" line="38"/> <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
@ -1769,7 +1771,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/oemid/OEMViewStep.cpp" line="121"/> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="121"/>
<source>OEM Configuration</source> <source>OEM Configuration</source>
<translation type="unfinished"/> <translation>OEM 配置</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/oemid/OEMViewStep.cpp" line="126"/> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="126"/>
@ -2022,7 +2024,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="571"/> <location filename="../src/modules/users/UsersPage.cpp" line="571"/>
<source>Password is empty</source> <source>Password is empty</source>
<translation type="unfinished"/> <translation>密码是空</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2035,7 +2037,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/packagechooser/page_package.ui" line="40"/> <location filename="../src/modules/packagechooser/page_package.ui" line="40"/>
<source>Product Name</source> <source>Product Name</source>
<translation type="unfinished"/> <translation>产品名称</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/packagechooser/page_package.ui" line="53"/> <location filename="../src/modules/packagechooser/page_package.ui" line="53"/>
@ -2045,12 +2047,12 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/packagechooser/page_package.ui" line="69"/> <location filename="../src/modules/packagechooser/page_package.ui" line="69"/>
<source>Long Product Description</source> <source>Long Product Description</source>
<translation type="unfinished"/> <translation>长产品描述</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="34"/> <location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="34"/>
<source>Package Selection</source> <source>Package Selection</source>
<translation type="unfinished"/> <translation>软件包选择</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="35"/> <location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="35"/>
@ -2063,7 +2065,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/packagechooser/PackageChooserViewStep.cpp" line="70"/> <location filename="../src/modules/packagechooser/PackageChooserViewStep.cpp" line="70"/>
<source>Packages</source> <source>Packages</source>
<translation type="unfinished"/> <translation>软件包</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2120,12 +2122,12 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="51"/> <location filename="../src/modules/users/page_usersetup.ui" line="51"/>
<source>Your Full Name</source> <source>Your Full Name</source>
<translation type="unfinished"/> <translation>全名</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="144"/> <location filename="../src/modules/users/page_usersetup.ui" line="144"/>
<source>login</source> <source>login</source>
<translation type="unfinished"/> <translation>登录</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="243"/> <location filename="../src/modules/users/page_usersetup.ui" line="243"/>
@ -2135,19 +2137,19 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="246"/> <location filename="../src/modules/users/page_usersetup.ui" line="246"/>
<source>Computer Name</source> <source>Computer Name</source>
<translation type="unfinished"/> <translation>计算机名称</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="351"/> <location filename="../src/modules/users/page_usersetup.ui" line="351"/>
<location filename="../src/modules/users/page_usersetup.ui" line="521"/> <location filename="../src/modules/users/page_usersetup.ui" line="521"/>
<source>Password</source> <source>Password</source>
<translation type="unfinished"/> <translation>密码</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="376"/> <location filename="../src/modules/users/page_usersetup.ui" line="376"/>
<location filename="../src/modules/users/page_usersetup.ui" line="546"/> <location filename="../src/modules/users/page_usersetup.ui" line="546"/>
<source>Repeat Password</source> <source>Repeat Password</source>
<translation type="unfinished"/> <translation>重复密码</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="451"/> <location filename="../src/modules/users/page_usersetup.ui" line="451"/>
@ -3364,7 +3366,7 @@ Output:
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="14"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="14"/>
<source>Create Volume Group</source> <source>Create Volume Group</source>
<translation type="unfinished"/> <translation>创建存储组</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="20"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="20"/>
@ -3433,17 +3435,17 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="143"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
<source>&amp;Donate</source> <source>&amp;Donate</source>
<translation type="unfinished"/> <translation>捐赠(&amp;D)</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="153"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
<source>Open help and support website</source> <source>Open help and support website</source>
<translation type="unfinished"/> <translation>打开帮助和支持页面</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="166"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
<source>Open issues and bug-tracking website</source> <source>Open issues and bug-tracking website</source>
<translation type="unfinished"/> <translation>打开问题追踪网站</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="179"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
@ -3541,32 +3543,32 @@ Output:
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="42"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="42"/>
<source>&lt;h3&gt;%1 &lt;quote&gt;%2&lt;/quote&gt;&lt;/h3&gt;</source> <source>&lt;h3&gt;%1 &lt;quote&gt;%2&lt;/quote&gt;&lt;/h3&gt;</source>
<translation type="unfinished"/> <translation>&lt;h3&gt;%1 &lt;quote&gt;%2&lt;/quote&gt;&lt;/h3&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="75"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="75"/>
<source>About</source> <source>About</source>
<translation type="unfinished"/> <translation>关于</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="86"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="86"/>
<source>Support</source> <source>Support</source>
<translation type="unfinished"/> <translation>支持</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="97"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="97"/>
<source>Known issues</source> <source>Known issues</source>
<translation type="unfinished"/> <translation>已知问题</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="108"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="108"/>
<source>Release notes</source> <source>Release notes</source>
<translation type="unfinished"/> <translation>发行说明</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="119"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="119"/>
<source>Donate</source> <source>Donate</source>
<translation type="unfinished"/> <translation>捐赠</translation>
</message> </message>
</context> </context>
</TS> </TS>

2
lang/python/ko/LC_MESSAGES/python.po
View File

@ -4,7 +4,7 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
# Translators: # Translators:
# Ji-Hyeon Gim <potatogim@potatogim.net>, 2018 # 김지현 <potatogim@potatogim.net>, 2018
# MarongHappy <daemul72@gmail.com>, 2019 # MarongHappy <daemul72@gmail.com>, 2019
# #
#, fuzzy #, fuzzy

BIN
lang/python/sv/LC_MESSAGES/python.mo
View File

Binary file not shown.

69
lang/python/sv/LC_MESSAGES/python.po
View File

@ -5,6 +5,7 @@
# #
# Translators: # Translators:
# Jan-Olof Svensson, 2019 # Jan-Olof Svensson, 2019
# Luna Jernberg <bittin@cafe8bitar.se>, 2020
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
@ -13,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-02-19 17:27+0100\n" "POT-Creation-Date: 2020-02-19 17:27+0100\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Jan-Olof Svensson, 2019\n" "Last-Translator: Luna Jernberg <bittin@cafe8bitar.se>, 2020\n"
"Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n" "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -23,11 +24,11 @@ msgstr ""
#: src/modules/grubcfg/main.py:37 #: src/modules/grubcfg/main.py:37
msgid "Configure GRUB." msgid "Configure GRUB."
msgstr "" msgstr "Konfigurera GRUB."
#: src/modules/mount/main.py:38 #: src/modules/mount/main.py:38
msgid "Mounting partitions." msgid "Mounting partitions."
msgstr "" msgstr "Monterar partitioner."
#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:201 #: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:201
#: src/modules/initcpiocfg/main.py:205 #: src/modules/initcpiocfg/main.py:205
@ -39,23 +40,23 @@ msgstr ""
#: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
#: src/modules/networkcfg/main.py:48 #: src/modules/networkcfg/main.py:48
msgid "Configuration Error" msgid "Configuration Error"
msgstr "" msgstr "Konfigurationsfel"
#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:202 #: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:202
#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172 #: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79 #: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
#: src/modules/fstab/main.py:323 #: src/modules/fstab/main.py:323
msgid "No partitions are defined for <pre>{!s}</pre> to use." msgid "No partitions are defined for <pre>{!s}</pre> to use."
msgstr "" msgstr "Inga partitioner är definerade för <pre>{!s}</pre> att använda."
#: src/modules/services-systemd/main.py:35 #: src/modules/services-systemd/main.py:35
msgid "Configure systemd services" msgid "Configure systemd services"
msgstr "" msgstr "Konfigurera systemd tjänster"
#: src/modules/services-systemd/main.py:68 #: src/modules/services-systemd/main.py:68
#: src/modules/services-openrc/main.py:102 #: src/modules/services-openrc/main.py:102
msgid "Cannot modify service" msgid "Cannot modify service"
msgstr "" msgstr "Kunde inte modifiera tjänst"
#: src/modules/services-systemd/main.py:69 #: src/modules/services-systemd/main.py:69
msgid "" msgid ""
@ -65,7 +66,7 @@ msgstr ""
#: src/modules/services-systemd/main.py:72 #: src/modules/services-systemd/main.py:72
#: src/modules/services-systemd/main.py:76 #: src/modules/services-systemd/main.py:76
msgid "Cannot enable systemd service <code>{name!s}</code>." msgid "Cannot enable systemd service <code>{name!s}</code>."
msgstr "" msgstr "Kunde inte aktivera systemd tjänst <code>{name!s}</code>."
#: src/modules/services-systemd/main.py:74 #: src/modules/services-systemd/main.py:74
msgid "Cannot enable systemd target <code>{name!s}</code>." msgid "Cannot enable systemd target <code>{name!s}</code>."
@ -87,15 +88,15 @@ msgstr ""
#: src/modules/umount/main.py:40 #: src/modules/umount/main.py:40
msgid "Unmount file systems." msgid "Unmount file systems."
msgstr "" msgstr "Avmontera filsystem."
#: src/modules/unpackfs/main.py:41 #: src/modules/unpackfs/main.py:41
msgid "Filling up filesystems." msgid "Filling up filesystems."
msgstr "" msgstr "Packar upp filsystem."
#: src/modules/unpackfs/main.py:184 #: src/modules/unpackfs/main.py:184
msgid "rsync failed with error code {}." msgid "rsync failed with error code {}."
msgstr "" msgstr "rsync misslyckades med felkod {}."
#: src/modules/unpackfs/main.py:245 src/modules/unpackfs/main.py:268 #: src/modules/unpackfs/main.py:245 src/modules/unpackfs/main.py:268
msgid "Failed to unpack image \"{}\"" msgid "Failed to unpack image \"{}\""
@ -109,7 +110,7 @@ msgstr ""
#: src/modules/unpackfs/main.py:370 #: src/modules/unpackfs/main.py:370
msgid "No mount point for root partition" msgid "No mount point for root partition"
msgstr "" msgstr "Ingen monteringspunkt för root partition"
#: src/modules/unpackfs/main.py:371 #: src/modules/unpackfs/main.py:371
msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
@ -117,7 +118,7 @@ msgstr ""
#: src/modules/unpackfs/main.py:376 #: src/modules/unpackfs/main.py:376
msgid "Bad mount point for root partition" msgid "Bad mount point for root partition"
msgstr "" msgstr "Dålig monteringspunkt för root partition"
#: src/modules/unpackfs/main.py:377 #: src/modules/unpackfs/main.py:377
msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
@ -126,11 +127,11 @@ msgstr ""
#: src/modules/unpackfs/main.py:389 src/modules/unpackfs/main.py:393 #: src/modules/unpackfs/main.py:389 src/modules/unpackfs/main.py:393
#: src/modules/unpackfs/main.py:407 #: src/modules/unpackfs/main.py:407
msgid "Bad unsquash configuration" msgid "Bad unsquash configuration"
msgstr "" msgstr "Dålig unsquash konfiguration"
#: src/modules/unpackfs/main.py:390 #: src/modules/unpackfs/main.py:390
msgid "The filesystem for \"{}\" ({}) is not supported" msgid "The filesystem for \"{}\" ({}) is not supported"
msgstr "" msgstr "Filsystemet för \"{}\" ({})  stöds inte"
#: src/modules/unpackfs/main.py:394 #: src/modules/unpackfs/main.py:394
msgid "The source filesystem \"{}\" does not exist" msgid "The source filesystem \"{}\" does not exist"
@ -142,31 +143,31 @@ msgstr ""
#: src/modules/displaymanager/main.py:515 #: src/modules/displaymanager/main.py:515
msgid "Cannot write KDM configuration file" msgid "Cannot write KDM configuration file"
msgstr "" msgstr "Misslyckades med att skriva KDM konfigurationsfil"
#: src/modules/displaymanager/main.py:516 #: src/modules/displaymanager/main.py:516
msgid "KDM config file {!s} does not exist" msgid "KDM config file {!s} does not exist"
msgstr "" msgstr "KDM konfigurationsfil {!s} existerar inte"
#: src/modules/displaymanager/main.py:577 #: src/modules/displaymanager/main.py:577
msgid "Cannot write LXDM configuration file" msgid "Cannot write LXDM configuration file"
msgstr "" msgstr "Misslyckades med att skriva LXDM konfigurationsfil"
#: src/modules/displaymanager/main.py:578 #: src/modules/displaymanager/main.py:578
msgid "LXDM config file {!s} does not exist" msgid "LXDM config file {!s} does not exist"
msgstr "" msgstr "LXDM konfigurationsfil {!s} existerar inte"
#: src/modules/displaymanager/main.py:661 #: src/modules/displaymanager/main.py:661
msgid "Cannot write LightDM configuration file" msgid "Cannot write LightDM configuration file"
msgstr "" msgstr "Misslyckades med att skriva LightDM konfigurationsfil"
#: src/modules/displaymanager/main.py:662 #: src/modules/displaymanager/main.py:662
msgid "LightDM config file {!s} does not exist" msgid "LightDM config file {!s} does not exist"
msgstr "" msgstr "LightDM konfigurationsfil {!s} existerar inte"
#: src/modules/displaymanager/main.py:736 #: src/modules/displaymanager/main.py:736
msgid "Cannot configure LightDM" msgid "Cannot configure LightDM"
msgstr "" msgstr "Kunde inte konfigurera LightDM"
#: src/modules/displaymanager/main.py:737 #: src/modules/displaymanager/main.py:737
msgid "No LightDM greeter installed." msgid "No LightDM greeter installed."
@ -174,11 +175,11 @@ msgstr ""
#: src/modules/displaymanager/main.py:768 #: src/modules/displaymanager/main.py:768
msgid "Cannot write SLIM configuration file" msgid "Cannot write SLIM configuration file"
msgstr "" msgstr "Misslyckades med att SLIM konfigurationsfil"
#: src/modules/displaymanager/main.py:769 #: src/modules/displaymanager/main.py:769
msgid "SLIM config file {!s} does not exist" msgid "SLIM config file {!s} does not exist"
msgstr "" msgstr "SLIM konfigurationsfil {!s} existerar inte"
#: src/modules/displaymanager/main.py:895 #: src/modules/displaymanager/main.py:895
msgid "No display managers selected for the displaymanager module." msgid "No display managers selected for the displaymanager module."
@ -196,7 +197,7 @@ msgstr ""
#: src/modules/initcpiocfg/main.py:37 #: src/modules/initcpiocfg/main.py:37
msgid "Configuring mkinitcpio." msgid "Configuring mkinitcpio."
msgstr "" msgstr "Konfigurerar mkinitcpio."
#: src/modules/initcpiocfg/main.py:206 #: src/modules/initcpiocfg/main.py:206
#: src/modules/luksopenswaphookcfg/main.py:100 #: src/modules/luksopenswaphookcfg/main.py:100
@ -208,7 +209,7 @@ msgstr ""
#: src/modules/luksopenswaphookcfg/main.py:35 #: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap." msgid "Configuring encrypted swap."
msgstr "" msgstr "Konfigurerar krypterad swap."
#: src/modules/rawfs/main.py:35 #: src/modules/rawfs/main.py:35
msgid "Installing data." msgid "Installing data."
@ -216,7 +217,7 @@ msgstr "Installerar data."
#: src/modules/services-openrc/main.py:38 #: src/modules/services-openrc/main.py:38
msgid "Configure OpenRC services" msgid "Configure OpenRC services"
msgstr "" msgstr "Konfigurera OpenRC tjänster"
#: src/modules/services-openrc/main.py:66 #: src/modules/services-openrc/main.py:66
msgid "Cannot add service {name!s} to run-level {level!s}." msgid "Cannot add service {name!s} to run-level {level!s}."
@ -259,7 +260,7 @@ msgstr ""
#: src/modules/plymouthcfg/main.py:36 #: src/modules/plymouthcfg/main.py:36
msgid "Configure Plymouth theme" msgid "Configure Plymouth theme"
msgstr "" msgstr "Konfigurera Plymouth tema"
#: src/modules/packages/main.py:62 #: src/modules/packages/main.py:62
#, python-format #, python-format
@ -286,7 +287,7 @@ msgstr[1] "Tar bort %(num)d paket."
#: src/modules/bootloader/main.py:51 #: src/modules/bootloader/main.py:51
msgid "Install bootloader." msgid "Install bootloader."
msgstr "" msgstr "Installera starthanterare."
#: src/modules/removeuser/main.py:34 #: src/modules/removeuser/main.py:34
msgid "Remove live user from target system" msgid "Remove live user from target system"
@ -298,7 +299,7 @@ msgstr "Ställer hårdvaruklockan."
#: src/modules/dracut/main.py:36 #: src/modules/dracut/main.py:36
msgid "Creating initramfs with dracut." msgid "Creating initramfs with dracut."
msgstr "" msgstr "Skapar initramfs med dracut."
#: src/modules/dracut/main.py:58 #: src/modules/dracut/main.py:58
msgid "Failed to run dracut on the target" msgid "Failed to run dracut on the target"
@ -310,11 +311,11 @@ msgstr ""
#: src/modules/initramfscfg/main.py:41 #: src/modules/initramfscfg/main.py:41
msgid "Configuring initramfs." msgid "Configuring initramfs."
msgstr "" msgstr "Konfigurerar initramfs."
#: src/modules/openrcdmcryptcfg/main.py:34 #: src/modules/openrcdmcryptcfg/main.py:34
msgid "Configuring OpenRC dmcrypt service." msgid "Configuring OpenRC dmcrypt service."
msgstr "" msgstr "Konfigurerar OpenRC dmcrypt tjänst."
#: src/modules/fstab/main.py:38 #: src/modules/fstab/main.py:38
msgid "Writing fstab." msgid "Writing fstab."
@ -330,8 +331,8 @@ msgstr ""
#: src/modules/localecfg/main.py:39 #: src/modules/localecfg/main.py:39
msgid "Configuring locales." msgid "Configuring locales."
msgstr "" msgstr "Konfigurerar språkinställningar"
#: src/modules/networkcfg/main.py:37 #: src/modules/networkcfg/main.py:37
msgid "Saving network configuration." msgid "Saving network configuration."
msgstr "" msgstr "Sparar nätverkskonfiguration."

BIN
lang/python/zh_CN/LC_MESSAGES/python.mo
View File

Binary file not shown.

128
lang/python/zh_CN/LC_MESSAGES/python.po
View File

@ -6,7 +6,7 @@
# Translators: # Translators:
# Mingcong Bai <jeffbai@aosc.xyz>, 2017 # Mingcong Bai <jeffbai@aosc.xyz>, 2017
# plantman <weihanlin@live.com>, 2017 # plantman <weihanlin@live.com>, 2017
# leonfeng <chaofeng111@qq.com>, 2018 # Feng Chao <chaofeng111@qq.com>, 2020
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
@ -15,7 +15,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-02-19 17:27+0100\n" "POT-Creation-Date: 2020-02-19 17:27+0100\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: leonfeng <chaofeng111@qq.com>, 2018\n" "Last-Translator: Feng Chao <chaofeng111@qq.com>, 2020\n"
"Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n" "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -25,11 +25,11 @@ msgstr ""
#: src/modules/grubcfg/main.py:37 #: src/modules/grubcfg/main.py:37
msgid "Configure GRUB." msgid "Configure GRUB."
msgstr "" msgstr "配置 GRUB."
#: src/modules/mount/main.py:38 #: src/modules/mount/main.py:38
msgid "Mounting partitions." msgid "Mounting partitions."
msgstr "" msgstr "挂载分区。"
#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:201 #: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:201
#: src/modules/initcpiocfg/main.py:205 #: src/modules/initcpiocfg/main.py:205
@ -41,51 +41,53 @@ msgstr ""
#: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
#: src/modules/networkcfg/main.py:48 #: src/modules/networkcfg/main.py:48
msgid "Configuration Error" msgid "Configuration Error"
msgstr "" msgstr "配置错误"
#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:202 #: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:202
#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172 #: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79 #: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
#: src/modules/fstab/main.py:323 #: src/modules/fstab/main.py:323
msgid "No partitions are defined for <pre>{!s}</pre> to use." msgid "No partitions are defined for <pre>{!s}</pre> to use."
msgstr "" msgstr "没有分配分区给 <pre>{!s}</pre>。"
#: src/modules/services-systemd/main.py:35 #: src/modules/services-systemd/main.py:35
msgid "Configure systemd services" msgid "Configure systemd services"
msgstr "" msgstr "配置 systemd 服务"
#: src/modules/services-systemd/main.py:68 #: src/modules/services-systemd/main.py:68
#: src/modules/services-openrc/main.py:102 #: src/modules/services-openrc/main.py:102
msgid "Cannot modify service" msgid "Cannot modify service"
msgstr "" msgstr "无法修改服务"
#: src/modules/services-systemd/main.py:69 #: src/modules/services-systemd/main.py:69
msgid "" msgid ""
"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}." "<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
msgstr "" msgstr "chroot 中的 <code>systemctl {arg!s}</code> 命令返回错误 {num!s}."
#: src/modules/services-systemd/main.py:72 #: src/modules/services-systemd/main.py:72
#: src/modules/services-systemd/main.py:76 #: src/modules/services-systemd/main.py:76
msgid "Cannot enable systemd service <code>{name!s}</code>." msgid "Cannot enable systemd service <code>{name!s}</code>."
msgstr "" msgstr "无法启用 systemd 服务 <code>{name!s}</code>."
#: src/modules/services-systemd/main.py:74 #: src/modules/services-systemd/main.py:74
msgid "Cannot enable systemd target <code>{name!s}</code>." msgid "Cannot enable systemd target <code>{name!s}</code>."
msgstr "" msgstr "无法启用 systemd 目标 <code>{name!s}</code>."
#: src/modules/services-systemd/main.py:78 #: src/modules/services-systemd/main.py:78
msgid "Cannot disable systemd target <code>{name!s}</code>." msgid "Cannot disable systemd target <code>{name!s}</code>."
msgstr "" msgstr "无法禁用 systemd 目标 <code>{name!s}</code>."
#: src/modules/services-systemd/main.py:80 #: src/modules/services-systemd/main.py:80
msgid "Cannot mask systemd unit <code>{name!s}</code>." msgid "Cannot mask systemd unit <code>{name!s}</code>."
msgstr "" msgstr "无法屏蔽 systemd 单元 <code>{name!s}</code>."
#: src/modules/services-systemd/main.py:82 #: src/modules/services-systemd/main.py:82
msgid "" msgid ""
"Unknown systemd commands <code>{command!s}</code> and " "Unknown systemd commands <code>{command!s}</code> and "
"<code>{suffix!s}</code> for unit {name!s}." "<code>{suffix!s}</code> for unit {name!s}."
msgstr "" msgstr ""
"未知的 systemd 命令 <code>{command!s}</code> 和 {name!s} 单元前缀 "
"<code>{suffix!s}</code>."
#: src/modules/umount/main.py:40 #: src/modules/umount/main.py:40
msgid "Unmount file systems." msgid "Unmount file systems."
@ -93,112 +95,112 @@ msgstr "卸载文件系统。"
#: src/modules/unpackfs/main.py:41 #: src/modules/unpackfs/main.py:41
msgid "Filling up filesystems." msgid "Filling up filesystems."
msgstr "" msgstr "写入文件系统。"
#: src/modules/unpackfs/main.py:184 #: src/modules/unpackfs/main.py:184
msgid "rsync failed with error code {}." msgid "rsync failed with error code {}."
msgstr "" msgstr "rsync 报错，错误码 {}."
#: src/modules/unpackfs/main.py:245 src/modules/unpackfs/main.py:268 #: src/modules/unpackfs/main.py:245 src/modules/unpackfs/main.py:268
msgid "Failed to unpack image \"{}\"" msgid "Failed to unpack image \"{}\""
msgstr "" msgstr "解压镜像失败 \"{}\""
#: src/modules/unpackfs/main.py:246 #: src/modules/unpackfs/main.py:246
msgid "" msgid ""
"Failed to find unsquashfs, make sure you have the squashfs-tools package " "Failed to find unsquashfs, make sure you have the squashfs-tools package "
"installed" "installed"
msgstr "" msgstr "未找到 unsquashfs，请确保安装了 squashfs-tools 软件包"
#: src/modules/unpackfs/main.py:370 #: src/modules/unpackfs/main.py:370
msgid "No mount point for root partition" msgid "No mount point for root partition"
msgstr "" msgstr "无 root 分区挂载点"
#: src/modules/unpackfs/main.py:371 #: src/modules/unpackfs/main.py:371
msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
msgstr "" msgstr "globalstorage 未包含 \"rootMountPoint\"，跳过"
#: src/modules/unpackfs/main.py:376 #: src/modules/unpackfs/main.py:376
msgid "Bad mount point for root partition" msgid "Bad mount point for root partition"
msgstr "" msgstr "错误的 root 分区挂载点"
#: src/modules/unpackfs/main.py:377 #: src/modules/unpackfs/main.py:377
msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
msgstr "" msgstr "rootMountPoint 是 \"{}\"，不存在此位置，跳过"
#: src/modules/unpackfs/main.py:389 src/modules/unpackfs/main.py:393 #: src/modules/unpackfs/main.py:389 src/modules/unpackfs/main.py:393
#: src/modules/unpackfs/main.py:407 #: src/modules/unpackfs/main.py:407
msgid "Bad unsquash configuration" msgid "Bad unsquash configuration"
msgstr "" msgstr "错误的 unsquash 配置"
#: src/modules/unpackfs/main.py:390 #: src/modules/unpackfs/main.py:390
msgid "The filesystem for \"{}\" ({}) is not supported" msgid "The filesystem for \"{}\" ({}) is not supported"
msgstr "" msgstr "不支持文件系统 \"{}\" ({})"
#: src/modules/unpackfs/main.py:394 #: src/modules/unpackfs/main.py:394
msgid "The source filesystem \"{}\" does not exist" msgid "The source filesystem \"{}\" does not exist"
msgstr "" msgstr "源文件系统 \"{}\" 不存在"
#: src/modules/unpackfs/main.py:408 #: src/modules/unpackfs/main.py:408
msgid "The destination \"{}\" in the target system is not a directory" msgid "The destination \"{}\" in the target system is not a directory"
msgstr "" msgstr "目标系统中的 \"{}\" 不是一个目录"
#: src/modules/displaymanager/main.py:515 #: src/modules/displaymanager/main.py:515
msgid "Cannot write KDM configuration file" msgid "Cannot write KDM configuration file"
msgstr "" msgstr "无法写入 KDM 配置文件"
#: src/modules/displaymanager/main.py:516 #: src/modules/displaymanager/main.py:516
msgid "KDM config file {!s} does not exist" msgid "KDM config file {!s} does not exist"
msgstr "" msgstr "KDM 配置文件 {!s} 不存在"
#: src/modules/displaymanager/main.py:577 #: src/modules/displaymanager/main.py:577
msgid "Cannot write LXDM configuration file" msgid "Cannot write LXDM configuration file"
msgstr "" msgstr "无法写入 LXDM 配置文件"
#: src/modules/displaymanager/main.py:578 #: src/modules/displaymanager/main.py:578
msgid "LXDM config file {!s} does not exist" msgid "LXDM config file {!s} does not exist"
msgstr "" msgstr "LXDM 配置文件 {!s} 不存在"
#: src/modules/displaymanager/main.py:661 #: src/modules/displaymanager/main.py:661
msgid "Cannot write LightDM configuration file" msgid "Cannot write LightDM configuration file"
msgstr "" msgstr "无法写入 LightDM 配置文件"
#: src/modules/displaymanager/main.py:662 #: src/modules/displaymanager/main.py:662
msgid "LightDM config file {!s} does not exist" msgid "LightDM config file {!s} does not exist"
msgstr "" msgstr "LightDM 配置文件 {!s} 不存在"
#: src/modules/displaymanager/main.py:736 #: src/modules/displaymanager/main.py:736
msgid "Cannot configure LightDM" msgid "Cannot configure LightDM"
msgstr "" msgstr "无法配置 LightDM"
#: src/modules/displaymanager/main.py:737 #: src/modules/displaymanager/main.py:737
msgid "No LightDM greeter installed." msgid "No LightDM greeter installed."
msgstr "" msgstr "未安装 LightDM 欢迎程序。"
#: src/modules/displaymanager/main.py:768 #: src/modules/displaymanager/main.py:768
msgid "Cannot write SLIM configuration file" msgid "Cannot write SLIM configuration file"
msgstr "" msgstr "无法写入 SLIM 配置文件"
#: src/modules/displaymanager/main.py:769 #: src/modules/displaymanager/main.py:769
msgid "SLIM config file {!s} does not exist" msgid "SLIM config file {!s} does not exist"
msgstr "" msgstr "SLIM 配置文件 {!s} 不存在"
#: src/modules/displaymanager/main.py:895 #: src/modules/displaymanager/main.py:895
msgid "No display managers selected for the displaymanager module." msgid "No display managers selected for the displaymanager module."
msgstr "" msgstr "显示管理器模块中未选择显示管理器。"
#: src/modules/displaymanager/main.py:896 #: src/modules/displaymanager/main.py:896
msgid "" msgid ""
"The displaymanagers list is empty or undefined in bothglobalstorage and " "The displaymanagers list is empty or undefined in bothglobalstorage and "
"displaymanager.conf." "displaymanager.conf."
msgstr "" msgstr "globalstorage 和 displaymanager.conf 配置文件中都没有配置显示管理器。"
#: src/modules/displaymanager/main.py:978 #: src/modules/displaymanager/main.py:978
msgid "Display manager configuration was incomplete" msgid "Display manager configuration was incomplete"
msgstr "" msgstr "显示管理器配置不完全"
#: src/modules/initcpiocfg/main.py:37 #: src/modules/initcpiocfg/main.py:37
msgid "Configuring mkinitcpio." msgid "Configuring mkinitcpio."
msgstr "" msgstr "配置 mkinitcpio."
#: src/modules/initcpiocfg/main.py:206 #: src/modules/initcpiocfg/main.py:206
#: src/modules/luksopenswaphookcfg/main.py:100 #: src/modules/luksopenswaphookcfg/main.py:100
@ -206,62 +208,62 @@ msgstr ""
#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 #: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
#: src/modules/networkcfg/main.py:49 #: src/modules/networkcfg/main.py:49
msgid "No root mount point is given for <pre>{!s}</pre> to use." msgid "No root mount point is given for <pre>{!s}</pre> to use."
msgstr "" msgstr " 未设置 <pre>{!s}</pre> 要使用的根挂载点。"
#: src/modules/luksopenswaphookcfg/main.py:35 #: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap." msgid "Configuring encrypted swap."
msgstr "" msgstr "配置加密交换分区。"
#: src/modules/rawfs/main.py:35 #: src/modules/rawfs/main.py:35
msgid "Installing data." msgid "Installing data."
msgstr "" msgstr "安装数据."
#: src/modules/services-openrc/main.py:38 #: src/modules/services-openrc/main.py:38
msgid "Configure OpenRC services" msgid "Configure OpenRC services"
msgstr "" msgstr "配置 OpenRC 服务。"
#: src/modules/services-openrc/main.py:66 #: src/modules/services-openrc/main.py:66
msgid "Cannot add service {name!s} to run-level {level!s}." msgid "Cannot add service {name!s} to run-level {level!s}."
msgstr "" msgstr "无法将服务 {name!s} 加入 {level!s} 运行级别."
#: src/modules/services-openrc/main.py:68 #: src/modules/services-openrc/main.py:68
msgid "Cannot remove service {name!s} from run-level {level!s}." msgid "Cannot remove service {name!s} from run-level {level!s}."
msgstr "" msgstr "无法从 {level!s} 运行级别中删除服务 {name!s}。"
#: src/modules/services-openrc/main.py:70 #: src/modules/services-openrc/main.py:70
msgid "" msgid ""
"Unknown service-action <code>{arg!s}</code> for service {name!s} in run-" "Unknown service-action <code>{arg!s}</code> for service {name!s} in run-"
"level {level!s}." "level {level!s}."
msgstr "" msgstr "未知的服务动作 <code>{arg!s}</code>，服务名: {name!s}，运行级别: {level!s}."
#: src/modules/services-openrc/main.py:103 #: src/modules/services-openrc/main.py:103
msgid "" msgid ""
"<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}." "<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}."
msgstr "" msgstr "chroot 中运行的 <code>rc-update {arg!s}</code> 返回错误 {num!s}."
#: src/modules/services-openrc/main.py:110 #: src/modules/services-openrc/main.py:110
msgid "Target runlevel does not exist" msgid "Target runlevel does not exist"
msgstr "" msgstr "目标运行级别不存在。"
#: src/modules/services-openrc/main.py:111 #: src/modules/services-openrc/main.py:111
msgid "" msgid ""
"The path for runlevel {level!s} is <code>{path!s}</code>, which does not " "The path for runlevel {level!s} is <code>{path!s}</code>, which does not "
"exist." "exist."
msgstr "" msgstr "运行级别 {level!s} 所在目录 <code>{path!s}</code> 不存在。"
#: src/modules/services-openrc/main.py:119 #: src/modules/services-openrc/main.py:119
msgid "Target service does not exist" msgid "Target service does not exist"
msgstr "" msgstr "目标服务不存在"
#: src/modules/services-openrc/main.py:120 #: src/modules/services-openrc/main.py:120
msgid "" msgid ""
"The path for service {name!s} is <code>{path!s}</code>, which does not " "The path for service {name!s} is <code>{path!s}</code>, which does not "
"exist." "exist."
msgstr "" msgstr "服务 {name!s} 的路径 <code>{path!s}</code> 不存在。"
#: src/modules/plymouthcfg/main.py:36 #: src/modules/plymouthcfg/main.py:36
msgid "Configure Plymouth theme" msgid "Configure Plymouth theme"
msgstr "" msgstr "配置 Plymouth 主题"
#: src/modules/packages/main.py:62 #: src/modules/packages/main.py:62
#, python-format #, python-format
@ -286,39 +288,39 @@ msgstr[0] "移除%(num)d软件包。"
#: src/modules/bootloader/main.py:51 #: src/modules/bootloader/main.py:51
msgid "Install bootloader." msgid "Install bootloader."
msgstr "" msgstr "安装启动加载器。"
#: src/modules/removeuser/main.py:34 #: src/modules/removeuser/main.py:34
msgid "Remove live user from target system" msgid "Remove live user from target system"
msgstr "" msgstr "从目标系统删除 live 用户"
#: src/modules/hwclock/main.py:35 #: src/modules/hwclock/main.py:35
msgid "Setting hardware clock." msgid "Setting hardware clock."
msgstr "" msgstr "设置硬件时钟。"
#: src/modules/dracut/main.py:36 #: src/modules/dracut/main.py:36
msgid "Creating initramfs with dracut." msgid "Creating initramfs with dracut."
msgstr "" msgstr "用 dracut 创建 initramfs."
#: src/modules/dracut/main.py:58 #: src/modules/dracut/main.py:58
msgid "Failed to run dracut on the target" msgid "Failed to run dracut on the target"
msgstr "" msgstr "无法在目标中运行 dracut "
#: src/modules/dracut/main.py:59 #: src/modules/dracut/main.py:59
msgid "The exit code was {}" msgid "The exit code was {}"
msgstr "" msgstr "退出码是 {}"
#: src/modules/initramfscfg/main.py:41 #: src/modules/initramfscfg/main.py:41
msgid "Configuring initramfs." msgid "Configuring initramfs."
msgstr "" msgstr "正在配置初始内存文件系统。"
#: src/modules/openrcdmcryptcfg/main.py:34 #: src/modules/openrcdmcryptcfg/main.py:34
msgid "Configuring OpenRC dmcrypt service." msgid "Configuring OpenRC dmcrypt service."
msgstr "" msgstr "配置 OpenRC dmcrypt 服务。"
#: src/modules/fstab/main.py:38 #: src/modules/fstab/main.py:38
msgid "Writing fstab." msgid "Writing fstab."
msgstr "" msgstr "正在写入 fstab。"
#: src/modules/dummypython/main.py:44 #: src/modules/dummypython/main.py:44
msgid "Dummy python job." msgid "Dummy python job."
@ -330,8 +332,8 @@ msgstr "占位 Python 步骤 {}"
#: src/modules/localecfg/main.py:39 #: src/modules/localecfg/main.py:39
msgid "Configuring locales." msgid "Configuring locales."
msgstr "" msgstr "正在进行本地化配置。"
#: src/modules/networkcfg/main.py:37 #: src/modules/networkcfg/main.py:37
msgid "Saving network configuration." msgid "Saving network configuration."
msgstr "" msgstr "正在保存网络配置。"

20
src/calamares/CalamaresApplication.cpp
View File

@ -99,8 +99,8 @@ CalamaresApplication::init()
CalamaresApplication::~CalamaresApplication() CalamaresApplication::~CalamaresApplication()
{ {
cDebug( Logger::LOGVERBOSE ) << "Shutting down Calamares..."; Logger::CDebug( Logger::LOGVERBOSE ) << "Shutting down Calamares...";
cDebug( Logger::LOGVERBOSE ) << Logger::SubEntry << "Finished shutdown."; Logger::CDebug( Logger::LOGVERBOSE ) << Logger::SubEntry << "Finished shutdown.";
} }
@ -266,22 +266,22 @@ CalamaresApplication::initModuleManager()
} }
/** @brief centers the widget @p w on (a) screen /** @brief centers the widget @p w on (a) screen
* *
* This tries to duplicate the (deprecated) qApp->desktop()->availableGeometry() * This tries to duplicate the (deprecated) qApp->desktop()->availableGeometry()
* placement by iterating over screens and putting Calamares in the first * placement by iterating over screens and putting Calamares in the first
* one where it fits; this is *generally* the primary screen. * one where it fits; this is *generally* the primary screen.
* *
* With debugging, it would look something like this (2 screens attached, * With debugging, it would look something like this (2 screens attached,
* primary at +1080+240 because I have a very strange X setup). Before * primary at +1080+240 because I have a very strange X setup). Before
* being mapped, the Calamares window is at +0+0 but does have a size. * being mapped, the Calamares window is at +0+0 but does have a size.
* The first screen's geometry includes the offset from the origin in * The first screen's geometry includes the offset from the origin in
* screen coordinates. * screen coordinates.
* *
* Proposed window size: 1024 520 * Proposed window size: 1024 520
* Window QRect(0,0 1024x520) * Window QRect(0,0 1024x520)
* Screen QRect(1080,240 2560x1440) * Screen QRect(1080,240 2560x1440)
* Moving QPoint(1848,700) * Moving QPoint(1848,700)
* Screen QRect(0,0 1080x1920) * Screen QRect(0,0 1080x1920)
* *
*/ */
static void static void

14
src/calamares/main.cpp
View File

@ -1,7 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* Copyright 2014, Teo Mrnjavac <teo@kde.org> * Copyright 2014, Teo Mrnjavac <teo@kde.org>
* Copyright 2017-2018, Adriaan de Groot <groot@kde.org> * Copyright 2017-2020, Adriaan de Groot <groot@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -36,9 +36,21 @@
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
/** @brief Gets debug-level from -D command-line-option
*
* If unset, use LOGERROR (corresponding to -D1), although
* effectively -D2 is the lowest level you can set for
* logging-to-the-console, and everything always gets
* logged to the session file).
*/
static unsigned int static unsigned int
debug_level( QCommandLineParser& parser, QCommandLineOption& levelOption ) debug_level( QCommandLineParser& parser, QCommandLineOption& levelOption )
{ {
if ( !parser.isSet( levelOption ) )
{
return Logger::LOGERROR;
}
bool ok = true; bool ok = true;
int l = parser.value( levelOption ).toInt( &ok ); int l = parser.value( levelOption ).toInt( &ok );
if ( !ok || ( l < 0 ) ) if ( !ok || ( l < 0 ) )

6
src/libcalamares/JobQueue.cpp
View File

@ -36,7 +36,6 @@ public:
: QThread( queue ) : QThread( queue )
, m_queue( queue ) , m_queue( queue )
, m_jobIndex( 0 ) , m_jobIndex( 0 )
, m_jobCount( 0 )
{ {
} }
@ -104,7 +103,6 @@ private:
QList< qreal > m_jobWeights; QList< qreal > m_jobWeights;
JobQueue* m_queue; JobQueue* m_queue;
int m_jobIndex; int m_jobIndex;
int m_jobCount;
void emitProgress( qreal jobPercent = 0 ) void emitProgress( qreal jobPercent = 0 )
{ {
@ -125,9 +123,9 @@ private:
if ( m_jobIndex < jobCount ) if ( m_jobIndex < jobCount )
{ {
cDebug( Logger::LOGVERBOSE ) << "[JOBQUEUE]: Progress for Job[" << m_jobIndex Logger::CDebug( Logger::LOGVERBOSE ) << "[JOBQUEUE]: Progress for Job[" << m_jobIndex
<< "]: " << ( jobPercent * 100 ) << "% completed"; << "]: " << ( jobPercent * 100 ) << "% completed";
cDebug( Logger::LOGVERBOSE ) << "[JOBQUEUE]: Progress Overall: " << ( cumulativeProgress * 100 ) Logger::CDebug( Logger::LOGVERBOSE ) << "[JOBQUEUE]: Progress Overall: " << ( cumulativeProgress * 100 )
<< "% (accumulated) + " << "% (accumulated) + "
<< ( ( ( m_jobWeights.at( m_jobIndex ) ) * jobPercent ) * 100 ) << ( ( ( m_jobWeights.at( m_jobIndex ) ) * jobPercent ) * 100 )
<< "% (this job) = " << ( percent * 100 ) << "% (total)"; << "% (this job) = " << ( percent * 100 ) << "% (total)";

2
src/libcalamares/PythonJobApi.cpp
View File

@ -148,7 +148,7 @@ check_target_env_output( const bp::list& args, const std::string& stdin, int tim
void void
debug( const std::string& s ) debug( const std::string& s )
{ {
cDebug() << "[PYTHON JOB]: " << QString::fromStdString( s ); Logger::CDebug( Logger::LOGDEBUG ) << "[PYTHON JOB]: " << QString::fromStdString( s );
} }
void void

31
src/libcalamares/utils/Logger.h
View File

@ -134,14 +134,32 @@ public:
* will produce a single timestamped debug line with continuations. * will produce a single timestamped debug line with continuations.
* Each element of the list of strings will be logged on a separate line. * Each element of the list of strings will be logged on a separate line.
*/ */
struct DebugList /* TODO: Calamares 3.3, bump requirements to C++17, and rename
* this to DebugList, dropping the convenience-definition
* below. In C++17, class template argument deduction is
* added, so `DebugList( whatever )` determines the right
* type already (also for QStringList).
*/
template < typename T >
struct DebugListT
{ {
explicit DebugList( const QStringList& l ) using list_t = QList< T >;
explicit DebugListT( const list_t& l )
: list( l ) : list( l )
{ {
} }
const QStringList& list; const list_t& list;
};
///@brief Convenience for QStringList, needs no template parameters
struct DebugList : public DebugListT< QString >
{
explicit DebugList( const list_t& l )
: DebugListT( l )
{
}
}; };
/** /**
@ -174,9 +192,10 @@ operator<<( QDebug& s, const DebugRow< T, U >& t )
return s; return s;
} }
/** @brief output operator for DebugList */ /** @brief output operator for DebugList, assuming operator<< for T exists */
template < typename T = QString >
inline QDebug& inline QDebug&
operator<<( QDebug& s, const DebugList& c ) operator<<( QDebug& s, const DebugListT< T >& c )
{ {
for ( const auto& i : c.list ) for ( const auto& i : c.list )
{ {
@ -200,7 +219,7 @@ operator<<( QDebug& s, const DebugMap& t )
} }
} // namespace Logger } // namespace Logger
#define cDebug Logger::CDebug #define cDebug() (Logger::CDebug( Logger::LOGDEBUG ) << Q_FUNC_INFO << Logger::Continuation)
#define cWarning() Logger::CDebug( Logger::LOGWARNING ) #define cWarning() Logger::CDebug( Logger::LOGWARNING )
#define cError() Logger::CDebug( Logger::LOGERROR ) #define cError() Logger::CDebug( Logger::LOGERROR )

97
src/modules/contextualprocess/Binding.h Normal file
View File

@ -0,0 +1,97 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2017-2020, 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/>.
*/
/* This file isn't public API, but is used to express the API that
* the tests for ContextualProcess can work with.
*/
#ifndef CONTEXTUALPROCESSJOB_BINDING_H
#define CONTEXTUALPROCESSJOB_BINDING_H
#include "Job.h"
#include <QList>
#include <QPair>
#include <QString>
namespace CalamaresUtils
{
class CommandList;
}
namespace Calamares
{
class GlobalStorage;
}
struct ValueCheck : public QPair< QString, CalamaresUtils::CommandList* >
{
ValueCheck( const QString& value, CalamaresUtils::CommandList* commands )
: QPair< QString, CalamaresUtils::CommandList* >( value, commands )
{
}
// ~ValueCheck()
//
// There is no destructor.
//
// We don't own the commandlist, the binding holding this valuecheck
// does, so don't delete. This is closely tied to (temporaries created
// by) pass-by-value in QList::append().
QString value() const { return first; }
CalamaresUtils::CommandList* commands() const { return second; }
};
class ContextualProcessBinding
{
public:
ContextualProcessBinding( const QString& varname )
: m_variable( varname )
{
}
~ContextualProcessBinding();
QString variable() const { return m_variable; }
int count() const { return m_checks.count(); }
/**
* @brief add commands to be executed when @p value is matched.
*
* Ownership of the CommandList passes to this binding.
*/
void append( const QString& value, CalamaresUtils::CommandList* commands );
///@brief The bound variable has @p value , run the associated commands.
Calamares::JobResult run( const QString& value ) const;
/** @brief Tries to obtain this binding's value from GS
*
* Stores the value in @p value and returns true if a value
* was found (e.g. @p storage contains the variable this binding
* is for) and false otherwise.
*/
bool fetch( Calamares::GlobalStorage* storage, QString& value ) const;
private:
QString m_variable;
QList< ValueCheck > m_checks;
CalamaresUtils::CommandList* m_wildcard = nullptr;
};
#endif

160
src/modules/contextualprocess/ContextualProcessJob.cpp
View File

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* Copyright 2017-2018, Adriaan de Groot <groot@kde.org> * Copyright 2017-2020, Adriaan de Groot <groot@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -18,9 +18,7 @@
#include "ContextualProcessJob.h" #include "ContextualProcessJob.h"
#include <QDateTime> #include "Binding.h"
#include <QProcess>
#include <QThread>
#include "CalamaresVersion.h" #include "CalamaresVersion.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
@ -30,81 +28,88 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Variant.h" #include "utils/Variant.h"
struct ValueCheck : public QPair< QString, CalamaresUtils::CommandList* >
{
ValueCheck( const QString& value, CalamaresUtils::CommandList* commands )
: QPair< QString, CalamaresUtils::CommandList* >( value, commands )
{
}
// ~ValueCheck()
//
// There is no destructor.
//
// We don't own the commandlist, the binding holding this valuecheck
// does, so don't delete. This is closely tied to (temporaries created
// by) pass-by-value in QList::append().
QString value() const { return first; }
CalamaresUtils::CommandList* commands() const { return second; }
};
struct ContextualProcessBinding
{
ContextualProcessBinding( const QString& varname )
: variable( varname )
{
}
~ContextualProcessBinding();
/**
* @brief add commands to be executed when @p value is matched.
*
* Ownership of the CommandList passes to this binding.
*/
void append( const QString& value, CalamaresUtils::CommandList* commands )
{
checks.append( ValueCheck( value, commands ) );
if ( value == QString( "*" ) )
{
wildcard = commands;
}
}
Calamares::JobResult run( const QString& value ) const
{
for ( const auto& c : checks )
{
if ( value == c.value() )
{
return c.commands()->run();
}
}
if ( wildcard )
{
return wildcard->run();
}
return Calamares::JobResult::ok();
}
QString variable;
QList< ValueCheck > checks;
CalamaresUtils::CommandList* wildcard { nullptr };
};
ContextualProcessBinding::~ContextualProcessBinding() ContextualProcessBinding::~ContextualProcessBinding()
{ {
wildcard = nullptr; m_wildcard = nullptr;
for ( const auto& c : checks ) for ( const auto& c : m_checks )
{ {
delete c.commands(); delete c.commands();
} }
} }
void
ContextualProcessBinding::append( const QString& value, CalamaresUtils::CommandList* commands )
{
m_checks.append( ValueCheck( value, commands ) );
if ( value == QString( "*" ) )
{
m_wildcard = commands;
}
}
Calamares::JobResult
ContextualProcessBinding::run( const QString& value ) const
{
for ( const auto& c : m_checks )
{
if ( value == c.value() )
{
return c.commands()->run();
}
}
if ( m_wildcard )
{
return m_wildcard->run();
}
return Calamares::JobResult::ok();
}
///@brief Implementation of fetch() for recursively looking up dotted selector parts.
static bool
fetch( QString& value, QStringList& selector, int index, const QVariant& v )
{
if ( !v.canConvert( QMetaType::QVariantMap ) )
{
return false;
}
const QVariantMap map = v.toMap();
const QString& key = selector.at( index );
if ( index == selector.length() - 1)
{
value = map.value( key ).toString();
return map.contains( key );
}
else
{
return fetch( value, selector, index + 1, map.value( key ) );
}
}
bool
ContextualProcessBinding::fetch( Calamares::GlobalStorage* storage, QString& value ) const
{
value.clear();
if ( !storage )
{
return false;
}
if ( m_variable.contains( '.' ) )
{
QStringList steps = m_variable.split( '.' );
return ::fetch( value, steps, 1, storage->value( steps.first() ) );
}
else
{
value = storage->value( m_variable ).toString();
return storage->contains( m_variable );
}
}
ContextualProcessJob::ContextualProcessJob( QObject* parent ) ContextualProcessJob::ContextualProcessJob( QObject* parent )
: Calamares::CppJob( parent ) : Calamares::CppJob( parent )
{ {
@ -131,9 +136,10 @@ ContextualProcessJob::exec()
for ( const ContextualProcessBinding* binding : m_commands ) for ( const ContextualProcessBinding* binding : m_commands )
{ {
if ( gs->contains( binding->variable ) ) QString value;
if ( binding->fetch( gs, value ) )
{ {
Calamares::JobResult r = binding->run( gs->value( binding->variable ).toString() ); Calamares::JobResult r = binding->run( value );
if ( !r ) if ( !r )
{ {
return r; return r;
@ -141,7 +147,7 @@ ContextualProcessJob::exec()
} }
else else
{ {
cWarning() << "ContextualProcess checks for unknown variable" << binding->variable; cWarning() << "ContextualProcess checks for unknown variable" << binding->variable();
} }
} }
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
@ -203,10 +209,12 @@ int
ContextualProcessJob::count( const QString& variableName ) ContextualProcessJob::count( const QString& variableName )
{ {
for ( const ContextualProcessBinding* binding : m_commands ) for ( const ContextualProcessBinding* binding : m_commands )
if ( binding->variable == variableName ) {
if ( binding->variable() == variableName )
{ {
return binding->checks.count(); return binding->count();
} }
}
return -1; return -1;
} }

2
src/modules/contextualprocess/ContextualProcessJob.h
View File

@ -27,7 +27,7 @@
#include "utils/PluginFactory.h" #include "utils/PluginFactory.h"
struct ContextualProcessBinding; class ContextualProcessBinding;
class PLUGINDLLEXPORT ContextualProcessJob : public Calamares::CppJob class PLUGINDLLEXPORT ContextualProcessJob : public Calamares::CppJob
{ {

129
src/modules/contextualprocess/Tests.cpp
View File

@ -17,9 +17,15 @@
*/ */
#include "Tests.h" #include "Tests.h"
#include "Binding.h"
#include "ContextualProcessJob.h" #include "ContextualProcessJob.h"
#include "GlobalStorage.h"
#include "JobQueue.h"
#include "utils/CalamaresUtilsSystem.h"
#include "utils/CommandList.h" #include "utils/CommandList.h"
#include "utils/Logger.h"
#include "utils/Yaml.h" #include "utils/Yaml.h"
#include <QtTest/QtTest> #include <QtTest/QtTest>
@ -38,6 +44,22 @@ ContextualProcessTests::~ContextualProcessTests() {}
void void
ContextualProcessTests::initTestCase() ContextualProcessTests::initTestCase()
{ {
Logger::setupLogLevel( Logger::LOGDEBUG );
// Ensure we have a system object, expect it to be a "bogus" one
CalamaresUtils::System* system = CalamaresUtils::System::instance();
QVERIFY( system );
QVERIFY( system->doChroot() );
// Ensure we have a system-wide GlobalStorage with /tmp as root
if ( !Calamares::JobQueue::instance() )
{
cDebug() << "Creating new JobQueue";
(void)new Calamares::JobQueue();
}
Calamares::GlobalStorage* gs
= Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
QVERIFY( gs );
} }
void void
@ -59,6 +81,111 @@ ContextualProcessTests::testProcessListSampleConfig()
ContextualProcessJob job; ContextualProcessJob job;
job.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc ).toMap() ); job.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc ).toMap() );
QCOMPARE( job.count(), 1 ); // Only "firmwareType" QCOMPARE( job.count(), 2 ); // Only "firmwareType" and "branding.shortVersion"
QCOMPARE( job.count( "firmwareType" ), 4 ); QCOMPARE( job.count( "firmwareType" ), 4 );
QCOMPARE( job.count( "branding.shortVersion" ), 2 ); // in the example config
}
void ContextualProcessTests::testFetch()
{
Logger::setupLogLevel( Logger::LOGVERBOSE );
QVariantMap m;
// Some keys without sub-map
m.insert( QStringLiteral( "carrot" ), true );
m.insert( QStringLiteral( "tomato" ), QStringLiteral( "fruit" ) );
// A key with sub-map
{
QVariantMap names;
names.insert( QStringLiteral( "blackcurrant" ), QStringLiteral( "black" ) );
names.insert( QStringLiteral( "redcurrant" ), QStringLiteral( "red" ) );
names.insert( QStringLiteral( "knoebels" ), QStringLiteral( "green" ) );
names.insert( QStringLiteral( "strawberry" ), QStringLiteral( "red" ) );
m.insert( QStringLiteral( "berries" ), names );
}
// Another key with sub-map
{
QVariantMap names;
names.insert( QStringLiteral( "ext4" ), 1 );
names.insert( QStringLiteral( "zfs" ), 2 );
names.insert( QStringLiteral( "swap" ), 2 );
m.insert( QStringLiteral( "filesystem_use" ), names );
}
QCOMPARE( m.count(), 4 );
Calamares::GlobalStorage* gs
= Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
QVERIFY( gs );
// Copy the built-up-map into GS
for ( auto it = m.cbegin(); it != m.cend(); ++it )
{
gs->insert( it.key(), it.value() );
}
// Testing of fetch()
{
ContextualProcessBinding b( QStringLiteral( "carrot" ) );
QString s;
QVERIFY( b.fetch( gs, s ) );
QCOMPARE( s, QStringLiteral( "true" ) ); // String representation of boolean true
}
{
ContextualProcessBinding b( QStringLiteral( "tomato" ) );
QString s;
QVERIFY( b.fetch( gs, s ) );
QCOMPARE( s, QStringLiteral( "fruit" ) );
}
{
// Key not found
ContextualProcessBinding b( QStringLiteral( "parsnip" ) );
QString s = QStringLiteral( "white" );
QVERIFY( !b.fetch( gs, s ) );
QCOMPARE( s, QString() );
QVERIFY( s.isEmpty() );
}
{
// Submap gets smashed
ContextualProcessBinding b( QStringLiteral( "berries" ) );
QString s;
QVERIFY( b.fetch( gs, s ) );
QVERIFY( s.isEmpty() ); // No string representation
}
{
// Compound lookup
ContextualProcessBinding b( QStringLiteral( "berries.strawberry" ) );
QString s;
QVERIFY( b.fetch( gs, s ) );
QCOMPARE( s, QStringLiteral( "red" ) );
}
{
ContextualProcessBinding b( QStringLiteral( "berries.knoebels" ) );
QString s;
QVERIFY( b.fetch( gs, s ) );
QCOMPARE( s, QStringLiteral( "green" ) );
}
{
ContextualProcessBinding b( QStringLiteral( "filesystem_use.ext4" ) );
QString s;
QVERIFY( b.fetch( gs, s ) );
QCOMPARE( s, QStringLiteral( "1" ) );
}
{
ContextualProcessBinding b( QStringLiteral( "filesystem_use.zfs" ) );
QString s;
QVERIFY( b.fetch( gs, s ) );
QCOMPARE( s, QStringLiteral( "2" ) );
}
{
// Key not found, compound
ContextualProcessBinding b( QStringLiteral( "filesystem_use.ufs" ) );
QString s = QStringLiteral( "ufs" );
QVERIFY( !b.fetch( gs, s ) );
QCOMPARE( s, QString() );
QVERIFY( s.isEmpty() );
}
} }

3
src/modules/contextualprocess/Tests.h
View File

@ -32,6 +32,9 @@ private Q_SLOTS:
void initTestCase(); void initTestCase();
// Check the sample config file is processed correctly // Check the sample config file is processed correctly
void testProcessListSampleConfig(); void testProcessListSampleConfig();
// Variable binding lookup
void testFetch();
}; };
#endif #endif

14
src/modules/contextualprocess/contextualprocess.conf
View File

@ -13,6 +13,17 @@
# to the variable's value. If the variable has that particular value, the # to the variable's value. If the variable has that particular value, the
# corresponding value (script) is executed. # corresponding value (script) is executed.
# #
# The variable **may** contain dots, in which case the dot is used
# to select into maps inside global storage, e.g.
#
# - *firmwareType* is a simple global name
# - *branding.bootloader* is the *bootloader* value in the *branding* map
#
# Only a few global storage entries have well-defined sub-maps;
# branding is one of them, and *filesystem_use* is another. Note that
# variable names with dots **must** be quoted, or you will get a YAML error.
#
#
# You can check for an empty value with "". # You can check for an empty value with "".
# #
# As a special case, the value-check "*" matches any value, but **only** # As a special case, the value-check "*" matches any value, but **only**
@ -44,3 +55,6 @@ firmwareType:
bios: "-pkg remove bios-firmware" bios: "-pkg remove bios-firmware"
"": "/bin/false no-firmware-type-set" "": "/bin/false no-firmware-type-set"
"*": "/bin/false some-other-firmware-value" "*": "/bin/false some-other-firmware-value"
"branding.shortVersion":
"2020.2": "/bin/false february"
"2019.4": "/bin/true april"

BIN
src/modules/dummypythonqt/lang/ko/LC_MESSAGES/dummypythonqt.mo
View File

Binary file not shown.

8
src/modules/dummypythonqt/lang/ko/LC_MESSAGES/dummypythonqt.po
View File

@ -4,8 +4,8 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
# Translators: # Translators:
# Ji-Hyeon Gim <potatogim@potatogim.net>, 2018
# MarongHappy <daemul72@gmail.com>, 2019 # MarongHappy <daemul72@gmail.com>, 2019
# 김지현 <potatogim@potatogim.net>, 2020
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
@ -14,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-02-19 17:27+0100\n" "POT-Creation-Date: 2020-02-19 17:27+0100\n"
"PO-Revision-Date: 2016-12-16 12:18+0000\n" "PO-Revision-Date: 2016-12-16 12:18+0000\n"
"Last-Translator: MarongHappy <daemul72@gmail.com>, 2019\n" "Last-Translator: 김지현 <potatogim@potatogim.net>, 2020\n"
"Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n" "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -40,8 +40,8 @@ msgstr "더미 PythonQt 작업"
#: src/modules/dummypythonqt/main.py:186 #: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}" msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "더미 PythonQt Job입니다. 이 더미 Job의 출력은 다음과 같습니다: {}" msgstr "더미 PythonQt 작업입니다. 이 더미 작업의 출력은 다음과 같습니다: {}"
#: src/modules/dummypythonqt/main.py:190 #: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job." msgid "A status message for Dummy PythonQt Job."
msgstr "더미 PythonQt Job의 상태 메시지" msgstr "더미 PythonQt 작업의 상태 메시지"

2
src/modules/initramfs/Tests.cpp
View File

@ -46,7 +46,7 @@ InitramfsTests::initTestCase()
{ {
Logger::setupLogLevel( Logger::LOGDEBUG ); Logger::setupLogLevel( Logger::LOGDEBUG );
auto* j = new Calamares::JobQueue(); (void) new Calamares::JobQueue();
(void) new CalamaresUtils::System( true ); (void) new CalamaresUtils::System( true );
} }

2
src/modules/netinstall/PackageModel.cpp
View File

@ -106,7 +106,7 @@ PackageModel::rowCount( const QModelIndex& parent ) const
} }
int int
PackageModel::columnCount( const QModelIndex& parent ) const PackageModel::columnCount( const QModelIndex& ) const
{ {
return 2; return 2;
} }

18
src/modules/packages/main.py
View File

@ -364,6 +364,24 @@ class PMPisi(PackageManager):
pass pass
class PMApk(PackageManager):
backend = "apk"
def install(self, pkgs, from_local=False):
for pkg in pkgs:
check_target_env_call(["apk", "add", pkg])
def remove(self, pkgs):
for pkg in pkgs:
check_target_env_call(["apk", "del", pkg])
def update_db(self):
check_target_env_call(["apk", "update"])
def update_system(self):
check_target_env_call(["apk", "upgrade", "--available"])
# Collect all the subclasses of PackageManager defined above, # Collect all the subclasses of PackageManager defined above,
# and index them based on the backend property of each class. # and index them based on the backend property of each class.
backend_managers = [ backend_managers = [

1
src/modules/packages/packages.conf
View File

@ -10,6 +10,7 @@
# - pacman - Pacman # - pacman - Pacman
# - portage - Gentoo package manager # - portage - Gentoo package manager
# - entropy - Sabayon package manager # - entropy - Sabayon package manager
# - apk = Alpine Linux package manager
# - dummy - Dummy manager, only logs # - dummy - Dummy manager, only logs
# #
backend: dummy backend: dummy

2
src/modules/partition/jobs/CreatePartitionTableJob.cpp
View File

@ -69,7 +69,7 @@ CreatePartitionTableJob::prettyStatusMessage() const
static inline QDebug& static inline QDebug&
operator <<( QDebug&& s, PartitionIterator& it ) operator <<( QDebug& s, PartitionIterator& it )
{ {
s << ( ( *it ) ? ( *it )->deviceNode() : QString( "<null device>" ) ); s << ( ( *it ) ? ( *it )->deviceNode() : QString( "<null device>" ) );
return s; return s;

54
src/modules/partition/jobs/FillGlobalStorageJob.cpp
View File

@ -40,9 +40,9 @@
#include <QFileInfo> #include <QFileInfo>
#include <QProcess> #include <QProcess>
using CalamaresUtils::Partition::PartitionIterator;
using CalamaresUtils::Partition::untranslatedFS; using CalamaresUtils::Partition::untranslatedFS;
using CalamaresUtils::Partition::userVisibleFS; using CalamaresUtils::Partition::userVisibleFS;
using CalamaresUtils::Partition::PartitionIterator;
typedef QHash< QString, QString > UuidForPartitionHash; typedef QHash< QString, QString > UuidForPartitionHash;
@ -107,10 +107,8 @@ mapForPartition( Partition* partition, const QString& uuid )
Logger::CDebug deb; Logger::CDebug deb;
using TR = Logger::DebugRow< const char* const, const QString& >; using TR = Logger::DebugRow< const char* const, const QString& >;
deb << Logger::SubEntry << "mapping for" << partition->partitionPath() << partition->deviceNode() deb << Logger::SubEntry << "mapping for" << partition->partitionPath() << partition->deviceNode()
<< TR( "mtpoint:", PartitionInfo::mountPoint( partition ) ) << TR( "mtpoint:", PartitionInfo::mountPoint( partition ) ) << TR( "fs:", map[ "fs" ].toString() )
<< TR( "fs:", map[ "fs" ].toString() ) << TR( "fsName", map[ "fsName" ].toString() ) << TR( "uuid", uuid )
<< TR( "fsName", map[ "fsName" ].toString() )
<< TR( "uuid", uuid )
<< TR( "claimed", map[ "claimed" ].toString() ); << TR( "claimed", map[ "claimed" ].toString() );
if ( partition->roles().has( PartitionRole::Luks ) ) if ( partition->roles().has( PartitionRole::Luks ) )
@ -147,7 +145,7 @@ FillGlobalStorageJob::prettyDescription() const
{ {
QStringList lines; QStringList lines;
const auto partitionList = createPartitionList().toList(); const auto partitionList = createPartitionList();
for ( const QVariant& partitionItem : partitionList ) for ( const QVariant& partitionItem : partitionList )
{ {
if ( partitionItem.type() == QVariant::Map ) if ( partitionItem.type() == QVariant::Map )
@ -212,12 +210,52 @@ FillGlobalStorageJob::prettyStatusMessage() const
return tr( "Setting up mount points." ); return tr( "Setting up mount points." );
} }
/** @brief note which FS'ses are in use in GS
*
* .. mark as "1" if it's on the system, somewhere
* .. mark as "2" if it's one of the claimed / in-use FSses
*
* Stores a GS key called "filesystems_use" with this mapping.
*/
static void
storeFSUse( Calamares::GlobalStorage* storage, const QVariantList& partitions )
{
QMap< QString, int > fsUses;
for ( const auto& p : partitions )
{
const auto pmap = p.toMap();
QString fs = pmap.value( "fs" ).toString();
int thisUse = pmap.value( "claimed" ).toBool() ? 2 : 1;
if ( fs.isEmpty() )
{
continue;
}
int newUse = qMax( fsUses.value( fs ), thisUse ); // value() is 0 if not present
fsUses.insert( fs, newUse );
}
QVariantMap fsUsesVariant;
for ( auto it = fsUses.cbegin(); it != fsUses.cend(); ++it )
{
fsUsesVariant.insert( it.key(), it.value() );
}
storage->insert( "filesystems_use", fsUsesVariant );
}
Calamares::JobResult Calamares::JobResult
FillGlobalStorageJob::exec() FillGlobalStorageJob::exec()
{ {
Calamares::GlobalStorage* storage = Calamares::JobQueue::instance()->globalStorage(); Calamares::GlobalStorage* storage = Calamares::JobQueue::instance()->globalStorage();
storage->insert( "partitions", createPartitionList() ); const auto partitions = createPartitionList();
cDebug() << "Saving partition information map to GlobalStorage[\"partitions\"]"; cDebug() << "Saving partition information map to GlobalStorage[\"partitions\"]";
storage->insert( "partitions", partitions );
storeFSUse( storage, partitions );
if ( !m_bootLoaderPath.isEmpty() ) if ( !m_bootLoaderPath.isEmpty() )
{ {
QVariant var = createBootLoaderMap(); QVariant var = createBootLoaderMap();
@ -236,7 +274,7 @@ FillGlobalStorageJob::exec()
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
} }
QVariant QVariantList
FillGlobalStorageJob::createPartitionList() const FillGlobalStorageJob::createPartitionList() const
{ {
UuidForPartitionHash hash = findPartitionUuids( m_devices ); UuidForPartitionHash hash = findPartitionUuids( m_devices );

4
src/modules/partition/jobs/FillGlobalStorageJob.h
View File

@ -22,8 +22,8 @@
#include "Job.h" #include "Job.h"
// Qt
#include <QList> #include <QList>
#include <QVariantList>
class Device; class Device;
class Partition; class Partition;
@ -48,7 +48,7 @@ private:
QList< Device* > m_devices; QList< Device* > m_devices;
QString m_bootLoaderPath; QString m_bootLoaderPath;
QVariant createPartitionList() const; QVariantList createPartitionList() const;
QVariant createBootLoaderMap() const; QVariant createBootLoaderMap() const;
}; };