Merge branch 'calamares' into issues-1166

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

View File

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

View File

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

View File

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

View File

@ -1955,7 +1955,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="37"/> <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> <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 ya cari mövqeyinizə əsaslanan standart bir bölgəni seçin.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="94"/> <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> <message>
<location filename="../src/modules/localeq/Offline.qml" line="111"/> <location filename="../src/modules/localeq/Offline.qml" line="111"/>
<source>Select your preferred Zone within your Region.</source> <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>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="182"/> <location filename="../src/modules/localeq/Offline.qml" line="182"/>
<source>Zones</source> <source>Zones</source>
<translation type="unfinished"/> <translation>Zonalar</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="229"/> <location filename="../src/modules/localeq/Offline.qml" line="229"/>
<source>You can fine-tune Language and Locale settings below.</source> <source>You can fine-tune Language and Locale settings below.</source>
<translation type="unfinished"/> <translation>Dil Yer ayarlarını aşağıda dəqiq tənzimləyə bilərsiniz.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3799,7 +3799,16 @@ Output:
development is sponsored by &lt;br/&gt; development is sponsored by &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; - &lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</source> 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>
<message> <message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/> <location filename="../src/modules/welcomeq/about.qml" line="96"/>
@ -3849,7 +3858,7 @@ Output:
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/> <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> <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 variantını seçmək üçün üstünlük verdiyiniz klaviatura modelini seçin ya avadanlıq tərəfindən aşkar edilən klaviaturaya əsaslanan standart birini seçin.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -3864,7 +3873,7 @@ Output:
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
<source>Keyboard Variant</source> <source>Keyboard Variant</source>
<translation type="unfinished"/> <translation>Klaviatura variantı</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@ -3948,7 +3957,7 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/> <location filename="../src/modules/usersq/usersq.qml" line="36"/>
<source>Pick your user name and credentials to login and perform admin tasks</source> <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 sistemə giriş üçün istifadəçi adını istifadəçi hesabı məlumatlarını daxil edin</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="52"/> <location filename="../src/modules/usersq/usersq.qml" line="52"/>
@ -3968,12 +3977,12 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/> <location filename="../src/modules/usersq/usersq.qml" line="87"/>
<source>Login Name</source> <source>Login Name</source>
<translation type="unfinished"/> <translation>Giriş Adı</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="103"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/> <location filename="../src/modules/usersq/usersq.qml" line="118"/>
@ -3988,7 +3997,7 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="140"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/> <location filename="../src/modules/usersq/usersq.qml" line="155"/>
@ -4008,27 +4017,27 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/> <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> <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 durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı müntəzəm olaraq dəyişdirilməlidir.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/> <location filename="../src/modules/usersq/usersq.qml" line="216"/>
<source>Validate passwords quality</source> <source>Validate passwords quality</source>
<translation type="unfinished"/> <translation>Şifrənin keyfiyyətini yoxlamaq</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/> <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> <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 siz zəif şifrədən istifadə edə bilməyəcəksiniz..</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/> <location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Log in automatically without asking for the password</source> <source>Log in automatically without asking for the password</source>
<translation type="unfinished"/> <translation>Şifrə soruşmadan sistemə daxil olmaq</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="243"/> <location filename="../src/modules/usersq/usersq.qml" line="243"/>
<source>Reuse user password as root password</source> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="253"/> <location filename="../src/modules/usersq/usersq.qml" line="253"/>
@ -4038,22 +4047,22 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="268"/> <location filename="../src/modules/usersq/usersq.qml" line="268"/>
<source>Choose a root password to keep your account safe.</source> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="279"/> <location filename="../src/modules/usersq/usersq.qml" line="279"/>
<source>Root Password</source> <source>Root Password</source>
<translation type="unfinished"/> <translation>Kök Şifrəsi</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="298"/> <location filename="../src/modules/usersq/usersq.qml" line="298"/>
<source>Repeat Root Password</source> <source>Repeat Root Password</source>
<translation type="unfinished"/> <translation>Kök Şifrəsini təkrar yazın</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/> <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> <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> </message>
</context> </context>
<context> <context>

View File

@ -6,7 +6,7 @@
<message> <message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="61"/> <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> <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;ı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;ı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>
<message> <message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="71"/> <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="71"/>
@ -65,12 +65,12 @@
<message> <message>
<location filename="../src/calamares/DebugWindow.ui" line="28"/> <location filename="../src/calamares/DebugWindow.ui" line="28"/>
<source>GlobalStorage</source> <source>GlobalStorage</source>
<translation>Ümumi yaddaş</translation> <translation>ÜmumiYaddaş</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/DebugWindow.ui" line="38"/> <location filename="../src/calamares/DebugWindow.ui" line="38"/>
<source>JobQueue</source> <source>JobQueue</source>
<translation>Tapşırıq sırası</translation> <translation>TapşırıqSırası</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/DebugWindow.ui" line="48"/> <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> <message>
<location filename="../src/modules/localeq/Offline.qml" line="37"/> <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> <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 ya cari mövqeyinizə əsaslanan standart bir bölgəni seçin.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="94"/> <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> <message>
<location filename="../src/modules/localeq/Offline.qml" line="111"/> <location filename="../src/modules/localeq/Offline.qml" line="111"/>
<source>Select your preferred Zone within your Region.</source> <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>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="182"/> <location filename="../src/modules/localeq/Offline.qml" line="182"/>
<source>Zones</source> <source>Zones</source>
<translation type="unfinished"/> <translation>Zonalar</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="229"/> <location filename="../src/modules/localeq/Offline.qml" line="229"/>
<source>You can fine-tune Language and Locale settings below.</source> <source>You can fine-tune Language and Locale settings below.</source>
<translation type="unfinished"/> <translation>Dil Yer ayarlarını aşağıda dəqiq tənzimləyə bilərsiniz.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3799,7 +3799,16 @@ Output:
development is sponsored by &lt;br/&gt; development is sponsored by &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; - &lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</source> 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>
<message> <message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/> <location filename="../src/modules/welcomeq/about.qml" line="96"/>
@ -3849,7 +3858,7 @@ Output:
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/> <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> <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 variantını seçmək üçün üstünlük verdiyiniz klaviatura modelini seçin ya avadanlıq tərəfindən aşkar edilən klaviaturaya əsaslanan standart birini seçin.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -3864,7 +3873,7 @@ Output:
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
<source>Keyboard Variant</source> <source>Keyboard Variant</source>
<translation type="unfinished"/> <translation>Klaviatura variantı</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@ -3948,7 +3957,7 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/> <location filename="../src/modules/usersq/usersq.qml" line="36"/>
<source>Pick your user name and credentials to login and perform admin tasks</source> <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 sistemə giriş üçün istifadəçi adını istifadəçi hesabı məlumatlarını daxil edin</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="52"/> <location filename="../src/modules/usersq/usersq.qml" line="52"/>
@ -3968,12 +3977,12 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/> <location filename="../src/modules/usersq/usersq.qml" line="87"/>
<source>Login Name</source> <source>Login Name</source>
<translation type="unfinished"/> <translation>Giriş Adı</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="103"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/> <location filename="../src/modules/usersq/usersq.qml" line="118"/>
@ -3988,7 +3997,7 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="140"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/> <location filename="../src/modules/usersq/usersq.qml" line="155"/>
@ -4008,27 +4017,27 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/> <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> <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 durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı müntəzəm olaraq dəyişdirilməlidir.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/> <location filename="../src/modules/usersq/usersq.qml" line="216"/>
<source>Validate passwords quality</source> <source>Validate passwords quality</source>
<translation type="unfinished"/> <translation>Şifrənin keyfiyyətini yoxlamaq</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/> <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> <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 siz zəif şifrədən istifadə edə bilməyəcəksiniz..</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/> <location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Log in automatically without asking for the password</source> <source>Log in automatically without asking for the password</source>
<translation type="unfinished"/> <translation>Şifrə soruşmadan sistemə daxil olmaq</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="243"/> <location filename="../src/modules/usersq/usersq.qml" line="243"/>
<source>Reuse user password as root password</source> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="253"/> <location filename="../src/modules/usersq/usersq.qml" line="253"/>
@ -4038,22 +4047,22 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="268"/> <location filename="../src/modules/usersq/usersq.qml" line="268"/>
<source>Choose a root password to keep your account safe.</source> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="279"/> <location filename="../src/modules/usersq/usersq.qml" line="279"/>
<source>Root Password</source> <source>Root Password</source>
<translation type="unfinished"/> <translation>Kök Şifrəsi</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="298"/> <location filename="../src/modules/usersq/usersq.qml" line="298"/>
<source>Repeat Root Password</source> <source>Repeat Root Password</source>
<translation type="unfinished"/> <translation>Kök Şifrəsini təkrar yazın</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/> <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> <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> </message>
</context> </context>
<context> <context>

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> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="124"/> <location filename="../src/modules/users/page_usersetup.ui" line="124"/>
<source>What name do you want to use to log in?</source> <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>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="148"/> <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> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="325"/> <location filename="../src/modules/users/page_usersetup.ui" line="325"/>
<source>Choose a password to keep your account safe.</source> <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>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="349"/> <location filename="../src/modules/users/page_usersetup.ui" line="349"/>
<location filename="../src/modules/users/page_usersetup.ui" line="374"/> <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> <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>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="355"/> <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="519"/>
<location filename="../src/modules/users/page_usersetup.ui" line="544"/> <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> <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> </message>
</context> </context>
<context> <context>
@ -3973,7 +3973,7 @@ La configuració pot continuar, però algunes característiques podrien estar in
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="80"/> <location filename="../src/modules/usersq/usersq.qml" line="80"/>
<source>What name do you want to use to log in?</source> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/> <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> <message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/> <location filename="../src/modules/usersq/usersq.qml" line="155"/>
<source>Choose a password to keep your account safe.</source> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="166"/> <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> <message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/> <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> <message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/> <location filename="../src/modules/usersq/usersq.qml" line="234"/>

View File

@ -722,12 +722,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message> <message>
<location filename="../src/modules/locale/Config.cpp" line="372"/> <location filename="../src/modules/locale/Config.cpp" line="372"/>
<source>The system language will be set to %1.</source> <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>
<message> <message>
<location filename="../src/modules/locale/Config.cpp" line="379"/> <location filename="../src/modules/locale/Config.cpp" line="379"/>
<source>The numbers and dates locale will be set to %1.</source> <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>
<message> <message>
<location filename="../src/modules/netinstall/Config.cpp" line="38"/> <location filename="../src/modules/netinstall/Config.cpp" line="38"/>
@ -1548,12 +1548,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message> <message>
<location filename="../src/modules/keyboard/KeyboardPage.cpp" line="206"/> <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="206"/>
<source>Set keyboard model to %1.&lt;br/&gt;</source> <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>
<message> <message>
<location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/> <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source> <source>Set keyboard layout to %1/%2.</source>
<translation>Sæt tastaturlayout til %1/%2.</translation> <translation>Indstil tastaturlayout til %1/%2.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1711,7 +1711,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message> <message>
<location filename="../src/modules/locale/LocalePage.cpp" line="124"/> <location filename="../src/modules/locale/LocalePage.cpp" line="124"/>
<source>Region:</source> <source>Region:</source>
<translation>Region:</translation> <translation>Område:</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/locale/LocalePage.cpp" line="125"/> <location filename="../src/modules/locale/LocalePage.cpp" line="125"/>
@ -1955,7 +1955,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="37"/> <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> <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>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="94"/> <location filename="../src/modules/localeq/Offline.qml" line="94"/>
@ -1967,17 +1967,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="111"/> <location filename="../src/modules/localeq/Offline.qml" line="111"/>
<source>Select your preferred Zone within your Region.</source> <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>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="182"/> <location filename="../src/modules/localeq/Offline.qml" line="182"/>
<source>Zones</source> <source>Zones</source>
<translation type="unfinished"/> <translation>Zoner</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="229"/> <location filename="../src/modules/localeq/Offline.qml" line="229"/>
<source>You can fine-tune Language and Locale settings below.</source> <source>You can fine-tune Language and Locale settings below.</source>
<translation type="unfinished"/> <translation>Du kan finjustere sprog- og lokalitetsindstillinger nedenfor.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3215,7 +3215,7 @@ setting
<message> <message>
<location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="53"/> <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="53"/>
<source>Set keyboard model to %1, layout to %2-%3</source> <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>
<message> <message>
<location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="345"/> <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="345"/>
@ -3371,7 +3371,7 @@ setting
<message> <message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="34"/> <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="34"/>
<source>Set timezone to %1/%2</source> <source>Set timezone to %1/%2</source>
<translation>Sæt tidszone til %1/%2</translation> <translation>Indstil tidszone til %1/%2</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="62"/> <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="79"/>
<location filename="../src/modules/welcome/WelcomePage.ui" line="98"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="98"/>
<source>Select application and system language</source> <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>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="140"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
@ -3800,7 +3800,17 @@ setting
development is sponsored by &lt;br/&gt; development is sponsored by &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; - &lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</source> 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>
<message> <message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/> <location filename="../src/modules/welcomeq/about.qml" line="96"/>
@ -3850,7 +3860,7 @@ setting
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/> <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> <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 din foretrukne tastaturmodel for at vælge layout og variant, eller brug den som er standard i det registrerede hardware</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -3865,7 +3875,7 @@ setting
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
<source>Keyboard Variant</source> <source>Keyboard Variant</source>
<translation type="unfinished"/> <translation>Tastaturvariant</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@ -3949,7 +3959,7 @@ setting
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/> <location filename="../src/modules/usersq/usersq.qml" line="36"/>
<source>Pick your user name and credentials to login and perform admin tasks</source> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="52"/> <location filename="../src/modules/usersq/usersq.qml" line="52"/>
@ -3969,12 +3979,12 @@ setting
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/> <location filename="../src/modules/usersq/usersq.qml" line="87"/>
<source>Login Name</source> <source>Login Name</source>
<translation type="unfinished"/> <translation>Loginnavn</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="103"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/> <location filename="../src/modules/usersq/usersq.qml" line="118"/>
@ -3989,7 +3999,7 @@ setting
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="140"/> <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> <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 et netværk.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/> <location filename="../src/modules/usersq/usersq.qml" line="155"/>
@ -4009,27 +4019,27 @@ setting
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/> <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> <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, 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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/> <location filename="../src/modules/usersq/usersq.qml" line="216"/>
<source>Validate passwords quality</source> <source>Validate passwords quality</source>
<translation type="unfinished"/> <translation>Validér kvaliteten af adgangskoderne</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/> <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> <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, foretages der tjek af adgangskodens styrke og du vil ikke være i stand til at bruge en svag adgangskode..</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/> <location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Log in automatically without asking for the password</source> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="243"/> <location filename="../src/modules/usersq/usersq.qml" line="243"/>
<source>Reuse user password as root password</source> <source>Reuse user password as root password</source>
<translation type="unfinished"/> <translation>Genbrug brugeradgangskode som root-adgangskode</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="253"/> <location filename="../src/modules/usersq/usersq.qml" line="253"/>
@ -4039,22 +4049,22 @@ setting
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="268"/> <location filename="../src/modules/usersq/usersq.qml" line="268"/>
<source>Choose a root password to keep your account safe.</source> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="279"/> <location filename="../src/modules/usersq/usersq.qml" line="279"/>
<source>Root Password</source> <source>Root Password</source>
<translation type="unfinished"/> <translation>Root-adgangskode</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="298"/> <location filename="../src/modules/usersq/usersq.qml" line="298"/>
<source>Repeat Root Password</source> <source>Repeat Root Password</source>
<translation type="unfinished"/> <translation>Gentag root-adgangskode</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/> <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> <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, det kan blive tjekket for skrivefejl.</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@ -1977,7 +1977,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="229"/> <location filename="../src/modules/localeq/Offline.qml" line="229"/>
<source>You can fine-tune Language and Locale settings below.</source> <source>You can fine-tune Language and Locale settings below.</source>
<translation type="unfinished"/> <translation> ि ििि ि </translation>
</message> </message>
</context> </context>
<context> <context>
@ -3798,7 +3798,18 @@ Output:
development is sponsored by &lt;br/&gt; development is sponsored by &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; - &lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</source> 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>
<message> <message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/> <location filename="../src/modules/welcomeq/about.qml" line="96"/>
@ -3848,7 +3859,7 @@ Output:
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/> <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> <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>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -3947,7 +3958,7 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/> <location filename="../src/modules/usersq/usersq.qml" line="36"/>
<source>Pick your user name and credentials to login and perform admin tasks</source> <source>Pick your user name and credentials to login and perform admin tasks</source>
<translation type="unfinished"/> <translation>ि ि </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="52"/> <location filename="../src/modules/usersq/usersq.qml" line="52"/>
@ -3972,7 +3983,7 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="103"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/> <location filename="../src/modules/usersq/usersq.qml" line="118"/>
@ -3987,7 +3998,7 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="140"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/> <location filename="../src/modules/usersq/usersq.qml" line="155"/>
@ -4007,27 +4018,27 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/> <location filename="../src/modules/usersq/usersq.qml" line="216"/>
<source>Validate passwords quality</source> <source>Validate passwords quality</source>
<translation type="unfinished"/> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/> <location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Log in automatically without asking for the password</source> <source>Log in automatically without asking for the password</source>
<translation type="unfinished"/> <translation> ि </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="243"/> <location filename="../src/modules/usersq/usersq.qml" line="243"/>
<source>Reuse user password as root password</source> <source>Reuse user password as root password</source>
<translation type="unfinished"/> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="253"/> <location filename="../src/modules/usersq/usersq.qml" line="253"/>
@ -4037,22 +4048,22 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="268"/> <location filename="../src/modules/usersq/usersq.qml" line="268"/>
<source>Choose a root password to keep your account safe.</source> <source>Choose a root password to keep your account safe.</source>
<translation type="unfinished"/> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="279"/> <location filename="../src/modules/usersq/usersq.qml" line="279"/>
<source>Root Password</source> <source>Root Password</source>
<translation type="unfinished"/> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="298"/> <location filename="../src/modules/usersq/usersq.qml" line="298"/>
<source>Repeat Root Password</source> <source>Repeat Root Password</source>
<translation type="unfinished"/> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/> <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> <source>Enter the same password twice, so that it can be checked for typing errors.</source>
<translation type="unfinished"/> <translation> , ि ि ि </translation>
</message> </message>
</context> </context>
<context> <context>

View File

@ -694,7 +694,7 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<message> <message>
<location filename="../src/libcalamares/utils/CommandList.cpp" line="143"/> <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> <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>
<message> <message>
<location filename="../src/libcalamares/utils/CommandList.cpp" line="156"/> <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> <message>
<location filename="../src/modules/localeq/Offline.qml" line="37"/> <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> <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>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="94"/> <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> <message>
<location filename="../src/modules/localeq/Offline.qml" line="111"/> <location filename="../src/modules/localeq/Offline.qml" line="111"/>
<source>Select your preferred Zone within your Region.</source> <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>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="182"/> <location filename="../src/modules/localeq/Offline.qml" line="182"/>
<source>Zones</source> <source>Zones</source>
<translation type="unfinished"/> <translation>Zonas</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="229"/> <location filename="../src/modules/localeq/Offline.qml" line="229"/>
<source>You can fine-tune Language and Locale settings below.</source> <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> </message>
</context> </context>
<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="349"/>
<location filename="../src/modules/users/page_usersetup.ui" line="374"/> <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> <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>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="355"/> <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> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="455"/> <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> <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>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="458"/> <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="519"/>
<location filename="../src/modules/users/page_usersetup.ui" line="544"/> <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> <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> </message>
</context> </context>
<context> <context>
@ -3798,7 +3798,18 @@ Saída:
development is sponsored by &lt;br/&gt; development is sponsored by &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; - &lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</source> 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>
<message> <message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/> <location filename="../src/modules/welcomeq/about.qml" line="96"/>
@ -3848,7 +3859,7 @@ Saída:
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/> <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> <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>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -3863,7 +3874,7 @@ Saída:
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
<source>Keyboard Variant</source> <source>Keyboard Variant</source>
<translation type="unfinished"/> <translation>Variante do Teclado</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@ -3947,7 +3958,7 @@ Saída:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/> <location filename="../src/modules/usersq/usersq.qml" line="36"/>
<source>Pick your user name and credentials to login and perform admin tasks</source> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="52"/> <location filename="../src/modules/usersq/usersq.qml" line="52"/>
@ -3967,12 +3978,12 @@ Saída:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/> <location filename="../src/modules/usersq/usersq.qml" line="87"/>
<source>Login Name</source> <source>Login Name</source>
<translation type="unfinished"/> <translation>Nome do Login</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="103"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/> <location filename="../src/modules/usersq/usersq.qml" line="118"/>
@ -3987,7 +3998,7 @@ Saída:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="140"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/> <location filename="../src/modules/usersq/usersq.qml" line="155"/>
@ -4007,27 +4018,27 @@ Saída:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/> <location filename="../src/modules/usersq/usersq.qml" line="216"/>
<source>Validate passwords quality</source> <source>Validate passwords quality</source>
<translation type="unfinished"/> <translation>Validar qualidade das senhas</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/> <location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Log in automatically without asking for the password</source> <source>Log in automatically without asking for the password</source>
<translation type="unfinished"/> <translation>Entrar automaticamente sem perguntar pela senha</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="243"/> <location filename="../src/modules/usersq/usersq.qml" line="243"/>
<source>Reuse user password as root password</source> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="253"/> <location filename="../src/modules/usersq/usersq.qml" line="253"/>
@ -4037,22 +4048,22 @@ Saída:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="268"/> <location filename="../src/modules/usersq/usersq.qml" line="268"/>
<source>Choose a root password to keep your account safe.</source> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="279"/> <location filename="../src/modules/usersq/usersq.qml" line="279"/>
<source>Root Password</source> <source>Root Password</source>
<translation type="unfinished"/> <translation>Senha de Root</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="298"/> <location filename="../src/modules/usersq/usersq.qml" line="298"/>
<source>Repeat Root Password</source> <source>Repeat Root Password</source>
<translation type="unfinished"/> <translation>Repita a Senha de Root</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/> <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> <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> </message>
</context> </context>
<context> <context>

View File

@ -1956,7 +1956,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="37"/> <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> <source>Select your preferred Region, or use the default one based on your current location.</source>
<translation type="unfinished"/> <translation>Минтақаи пазируфтаи худро интихоб намоед ё минтақаи стандартиро дар асоси ҷойгиршавии ҷории худ истифода баред.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="94"/> <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> <message>
<location filename="../src/modules/localeq/Offline.qml" line="111"/> <location filename="../src/modules/localeq/Offline.qml" line="111"/>
<source>Select your preferred Zone within your Region.</source> <source>Select your preferred Zone within your Region.</source>
<translation type="unfinished"/> <translation>Шаҳри пазируфтаи худро дар ҳудуди минтақаи худ интихоб намоед.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="182"/> <location filename="../src/modules/localeq/Offline.qml" line="182"/>
<source>Zones</source> <source>Zones</source>
<translation type="unfinished"/> <translation>Шаҳрҳо</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="229"/> <location filename="../src/modules/localeq/Offline.qml" line="229"/>
<source>You can fine-tune Language and Locale settings below.</source> <source>You can fine-tune Language and Locale settings below.</source>
<translation type="unfinished"/> <translation>Шумо метавонед танзимоти забон ва маҳаллисозиро дар зер дуруст кунед.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3799,7 +3799,17 @@ Output:
development is sponsored by &lt;br/&gt; development is sponsored by &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; - &lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</source> 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>
<message> <message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/> <location filename="../src/modules/welcomeq/about.qml" line="96"/>
@ -3849,7 +3859,7 @@ Output:
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/> <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> <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>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -3864,7 +3874,7 @@ Output:
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
<source>Keyboard Variant</source> <source>Keyboard Variant</source>
<translation type="unfinished"/> <translation>Вариантҳои клавиатура</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@ -3948,7 +3958,7 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/> <location filename="../src/modules/usersq/usersq.qml" line="36"/>
<source>Pick your user name and credentials to login and perform admin tasks</source> <source>Pick your user name and credentials to login and perform admin tasks</source>
<translation type="unfinished"/> <translation>Барои ворид шудан ба низом ва иҷро кардани вазифаҳои маъмурӣ, номи корбар ва маълумоти корбариро муайян кунед.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="52"/> <location filename="../src/modules/usersq/usersq.qml" line="52"/>
@ -3968,12 +3978,12 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/> <location filename="../src/modules/usersq/usersq.qml" line="87"/>
<source>Login Name</source> <source>Login Name</source>
<translation type="unfinished"/> <translation>Номи корбар</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="103"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/> <location filename="../src/modules/usersq/usersq.qml" line="118"/>
@ -3988,7 +3998,7 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="140"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/> <location filename="../src/modules/usersq/usersq.qml" line="155"/>
@ -4008,27 +4018,27 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/> <location filename="../src/modules/usersq/usersq.qml" line="216"/>
<source>Validate passwords quality</source> <source>Validate passwords quality</source>
<translation type="unfinished"/> <translation>Санҷиши сифати ниҳонвожаҳо</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/> <location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Log in automatically without asking for the password</source> <source>Log in automatically without asking for the password</source>
<translation type="unfinished"/> <translation>Ба таври худкор бе дархости ниҳонвожа ворид карда шавад</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="243"/> <location filename="../src/modules/usersq/usersq.qml" line="243"/>
<source>Reuse user password as root password</source> <source>Reuse user password as root password</source>
<translation type="unfinished"/> <translation>Ниҳонвожаи корбар ҳам барои ниҳонвожаи root истифода карда шавад</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="253"/> <location filename="../src/modules/usersq/usersq.qml" line="253"/>
@ -4038,22 +4048,22 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="268"/> <location filename="../src/modules/usersq/usersq.qml" line="268"/>
<source>Choose a root password to keep your account safe.</source> <source>Choose a root password to keep your account safe.</source>
<translation type="unfinished"/> <translation>Барои эмин нигоҳ доштани ҳисоби худ ниҳонвожаи root-ро интихоб намоед.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="279"/> <location filename="../src/modules/usersq/usersq.qml" line="279"/>
<source>Root Password</source> <source>Root Password</source>
<translation type="unfinished"/> <translation>Ниҳонвожаи root</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="298"/> <location filename="../src/modules/usersq/usersq.qml" line="298"/>
<source>Repeat Root Password</source> <source>Repeat Root Password</source>
<translation type="unfinished"/> <translation>Ниҳонвожаи root-ро тасдиқ намоед</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/> <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> <source>Enter the same password twice, so that it can be checked for typing errors.</source>
<translation type="unfinished"/> <translation>Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад.</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@ -716,7 +716,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/locale/Config.cpp" line="334"/> <location filename="../src/modules/locale/Config.cpp" line="334"/>
<source>Set timezone to %1/%2.</source> <source>Set timezone to %1/%2.</source>
<translation type="unfinished"/> <translation> %1/%2 </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/locale/Config.cpp" line="372"/> <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> <message>
<location filename="../src/modules/welcome/Config.cpp" line="244"/> <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> <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>
<message> <message>
<location filename="../src/modules/welcome/Config.cpp" line="245"/> <location filename="../src/modules/welcome/Config.cpp" line="245"/>
<source>&lt;h1&gt;Welcome to %1 setup&lt;/h1&gt;</source> <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>
<message> <message>
<location filename="../src/modules/welcome/Config.cpp" line="250"/> <location filename="../src/modules/welcome/Config.cpp" line="250"/>
<source>&lt;h1&gt;Welcome to the Calamares installer for %1&lt;/h1&gt;</source> <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>
<message> <message>
<location filename="../src/modules/welcome/Config.cpp" line="251"/> <location filename="../src/modules/welcome/Config.cpp" line="251"/>
<source>&lt;h1&gt;Welcome to the %1 installer&lt;/h1&gt;</source> <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>
<message> <message>
<location filename="../src/modules/users/Config.cpp" line="164"/> <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> <message>
<location filename="../src/modules/users/Config.cpp" line="170"/> <location filename="../src/modules/users/Config.cpp" line="170"/>
<source>'%1' is not allowed as username.</source> <source>'%1' is not allowed as username.</source>
<translation type="unfinished"/> <translation>'%1' </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/Config.cpp" line="177"/> <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> <message>
<location filename="../src/modules/users/Config.cpp" line="237"/> <location filename="../src/modules/users/Config.cpp" line="237"/>
<source>'%1' is not allowed as hostname.</source> <source>'%1' is not allowed as hostname.</source>
<translation type="unfinished"/> <translation>'%1' </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/Config.cpp" line="243"/> <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> <message>
<location filename="../src/modules/localeq/Map.qml" line="243"/> <location filename="../src/modules/localeq/Map.qml" line="243"/>
<source>Timezone: %1</source> <source>Timezone: %1</source>
<translation type="unfinished"/> <translation>: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/localeq/Map.qml" line="264"/> <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 <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 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> to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming.</source>
<translation type="unfinished"/> <translation>
+/- /使</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1955,29 +1957,29 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="37"/> <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> <source>Select your preferred Region, or use the default one based on your current location.</source>
<translation type="unfinished"/> <translation>使</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="94"/> <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="169"/>
<location filename="../src/modules/localeq/Offline.qml" line="213"/> <location filename="../src/modules/localeq/Offline.qml" line="213"/>
<source>Timezone: %1</source> <source>Timezone: %1</source>
<translation type="unfinished"/> <translation>: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="111"/> <location filename="../src/modules/localeq/Offline.qml" line="111"/>
<source>Select your preferred Zone within your Region.</source> <source>Select your preferred Zone within your Region.</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="182"/> <location filename="../src/modules/localeq/Offline.qml" line="182"/>
<source>Zones</source> <source>Zones</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/modules/localeq/Offline.qml" line="229"/> <location filename="../src/modules/localeq/Offline.qml" line="229"/>
<source>You can fine-tune Language and Locale settings below.</source> <source>You can fine-tune Language and Locale settings below.</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
</context> </context>
<context> <context>
@ -2882,7 +2884,8 @@ Output:
<location filename="../src/modules/welcomeq/Recommended.qml" line="40"/> <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; <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> 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> </message>
</context> </context>
<context> <context>
@ -2993,13 +2996,15 @@ Output:
<location filename="../src/modules/welcomeq/Requirements.qml" line="38"/> <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; <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> Installation cannot continue.&lt;/p&gt;</source>
<translation type="unfinished"/> <translation>&lt;p&gt; %1 &lt;br/&gt;
&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/Requirements.qml" line="40"/> <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; <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> 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> </message>
</context> </context>
<context> <context>
@ -3467,28 +3472,28 @@ Output:
<message> <message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="122"/> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="122"/>
<source>KDE user feedback</source> <source>KDE user feedback</source>
<translation type="unfinished"/> <translation>KDE </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="128"/> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="128"/>
<source>Configuring KDE user feedback.</source> <source>Configuring KDE user feedback.</source>
<translation type="unfinished"/> <translation> KDE </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="150"/> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="150"/>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="156"/> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="156"/>
<source>Error in KDE user feedback configuration.</source> <source>Error in KDE user feedback configuration.</source>
<translation type="unfinished"/> <translation>KDE </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="151"/> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="151"/>
<source>Could not configure KDE user feedback correctly, script error %1.</source> <source>Could not configure KDE user feedback correctly, script error %1.</source>
<translation type="unfinished"/> <translation> KDE %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="157"/> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="157"/>
<source>Could not configure KDE user feedback correctly, Calamares error %1.</source> <source>Could not configure KDE user feedback correctly, Calamares error %1.</source>
<translation type="unfinished"/> <translation> KDE Calamares %1</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3550,17 +3555,17 @@ Output:
<message> <message>
<location filename="../src/modules/tracking/TrackingPage.cpp" line="91"/> <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> <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>
<message> <message>
<location filename="../src/modules/tracking/TrackingPage.cpp" line="94"/> <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> <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>
<message> <message>
<location filename="../src/modules/tracking/TrackingPage.cpp" line="98"/> <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> <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> </message>
</context> </context>
<context> <context>
@ -3797,7 +3802,18 @@ Output:
development is sponsored by &lt;br/&gt; development is sponsored by &lt;br/&gt;
&lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; - &lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
Liberating Software.</source> 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>
<message> <message>
<location filename="../src/modules/welcomeq/about.qml" line="96"/> <location filename="../src/modules/welcomeq/about.qml" line="96"/>
@ -3811,13 +3827,15 @@ Output:
<location filename="../src/modules/localeq/i18n.qml" line="46"/> <location filename="../src/modules/localeq/i18n.qml" line="46"/>
<source>&lt;h1&gt;Languages&lt;/h1&gt; &lt;/br&gt; <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> 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>
<message> <message>
<location filename="../src/modules/localeq/i18n.qml" line="106"/> <location filename="../src/modules/localeq/i18n.qml" line="106"/>
<source>&lt;h1&gt;Locales&lt;/h1&gt; &lt;/br&gt; <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> 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>
<message> <message>
<location filename="../src/modules/localeq/i18n.qml" line="158"/> <location filename="../src/modules/localeq/i18n.qml" line="158"/>
@ -3845,7 +3863,7 @@ Output:
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/> <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> <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>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@ -3860,7 +3878,7 @@ Output:
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
<source>Keyboard Variant</source> <source>Keyboard Variant</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@ -3873,7 +3891,7 @@ Output:
<message> <message>
<location filename="../src/modules/localeq/localeq.qml" line="81"/> <location filename="../src/modules/localeq/localeq.qml" line="81"/>
<source>Change</source> <source>Change</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
</context> </context>
<context> <context>
@ -3945,7 +3963,7 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="36"/> <location filename="../src/modules/usersq/usersq.qml" line="36"/>
<source>Pick your user name and credentials to login and perform admin tasks</source> <source>Pick your user name and credentials to login and perform admin tasks</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="52"/> <location filename="../src/modules/usersq/usersq.qml" line="52"/>
@ -3965,12 +3983,12 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/> <location filename="../src/modules/usersq/usersq.qml" line="87"/>
<source>Login Name</source> <source>Login Name</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="103"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="118"/> <location filename="../src/modules/usersq/usersq.qml" line="118"/>
@ -3985,7 +4003,7 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="140"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="155"/> <location filename="../src/modules/usersq/usersq.qml" line="155"/>
@ -4005,27 +4023,27 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="204"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="216"/> <location filename="../src/modules/usersq/usersq.qml" line="216"/>
<source>Validate passwords quality</source> <source>Validate passwords quality</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="226"/> <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> <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>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="234"/> <location filename="../src/modules/usersq/usersq.qml" line="234"/>
<source>Log in automatically without asking for the password</source> <source>Log in automatically without asking for the password</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="243"/> <location filename="../src/modules/usersq/usersq.qml" line="243"/>
<source>Reuse user password as root password</source> <source>Reuse user password as root password</source>
<translation type="unfinished"/> <translation> root </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="253"/> <location filename="../src/modules/usersq/usersq.qml" line="253"/>
@ -4035,22 +4053,22 @@ Output:
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="268"/> <location filename="../src/modules/usersq/usersq.qml" line="268"/>
<source>Choose a root password to keep your account safe.</source> <source>Choose a root password to keep your account safe.</source>
<translation type="unfinished"/> <translation> root </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="279"/> <location filename="../src/modules/usersq/usersq.qml" line="279"/>
<source>Root Password</source> <source>Root Password</source>
<translation type="unfinished"/> <translation>Root </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="298"/> <location filename="../src/modules/usersq/usersq.qml" line="298"/>
<source>Repeat Root Password</source> <source>Repeat Root Password</source>
<translation type="unfinished"/> <translation> Root </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/> <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> <source>Enter the same password twice, so that it can be checked for typing errors.</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
</context> </context>
<context> <context>

View File

@ -320,11 +320,11 @@ msgstr "Aparat saatını ayarlamaq."
#: src/modules/mkinitfs/main.py:27 #: src/modules/mkinitfs/main.py:27
msgid "Creating initramfs with mkinitfs." msgid "Creating initramfs with mkinitfs."
msgstr "" msgstr "mkinitfs ilə initramfs yaradılır"
#: src/modules/mkinitfs/main.py:49 #: src/modules/mkinitfs/main.py:49
msgid "Failed to run mkinitfs on the target" 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 #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
msgid "The exit code was {}" msgid "The exit code was {}"

View File

@ -320,11 +320,11 @@ msgstr "Aparat saatını ayarlamaq."
#: src/modules/mkinitfs/main.py:27 #: src/modules/mkinitfs/main.py:27
msgid "Creating initramfs with mkinitfs." msgid "Creating initramfs with mkinitfs."
msgstr "" msgstr "mkinitfs ilə initramfs yaradılır."
#: src/modules/mkinitfs/main.py:49 #: src/modules/mkinitfs/main.py:49
msgid "Failed to run mkinitfs on the target" 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 #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
msgid "The exit code was {}" msgid "The exit code was {}"

View File

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

View File

@ -319,11 +319,11 @@ msgstr "Indstiller hardwareur."
#: src/modules/mkinitfs/main.py:27 #: src/modules/mkinitfs/main.py:27
msgid "Creating initramfs with mkinitfs." msgid "Creating initramfs with mkinitfs."
msgstr "" msgstr "Opretter initramfs med mkinitfs."
#: src/modules/mkinitfs/main.py:49 #: src/modules/mkinitfs/main.py:49
msgid "Failed to run mkinitfs on the target" 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 #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
msgid "The exit code was {}" msgid "The exit code was {}"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -40,7 +40,7 @@ PythonJobModule::loadSelf()
return; 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; m_loaded = true;
} }

View File

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

View File

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

View File

@ -34,18 +34,16 @@ ImageRegistry::icon( const QString& image, CalamaresUtils::ImageMode mode )
qint64 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 QPixmap
ImageRegistry::pixmap( const QString& image, ImageRegistry::pixmap( const QString& image,
const QSize& size, const QSize& size,
CalamaresUtils::ImageMode mode, CalamaresUtils::ImageMode mode )
qreal opacity,
QColor tint )
{ {
Q_ASSERT( !( size.width() < 0 || size.height() < 0 ) ); Q_ASSERT( !( size.width() < 0 || size.height() < 0 ) );
if ( 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 ); subsubcache = subcache.value( mode );
const qint64 ck = cacheKey( size, opacity, tint ); const qint64 ck = cacheKey( size );
if ( subsubcache.contains( ck ) ) if ( subsubcache.contains( ck ) )
{ {
return subsubcache.value( ck ); return subsubcache.value( ck );
@ -81,23 +79,9 @@ ImageRegistry::pixmap( const QString& image,
p.fill( Qt::transparent ); p.fill( Qt::transparent );
QPainter pixPainter( &p ); QPainter pixPainter( &p );
pixPainter.setOpacity( opacity );
svgRenderer.render( &pixPainter ); svgRenderer.render( &pixPainter );
pixPainter.end(); 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; pixmap = p;
} }
else else
@ -128,7 +112,7 @@ ImageRegistry::pixmap( const QString& image,
} }
} }
putInCache( image, size, mode, opacity, pixmap, tint ); putInCache( image, size, mode, pixmap );
} }
return pixmap; return pixmap;
@ -139,9 +123,7 @@ void
ImageRegistry::putInCache( const QString& image, ImageRegistry::putInCache( const QString& image,
const QSize& size, const QSize& size,
CalamaresUtils::ImageMode mode, CalamaresUtils::ImageMode mode,
qreal opacity, const QPixmap& pixmap )
const QPixmap& pixmap,
QColor tint )
{ {
QHash< qint64, QPixmap > subsubcache; QHash< qint64, QPixmap > subsubcache;
QHash< int, QHash< qint64, QPixmap > > subcache; 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 ); subcache.insert( mode, subsubcache );
s_cache.insert( image, subcache ); s_cache.insert( image, subcache );
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -270,7 +270,12 @@ ChoicePage::setupChoices()
m_itemsLayout->addStretch(); 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. if ( checked ) // An action was picked.
{ {
m_choice = static_cast< InstallChoice >( id ); m_choice = static_cast< InstallChoice >( id );

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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