diff --git a/src/modules/prepare/PreparePage.cpp b/src/modules/prepare/PreparePage.cpp index b69dd584e..c38ef8d46 100644 --- a/src/modules/prepare/PreparePage.cpp +++ b/src/modules/prepare/PreparePage.cpp @@ -21,6 +21,7 @@ #include "PrepareCheckWidget.h" #include "utils/CalamaresUtilsGui.h" +#include "utils/Retranslator.h" #include "Branding.h" #include @@ -33,8 +34,10 @@ PreparePage::PreparePage( QWidget* parent ) QBoxLayout *mainLayout = new QVBoxLayout; setLayout( mainLayout ); - QLabel* text = new QLabel( tr( "For best results, please ensure that this " - "computer:" ), this ); + QLabel* text = new QLabel( this ); + CALAMARES_RETRANSLATE( + text->setText( tr( "For best results, please ensure that this computer:" ) ); + ) mainLayout->addSpacing( CalamaresUtils::defaultFontHeight() ); mainLayout->addWidget( text ); @@ -88,24 +91,27 @@ PreparePage::init( const QList< PrepareEntry >& checkEntries ) iconLabel->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Fail, CalamaresUtils::Original, iconLabel->size() ) ); - textLabel->setText( tr( "This computer does not satisfy the minimum " - "requirements for installing %1.\n" - "Installation cannot continue." ) + CALAMARES_RETRANSLATE( + textLabel->setText( tr( "This computer does not satisfy the minimum " + "requirements for installing %1.\n" + "Installation cannot continue." ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::ShortVersionedName ) ) ); + ) } else { iconLabel->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Information, CalamaresUtils::Original, iconLabel->size() ) ); - textLabel->setText( tr( "This computer does not satisfy some of the " - "recommended requirements for installing %1.\n" - "Installation can continue, but some features " - "might be disabled." ) + CALAMARES_RETRANSLATE( + textLabel->setText( tr( "This computer does not satisfy some of the " + "recommended requirements for installing %1.\n" + "Installation can continue, but some features " + "might be disabled." ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::ShortVersionedName ) ) ); - + ) } mainLayout->insertLayout( mainLayout->count(), infoLayout ); diff --git a/src/modules/prepare/PrepareViewStep.cpp b/src/modules/prepare/PrepareViewStep.cpp index 6a6b12662..4f230ed49 100644 --- a/src/modules/prepare/PrepareViewStep.cpp +++ b/src/modules/prepare/PrepareViewStep.cpp @@ -24,6 +24,7 @@ #include "widgets/WaitingWidget.h" #include "utils/CalamaresUtilsGui.h" #include "utils/Logger.h" +#include "utils/Retranslator.h" #include "JobQueue.h" #include "GlobalStorage.h" @@ -47,8 +48,9 @@ PrepareViewStep::PrepareViewStep( QObject* parent ) m_widget->setLayout( mainLayout ); CalamaresUtils::unmarginLayout( mainLayout ); - QWidget* waitingWidget = new WaitingWidget( tr( "Gathering system information..." ) ); + WaitingWidget* waitingWidget = new WaitingWidget( QString() ); mainLayout->addWidget( waitingWidget ); + CALAMARES_RETRANSLATE( waitingWidget->setText( tr( "Gathering system information..." ) ); ) QTimer* timer = new QTimer; timer->setSingleShot( true );