diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp
index 28775f326..bc489d186 100644
--- a/src/modules/welcome/Config.cpp
+++ b/src/modules/welcome/Config.cpp
@@ -31,6 +31,8 @@ Config::Config( QObject* parent )
initLanguages();
CALAMARES_RETRANSLATE_SLOT( &Config::retranslate );
+ // But also when the requirements model changes, update the messages
+ connect( requirementsModel(), &Calamares::RequirementsModel::progressMessageChanged, this, &Config::retranslate );
}
void
@@ -63,11 +65,11 @@ Config::retranslate()
message = setup ? tr( "This computer does not satisfy some of the "
"recommended requirements for setting up %1.
"
"Setup can continue, but some features "
- "might be reduced." )
+ "might be disabled." )
: tr( "This computer does not satisfy some of the "
"recommended requirements for installing %1.
"
"Installation can continue, but some features "
- "might be reduced." );
+ "might be disabled." );
}
m_warningMessage = message.arg( Calamares::Branding::instance()->shortVersionedName() );
diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp
index e3ef28526..acbb48e42 100644
--- a/src/modules/welcome/checker/ResultsListWidget.cpp
+++ b/src/modules/welcome/checker/ResultsListWidget.cpp
@@ -127,7 +127,6 @@ ResultsListDialog::ResultsListDialog( const Calamares::RequirementsModel& model,
connect( buttonBox, &QDialogButtonBox::clicked, this, &QDialog::close );
CALAMARES_RETRANSLATE_SLOT( &ResultsListDialog::retranslate );
- retranslate(); // Do it now to fill in the texts
}
ResultsListDialog::~ResultsListDialog() {}
@@ -169,15 +168,15 @@ ResultsListWidget::ResultsListWidget( Config* config, QWidget* parent )
spacerLayout->addSpacing( paddingSize );
CalamaresUtils::unmarginLayout( spacerLayout );
- auto* explanation = new QLabel;
+ auto* explanation = new QLabel( m_config->warningMessage() );
explanation->setWordWrap( true );
explanation->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
explanation->setOpenExternalLinks( false );
explanation->setObjectName( "resultsExplanation" );
- connect( explanation, &QLabel::linkActivated, this, &ResultsListWidget::linkClicked );
entriesLayout->addWidget( explanation );
connect( config, &Config::warningMessageChanged, explanation, &QLabel::setText );
+ connect( explanation, &QLabel::linkActivated, this, &ResultsListWidget::linkClicked );
// Check that all are satisfied (gives warnings if not) and
// all *mandatory* entries are satisfied (gives errors if not).
@@ -226,7 +225,6 @@ ResultsListWidget::ResultsListWidget( Config* config, QWidget* parent )
}
CALAMARES_RETRANSLATE_SLOT( &ResultsListWidget::retranslate );
- retranslate();
}