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

Merge branch 'calamares' into issues-1166

Browse Source
This commit is contained in:
Adriaan de Groot 2020-09-28 14:34:39 +02:00
commit b6dd23a384
117 changed files with 489 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h vendored
View File

@ -41,7 +41,7 @@ public:
explicit KDSingleApplicationGuard( Policy policy, QObject * parent=nullptr );
explicit KDSingleApplicationGuard( const QStringList & arguments, QObject * parent=nullptr );
explicit KDSingleApplicationGuard( const QStringList & arguments, Policy policy, QObject * parent=nullptr );
~KDSingleApplicationGuard();
~KDSingleApplicationGuard() override;
bool isOperational() const;
@ -70,7 +70,7 @@ public Q_SLOTS:
void killOtherInstances();
protected:
/*! \reimp */ bool event( QEvent * event );
/*! \reimp */ bool event( QEvent * event ) override;
private:
#ifndef Q_WS_WIN

2
3rdparty/waitingspinnerwidget.h vendored
View File

@ -85,7 +85,7 @@ private slots:
void rotate();
protected:
void paintEvent(QPaintEvent *paintEvent);
void paintEvent(QPaintEvent *paintEvent) override;
private:
static int lineCountDistanceFromPrimary(int current, int primary,

2
CHANGES
View File

@ -10,7 +10,7 @@ website will have to do for older versions.
# 3.2.31 (unreleased) #
This release contains contributions from (alphabetically by first name):
- No external contributors yet
- Corentin Noël
## Core ##
- No core changes yet

49
lang/calamares_az.ts
View File

@ -1955,7 +1955,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/localeq/Offline.qml" line="37"/>
<source>Select your preferred Region, or use the default one based on your current location.</source>
<translation type="unfinished"/>
<translation>Üstünlük verdiyiniz bölgəni və ya cari mövqeyinizə əsaslanan standart bir bölgəni seçin.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="94"/>
@ -1967,17 +1967,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/localeq/Offline.qml" line="111"/>
<source>Select your preferred Zone within your Region.</source>
<translation type="unfinished"/>
<translation>Bölgənizlə birlikdə üstünlük verdiyiniz zonanı seçin.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="182"/>
<source>Zones</source>
<translation type="unfinished"/>
<translation>Zonalar</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="229"/>
<source>You can fine-tune Language and Locale settings below.</source>
<translation type="unfinished"/>
<translation>Dil və Yer ayarlarını aşağıda dəqiq tənzimləyə bilərsiniz.</translation>
</message>
</context>
<context>
@ -3799,7 +3799,16 @@ Output:
development is sponsored by &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;
&lt;strong&gt;%2&lt;br/&gt;
%3 üçün&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;
Müəliff hüquqları 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;
Müəliff hüquqları 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;8&lt;br/&gt;
&lt;a href='https://calamares.io/team/'&gt;Calamares komandasına&lt;/a&gt; və
&lt;a href='https://www.transifex.com/calamares/calamares/'&gt;Calamares tərcümə komandasına&lt;/a&gt; təşəkkürlər.&lt;br/&gt;&lt;br/&gt;
&lt;a href='https://calamares.io/'&gt;Calamares&lt;/a&gt; tərtibatı &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; - Liberating Software
tərəfindən dəstəklənir.</translation>
</message>
<message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/>
@ -3849,7 +3858,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
<source>Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.</source>
<translation type="unfinished"/>
<translation>Yazı dili və variantını seçmək üçün üstünlük verdiyiniz klaviatura modelini seçin və ya avadanlıq tərəfindən aşkar edilən klaviaturaya əsaslanan standart birini seçin.</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -3864,7 +3873,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
<source>Keyboard Variant</source>
<translation type="unfinished"/>
<translation>Klaviatura variantı</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@ -3948,7 +3957,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/>
<source>Pick your user name and credentials to login and perform admin tasks</source>
<translation type="unfinished"/>
<translation>İnzibatçı tapşırıqlarını yerinə yetirmək və sistemə giriş üçün istifadəçi adını və istifadəçi hesabı məlumatlarını daxil edin</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="52"/>
@ -3968,12 +3977,12 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/>
<source>Login Name</source>
<translation type="unfinished"/>
<translation>Giriş Adı</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="103"/>
<source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
<translation type="unfinished"/>
<translation>Əgər bu komputeri bir neçə şəxs istifadə ediləcəksə o zaman quraşdırmadan sonra birdən çox hesab yarada bilərsiniz.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
@ -3988,7 +3997,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="140"/>
<source>This name will be used if you make the computer visible to others on a network.</source>
<translation type="unfinished"/>
<translation>Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/>
@ -4008,27 +4017,27 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/>
<source>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</source>
<translation type="unfinished"/>
<translation>Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. Güclü şifrə üçün rəqəm, hərf və durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı və müntəzəm olaraq dəyişdirilməlidir.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/>
<source>Validate passwords quality</source>
<translation type="unfinished"/>
<translation>Şifrənin keyfiyyətini yoxlamaq</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/>
<source>When this box is checked, password-strength checking is done and you will not be able to use a weak password..</source>
<translation type="unfinished"/>
<translation>Bu xana işarələnərsə şifrələrin etibatlılıq səviyyəsi yoxlanılacaq və siz zəif şifrədən istifadə edə bilməyəcəksiniz..</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Log in automatically without asking for the password</source>
<translation type="unfinished"/>
<translation>Şifrə soruşmadan sistemə daxil olmaq</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="243"/>
<source>Reuse user password as root password</source>
<translation type="unfinished"/>
<translation>İstifadəçi şifrəsini kök şifrəsi kimi istifadə etmək</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="253"/>
@ -4038,22 +4047,22 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="268"/>
<source>Choose a root password to keep your account safe.</source>
<translation type="unfinished"/>
<translation>Hesabınızı qorumaq üçün kök şifrəsini seçin.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="279"/>
<source>Root Password</source>
<translation type="unfinished"/>
<translation>Kök Şifrəsi</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="298"/>
<source>Repeat Root Password</source>
<translation type="unfinished"/>
<translation>Kök Şifrəsini təkrar yazın</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/>
<source>Enter the same password twice, so that it can be checked for typing errors.</source>
<translation type="unfinished"/>
<translation>Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin.</translation>
</message>
</context>
<context>

55
lang/calamares_az_AZ.ts
View File

@ -6,7 +6,7 @@
<message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="61"/>
<source>The &lt;strong&gt;boot environment&lt;/strong&gt; of this system.&lt;br&gt;&lt;br&gt;Older x86 systems only support &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Modern systems usually use &lt;strong&gt;EFI&lt;/strong&gt;, but may also show up as BIOS if started in compatibility mode.</source>
<translation>Bu sistemin &lt;strong&gt;açılış mühiti&lt;/strong&gt;.&lt;br&gt;&lt;br&gt;Köhnə x86 sistemlər yalnız &lt;strong&gt;BIOS&lt;/strong&gt; dəstəkləyir.&lt;br&gt;Müasir sistemlər isə adətən &lt;strong&gt;EFI&lt;/strong&gt; istifadə edir, lakin açılış mühiti əgər uyğun rejimdə başladılmışsa, həmçinin BİOS istiafadə edə bilər.</translation>
<translation>Sistemin &lt;strong&gt;açılış mühiti&lt;/strong&gt;.&lt;br&gt;&lt;br&gt;Köhnə x86 sistemlər yalnız &lt;strong&gt;BIOS&lt;/strong&gt; dəstəkləyir.&lt;br&gt;Müasir sistemlər isə adətən &lt;strong&gt;EFI&lt;/strong&gt; istifadə edir, lakin açılış mühiti əgər uyğun rejimdə başladılmışsa, həmçinin BİOS istiafadə edə bilər.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="71"/>
@ -65,12 +65,12 @@
<message>
<location filename="../src/calamares/DebugWindow.ui" line="28"/>
<source>GlobalStorage</source>
<translation>Ümumi yaddaş</translation>
<translation>ÜmumiYaddaş</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="38"/>
<source>JobQueue</source>
<translation>Tapşırıq sırası</translation>
<translation>TapşırıqSırası</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="48"/>
@ -1955,7 +1955,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/localeq/Offline.qml" line="37"/>
<source>Select your preferred Region, or use the default one based on your current location.</source>
<translation type="unfinished"/>
<translation>Üstünlük verdiyiniz bölgəni və ya cari mövqeyinizə əsaslanan standart bir bölgəni seçin.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="94"/>
@ -1967,17 +1967,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message>
<location filename="../src/modules/localeq/Offline.qml" line="111"/>
<source>Select your preferred Zone within your Region.</source>
<translation type="unfinished"/>
<translation>Bölgənizlə birlikdə üstünlük verdiyiniz zonanı seçin.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="182"/>
<source>Zones</source>
<translation type="unfinished"/>
<translation>Zonalar</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="229"/>
<source>You can fine-tune Language and Locale settings below.</source>
<translation type="unfinished"/>
<translation>Dil və Yer ayarlarını aşağıda dəqiq tənzimləyə bilərsiniz.</translation>
</message>
</context>
<context>
@ -3799,7 +3799,16 @@ Output:
development is sponsored by &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;
&lt;strong&gt;%2&lt;br/&gt;
%3 üçün&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;
Müəliff hüquqları 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;
Müəliff hüquqları 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;8&lt;br/&gt;
&lt;a href='https://calamares.io/team/'&gt;Calamares komandasına&lt;/a&gt; və
&lt;a href='https://www.transifex.com/calamares/calamares/'&gt;Calamares tərcümə komandasına&lt;/a&gt; təşəkkürlər.&lt;br/&gt;&lt;br/&gt;
&lt;a href='https://calamares.io/'&gt;Calamares&lt;/a&gt; tərtibatı &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; - Liberating Software
tərəfindən dəstəklənir.</translation>
</message>
<message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/>
@ -3849,7 +3858,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
<source>Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.</source>
<translation type="unfinished"/>
<translation>Yazı dili və variantını seçmək üçün üstünlük verdiyiniz klaviatura modelini seçin və ya avadanlıq tərəfindən aşkar edilən klaviaturaya əsaslanan standart birini seçin.</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -3864,7 +3873,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
<source>Keyboard Variant</source>
<translation type="unfinished"/>
<translation>Klaviatura variantı</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@ -3948,7 +3957,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/>
<source>Pick your user name and credentials to login and perform admin tasks</source>
<translation type="unfinished"/>
<translation>İnzibatçı tapşırıqlarını yerinə yetirmək və sistemə giriş üçün istifadəçi adını və istifadəçi hesabı məlumatlarını daxil edin</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="52"/>
@ -3968,12 +3977,12 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/>
<source>Login Name</source>
<translation type="unfinished"/>
<translation>Giriş Adı</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="103"/>
<source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
<translation type="unfinished"/>
<translation>Əgər bu komputeri bir neçə şəxs istifadə ediləcəksə o zaman quraşdırmadan sonra birdən çox hesab yarada bilərsiniz.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
@ -3988,7 +3997,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="140"/>
<source>This name will be used if you make the computer visible to others on a network.</source>
<translation type="unfinished"/>
<translation>Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/>
@ -4008,27 +4017,27 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/>
<source>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</source>
<translation type="unfinished"/>
<translation>Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. Güclü şifrə üçün rəqəm, hərf və durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı və müntəzəm olaraq dəyişdirilməlidir.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/>
<source>Validate passwords quality</source>
<translation type="unfinished"/>
<translation>Şifrənin keyfiyyətini yoxlamaq</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/>
<source>When this box is checked, password-strength checking is done and you will not be able to use a weak password..</source>
<translation type="unfinished"/>
<translation>Bu xana işarələnərsə şifrələrin etibatlılıq səviyyəsi yoxlanılacaq və siz zəif şifrədən istifadə edə bilməyəcəksiniz..</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Log in automatically without asking for the password</source>
<translation type="unfinished"/>
<translation>Şifrə soruşmadan sistemə daxil olmaq</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="243"/>
<source>Reuse user password as root password</source>
<translation type="unfinished"/>
<translation>İstifadəçi şifrəsini kök şifrəsi kimi istifadə etmək</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="253"/>
@ -4038,22 +4047,22 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="268"/>
<source>Choose a root password to keep your account safe.</source>
<translation type="unfinished"/>
<translation>Hesabınızı qorumaq üçün kök şifrəsini seçin.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="279"/>
<source>Root Password</source>
<translation type="unfinished"/>
<translation>Kök Şifrəsi</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="298"/>
<source>Repeat Root Password</source>
<translation type="unfinished"/>
<translation>Kök Şifrəsini təkrar yazın</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/>
<source>Enter the same password twice, so that it can be checked for typing errors.</source>
<translation type="unfinished"/>
<translation>Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin.</translation>
</message>
</context>
<context>

16
lang/calamares_ca.ts
View File

@ -2320,7 +2320,7 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="124"/>
<source>What name do you want to use to log in?</source>
<translation>Quin nom voleu usar per iniciar la sessió d'usuari?</translation>
<translation>Quin nom voleu usar per iniciar la sessió?</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="148"/>
@ -2345,13 +2345,13 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="325"/>
<source>Choose a password to keep your account safe.</source>
<translation>Trieu una contrasenya per tal de mantenir el compte d'usuari segur.</translation>
<translation>Trieu una contrasenya per tal de mantenir el compte segur.</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="349"/>
<location filename="../src/modules/users/page_usersetup.ui" line="374"/>
<source>&lt;small&gt;Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.&lt;/small&gt;</source>
<translation>&lt;small&gt;Escriviu la mateixa contrasenya dues vegades, de manera que se'n puguin comprovar els errors de mecanografia. Una bona contrasenya contindrà una barreja de lletres, números i signes de puntuació, hauria de tenir un mínim de 8 caràcters i s'hauria de modificar a intervals regulars de temps.&lt;/small&gt;</translation>
<translation>&lt;small&gt;Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia. Una bona contrasenya contindrà una barreja de lletres, números i signes de puntuació, hauria de tenir un mínim de 8 caràcters i s'hauria de modificar a intervals regulars.&lt;/small&gt;</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="355"/>
@ -2394,7 +2394,7 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé
<location filename="../src/modules/users/page_usersetup.ui" line="519"/>
<location filename="../src/modules/users/page_usersetup.ui" line="544"/>
<source>&lt;small&gt;Enter the same password twice, so that it can be checked for typing errors.&lt;/small&gt;</source>
<translation>&lt;small&gt;Escriviu la mateixa contrasenya dues vegades, per tal de poder-ne comprovar els errors de mecanografia.&lt;/small&gt;</translation>
<translation>&lt;small&gt;Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia.&lt;/small&gt;</translation>
</message>
</context>
<context>
@ -3973,7 +3973,7 @@ La configuració pot continuar, però algunes característiques podrien estar in
<message>
<location filename="../src/modules/usersq/usersq.qml" line="80"/>
<source>What name do you want to use to log in?</source>
<translation>Quin nom voleu usar per iniciar la sessió d'usuari?</translation>
<translation>Quin nom voleu usar per iniciar la sessió?</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/>
@ -4003,7 +4003,7 @@ La configuració pot continuar, però algunes característiques podrien estar in
<message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/>
<source>Choose a password to keep your account safe.</source>
<translation>Trieu una contrasenya per tal de mantenir el compte d'usuari segur.</translation>
<translation>Trieu una contrasenya per tal de mantenir el compte segur.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="166"/>
@ -4018,7 +4018,7 @@ La configuració pot continuar, però algunes característiques podrien estar in
<message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/>
<source>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</source>
<translation>Escriviu la mateixa contrasenya dues vegades, de manera que se'n puguin comprovar els errors de mecanografia. Una bona contrasenya ha de contenir una barreja de lletres, números i signes de puntuació, hauria de tenir un mínim de 8 caràcters i s'hauria de modificar a intervals regulars de temps.</translation>
<translation>Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia. Una bona contrasenya ha de contenir una barreja de lletres, números i signes de puntuació, hauria de tenir un mínim de 8 caràcters i s'hauria de modificar a intervals regulars.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/>
@ -4028,7 +4028,7 @@ La configuració pot continuar, però algunes característiques podrien estar in
<message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/>
<source>When this box is checked, password-strength checking is done and you will not be able to use a weak password..</source>
<translation>Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no en podreu fer una de dèbil.</translation>
<translation>Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no en podreu usar una de dèbil.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/>

66
lang/calamares_da.ts
View File

@ -722,12 +722,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/locale/Config.cpp" line="372"/>
<source>The system language will be set to %1.</source>
<translation>Systemsproget vil blive sat til %1.</translation>
<translation>Systemets sprog indstilles til %1.</translation>
</message>
<message>
<location filename="../src/modules/locale/Config.cpp" line="379"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Lokalitet for tal og datoer vil blive sat til %1.</translation>
<translation>Lokalitet for tal og datoer indstilles til %1.</translation>
</message>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="38"/>
@ -1548,12 +1548,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/keyboard/KeyboardPage.cpp" line="206"/>
<source>Set keyboard model to %1.&lt;br/&gt;</source>
<translation>Sæt tastaturmodel til %1.&lt;br/&gt;</translation>
<translation>Indstil tastaturmodel til %1.&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Sæt tastaturlayout til %1/%2.</translation>
<translation>Indstil tastaturlayout til %1/%2.</translation>
</message>
</context>
<context>
@ -1711,7 +1711,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/locale/LocalePage.cpp" line="124"/>
<source>Region:</source>
<translation>Region:</translation>
<translation>Område:</translation>
</message>
<message>
<location filename="../src/modules/locale/LocalePage.cpp" line="125"/>
@ -1955,7 +1955,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/localeq/Offline.qml" line="37"/>
<source>Select your preferred Region, or use the default one based on your current location.</source>
<translation type="unfinished"/>
<translation>Vælg dit foretrukne område eller bruge den som er standard for din nuværende placering.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="94"/>
@ -1967,17 +1967,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/localeq/Offline.qml" line="111"/>
<source>Select your preferred Zone within your Region.</source>
<translation type="unfinished"/>
<translation>Vælg din foretrukne zone i dit område.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="182"/>
<source>Zones</source>
<translation type="unfinished"/>
<translation>Zoner</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="229"/>
<source>You can fine-tune Language and Locale settings below.</source>
<translation type="unfinished"/>
<translation>Du kan finjustere sprog- og lokalitetsindstillinger nedenfor.</translation>
</message>
</context>
<context>
@ -3215,7 +3215,7 @@ setting
<message>
<location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="53"/>
<source>Set keyboard model to %1, layout to %2-%3</source>
<translation>Sæt tastaturmodel til %1, layout til %2-%3</translation>
<translation>Indstil tastaturmodel til %1, layout til %2-%3</translation>
</message>
<message>
<location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="345"/>
@ -3371,7 +3371,7 @@ setting
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="34"/>
<source>Set timezone to %1/%2</source>
<translation>Sæt tidszone til %1/%2</translation>
<translation>Indstil tidszone til %1/%2</translation>
</message>
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="62"/>
@ -3680,7 +3680,7 @@ setting
<location filename="../src/modules/welcome/WelcomePage.ui" line="79"/>
<location filename="../src/modules/welcome/WelcomePage.ui" line="98"/>
<source>Select application and system language</source>
<translation>Vælg program- og systemsprog</translation>
<translation>Vælg sprog for programmet og systemet</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
@ -3800,7 +3800,17 @@ setting
development is sponsored by &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;
&lt;strong&gt;%2&lt;br/&gt;
for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;
Ophavsret 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;
Ophavsret 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;
Tak til &lt;a href='https://calamares.io/team/'&gt;Calamares-teamet&lt;/a&gt;
og &lt;a href='https://www.transifex.com/calamares/calamares/'&gt;Calamares-oversætterteamet&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;
Udviklingen af &lt;a href='https://calamares.io/'&gt;Calamares&lt;/a&gt;
er sponsoreret af &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</translation>
</message>
<message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/>
@ -3850,7 +3860,7 @@ setting
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
<source>Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.</source>
<translation type="unfinished"/>
<translation>Klik på din foretrukne tastaturmodel for at vælge layout og variant, eller brug den som er standard i det registrerede hardware</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -3865,7 +3875,7 @@ setting
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
<source>Keyboard Variant</source>
<translation type="unfinished"/>
<translation>Tastaturvariant</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@ -3949,7 +3959,7 @@ setting
<message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/>
<source>Pick your user name and credentials to login and perform admin tasks</source>
<translation type="unfinished"/>
<translation>Vælg dit brugernavn og loginoplysninger som bruges til at logge ind med og udføre administrative opgaver.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="52"/>
@ -3969,12 +3979,12 @@ setting
<message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/>
<source>Login Name</source>
<translation type="unfinished"/>
<translation>Loginnavn</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="103"/>
<source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
<translation type="unfinished"/>
<translation>Hvis mere end én person bruger computeren, kan du oprette flere konti efter installationen.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
@ -3989,7 +3999,7 @@ setting
<message>
<location filename="../src/modules/usersq/usersq.qml" line="140"/>
<source>This name will be used if you make the computer visible to others on a network.</source>
<translation type="unfinished"/>
<translation>Navnet bruges, hvis du gør computeren synlig for andre på et netværk.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/>
@ -4009,27 +4019,27 @@ setting
<message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/>
<source>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</source>
<translation type="unfinished"/>
<translation>Skriv den samme adgangskode to gange, så det kan blive tjekket for skrivefejl. En god adgangskode indeholder en blanding af bogstaver, tal og specialtegn, og bør være mindst 8 tegn langt og bør skiftes jævnligt.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/>
<source>Validate passwords quality</source>
<translation type="unfinished"/>
<translation>Validér kvaliteten af adgangskoderne</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/>
<source>When this box is checked, password-strength checking is done and you will not be able to use a weak password..</source>
<translation type="unfinished"/>
<translation>Når boksen er tilvalgt, så foretages der tjek af adgangskodens styrke og du vil ikke være i stand til at bruge en svag adgangskode..</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Log in automatically without asking for the password</source>
<translation type="unfinished"/>
<translation>Log ind automatisk uden at spørge efter adgangskoden</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="243"/>
<source>Reuse user password as root password</source>
<translation type="unfinished"/>
<translation>Genbrug brugeradgangskode som root-adgangskode</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="253"/>
@ -4039,22 +4049,22 @@ setting
<message>
<location filename="../src/modules/usersq/usersq.qml" line="268"/>
<source>Choose a root password to keep your account safe.</source>
<translation type="unfinished"/>
<translation>Vælg en root-adgangskode til at holde din konto sikker</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="279"/>
<source>Root Password</source>
<translation type="unfinished"/>
<translation>Root-adgangskode</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="298"/>
<source>Repeat Root Password</source>
<translation type="unfinished"/>
<translation>Gentag root-adgangskode</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/>
<source>Enter the same password twice, so that it can be checked for typing errors.</source>
<translation type="unfinished"/>
<translation>Skriv den samme adgangskode to gange, så det kan blive tjekket for skrivefejl.</translation>
</message>
</context>
<context>

41
lang/calamares_hi.ts
View File

@ -1977,7 +1977,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="229"/>
<source>You can fine-tune Language and Locale settings below.</source>
<translation type="unfinished"/>
<translation>भाषा व स्थानिकी हेतु निम्नलिखित सेटिंग्स उपयोग करें।</translation>
</message>
</context>
<context>
@ -3798,7 +3798,18 @@ Output:
development is sponsored by &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;
&lt;strong&gt;%2&lt;br/&gt;
के लिए %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;
प्रतिलिप्याधिकार 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;
प्रतिलिप्याधिकार 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;
&lt;a href='https://calamares.io/team/'&gt;Calamares टीम&lt;/a&gt;
व &lt;a href='https://www.transifex.com/calamares/calamares/'&gt;Calamares
अनुवादक टीम&lt;/a&gt;को धन्यवाद।&lt;br/&gt;&lt;br/&gt;
&lt;a href='https://calamares.io/'&gt;Calamares&lt;/a&gt;
का विकास &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;ब्लू सिस्टम्स&lt;/a&gt; -
लिब्रेटिंग सॉफ्टवेयर द्वारा प्रायोजित है।</translation>
</message>
<message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/>
@ -3848,7 +3859,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
<source>Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.</source>
<translation type="unfinished"/>
<translation>इच्छित अभिन्यास व प्रकार हेतु कुंजीपटल मॉडल पर क्लिक चुनें या फिर हार्डवेयर आधारित डिफ़ॉल्ट मॉडल उपयोग करें।</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -3947,7 +3958,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/>
<source>Pick your user name and credentials to login and perform admin tasks</source>
<translation type="unfinished"/>
<translation>लॉगिन एवं प्रशासक कार्यों हेतु उपयोक्ता नाम इत्यादि चुनें।</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="52"/>
@ -3972,7 +3983,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="103"/>
<source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
<translation type="unfinished"/>
<translation>यदि एक से अधिक व्यक्ति इस कंप्यूटर का उपयोग करेंगे, तो आप इंस्टॉल के उपरांत एकाधिक अकाउंट बना सकते हैं।</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
@ -3987,7 +3998,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="140"/>
<source>This name will be used if you make the computer visible to others on a network.</source>
<translation type="unfinished"/>
<translation>यदि आपका कंप्यूटर किसी नेटवर्क पर दृश्यमान होता है, तो यह नाम उपयोग किया जाएगा।</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/>
@ -4007,27 +4018,27 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/>
<source>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</source>
<translation type="unfinished"/>
<translation>एक ही कूटशब्द दो बार दर्ज़ करें, ताकि उसे टाइप त्रुटि हेतु जाँचा जा सके। एक अच्छे कूटशब्द में अक्षर, अंक व विराम चिन्हों का मेल होता है, उसमें कम-से-कम आठ अक्षर होने चाहिए, और उसे नियमित अंतराल पर बदलते रहना चाहिए।</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/>
<source>Validate passwords quality</source>
<translation type="unfinished"/>
<translation>कूटशब्द गुणवत्ता प्रमाणीकरण</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/>
<source>When this box is checked, password-strength checking is done and you will not be able to use a weak password..</source>
<translation type="unfinished"/>
<translation>यह बॉक्स टिक करने के परिणाम स्वरुप कूटशब्द-क्षमता की जाँच होगी व आप कमज़ोर कूटशब्द उपयोग नहीं कर पाएंगे..</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Log in automatically without asking for the password</source>
<translation type="unfinished"/>
<translation>कूटशब्द बिना पूछे ही स्वतः लॉग इन करें</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="243"/>
<source>Reuse user password as root password</source>
<translation type="unfinished"/>
<translation>रुट कूटशब्द हेतु भी उपयोक्ता कूटशब्द उपयोग करें</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="253"/>
@ -4037,22 +4048,22 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="268"/>
<source>Choose a root password to keep your account safe.</source>
<translation type="unfinished"/>
<translation>अकाउंट सुरक्षा हेतु रुट कूटशब्द चुनें।</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="279"/>
<source>Root Password</source>
<translation type="unfinished"/>
<translation>रुट कूटशब्द</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="298"/>
<source>Repeat Root Password</source>
<translation type="unfinished"/>
<translation>रुट कूटशब्द पुनः दर्ज करें</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/>
<source>Enter the same password twice, so that it can be checked for typing errors.</source>
<translation type="unfinished"/>
<translation>समान कूटशब्द दो बार दर्ज करें, ताकि टाइपिंग त्रुटि हेतु जाँच की जा सकें।</translation>
</message>
</context>
<context>

59
lang/calamares_pt_BR.ts
View File

@ -694,7 +694,7 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<message>
<location filename="../src/libcalamares/utils/CommandList.cpp" line="143"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>O comando é executado no ambiente do hospedeiro e precisa saber o caminho root, mas nenhum rootMountPoint foi definido.</translation>
<translation>O comando é executado no ambiente do hospedeiro e precisa saber o caminho raiz, mas nenhum rootMountPoint foi definido.</translation>
</message>
<message>
<location filename="../src/libcalamares/utils/CommandList.cpp" line="156"/>
@ -1955,7 +1955,7 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<message>
<location filename="../src/modules/localeq/Offline.qml" line="37"/>
<source>Select your preferred Region, or use the default one based on your current location.</source>
<translation type="unfinished"/>
<translation>Selecione sua Região preferida, ou use a padrão baseada no seu local atual.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="94"/>
@ -1967,17 +1967,17 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<message>
<location filename="../src/modules/localeq/Offline.qml" line="111"/>
<source>Select your preferred Zone within your Region.</source>
<translation type="unfinished"/>
<translation>Selecione a sua Zona preferida dentro da sua Região.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="182"/>
<source>Zones</source>
<translation type="unfinished"/>
<translation>Zonas</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="229"/>
<source>You can fine-tune Language and Locale settings below.</source>
<translation type="unfinished"/>
<translation>Você pode ajustar as configurações de Idioma e Localidade abaixo.</translation>
</message>
</context>
<context>
@ -2351,7 +2351,7 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<location filename="../src/modules/users/page_usersetup.ui" line="349"/>
<location filename="../src/modules/users/page_usersetup.ui" line="374"/>
<source>&lt;small&gt;Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.&lt;/small&gt;</source>
<translation>&lt;small&gt;Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. Uma boa senha contém uma mistura de letras, números e sinais de pontuação, deve ter pelo menos oito caracteres e deve ser alterada em intervalos regulares.&lt;/small&gt;</translation>
<translation>&lt;small&gt;Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. Uma boa senha contém uma mistura de letras, números e sinais de pontuação, deve ter pelo menos oito caracteres, e deve ser alterada em intervalos regulares.&lt;/small&gt;</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="355"/>
@ -2368,7 +2368,7 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="455"/>
<source>When this box is checked, password-strength checking is done and you will not be able to use a weak password.</source>
<translation>Quando esta caixa estiver marcada, será feita a verificação do tamanho da senha e você não poderá usar uma senha fraca.</translation>
<translation>Quando esta caixa estiver marcada, será feita a verificação da força da senha e você não poderá usar uma senha fraca.</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="458"/>
@ -2394,7 +2394,7 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<location filename="../src/modules/users/page_usersetup.ui" line="519"/>
<location filename="../src/modules/users/page_usersetup.ui" line="544"/>
<source>&lt;small&gt;Enter the same password twice, so that it can be checked for typing errors.&lt;/small&gt;</source>
<translation>&lt;small&gt;Digite a mesma senha duas vezes para que possa ser verificada contra erros de digitação.&lt;/small&gt;</translation>
<translation>&lt;small&gt;Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação.&lt;/small&gt;</translation>
</message>
</context>
<context>
@ -3798,7 +3798,18 @@ Saída:
development is sponsored by &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;
&lt;strong&gt;%2&lt;br/&gt;
para %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;
Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;
Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;
Obrigado ao &lt;a href='https://calamares.io/team/'&gt;time Calamares&lt;/a&gt;
e ao &lt;a href='https://www.transifex.com/calamares/calamares/'&gt;time de
tradutores do Calamares&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;
O desenvolvimento do &lt;a href='https://calamares.io/'&gt;Calamares&lt;/a&gt;
é patrocinado pela &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</translation>
</message>
<message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/>
@ -3848,7 +3859,7 @@ Saída:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
<source>Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.</source>
<translation type="unfinished"/>
<translation>Clique no seu modelo de teclado preferido para selecionar o layout e a variante, ou use o padrão baseado no hardware detectado.</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -3863,7 +3874,7 @@ Saída:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
<source>Keyboard Variant</source>
<translation type="unfinished"/>
<translation>Variante do Teclado</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@ -3947,7 +3958,7 @@ Saída:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/>
<source>Pick your user name and credentials to login and perform admin tasks</source>
<translation type="unfinished"/>
<translation>Escolha seu nome de usuário e credenciais para fazer login e executar tarefas de administrador</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="52"/>
@ -3967,12 +3978,12 @@ Saída:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/>
<source>Login Name</source>
<translation type="unfinished"/>
<translation>Nome do Login</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="103"/>
<source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
<translation type="unfinished"/>
<translation>Se mais de uma pessoa for usar este computador, você poderá criar múltiplas contas após a instalação.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
@ -3987,7 +3998,7 @@ Saída:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="140"/>
<source>This name will be used if you make the computer visible to others on a network.</source>
<translation type="unfinished"/>
<translation>Este nome será usado se você fizer o computador ficar visível para outros numa rede.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/>
@ -4007,27 +4018,27 @@ Saída:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/>
<source>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</source>
<translation type="unfinished"/>
<translation>Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. Uma boa senha contém uma mistura de letras, números e sinais de pontuação, deve ter pelo menos oito caracteres, e deve ser alterada em intervalos regulares.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/>
<source>Validate passwords quality</source>
<translation type="unfinished"/>
<translation>Validar qualidade das senhas</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/>
<source>When this box is checked, password-strength checking is done and you will not be able to use a weak password..</source>
<translation type="unfinished"/>
<translation>Quando esta caixa estiver marcada, será feita a verificação da força da senha e você não poderá usar uma senha fraca.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Log in automatically without asking for the password</source>
<translation type="unfinished"/>
<translation>Entrar automaticamente sem perguntar pela senha</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="243"/>
<source>Reuse user password as root password</source>
<translation type="unfinished"/>
<translation>Reutilizar a senha de usuário como senha de root</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="253"/>
@ -4037,22 +4048,22 @@ Saída:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="268"/>
<source>Choose a root password to keep your account safe.</source>
<translation type="unfinished"/>
<translation>Escolha uma senha de root para manter sua conta segura.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="279"/>
<source>Root Password</source>
<translation type="unfinished"/>
<translation>Senha de Root</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="298"/>
<source>Repeat Root Password</source>
<translation type="unfinished"/>
<translation>Repita a Senha de Root</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/>
<source>Enter the same password twice, so that it can be checked for typing errors.</source>
<translation type="unfinished"/>
<translation>Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação.</translation>
</message>
</context>
<context>

50
lang/calamares_tg.ts
View File

@ -1956,7 +1956,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="37"/>
<source>Select your preferred Region, or use the default one based on your current location.</source>
<translation type="unfinished"/>
<translation>Минтақаи пазируфтаи худро интихоб намоед ё минтақаи стандартиро дар асоси ҷойгиршавии ҷории худ истифода баред.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="94"/>
@ -1968,17 +1968,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="111"/>
<source>Select your preferred Zone within your Region.</source>
<translation type="unfinished"/>
<translation>Шаҳри пазируфтаи худро дар ҳудуди минтақаи худ интихоб намоед.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="182"/>
<source>Zones</source>
<translation type="unfinished"/>
<translation>Шаҳрҳо</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="229"/>
<source>You can fine-tune Language and Locale settings below.</source>
<translation type="unfinished"/>
<translation>Шумо метавонед танзимоти забон ва маҳаллисозиро дар зер дуруст кунед.</translation>
</message>
</context>
<context>
@ -3799,7 +3799,17 @@ Output:
development is sponsored by &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;
&lt;strong&gt;%2&lt;br/&gt;
барои %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;
Ҳуқуқи муаллиф 2014-2017 Тео Марҷавак &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;
Ҳуқуқи муаллиф 2017-2020 Адриан де Грут &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;
Ташаккури зиёд ба &lt;a href='https://calamares.io/team/'&gt;дастаи Calamares&lt;/a&gt;
ва &lt;a href='https://www.transifex.com/calamares/calamares/'&gt;гурӯҳи тарҷумонони Calamares&lt;/a&gt; (тарҷумаи тоҷикӣ аз ҷониби Виктор Ибрагимов &amp;lt;victor.ibragimov@gmail.com&amp;gt;).&lt;br/&gt;&lt;br/&gt;
Барномарезии насбкунандаи &lt;a href='https://calamares.io/'&gt;Calamares&lt;/a&gt;
аз тарафи &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software дастгирӣ карда мешавад.</translation>
</message>
<message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/>
@ -3849,7 +3859,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
<source>Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.</source>
<translation type="unfinished"/>
<translation>Намунаи клавиатураи пазируфтаи худро барои танзими тарҳбандӣ ва варианти он интихоб кунед ё клавиатураи муқаррареро дар асоси сахтафзори муайяншуда истифода баред.</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -3864,7 +3874,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
<source>Keyboard Variant</source>
<translation type="unfinished"/>
<translation>Вариантҳои клавиатура</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@ -3948,7 +3958,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/>
<source>Pick your user name and credentials to login and perform admin tasks</source>
<translation type="unfinished"/>
<translation>Барои ворид шудан ба низом ва иҷро кардани вазифаҳои маъмурӣ, номи корбар ва маълумоти корбариро муайян кунед.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="52"/>
@ -3968,12 +3978,12 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/>
<source>Login Name</source>
<translation type="unfinished"/>
<translation>Номи корбар</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="103"/>
<source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
<translation type="unfinished"/>
<translation>Агар зиёда аз як корбар ин компютерро истифода барад, шумо метавонед баъд аз насбкунӣ якчанд ҳисобро эҷод намоед.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
@ -3988,7 +3998,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="140"/>
<source>This name will be used if you make the computer visible to others on a network.</source>
<translation type="unfinished"/>
<translation>Ин ном истифода мешавад, агар шумо компютери худро барои дигарон дар шабака намоён кунед.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/>
@ -4008,27 +4018,27 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/>
<source>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</source>
<translation type="unfinished"/>
<translation>Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад. Ниҳонвожаи хуб бояд дар омезиш калимаҳо, рақамҳо ва аломатҳои китобатиро дар бар гирад, ақаллан аз ҳашт аломат иборат шавад ва мунтазам иваз карда шавад.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/>
<source>Validate passwords quality</source>
<translation type="unfinished"/>
<translation>Санҷиши сифати ниҳонвожаҳо</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/>
<source>When this box is checked, password-strength checking is done and you will not be able to use a weak password..</source>
<translation type="unfinished"/>
<translation>Агар шумо ин имконро интихоб кунед, қувваи ниҳонвожа тафтиш карда мешавад ва шумо ниҳонвожаи заифро истифода карда наметавонед.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Log in automatically without asking for the password</source>
<translation type="unfinished"/>
<translation>Ба таври худкор бе дархости ниҳонвожа ворид карда шавад</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="243"/>
<source>Reuse user password as root password</source>
<translation type="unfinished"/>
<translation>Ниҳонвожаи корбар ҳам барои ниҳонвожаи root истифода карда шавад</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="253"/>
@ -4038,22 +4048,22 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="268"/>
<source>Choose a root password to keep your account safe.</source>
<translation type="unfinished"/>
<translation>Барои эмин нигоҳ доштани ҳисоби худ ниҳонвожаи root-ро интихоб намоед.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="279"/>
<source>Root Password</source>
<translation type="unfinished"/>
<translation>Ниҳонвожаи root</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="298"/>
<source>Repeat Root Password</source>
<translation type="unfinished"/>
<translation>Ниҳонвожаи root-ро тасдиқ намоед</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/>
<source>Enter the same password twice, so that it can be checked for typing errors.</source>
<translation type="unfinished"/>
<translation>Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад.</translation>
</message>
</context>
<context>

106
lang/calamares_zh_CN.ts
View File

@ -716,7 +716,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/locale/Config.cpp" line="334"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
<translation>将时区设置为 %1/%2 。</translation>
</message>
<message>
<location filename="../src/modules/locale/Config.cpp" line="372"/>
@ -778,22 +778,22 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="244"/>
<source>&lt;h1&gt;Welcome to the Calamares setup program for %1&lt;/h1&gt;</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;欢迎使用 %1 的 Calamares 安装程序&lt;/h1&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="245"/>
<source>&lt;h1&gt;Welcome to %1 setup&lt;/h1&gt;</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;欢迎使用 %1 设置&lt;/h1&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="250"/>
<source>&lt;h1&gt;Welcome to the Calamares installer for %1&lt;/h1&gt;</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;欢迎使用 %1 的 Calamares 安装程序&lt;/h1&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="251"/>
<source>&lt;h1&gt;Welcome to the %1 installer&lt;/h1&gt;</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;欢迎使用 %1 安装程序&lt;/h1&gt;</translation>
</message>
<message>
<location filename="../src/modules/users/Config.cpp" line="164"/>
@ -803,7 +803,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/Config.cpp" line="170"/>
<source>'%1' is not allowed as username.</source>
<translation type="unfinished"/>
<translation>'%1' 不允许作为用户名。</translation>
</message>
<message>
<location filename="../src/modules/users/Config.cpp" line="177"/>
@ -828,7 +828,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/Config.cpp" line="237"/>
<source>'%1' is not allowed as hostname.</source>
<translation type="unfinished"/>
<translation>'%1' 不允许作为主机名。</translation>
</message>
<message>
<location filename="../src/modules/users/Config.cpp" line="243"/>
@ -1802,14 +1802,16 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/localeq/Map.qml" line="243"/>
<source>Timezone: %1</source>
<translation type="unfinished"/>
<translation>时区: %1</translation>
</message>
<message>
<location filename="../src/modules/localeq/Map.qml" line="264"/>
<source>Please select your preferred location on the map so the installer can suggest the locale
and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging
to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming.</source>
<translation type="unfinished"/>
<translation>请在地图上选择您的首选位置，安装程序可以为您提供可参考的区域
设置和时区设置。 您可以在下面微调推荐的设置。 拖动以搜索地图，然后
用 +/- 按钮进行放大/缩小，或使用鼠标滚动进行缩放。</translation>
</message>
</context>
<context>
@ -1955,29 +1957,29 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="37"/>
<source>Select your preferred Region, or use the default one based on your current location.</source>
<translation type="unfinished"/>
<translation>请选择一个地区或者使用基于您当前位置的默认值。</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="94"/>
<location filename="../src/modules/localeq/Offline.qml" line="169"/>
<location filename="../src/modules/localeq/Offline.qml" line="213"/>
<source>Timezone: %1</source>
<translation type="unfinished"/>
<translation>时区: %1</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="111"/>
<source>Select your preferred Zone within your Region.</source>
<translation type="unfinished"/>
<translation>在您的区域中选择您的首选区域。</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="182"/>
<source>Zones</source>
<translation type="unfinished"/>
<translation>区域</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="229"/>
<source>You can fine-tune Language and Locale settings below.</source>
<translation type="unfinished"/>
<translation>您可以在下面微调“语言”和“区域设置”。</translation>
</message>
</context>
<context>
@ -2882,7 +2884,8 @@ Output:
<location filename="../src/modules/welcomeq/Recommended.qml" line="40"/>
<source>&lt;p&gt;This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;
Setup can continue, but some features might be disabled.&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;此计算机不满足安装 %1 的某些推荐配置。&lt;br/&gt;
安装可以继续，但是一些特性可能被禁用。&lt;/p&gt;</translation>
</message>
</context>
<context>
@ -2993,13 +2996,15 @@ Output:
<location filename="../src/modules/welcomeq/Requirements.qml" line="38"/>
<source>&lt;p&gt;This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;
Installation cannot continue.&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;此计算机不满足安装 %1 的最低配置。&lt;br/&gt;
安装无法继续。&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcomeq/Requirements.qml" line="40"/>
<source>&lt;p&gt;This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;
Setup can continue, but some features might be disabled.&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;此计算机不满足安装 %1 的某些推荐配置。&lt;br/&gt;
安装可以继续，但是一些特性可能被禁用。&lt;/p&gt;</translation>
</message>
</context>
<context>
@ -3467,28 +3472,28 @@ Output:
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="122"/>
<source>KDE user feedback</source>
<translation type="unfinished"/>
<translation>KDE 用户反馈</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="128"/>
<source>Configuring KDE user feedback.</source>
<translation type="unfinished"/>
<translation>配置 KDE 用户反馈。</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="150"/>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="156"/>
<source>Error in KDE user feedback configuration.</source>
<translation type="unfinished"/>
<translation>KDE 用户反馈配置中存在错误。</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="151"/>
<source>Could not configure KDE user feedback correctly, script error %1.</source>
<translation type="unfinished"/>
<translation>无法正确 KDE 用户反馈，脚本错误代码 %1。</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="157"/>
<source>Could not configure KDE user feedback correctly, Calamares error %1.</source>
<translation type="unfinished"/>
<translation>无法正确 KDE 用户反馈，Calamares 错误代码 %1。</translation>
</message>
</context>
<context>
@ -3550,17 +3555,17 @@ Output:
<message>
<location filename="../src/modules/tracking/TrackingPage.cpp" line="91"/>
<source>By selecting this you will send information about your installation and hardware. This information will only be sent &lt;b&gt;once&lt;/b&gt; after the installation finishes.</source>
<translation type="unfinished"/>
<translation>选中此项时，安装器将发送关于安装过程和硬件的信息。该信息仅会在安装结束后发送&lt;b&gt;一次&lt;/b&gt; 。</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingPage.cpp" line="94"/>
<source>By selecting this you will periodically send information about your &lt;b&gt;machine&lt;/b&gt; installation, hardware and applications, to %1.</source>
<translation type="unfinished"/>
<translation>通过选择此选项，您将定期将有关您 &lt;b&gt;计算机&lt;/b&gt;的安装，硬件和应用程序的信息发送到 %1。</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingPage.cpp" line="98"/>
<source>By selecting this you will regularly send information about your &lt;b&gt;user&lt;/b&gt; installation, hardware, applications and application usage patterns, to %1.</source>
<translation type="unfinished"/>
<translation>通过选择此选项，您将定期将有关&lt;b&gt;用户&lt;/b&gt; 安装，硬件，应用程序和应用程序使用方式的信息发送到 %1。</translation>
</message>
</context>
<context>
@ -3797,7 +3802,18 @@ Output:
development is sponsored by &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;
&lt;strong&gt;%2&lt;br/&gt;
for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;
Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;
Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;
致谢 &lt;a href='https://calamares.io/team/'&gt; Calamares 开发团队&lt;/a&gt;
和&lt;a href='https://www.transifex.com/calamares/calamares/'&gt;Calamares
翻译团队&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;
&lt;a href='https://calamares.io/'&gt;Calamares&lt;/a&gt;
开发赞助来自&lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</translation>
</message>
<message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/>
@ -3811,13 +3827,15 @@ Output:
<location filename="../src/modules/localeq/i18n.qml" line="46"/>
<source>&lt;h1&gt;Languages&lt;/h1&gt; &lt;/br&gt;
The system locale setting affects the language and character set for some command line user interface elements. The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;语言&lt;/h1&gt; &lt;/br&gt;
系统语言区域设置会影响部份命令行用户界面的语言及字符集。 当前设置是 &lt;strong&gt;%1&lt;/strong&gt;.</translation>
</message>
<message>
<location filename="../src/modules/localeq/i18n.qml" line="106"/>
<source>&lt;h1&gt;Locales&lt;/h1&gt; &lt;/br&gt;
The system locale setting affects the numbers and dates format. The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;区域&lt;/h1&gt; &lt;/br&gt;
系统区域设置会影响数字和日期格式。 当前设置是 &lt;strong&gt;%1&lt;/strong&gt;。</translation>
</message>
<message>
<location filename="../src/modules/localeq/i18n.qml" line="158"/>
@ -3845,7 +3863,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
<source>Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.</source>
<translation type="unfinished"/>
<translation>单击您的首选键盘型号以选择布局和变体，或根据检测到的硬件使用默认键盘。</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -3860,7 +3878,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
<source>Keyboard Variant</source>
<translation type="unfinished"/>
<translation>键盘变体</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@ -3873,7 +3891,7 @@ Output:
<message>
<location filename="../src/modules/localeq/localeq.qml" line="81"/>
<source>Change</source>
<translation type="unfinished"/>
<translation>更改</translation>
</message>
</context>
<context>
@ -3945,7 +3963,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/>
<source>Pick your user name and credentials to login and perform admin tasks</source>
<translation type="unfinished"/>
<translation>选择您的用户名和凭据登录并执行管理任务</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="52"/>
@ -3965,12 +3983,12 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/>
<source>Login Name</source>
<translation type="unfinished"/>
<translation>登录名</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="103"/>
<source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
<translation type="unfinished"/>
<translation>如果有多人要使用此计算机，您可以在安装后创建多个账户。</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/>
@ -3985,7 +4003,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="140"/>
<source>This name will be used if you make the computer visible to others on a network.</source>
<translation type="unfinished"/>
<translation>将计算机设置为对其他网络上计算机可见时将使用此名称。</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/>
@ -4005,27 +4023,27 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/>
<source>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</source>
<translation type="unfinished"/>
<translation>输入相同密码两次，以检查输入错误。好的密码包含字母，数字，标点的组合，应当至少为 8 个字符长，并且应按一定周期更换。</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/>
<source>Validate passwords quality</source>
<translation type="unfinished"/>
<translation>验证密码质量</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/>
<source>When this box is checked, password-strength checking is done and you will not be able to use a weak password..</source>
<translation type="unfinished"/>
<translation>若选中此项，密码强度检测会开启，你将不被允许使用弱密码..</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Log in automatically without asking for the password</source>
<translation type="unfinished"/>
<translation>不询问密码自动登录</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="243"/>
<source>Reuse user password as root password</source>
<translation type="unfinished"/>
<translation>重用用户密码作为 root 密码</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="253"/>
@ -4035,22 +4053,22 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="268"/>
<source>Choose a root password to keep your account safe.</source>
<translation type="unfinished"/>
<translation>选择一个 root 密码来保证您的账户安全。</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="279"/>
<source>Root Password</source>
<translation type="unfinished"/>
<translation>Root 密码</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="298"/>
<source>Repeat Root Password</source>
<translation type="unfinished"/>
<translation>重复 Root 密码</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/>
<source>Enter the same password twice, so that it can be checked for typing errors.</source>
<translation type="unfinished"/>
<translation>输入相同密码两次，以检查输入错误。</translation>
</message>
</context>
<context>

4
lang/python/az/LC_MESSAGES/python.po
View File

@ -320,11 +320,11 @@ msgstr "Aparat saatını ayarlamaq."
#: src/modules/mkinitfs/main.py:27
msgid "Creating initramfs with mkinitfs."
msgstr ""
msgstr "mkinitfs ilə initramfs yaradılır"
#: src/modules/mkinitfs/main.py:49
msgid "Failed to run mkinitfs on the target"
msgstr ""
msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
msgid "The exit code was {}"

4
lang/python/az_AZ/LC_MESSAGES/python.po
View File

@ -320,11 +320,11 @@ msgstr "Aparat saatını ayarlamaq."
#: src/modules/mkinitfs/main.py:27
msgid "Creating initramfs with mkinitfs."
msgstr ""
msgstr "mkinitfs ilə initramfs yaradılır."
#: src/modules/mkinitfs/main.py:49
msgid "Failed to run mkinitfs on the target"
msgstr ""
msgstr "Hədəfdə dracut başladılmadı"
#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
msgid "The exit code was {}"

4
lang/python/bg/LC_MESSAGES/python.po
View File

@ -4,7 +4,7 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Georgi Georgiev <georgiev_1994@abv.bg>, 2020
# Georgi Georgiev, 2020
#
#, fuzzy
msgid ""
@ -13,7 +13,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-09-03 21:19+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Georgi Georgiev <georgiev_1994@abv.bg>, 2020\n"
"Last-Translator: Georgi Georgiev, 2020\n"
"Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

4
lang/python/da/LC_MESSAGES/python.po
View File

@ -319,11 +319,11 @@ msgstr "Indstiller hardwareur."
#: src/modules/mkinitfs/main.py:27
msgid "Creating initramfs with mkinitfs."
msgstr ""
msgstr "Opretter initramfs med mkinitfs."
#: src/modules/mkinitfs/main.py:49
msgid "Failed to run mkinitfs on the target"
msgstr ""
msgstr "Kunne ikke køre mkinitfs på målet"
#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
msgid "The exit code was {}"

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

@ -5,7 +5,7 @@
#
# Translators:
# Choiril Abdul, 2018
# Harry Suryapambagya <harsxv@gmail.com>, 2018
# harsxv <harsxv@gmail.com>, 2018
# Wantoyèk <wantoyek@gmail.com>, 2018
#
#, fuzzy

4
lang/python/tg/LC_MESSAGES/python.po
View File

@ -321,11 +321,11 @@ msgstr "Танзимкунии соати сахтафзор."
#: src/modules/mkinitfs/main.py:27
msgid "Creating initramfs with mkinitfs."
msgstr ""
msgstr "Эҷодкунии initramfs бо mkinitfs."
#: src/modules/mkinitfs/main.py:49
msgid "Failed to run mkinitfs on the target"
msgstr ""
msgstr "mkinitfs дар низоми интихобшуда иҷро нашуд"
#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
msgid "The exit code was {}"

2
lang/tz_tg.ts
View File

@ -1762,7 +1762,7 @@
<location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="332"/>
<source>New York</source>
<comment>tz_names</comment>
<translation>Штати Ню-Йорк</translation>
<translation>Ню-Йорк</translation>
</message>
<message>
<location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="333"/>

2
src/calamares/CalamaresApplication.h
View File

@ -30,7 +30,7 @@ class CalamaresApplication : public QApplication
Q_OBJECT
public:
CalamaresApplication( int& argc, char* argv[] );
virtual ~CalamaresApplication();
~CalamaresApplication() override;
/**
* @brief init handles the first part of Calamares application startup.

2
src/calamares/CalamaresWindow.h
View File

@ -28,7 +28,7 @@ class CalamaresWindow : public QWidget
Q_OBJECT
public:
CalamaresWindow( QWidget* parent = nullptr );
virtual ~CalamaresWindow() override {}
~CalamaresWindow() override {}
public slots:
/**

4
src/calamares/VariantModel.cpp
View File

@ -229,11 +229,11 @@ VariantModel::headerData( int section, Qt::Orientation orientation, int role ) c
{
if ( section == 0 )
{
return tr( "Key" );
return tr( "Key", "Column header for key/value" );
}
else if ( section == 1 )
{
return tr( "Value" );
return tr( "Value", "Column header for key/value" );
}
else
{

2
src/calamares/progresstree/ProgressTreeView.h
View File

@ -22,7 +22,7 @@ class ProgressTreeView : public QListView
Q_OBJECT
public:
explicit ProgressTreeView( QWidget* parent = nullptr );
virtual ~ProgressTreeView() override;
~ProgressTreeView() override;
/**
* @brief setModel assigns a model to this view.

2
src/calamares/testmain.cpp
View File

@ -140,7 +140,7 @@ public:
, m_delay( t )
{
}
virtual ~ExecViewJob() override;
~ExecViewJob() override;
QString prettyName() const override { return m_name; }

2
src/libcalamares/CppJob.h
View File

@ -28,7 +28,7 @@ class DLLEXPORT CppJob : public Job
Q_OBJECT
public:
explicit CppJob( QObject* parent = nullptr );
virtual ~CppJob();
~CppJob() override;
void setModuleInstanceKey( const Calamares::ModuleSystem::InstanceKey& instanceKey );
Calamares::ModuleSystem::InstanceKey moduleInstanceKey() const { return m_instanceKey; }

2
src/libcalamares/Job.h
View File

@ -86,7 +86,7 @@ class DLLEXPORT Job : public QObject
Q_OBJECT
public:
explicit Job( QObject* parent = nullptr );
virtual ~Job();
~Job() override;
/** @brief The job's (relative) weight.
*

2
src/libcalamares/JobQueue.cpp
View File

@ -53,7 +53,7 @@ public:
{
}
virtual ~JobThread() override;
~JobThread() override;
void finalize()
{

2
src/libcalamares/JobQueue.h
View File

@ -25,7 +25,7 @@ class DLLEXPORT JobQueue : public QObject
Q_OBJECT
public:
explicit JobQueue( QObject* parent = nullptr );
virtual ~JobQueue();
~JobQueue() override;
static JobQueue* instance();

2
src/libcalamares/ProcessJob.h
View File

@ -27,7 +27,7 @@ public:
bool runInChroot = false,
std::chrono::seconds secondsTimeout = std::chrono::seconds( 30 ),
QObject* parent = nullptr );
virtual ~ProcessJob() override;
~ProcessJob() override;
QString prettyName() const override;
QString prettyStatusMessage() const override;

2
src/libcalamares/PythonHelper.h
View File

@ -48,7 +48,7 @@ public:
static Helper* instance();
private:
virtual ~Helper();
~Helper() override;
explicit Helper();
boost::python::object m_mainModule;

3
src/libcalamares/PythonJob.cpp
View File

@ -160,8 +160,7 @@ struct PythonJob::Private
bp::object m_prettyStatusMessage;
};
PythonJob::PythonJob( const ModuleSystem::InstanceKey& instance,
const QString& scriptFile,
PythonJob::PythonJob( const QString& scriptFile,
const QString& workingPath,
const QVariantMap& moduleConfiguration,
QObject* parent )

5
src/libcalamares/PythonJob.h
View File

@ -31,12 +31,11 @@ class PythonJob : public Job
{
Q_OBJECT
public:
explicit PythonJob( const ModuleSystem::InstanceKey& instance,
const QString& scriptFile,
explicit PythonJob( const QString& scriptFile,
const QString& workingPath,
const QVariantMap& moduleConfiguration = QVariantMap(),
QObject* parent = nullptr );
virtual ~PythonJob() override;
~PythonJob() override;
QString prettyName() const override;
QString prettyStatusMessage() const override;

4
src/libcalamares/Tests.cpp
View File

@ -24,7 +24,7 @@ class TestLibCalamares : public QObject
Q_OBJECT
public:
TestLibCalamares() {}
virtual ~TestLibCalamares() {}
~TestLibCalamares() override {}
private Q_SLOTS:
void testGSModify();
@ -484,7 +484,7 @@ public:
: Calamares::Job( parent )
{
}
virtual ~DummyJob() override;
~DummyJob() override;
QString prettyName() const override;
Calamares::JobResult exec() override;

2
src/libcalamares/locale/LabelModel.h
View File

@ -36,7 +36,7 @@ public:
};
LabelModel( const QStringList& locales, QObject* parent = nullptr );
virtual ~LabelModel() override;
~LabelModel() override;
int rowCount( const QModelIndex& parent ) const override;

4
src/libcalamares/locale/TimeZone.h
View File

@ -94,7 +94,7 @@ public:
};
RegionsModel( QObject* parent = nullptr );
virtual ~RegionsModel() override;
~RegionsModel() override;
int rowCount( const QModelIndex& parent ) const override;
QVariant data( const QModelIndex& index, int role ) const override;
@ -126,7 +126,7 @@ public:
};
ZonesModel( QObject* parent = nullptr );
virtual ~ZonesModel() override;
~ZonesModel() override;
int rowCount( const QModelIndex& parent ) const override;
QVariant data( const QModelIndex& index, int role ) const override;

2
src/libcalamares/modulesystem/RequirementsChecker.h
View File

@ -34,7 +34,7 @@ class RequirementsChecker : public QObject
public:
RequirementsChecker( QVector< Module* > modules, RequirementsModel* model, QObject* parent = nullptr );
virtual ~RequirementsChecker() override;
~RequirementsChecker() override;
public Q_SLOTS:
/// @brief Start checking all the requirements

2
src/libcalamares/modulesystem/Tests.cpp
View File

@ -20,7 +20,7 @@ class ModuleSystemTests : public QObject
Q_OBJECT
public:
ModuleSystemTests() {}
virtual ~ModuleSystemTests() {}
~ModuleSystemTests() override {}
private Q_SLOTS:
void initTestCase();

2
src/libcalamares/network/Manager.h
View File

@ -99,7 +99,7 @@ public:
* to keep the reference.
*/
static Manager& instance();
virtual ~Manager();
~Manager() override;
/** @brief Checks if the given @p url returns data.
*

2
src/libcalamares/utils/CalamaresUtilsSystem.h
View File

@ -126,7 +126,7 @@ public:
* @param parent the QObject parent.
*/
explicit System( bool doChroot, QObject* parent = nullptr );
virtual ~System();
~System() override;
static System* instance();

2
src/libcalamares/utils/PluginFactory.h
View File

@ -88,7 +88,7 @@ public:
Q_PLUGIN_METADATA( IID CalamaresPluginFactory_iid ) \
public: \
explicit name(); \
~name(); \
~name() override; \
};
#define CALAMARES_PLUGIN_FACTORY_DEFINITION( name, pluginRegistrations ) \
K_PLUGIN_FACTORY_DEFINITION_WITH_BASEFACTORY( name, CalamaresPluginFactory, pluginRegistrations )

2
src/libcalamares/utils/TestPaths.cpp
View File

@ -26,7 +26,7 @@ class TestPaths : public QObject
Q_OBJECT
public:
TestPaths() {}
virtual ~TestPaths() {}
~TestPaths() override {}
private Q_SLOTS:
void initTestCase();

1
src/libcalamares/utils/Yaml.h
View File

@ -38,6 +38,7 @@ class QFileInfo;
#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
#pragma clang diagnostic ignored "-Wshadow"
#pragma clang diagnostic ignored "-Wfloat-equal"
#pragma clang diagnostic ignored "-Wsuggest-destructor-override"
#endif
#include <yaml-cpp/yaml.h>

2
src/libcalamaresui/ViewManager.h
View File

@ -212,7 +212,7 @@ signals:
private:
explicit ViewManager( QObject* parent = nullptr );
virtual ~ViewManager() override;
~ViewManager() override;
void insertViewStep( int before, ViewStep* step );
void updateButtonLabels();

2
src/libcalamaresui/modulesystem/CppJobModule.h
View File

@ -34,7 +34,7 @@ protected:
private:
explicit CppJobModule();
virtual ~CppJobModule() override;
~CppJobModule() override;
QPluginLoader* m_loader;
job_ptr m_job;

8
src/libcalamaresui/modulesystem/ModuleManager.cpp
View File

@ -124,7 +124,7 @@ ModuleManager::doInit()
// At this point m_availableDescriptorsByModuleName is filled with
// the modules that were found in the search paths.
cDebug() << "Found" << m_availableDescriptorsByModuleName.count() << "modules";
emit initDone();
QTimer::singleShot( 10, this, &ModuleManager::initDone );
}
@ -281,11 +281,13 @@ ModuleManager::loadModules()
if ( !failedModules.isEmpty() )
{
ViewManager::instance()->onInitFailed( failedModules );
emit modulesFailed( failedModules );
QTimer::singleShot( 10, [=]() {
emit modulesFailed( failedModules );
} );
}
else
{
emit modulesLoaded();
QTimer::singleShot( 10, this, &ModuleManager::modulesLoaded );
}
}

2
src/libcalamaresui/modulesystem/ModuleManager.h
View File

@ -37,7 +37,7 @@ class ModuleManager : public QObject
Q_OBJECT
public:
explicit ModuleManager( const QStringList& paths, QObject* parent = nullptr );
virtual ~ModuleManager() override;
~ModuleManager() override;
static ModuleManager* instance();

2
src/libcalamaresui/modulesystem/ProcessJobModule.h
View File

@ -33,7 +33,7 @@ protected:
private:
explicit ProcessJobModule();
virtual ~ProcessJobModule() override;
~ProcessJobModule() override;
QString m_command;
QString m_workingPath;

2
src/libcalamaresui/modulesystem/PythonJobModule.cpp
View File

@ -40,7 +40,7 @@ PythonJobModule::loadSelf()
return;
}
m_job = Calamares::job_ptr( new PythonJob( instanceKey(), m_scriptFileName, m_workingPath, m_configurationMap ) );
m_job = Calamares::job_ptr( new PythonJob( m_scriptFileName, m_workingPath, m_configurationMap ) );
m_loaded = true;
}

2
src/libcalamaresui/modulesystem/PythonJobModule.h
View File

@ -30,7 +30,7 @@ protected:
private:
explicit PythonJobModule();
virtual ~PythonJobModule() override;
~PythonJobModule() override;
QString m_scriptFileName;
QString m_workingPath;

2
src/libcalamaresui/modulesystem/ViewModule.h
View File

@ -37,7 +37,7 @@ protected:
private:
explicit ViewModule();
virtual ~ViewModule() override;
~ViewModule() override;
QPluginLoader* m_loader;
ViewStep* m_viewStep = nullptr;

32
src/libcalamaresui/utils/ImageRegistry.cpp
View File

@ -34,18 +34,16 @@ ImageRegistry::icon( const QString& image, CalamaresUtils::ImageMode mode )
qint64
ImageRegistry::cacheKey( const QSize& size, qreal opacity, QColor tint )
ImageRegistry::cacheKey( const QSize& size )
{
return size.width() * 100 + size.height() * 10 + static_cast< qint64 >( opacity * 100.0 ) + tint.value();
return size.width() * 100 + size.height() * 10;
}
QPixmap
ImageRegistry::pixmap( const QString& image,
const QSize& size,
CalamaresUtils::ImageMode mode,
qreal opacity,
QColor tint )
CalamaresUtils::ImageMode mode )
{
Q_ASSERT( !( size.width() < 0 || size.height() < 0 ) );
if ( size.width() < 0 || size.height() < 0 )
@ -64,7 +62,7 @@ ImageRegistry::pixmap( const QString& image,
{
subsubcache = subcache.value( mode );
const qint64 ck = cacheKey( size, opacity, tint );
const qint64 ck = cacheKey( size );
if ( subsubcache.contains( ck ) )
{
return subsubcache.value( ck );
@ -81,23 +79,9 @@ ImageRegistry::pixmap( const QString& image,
p.fill( Qt::transparent );
QPainter pixPainter( &p );
pixPainter.setOpacity( opacity );
svgRenderer.render( &pixPainter );
pixPainter.end();
if ( tint.alpha() > 0 )
{
QImage resultImage( p.size(), QImage::Format_ARGB32_Premultiplied );
QPainter painter( &resultImage );
painter.drawPixmap( 0, 0, p );
painter.setCompositionMode( QPainter::CompositionMode_Screen );
painter.fillRect( resultImage.rect(), tint );
painter.end();
resultImage.setAlphaChannel( p.toImage().alphaChannel() );
p = QPixmap::fromImage( resultImage );
}
pixmap = p;
}
else
@ -128,7 +112,7 @@ ImageRegistry::pixmap( const QString& image,
}
}
putInCache( image, size, mode, opacity, pixmap, tint );
putInCache( image, size, mode, pixmap );
}
return pixmap;
@ -139,9 +123,7 @@ void
ImageRegistry::putInCache( const QString& image,
const QSize& size,
CalamaresUtils::ImageMode mode,
qreal opacity,
const QPixmap& pixmap,
QColor tint )
const QPixmap& pixmap )
{
QHash< qint64, QPixmap > subsubcache;
QHash< int, QHash< qint64, QPixmap > > subcache;
@ -155,7 +137,7 @@ ImageRegistry::putInCache( const QString& image,
}
}
subsubcache.insert( cacheKey( size, opacity, tint ), pixmap );
subsubcache.insert( cacheKey( size ), pixmap );
subcache.insert( mode, subsubcache );
s_cache.insert( image, subcache );
}

10
src/libcalamaresui/utils/ImageRegistry.h
View File

@ -24,18 +24,14 @@ public:
QIcon icon( const QString& image, CalamaresUtils::ImageMode mode = CalamaresUtils::Original );
QPixmap pixmap( const QString& image,
const QSize& size,
CalamaresUtils::ImageMode mode = CalamaresUtils::Original,
qreal opacity = 1.0,
QColor tint = QColor( 0, 0, 0, 0 ) );
CalamaresUtils::ImageMode mode = CalamaresUtils::Original );
private:
qint64 cacheKey( const QSize& size, qreal opacity, QColor tint );
qint64 cacheKey( const QSize& size );
void putInCache( const QString& image,
const QSize& size,
CalamaresUtils::ImageMode mode,
qreal opacity,
const QPixmap& pixmap,
QColor tint );
const QPixmap& pixmap );
};
#endif // IMAGE_REGISTRY_H

2
src/libcalamaresui/viewpages/BlankViewStep.h
View File

@ -29,7 +29,7 @@ public:
const QString& description,
const QString& details = QString(),
QObject* parent = nullptr );
virtual ~BlankViewStep() override;
~BlankViewStep() override;
QString prettyName() const override;

2
src/libcalamaresui/viewpages/QmlViewStep.h
View File

@ -50,7 +50,7 @@ public:
* @see Qml.h for available Calamares internals.
*/
QmlViewStep( QObject* parent = nullptr );
virtual ~QmlViewStep() override;
~QmlViewStep() override;
virtual QString prettyName() const override;

6
src/libcalamaresui/viewpages/Slideshow.h
View File

@ -52,7 +52,7 @@ public:
: QObject( parent )
{
}
virtual ~Slideshow();
~Slideshow() override;
/// @brief Is the slideshow being shown **right now**?
bool isActive() const { return m_state == Start; }
@ -91,7 +91,7 @@ class SlideshowQML : public Slideshow
Q_OBJECT
public:
SlideshowQML( QWidget* parent );
virtual ~SlideshowQML() override;
~SlideshowQML() override;
QWidget* widget() override;
void changeSlideShowState( Action a ) override;
@ -123,7 +123,7 @@ class SlideshowPictures : public Slideshow
Q_OBJECT
public:
SlideshowPictures( QWidget* parent );
virtual ~SlideshowPictures() override;
~SlideshowPictures() override;
QWidget* widget() override;
virtual void changeSlideShowState( Action a ) override;

2
src/libcalamaresui/viewpages/ViewStep.h
View File

@ -41,7 +41,7 @@ class UIDLLEXPORT ViewStep : public QObject
Q_OBJECT
public:
explicit ViewStep( QObject* parent = nullptr );
virtual ~ViewStep() override;
~ViewStep() override;
/** @brief Human-readable name of the step
*

2
src/libcalamaresui/widgets/ClickableLabel.h
View File

@ -32,7 +32,7 @@ class UIDLLEXPORT ClickableLabel : public QLabel
public:
explicit ClickableLabel( QWidget* parent = nullptr );
explicit ClickableLabel( const QString& text, QWidget* parent = nullptr );
virtual ~ClickableLabel() override;
~ClickableLabel() override;
signals:
void clicked();

2
src/libcalamaresui/widgets/FixedAspectRatioLabel.h
View File

@ -19,7 +19,7 @@ class FixedAspectRatioLabel : public QLabel
Q_OBJECT
public:
explicit FixedAspectRatioLabel( QWidget* parent = nullptr );
virtual ~FixedAspectRatioLabel() override;
~FixedAspectRatioLabel() override;
public slots:
void setPixmap( const QPixmap& pixmap );

2
src/libcalamaresui/widgets/PrettyRadioButton.h
View File

@ -38,7 +38,7 @@ class UIDLLEXPORT PrettyRadioButton : public QWidget
Q_OBJECT
public:
explicit PrettyRadioButton( QWidget* parent = nullptr );
virtual ~PrettyRadioButton() {}
~PrettyRadioButton() override {}
/// @brief Passes @p text on to the ClickableLabel
void setText( const QString& text );

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

@ -26,7 +26,7 @@ class PLUGINDLLEXPORT ContextualProcessJob : public Calamares::CppJob
public:
explicit ContextualProcessJob( QObject* parent = nullptr );
virtual ~ContextualProcessJob() override;
~ContextualProcessJob() override;
QString prettyName() const override;

2
src/modules/dracutlukscfg/DracutLuksCfgJob.h
View File

@ -26,7 +26,7 @@ class PLUGINDLLEXPORT DracutLuksCfgJob : public Calamares::CppJob
public:
explicit DracutLuksCfgJob( QObject* parent = nullptr );
virtual ~DracutLuksCfgJob() override;
~DracutLuksCfgJob() override;
QString prettyName() const override;

2
src/modules/dummycpp/DummyCppJob.h
View File

@ -26,7 +26,7 @@ class PLUGINDLLEXPORT DummyCppJob : public Calamares::CppJob
public:
explicit DummyCppJob( QObject* parent = nullptr );
virtual ~DummyCppJob() override;
~DummyCppJob() override;
QString prettyName() const override;

2
src/modules/finished/FinishedViewStep.h
View File

@ -36,7 +36,7 @@ public:
static QString modeName( RestartMode m );
explicit FinishedViewStep( QObject* parent = nullptr );
virtual ~FinishedViewStep() override;
~FinishedViewStep() override;
QString prettyName() const override;

2
src/modules/fsresizer/ResizeFSJob.h
View File

@ -33,7 +33,7 @@ class PLUGINDLLEXPORT ResizeFSJob : public Calamares::CppJob
public:
explicit ResizeFSJob( QObject* parent = nullptr );
virtual ~ResizeFSJob() override;
~ResizeFSJob() override;
QString prettyName() const override;

2
src/modules/hostinfo/HostInfoJob.h
View File

@ -43,7 +43,7 @@ class PLUGINDLLEXPORT HostInfoJob : public Calamares::CppJob
public:
explicit HostInfoJob( QObject* parent = nullptr );
virtual ~HostInfoJob() override;
~HostInfoJob() override;
QString prettyName() const override;

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

@ -22,7 +22,7 @@ class HostInfoTests : public QObject
Q_OBJECT
public:
HostInfoTests() {}
virtual ~HostInfoTests() {}
~HostInfoTests() override {}
private Q_SLOTS:
void initTestCase();

2
src/modules/initcpio/InitcpioJob.h
View File

@ -23,7 +23,7 @@ class PLUGINDLLEXPORT InitcpioJob : public Calamares::CppJob
public:
explicit InitcpioJob( QObject* parent = nullptr );
virtual ~InitcpioJob() override;
~InitcpioJob() override;
QString prettyName() const override;

2
src/modules/initramfs/InitramfsJob.h
View File

@ -23,7 +23,7 @@ class PLUGINDLLEXPORT InitramfsJob : public Calamares::CppJob
public:
explicit InitramfsJob( QObject* parent = nullptr );
virtual ~InitramfsJob() override;
~InitramfsJob() override;
QString prettyName() const override;

2
src/modules/interactiveterminal/InteractiveTerminalViewStep.h
View File

@ -26,7 +26,7 @@ class PLUGINDLLEXPORT InteractiveTerminalViewStep : public Calamares::ViewStep
public:
explicit InteractiveTerminalViewStep( QObject* parent = nullptr );
virtual ~InteractiveTerminalViewStep() override;
~InteractiveTerminalViewStep() override;
QString prettyName() const override;

4
src/modules/keyboard/KeyboardPage.cpp
View File

@ -35,7 +35,7 @@ class LayoutItem : public QListWidgetItem
public:
QString data;
virtual ~LayoutItem();
~LayoutItem() override;
};
LayoutItem::~LayoutItem() {}
@ -77,7 +77,7 @@ KeyboardPage::KeyboardPage( QWidget* parent )
ui->buttonRestore, &QPushButton::clicked, [this] { ui->comboBoxModel->setCurrentIndex( m_defaultIndex ); } );
connect( ui->comboBoxModel,
static_cast< void ( QComboBox::* )( const QString& ) >( &QComboBox::currentIndexChanged ),
&QComboBox::currentTextChanged,
[this]( const QString& text ) {
QString model = m_models.value( text, "pc105" );

2
src/modules/keyboard/KeyboardPage.h
View File

@ -34,7 +34,7 @@ class KeyboardPage : public QWidget
Q_OBJECT
public:
explicit KeyboardPage( QWidget* parent = nullptr );
virtual ~KeyboardPage();
~KeyboardPage() override;
void init();

2
src/modules/keyboard/KeyboardViewStep.h
View File

@ -25,7 +25,7 @@ class PLUGINDLLEXPORT KeyboardViewStep : public Calamares::ViewStep
public:
explicit KeyboardViewStep( QObject* parent = nullptr );
virtual ~KeyboardViewStep() override;
~KeyboardViewStep() override;
QString prettyName() const override;
QString prettyStatus() const override;

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

@ -18,7 +18,7 @@ class KeyboardLayoutTests : public QObject
Q_OBJECT
public:
KeyboardLayoutTests() {}
virtual ~KeyboardLayoutTests() {}
~KeyboardLayoutTests() override {}
private Q_SLOTS:
void initTestCase();

4
src/modules/keyboard/keyboardwidget/keyboardpreview.h
View File

@ -71,8 +71,8 @@ private:
QString fromUnicodeString( QString raw );
protected:
void paintEvent( QPaintEvent* event );
void resizeEvent( QResizeEvent* event );
void paintEvent( QPaintEvent* event ) override;
void resizeEvent( QResizeEvent* event ) override;
};
#endif // KEYBOARDPREVIEW_H

2
src/modules/license/LicenseViewStep.h
View File

@ -27,7 +27,7 @@ class PLUGINDLLEXPORT LicenseViewStep : public Calamares::ViewStep
public:
explicit LicenseViewStep( QObject* parent = nullptr );
virtual ~LicenseViewStep() override;
~LicenseViewStep() override;
QString prettyName() const override;

2
src/modules/license/LicenseWidget.h
View File

@ -24,7 +24,7 @@ class LicenseWidget : public QWidget
{
public:
LicenseWidget( LicenseEntry e, QWidget* parent = nullptr );
virtual ~LicenseWidget() override;
~LicenseWidget() override;
void retranslateUi();

2
src/modules/locale/Config.h
View File

@ -52,7 +52,7 @@ class Config : public QObject
public:
Config( QObject* parent = nullptr );
~Config();
~Config() override;
void setConfigurationMap( const QVariantMap& );
void finalizeGlobalStorage() const;

2
src/modules/locale/LocalePage.h
View File

@ -32,7 +32,7 @@ class LocalePage : public QWidget
Q_OBJECT
public:
explicit LocalePage( class Config* config, QWidget* parent = nullptr );
virtual ~LocalePage();
~LocalePage() override;
void onActivate();

2
src/modules/locale/LocaleViewStep.h
View File

@ -27,7 +27,7 @@ class PLUGINDLLEXPORT LocaleViewStep : public Calamares::ViewStep
public:
explicit LocaleViewStep( QObject* parent = nullptr );
virtual ~LocaleViewStep() override;
~LocaleViewStep() override;
QString prettyName() const override;
QString prettyStatus() const override;

4
src/modules/locale/timezonewidget/timezonewidget.h
View File

@ -66,8 +66,8 @@ private:
const CalamaresUtils::Locale::ZonesModel* m_zonesData;
const TimeZoneData* m_currentLocation = nullptr; // Not owned by me
void paintEvent( QPaintEvent* event );
void mousePressEvent( QMouseEvent* event );
void paintEvent( QPaintEvent* event ) override;
void mousePressEvent( QMouseEvent* event ) override;
};
#endif // TIMEZONEWIDGET_H

2
src/modules/luksbootkeyfile/LuksBootKeyFileJob.h
View File

@ -25,7 +25,7 @@ class PLUGINDLLEXPORT LuksBootKeyFileJob : public Calamares::CppJob
Q_OBJECT
public:
explicit LuksBootKeyFileJob( QObject* parent = nullptr );
virtual ~LuksBootKeyFileJob() override;
~LuksBootKeyFileJob() override;
QString prettyName() const override;

2
src/modules/machineid/MachineIdJob.h
View File

@ -29,7 +29,7 @@ class PLUGINDLLEXPORT MachineIdJob : public Calamares::CppJob
public:
explicit MachineIdJob( QObject* parent = nullptr );
virtual ~MachineIdJob() override;
~MachineIdJob() override;
QString prettyName() const override;

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

@ -27,7 +27,7 @@ class MachineIdTests : public QObject
Q_OBJECT
public:
MachineIdTests() {}
virtual ~MachineIdTests() {}
~MachineIdTests() override {}
private Q_SLOTS:
void initTestCase();

2
src/modules/netinstall/Config.h
View File

@ -28,7 +28,7 @@ class Config : public QObject
public:
Config( QObject* parent = nullptr );
virtual ~Config();
~Config() override;
enum class Status
{

2
src/modules/netinstall/NetInstallPage.h
View File

@ -35,7 +35,7 @@ class NetInstallPage : public QWidget
Q_OBJECT
public:
NetInstallPage( Config* config, QWidget* parent = nullptr );
virtual ~NetInstallPage();
~NetInstallPage() override;
/** @brief Sets the page title
*

2
src/modules/netinstall/NetInstallViewStep.h
View File

@ -28,7 +28,7 @@ class PLUGINDLLEXPORT NetInstallViewStep : public Calamares::ViewStep
public:
explicit NetInstallViewStep( QObject* parent = nullptr );
virtual ~NetInstallViewStep() override;
~NetInstallViewStep() override;
QString prettyName() const override;

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

@ -21,7 +21,7 @@ class ItemTests : public QObject
Q_OBJECT
public:
ItemTests();
virtual ~ItemTests() {}
~ItemTests() override {}
private:
void checkAllSelected( PackageTreeItem* p );

2
src/modules/notesqml/NotesQmlViewStep.h
View File

@ -22,7 +22,7 @@ class PLUGINDLLEXPORT NotesQmlViewStep : public Calamares::QmlViewStep
public:
NotesQmlViewStep( QObject* parent = nullptr );
virtual ~NotesQmlViewStep() override;
~NotesQmlViewStep() override;
QString prettyName() const override;

2
src/modules/oemid/OEMViewStep.cpp
View File

@ -32,7 +32,7 @@ public:
CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); )
}
virtual ~OEMPage() override;
~OEMPage() override;
Ui_OEMPage* m_ui;
};

2
src/modules/oemid/OEMViewStep.h
View File

@ -25,7 +25,7 @@ class PLUGINDLLEXPORT OEMViewStep : public Calamares::ViewStep
public:
explicit OEMViewStep( QObject* parent = nullptr );
virtual ~OEMViewStep() override;
~OEMViewStep() override;
QString prettyName() const override;
QString prettyStatus() const override;

2
src/modules/packagechooser/PackageChooserViewStep.h
View File

@ -29,7 +29,7 @@ class PLUGINDLLEXPORT PackageChooserViewStep : public Calamares::ViewStep
public:
explicit PackageChooserViewStep( QObject* parent = nullptr );
virtual ~PackageChooserViewStep() override;
~PackageChooserViewStep() override;
QString prettyName() const override;

2
src/modules/packagechooser/PackageModel.h
View File

@ -88,7 +88,7 @@ class PackageListModel : public QAbstractListModel
public:
PackageListModel( PackageList&& items, QObject* parent );
PackageListModel( QObject* parent );
virtual ~PackageListModel() override;
~PackageListModel() override;
/** @brief Add a package @p to the model
*

2
src/modules/partition/core/BootLoaderModel.cpp
View File

@ -40,7 +40,6 @@ BootLoaderModel::~BootLoaderModel() {}
void
BootLoaderModel::init( const QList< Device* >& devices )
{
cDebug() << "BLM::init with" << devices.count() << "devices" << rowCount() << "rows";
beginResetModel();
blockSignals( true );
@ -64,7 +63,6 @@ BootLoaderModel::createMbrItems()
void
BootLoaderModel::update()
{
cDebug() << "BLM::update holds" << m_devices.count() << "devices" << rowCount() << "rows";
beginResetModel();
blockSignals( true );
updateInternal();

122
src/modules/partition/core/PartitionLayout.cpp
View File

@ -164,22 +164,36 @@ PartitionLayout::execute( Device* dev,
const PartitionRole& role )
{
QList< Partition* > partList;
// Map each partition entry to its requested size (0 when calculated later)
QMap< const PartitionLayout::PartitionEntry *, qint64 > partSizeMap;
qint64 minSize, maxSize, end;
qint64 totalSize = lastSector - firstSector + 1;
qint64 availableSize = totalSize;
// TODO: Refine partition sizes to make sure there is room for every partition
// Use a default (200-500M ?) minimum size for partition without minSize
foreach ( const PartitionLayout::PartitionEntry& part, m_partLayout )
// Let's check if we have enough space for each partSize
for( const PartitionLayout::PartitionEntry& part : m_partLayout )
{
Partition* currentPartition = nullptr;
qint64 size = -1;
// Calculate partition size
if ( part.partSize.isValid() )
{
size = part.partSize.toSectors( totalSize, dev->logicalSize() );
// We need to ignore the percent-defined
if ( part.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent)
{
size = part.partSize.toSectors( totalSize, dev->logicalSize() );
}
else
{
if ( part.partMinSize.isValid() )
{
size = part.partMinSize.toSectors( totalSize, dev->logicalSize() );
}
else
{
size = 0;
}
}
}
else
{
@ -187,37 +201,81 @@ PartitionLayout::execute( Device* dev,
continue;
}
if ( part.partMinSize.isValid() )
{
minSize = part.partMinSize.toSectors( totalSize, dev->logicalSize() );
}
else
{
minSize = 0;
}
partSizeMap.insert (&part, size);
availableSize -= size;
}
if ( part.partMaxSize.isValid() )
// Use partMinSize and see if we can do better afterward.
if (availableSize < 0)
{
availableSize = totalSize;
for( const PartitionLayout::PartitionEntry& part : m_partLayout )
{
maxSize = part.partMaxSize.toSectors( totalSize, dev->logicalSize() );
}
else
{
maxSize = availableSize;
}
qint64 size;
// Make sure we never go under minSize once converted to sectors
if ( maxSize < minSize )
{
cWarning() << "Partition" << part.partMountPoint << "max size (" << maxSize << "sectors) is < min size ("
<< minSize << "sectors), using min size";
maxSize = minSize;
if ( part.partMinSize.isValid() )
{
size = part.partMinSize.toSectors( totalSize, dev->logicalSize() );
}
else if ( part.partSize.isValid() )
{
if ( part.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent)
{
size = part.partSize.toSectors( totalSize, dev->logicalSize() );
}
else
{
size = 0;
}
}
else
{
size = 0;
}
partSizeMap.insert (&part, size);
availableSize -= size;
}
}
// Assign size for percentage-defined partitions
for( const PartitionLayout::PartitionEntry& part : m_partLayout )
{
if ( part.partSize.unit() == CalamaresUtils::Partition::SizeUnit::Percent)
{
qint64 size = partSizeMap.value (&part);
size = part.partSize.toSectors( availableSize + size, dev->logicalSize() );
partSizeMap.insert (&part, size);
if ( part.partMinSize.isValid() )
{
qint64 minSize = part.partMinSize.toSectors( totalSize, dev->logicalSize() );
if (minSize > size)
{
size = minSize;
}
}
if ( part.partMaxSize.isValid() )
{
qint64 maxSize = part.partMaxSize.toSectors( totalSize, dev->logicalSize() );
if (maxSize < size)
{
size = maxSize;
}
}
}
}
availableSize = totalSize;
// TODO: Refine partition sizes to make sure there is room for every partition
// Use a default (200-500M ?) minimum size for partition without minSize
for( const PartitionLayout::PartitionEntry& part : m_partLayout )
{
qint64 size = partSizeMap.value (&part);
Partition* currentPartition = nullptr;
// Adjust partition size based on user-defined boundaries and available space
if ( size < minSize )
{
size = minSize;
}
if ( size > maxSize )
{
size = maxSize;

7
src/modules/partition/gui/ChoicePage.cpp
View File

@ -270,7 +270,12 @@ ChoicePage::setupChoices()
m_itemsLayout->addStretch();
connect( m_grp, QOverload< int, bool >::of( &QButtonGroup::buttonToggled ), this, [this]( int id, bool checked ) {
#if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) )
auto buttonSignal = QOverload< int, bool >::of( &QButtonGroup::buttonToggled );
#else
auto buttonSignal = &QButtonGroup::idToggled;
#endif
connect( m_grp, buttonSignal, this, [this]( int id, bool checked ) {
if ( checked ) // An action was picked.
{
m_choice = static_cast< InstallChoice >( id );

2
src/modules/partition/gui/PartitionBarsView.h
View File

@ -34,7 +34,7 @@ public:
};
explicit PartitionBarsView( QWidget* parent = nullptr );
virtual ~PartitionBarsView() override;
~PartitionBarsView() override;
void setNestedPartitionsMode( NestedPartitionsMode mode );

2
src/modules/partition/gui/PartitionLabelsView.h
View File

@ -28,7 +28,7 @@ class PartitionLabelsView : public QAbstractItemView
Q_OBJECT
public:
explicit PartitionLabelsView( QWidget* parent = nullptr );
virtual ~PartitionLabelsView() override;
~PartitionLabelsView() override;
QSize minimumSizeHint() const override;

2
src/modules/partition/gui/PartitionViewStep.h
View File

@ -40,7 +40,7 @@ class PLUGINDLLEXPORT PartitionViewStep : public Calamares::ViewStep
public:
explicit PartitionViewStep( QObject* parent = nullptr );
virtual ~PartitionViewStep() override;
~PartitionViewStep() override;
QString prettyName() const override;
QWidget* createSummaryWidget() const override;

2
src/modules/partition/tests/PartitionJobTests.h
View File

@ -27,7 +27,7 @@ class QueueRunner : public QObject
{
public:
QueueRunner( Calamares::JobQueue* queue );
virtual ~QueueRunner() override;
~QueueRunner() override;
/**
* Synchronously runs the queue. Returns true on success

2
src/modules/plasmalnf/PlasmaLnfJob.h
View File

@ -21,7 +21,7 @@ class PlasmaLnfJob : public Calamares::Job
public:
explicit PlasmaLnfJob( const QString& lnfPath, const QString& id );
virtual ~PlasmaLnfJob() override;
~PlasmaLnfJob() override;
QString prettyName() const override;
QString prettyStatusMessage() const override;

2
src/modules/plasmalnf/PlasmaLnfViewStep.h
View File

@ -26,7 +26,7 @@ class PLUGINDLLEXPORT PlasmaLnfViewStep : public Calamares::ViewStep
public:
explicit PlasmaLnfViewStep( QObject* parent = nullptr );
virtual ~PlasmaLnfViewStep() override;
~PlasmaLnfViewStep() override;
QString prettyName() const override;

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