From f736ace996c5163669f8f79a425b16269292fe5f Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Tue, 15 Dec 2015 17:33:56 +0100 Subject: [PATCH] Update Erase disk string. --- src/modules/partition/gui/ChoicePage.cpp | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 5829d752f..db1c67786 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -586,10 +586,8 @@ ChoicePage::setupActions( Device *currentDevice ) m_eraseButton->setText( tr( "Erase disk
" "This will delete all the data " - "currently present on %2 (if any), including programs, " - "documents, photos, music, and other files and install %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) + "currently present on %1 (if any), including programs, " + "documents, photos, music, and other files." ) .arg( currentDevice->deviceNode() ) ); ) @@ -616,10 +614,8 @@ ChoicePage::setupActions( Device *currentDevice ) m_eraseButton->setText( tr( "Erase disk
" "This will delete all the data " - "currently present on %2 (if any), including programs, " - "documents, photos, music, and other files and install %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) + "currently present on %1 (if any), including programs, " + "documents, photos, music, and other files." ) .arg( currentDevice->deviceNode() ) ); @@ -642,10 +638,8 @@ ChoicePage::setupActions( Device *currentDevice ) m_eraseButton->setText( tr( "Erase disk
" "This will delete all the data " - "currently present on %2 (if any), including programs, " - "documents, photos, music, and other files and install %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) + "currently present on %1 (if any), including programs, " + "documents, photos, music, and other files." ) .arg( currentDevice->deviceNode() ) ); m_replaceButton->setText( tr( "Replace a partition
" @@ -683,10 +677,8 @@ ChoicePage::setupActions( Device *currentDevice ) m_eraseButton->setText( tr( "Erase disk
" "This will delete all the data " - "currently present on %2 (if any), including programs, " - "documents, photos, music, and other files and install %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) + "currently present on %1 (if any), including programs, " + "documents, photos, music, and other files." ) .arg( currentDevice->deviceNode() ) ); m_replaceButton->setText( tr( "Replace a partition
"