applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 19:05:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] Adjust message and fix debug message

Browse source
This commit is contained in:
Adriaan de Groot 2020-10-16 22:32:32 +02:00
parent 9a5099cd48
commit 36396d0cfd
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/modules/partition/gui/ChoicePage.cpp
View file

@ -1445,18 +1445,16 @@ ChoicePage::setupActions()
if ( tableType != PartitionTable::unknownTableType && !matchTableType ) if ( tableType != PartitionTable::unknownTableType && !matchTableType )
{ {
m_messageLabel->setText( tr( "This storage device already may has an operating system on it, " m_messageLabel->setText( tr( "This storage device already has an operating system on it, "
"but its partition table <strong>%1</strong> mismatch the " "but the partition table <strong>%1</strong> is different from the "
"requirement <strong>%2</strong>.<br/>" ) "needed <strong>%2</strong>.<br/>" )
.arg( PartitionTable::tableTypeToName( tableType ) ) .arg( PartitionTable::tableTypeToName( tableType ) )
.arg( m_requiredPartitionTableType.join( " or " ) ) ); .arg( m_requiredPartitionTableType.join( " or " ) ) );
m_messageLabel->show(); m_messageLabel->show();
cWarning() << "Partition table" << PartitionTable::tableTypeToName( tableType ) cWarning() << "Partition table" << PartitionTable::tableTypeToName( tableType )
<< "does not match the requirement " << m_requiredPartitionTableType.join( " or " ) << "does not match the requirement " << m_requiredPartitionTableType.join( " or " )
<< ", " << ", ENABLING erease feature and DISABLING alongside, replace and manual features.";
"ENABLING erease feature and ";
"DISABLING alongside, replace and manual features.";
m_eraseButton->show(); m_eraseButton->show();
m_alongsideButton->hide(); m_alongsideButton->hide();
m_replaceButton->hide(); m_replaceButton->hide();