From 5a07c240a94caacd1fd4e5c9d73d59367bb5c705 Mon Sep 17 00:00:00 2001 From: demmm Date: Sat, 16 May 2015 12:48:18 -0400 Subject: [PATCH] use ShortProductName as second argument choicepage.cpp has 2 instances where %2 is not defined --- src/modules/partition/gui/ChoicePage.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index d9c7f6b7c..91ea1d22f 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -181,7 +181,9 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn "You can choose which operating system you want each time the " "computer starts up." ) .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) ); + string( Calamares::Branding::ShortVersionedName ) ) + .arg( Calamares::Branding::instance()-> + string( Calamares::Branding::ShortProductName ) ) ); if ( core->deviceModel()->rowCount() < 2 ) eraseButton->setText( tr( "Erase disk and install %1
" @@ -228,7 +230,9 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn "You can choose which operating system you want each time the " "computer starts up." ) .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) ); + string( Calamares::Branding::ShortVersionedName ) ) + .arg( Calamares::Branding::instance()-> + string( Calamares::Branding::ShortProductName ) ) ); if ( core->deviceModel()->rowCount() < 2 ) eraseButton->setText( tr( "Erase disk and install %1
"