aiden
/
calamares
mirror of https://github.com/cutefishos/calamares
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use <strong> instead of <b> in all instances.

Browse Source
main
Teo Mrnjavac 10 years ago
parent e2c133f329
commit fefa736501
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

4
src/modules/greeting/GreetingPage.cpp
Unescape Escape View File

@ -145,8 +145,8 @@ GreetingPage::GreetingPage( QWidget* parent )
.arg( CALAMARES_APPLICATION_NAME ), .arg( CALAMARES_APPLICATION_NAME ),
tr( tr(
"<h1>%1</h1><br/>" "<h1>%1</h1><br/>"
"<b>%2<br/>" "<strong>%2<br/>"
"for %3</b><br/><br/>" "for %3</strong><br/><br/>"
"Copyright 2014 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>" "Copyright 2014 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>"
"Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, " "Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, "
"Pier Luigi Fiorini and Rohan Garg.<br/><br/>" "Pier Luigi Fiorini and Rohan Garg.<br/><br/>"

2
src/modules/locale/LCLocaleDialog.cpp
Unescape Escape View File

@ -39,7 +39,7 @@ LCLocaleDialog::LCLocaleDialog( const QString& guessedLCLocale,
upperText->setWordWrap( true ); upperText->setWordWrap( true );
upperText->setText( tr( "The system locale setting affects the language and character " upperText->setText( tr( "The system locale setting affects the language and character "
"set for some command line user interface elements.<br/>" "set for some command line user interface elements.<br/>"
"The current setting is <b>%1</b>." ) "The current setting is <strong>%1</strong>." )
.arg( guessedLCLocale ) ); .arg( guessedLCLocale ) );
mainLayout->addWidget( upperText ); mainLayout->addWidget( upperText );
setMinimumWidth( upperText->fontMetrics().height() * 24 ); setMinimumWidth( upperText->fontMetrics().height() * 24 );

2
src/modules/partition/gui/AlongsidePage.cpp
Unescape Escape View File

@ -164,7 +164,7 @@ AlongsidePage::init( PartitionCoreModule* core , const OsproberEntryList& osprob
connect( m_splitterWidget, &PartitionSplitterWidget::partitionResized, connect( m_splitterWidget, &PartitionSplitterWidget::partitionResized,
this, [ this ]( const QString& path, qint64 size, qint64 sizeNext ) this, [ this ]( const QString& path, qint64 size, qint64 sizeNext )
{ {
m_sizeLabel->setText( tr( "With this operation, the partition <b>%1</b> which contains " m_sizeLabel->setText( tr( "With this operation, the partition <strong>%1</strong> which contains "
"%4 will be shrunk " "%4 will be shrunk "
"to %2MB and a new %3MB partition will be created for %5." ) "to %2MB and a new %3MB partition will be created for %5." )
.arg( path ) .arg( path )

30
src/modules/partition/gui/ChoicePage.cpp
Unescape Escape View File

@ -116,13 +116,13 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
"What would you like to do?" ) ); "What would you like to do?" ) );
if ( core->deviceModel()->rowCount() < 2 ) if ( core->deviceModel()->rowCount() < 2 )
eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>" eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
"<font color=\"red\">Warning: </font>This will delete all of your programs, " "<font color=\"red\">Warning: </font>This will delete all of your programs, "
"documents, photos, music, and any other files." ) "documents, photos, music, and any other files." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
else else
eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>" eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
"You will be offered a choice of which disk to erase." ) "You will be offered a choice of which disk to erase." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
@ -142,7 +142,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
"What would you like to do?" ) "What would you like to do?" )
.arg( osName ) ); .arg( osName ) );
alongsideButton->setText( tr( "<b>Install %2 alongside %1</b><br/>" alongsideButton->setText( tr( "<strong>Install %2 alongside %1</strong><br/>"
"The installer will shrink the %1 volume to make room for %2. " "The installer will shrink the %1 volume to make room for %2. "
"You can choose which operating system you want each time the " "You can choose which operating system you want each time the "
"computer starts up." ) "computer starts up." )
@ -151,7 +151,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
if ( core->deviceModel()->rowCount() < 2 ) if ( core->deviceModel()->rowCount() < 2 )
eraseButton->setText( tr( "<b>Erase entire disk with %1 and install %2</b><br/>" eraseButton->setText( tr( "<strong>Erase entire disk with %1 and install %2</strong><br/>"
"<font color=\"red\">Warning: </font>This will erase the whole disk and " "<font color=\"red\">Warning: </font>This will erase the whole disk and "
"delete all of your %1 programs, " "delete all of your %1 programs, "
"documents, photos, music, and any other files." ) "documents, photos, music, and any other files." )
@ -159,12 +159,12 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
else else
eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>" eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
"You will be offered a choice of which disk to erase." ) "You will be offered a choice of which disk to erase." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
replaceButton->setText( tr( "<b>Replace a partition with %1</b><br/>" replaceButton->setText( tr( "<strong>Replace a partition with %1</strong><br/>"
"You will be offered a choice of which partition to erase." ) "You will be offered a choice of which partition to erase." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
@ -176,7 +176,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
m_messageLabel->setText( tr( "This computer already has an operating system on it. " m_messageLabel->setText( tr( "This computer already has an operating system on it. "
"What would you like to do?" ) ); "What would you like to do?" ) );
alongsideButton->setText( tr( "<b>Install %1 alongside your current operating system</b><br/>" alongsideButton->setText( tr( "<strong>Install %1 alongside your current operating system</strong><br/>"
"The installer will shrink an existing volume to make room for %2. " "The installer will shrink an existing volume to make room for %2. "
"You can choose which operating system you want each time the " "You can choose which operating system you want each time the "
"computer starts up." ) "computer starts up." )
@ -184,18 +184,18 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
if ( core->deviceModel()->rowCount() < 2 ) if ( core->deviceModel()->rowCount() < 2 )
eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>" eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
"<font color=\"red\">Warning: </font>This will delete all of your programs, " "<font color=\"red\">Warning: </font>This will delete all of your programs, "
"documents, photos, music, and any other files." ) "documents, photos, music, and any other files." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
else else
eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>" eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
"You will be offered a choice of which disk to erase." ) "You will be offered a choice of which disk to erase." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
replaceButton->setText( tr( "<b>Replace a partition with %1</b><br/>" replaceButton->setText( tr( "<strong>Replace a partition with %1</strong><br/>"
"You will be offered a choice of which partition to erase." ) "You will be offered a choice of which partition to erase." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
@ -223,7 +223,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
m_messageLabel->setText( tr( "This computer currently has multiple operating systems on it. " m_messageLabel->setText( tr( "This computer currently has multiple operating systems on it. "
"What would you like to do?" ) ); "What would you like to do?" ) );
alongsideButton->setText( tr( "<b>Install %1 alongside your current operating systems</b><br/>" alongsideButton->setText( tr( "<strong>Install %1 alongside your current operating systems</strong><br/>"
"The installer will shrink an existing volume to make room for %2. " "The installer will shrink an existing volume to make room for %2. "
"You can choose which operating system you want each time the " "You can choose which operating system you want each time the "
"computer starts up." ) "computer starts up." )
@ -231,18 +231,18 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
if ( core->deviceModel()->rowCount() < 2 ) if ( core->deviceModel()->rowCount() < 2 )
eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>" eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
"<font color=\"red\">Warning: </font>This will delete all of your programs, " "<font color=\"red\">Warning: </font>This will delete all of your programs, "
"documents, photos, music, and any other files." ) "documents, photos, music, and any other files." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
else else
eraseButton->setText( tr( "<b>Erase disk and install %1</b><br/>" eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
"You will be offered a choice of which disk to erase." ) "You will be offered a choice of which disk to erase." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
replaceButton->setText( tr( "<b>Replace a partition with %1</b><br/>" replaceButton->setText( tr( "<strong>Replace a partition with %1</strong><br/>"
"You will be offered a choice of which partition to erase." ) "You will be offered a choice of which partition to erase." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
@ -258,7 +258,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
PrettyRadioButton* somethingElseButton = new PrettyRadioButton; PrettyRadioButton* somethingElseButton = new PrettyRadioButton;
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
somethingElseButton->setText( tr( "<b>Manual partitioning</b><br/>" somethingElseButton->setText( tr( "<strong>Manual partitioning</strong><br/>"
"You can create or resize partitions yourself, or choose " "You can create or resize partitions yourself, or choose "
"multiple partitions for %1." ) "multiple partitions for %1." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->

2
src/modules/partition/gui/PartitionViewStep.cpp
Unescape Escape View File

@ -184,7 +184,7 @@ PartitionViewStep::createSummaryWidget() const
QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo(); QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo();
for ( const auto& info : list ) for ( const auto& info : list )
{ {
QLabel* diskInfoLabel = new QLabel( tr( "Disk <b>%1</b> (%2)" ) QLabel* diskInfoLabel = new QLabel( tr( "Disk <strong>%1</strong> (%2)" )
.arg( info.deviceNode ) .arg( info.deviceNode )
.arg( info.deviceName ) ); .arg( info.deviceName ) );
formLayout->addRow( diskInfoLabel ); formLayout->addRow( diskInfoLabel );

4
src/modules/partition/gui/ReplacePage.cpp
Unescape Escape View File

@ -203,7 +203,7 @@ ReplacePage::onPartitionSelected()
if ( partition->capacity() < requiredSpaceB ) if ( partition->capacity() < requiredSpaceB )
{ {
updateStatus( CalamaresUtils::Fail, updateStatus( CalamaresUtils::Fail,
tr( "<b>%4</b><br/><br/>" tr( "<strong>%4</strong><br/><br/>"
"The partition %1 is too small for %2. Please select a partition " "The partition %1 is too small for %2. Please select a partition "
"with capacity at least %3 GiB." ) "with capacity at least %3 GiB." )
.arg( partition->partitionPath() ) .arg( partition->partitionPath() )
@ -217,7 +217,7 @@ ReplacePage::onPartitionSelected()
} }
updateStatus( CalamaresUtils::PartitionPartition, updateStatus( CalamaresUtils::PartitionPartition,
tr( "<b>%3</b><br/><br/>" tr( "<strong>%3</strong><br/><br/>"
"%1 will be installed on %2.<br/>" "%1 will be installed on %2.<br/>"
"<font color=\"red\">Warning: </font>all data on partition" "<font color=\"red\">Warning: </font>all data on partition"
"%2 will be lost.") "%2 will be lost.")

Write Preview
Loading…
Cancel
Save