diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
index 3db9741..8be4041 100644
--- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -534,7 +534,10 @@ public function buildIdConflictForm(array &$form, FormStateInterface $form_state
    *   The form structure.
    */
   protected function conflictsForm(array &$form, FormStateInterface $form_state, array $conflicts) {
-    $form['warning']['#markup'] .= '<p>' . $this->t('It looks like you have content on your site which <strong>may be overwritten</strong> if you continue to run the upgrade. The upgrade should be performed on a clean Drupal 8 installation. For more information, refer to the <a target="_blank" href=":id-conflicts-handbook">upgrade handbook</a>.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts']) . '</p>';
+    $form['warning'] = [
+      '#type' => 'markup',
+      '#markup' => '<p>' . $this->t('It looks like you have content on your site which <strong>may be overwritten</strong> if you continue to run the upgrade. The upgrade should be performed on a clean Drupal 8 installation. For more information, refer to the <a target="_blank" href=":id-conflicts-handbook">upgrade handbook</a>.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts']) . '</p>',
+    ];
 
     $form['conflicts'] = [
       '#title' => $this->t('There is conflicting content of these types:'),
@@ -585,7 +588,10 @@ protected function formatConflicts(array $conflicts) {
    *   The form structure.
    */
   protected function i18nWarningForm(array &$form, FormStateInterface $form_state, array $conflicts) {
-    $form['warning']['#markup'] .= '<p>' . $this->t('It looks like you are migrating translated content. Possible ID conflicts for translations are not automatically detected in the current version of Drupal. Refer to the <a target="_blank" href=":id-conflicts-handbook">upgrade handbook</a> for instructions on how to avoid ID conflicts with translated content.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts']) . '</p>';
+    $form['i18n_warning'] = [
+      '#type' => 'markup',
+      '#markup' => '<p>' . $this->t('It looks like you are migrating translated content. Possible ID conflicts for translations are not automatically detected in the current version of Drupal. Refer to the <a target="_blank" href=":id-conflicts-handbook">upgrade handbook</a> for instructions on how to avoid ID conflicts with translated content.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts']) . '</p>',
+    ];
 
     $form['i18n'] = [
       '#title' => $this->t('There is translated content of these types:'),
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
index 0d3c10b..5cf9f25 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
@@ -161,7 +161,7 @@ public function testMigrateUpgrade() {
 
     $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
     $session->pageTextContains('Content may be overwritten');
-    $session->pageTextContains('The conflicting content are of the following types:');
+    $session->pageTextContains('There is conflicting content of these types:');
     $session->pageTextContains('aggregator feed entities');
     $session->pageTextContains('aggregator feed item entities');
     $session->pageTextContains('custom block entities');
@@ -172,7 +172,7 @@ public function testMigrateUpgrade() {
     $session->pageTextContains('comments');
     $session->pageTextContains('content item revisions');
     $session->pageTextContains('content items');
-    $session->pageTextContains('The translated content are of the following types:');
+    $session->pageTextContains('There is translated content of these types:');
     $this->drupalPostForm(NULL, [], t('I acknowledge I may lose data, continue anyway.'));
     $this->assertResponse(200);
     $this->assertText('Upgrade analysis report');