UpdateInfo: Tr::tr

Change-Id: I7167f675bf58793cb38e11bfd58902bb7537c4b9
Reviewed-by: hjk <hjk@qt.io>

share/qtcreator/translations/qtcreator_cs.ts

@@ -39691,7 +39691,7 @@ Filtr: %2
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::UpdateInfoPlugin</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Could not determine location of maintenance tool. Please check your installation if you did not enable this plugin manually.</source>
         <translation>Nepodařilo se najít umístění nástroje na správu. Prověřte, prosím, svoji instalaci, pokud jste tento přídavný modul nezapnuli ručně.</translation>
@@ -53948,7 +53948,7 @@ monitor reset</source>
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::SettingsWidget</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Configure Filters</source>
         <translation>Nastavit filtry</translation>
@@ -55406,11 +55406,7 @@ se vyskytla chyba</translation>
     </message>
 </context>
 <context>
-    <name>Update</name>
+    <name>::UpdateInfo</name>
-    <message>
-        <source>Update</source>
-        <translation>Aktualizovat</translation>
-    </message>
 </context>
 <context>
     <name>::Valgrind</name>

share/qtcreator/translations/qtcreator_da.ts

@@ -36367,14 +36367,11 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation>
     </message>
 </context>
 <context>
-    <name>Update</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Update</source>
         <translation>Opdater</translation>
     </message>
-</context>
-<context>
-    <name>UpdateInfo::Internal::SettingsPage</name>
     <message>
         <source>Daily</source>
         <translation>Dagligt</translation>
@@ -36403,9 +36400,6 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation>
         <source>Not checked yet</source>
         <translation>Endnu ikke tjekket</translation>
     </message>
-</context>
-<context>
-    <name>UpdateInfo::Internal::SettingsWidget</name>
     <message>
         <source>Configure Filters</source>
         <translation>Konfigurer filtre</translation>
@@ -36426,10 +36420,6 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation>
         <source>Last check date:</source>
         <translation>Sidste tjekdato:</translation>
     </message>
-    <message>
-        <source>Not checked yet</source>
-        <translation>Endnu ikke tjekket</translation>
-    </message>
     <message>
         <source>Check Now</source>
         <translation>Tjek nu</translation>
@@ -36438,9 +36428,6 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation>
         <source>Automatically runs a scheduled check for updates on a time interval basis. The automatic check for updates will be performed at the scheduled date, or the next startup following it.</source>
         <translation>Kører automatisk en planlagt søgning efter opdateringer på et tidsinterval basis. Den automatiske søgning efter opdateringer udføres på den planlagte dato eller den næste opstart som kommer efter.</translation>
     </message>
-</context>
-<context>
-    <name>UpdateInfo::Internal::UpdateInfoPlugin</name>
     <message>
         <source>Qt Updater</source>
         <translation>Qt opdatering</translation>

share/qtcreator/translations/qtcreator_de.ts

@@ -21063,7 +21063,7 @@ Außer: %3
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::UpdateInfoPlugin</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Checking for Updates</source>
         <translation>Aktualisierungen werden gesucht</translation>
@@ -45718,7 +45718,7 @@ Do you want to display them anyway?</source>
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::UpdateInfoSettingsPage</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Daily</source>
         <translation>Täglich</translation>

share/qtcreator/translations/qtcreator_fr.ts

@@ -38227,7 +38227,7 @@ Filtre : %2
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::UpdateInfoPlugin</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Could not determine location of maintenance tool. Please check your installation if you did not enable this plugin manually.</source>
         <translation>Impossible de déterminer l&apos;emplacement de l&apos;outil de maintenant. Veuillez vérifier votre installation si vous n&apos;avez pas activé ce module manuellement.</translation>
@@ -50651,7 +50651,7 @@ réinitialisation du moniteur</translation>
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::SettingsWidget</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Configure Filters</source>
         <translation>Configurer les filtres</translation>
@@ -52056,11 +52056,7 @@ Veuillez fermer toutes les instances de votre application en cours d&apos;exécu
     </message>
 </context>
 <context>
-    <name>Update</name>
+    <name>::UpdateInfo</name>
-    <message>
-        <source>Update</source>
-        <translation>Mettre à jour</translation>
-    </message>
 </context>
 <context>
     <name>::Valgrind</name>

share/qtcreator/translations/qtcreator_hr.ts

@@ -8586,7 +8586,7 @@ Utječe na uvlačenje neprekinutih redaka.
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::SettingsWidget</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Configure Filters</source>
         <translation>Konfiguriraj filtre</translation>
@@ -35324,14 +35324,11 @@ Neće se primijeniti na bjeline u komentarima i znakovnim nizovima.</translation
     </message>
 </context>
 <context>
-    <name>Update</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Update</source>
         <translation>Aktualiziraj</translation>
     </message>
-</context>
-<context>
-    <name>UpdateInfo::Internal::SettingsPage</name>
     <message>
         <source>Daily</source>
         <translation>Dnevno</translation>
@@ -35356,13 +35353,6 @@ Neće se primijeniti na bjeline u komentarima i znakovnim nizovima.</translation
         <source>Checking for updates...</source>
         <translation>Provjeravanje nadogradnji …</translation>
     </message>
-    <message>
-        <source>Not checked yet</source>
-        <translation>Još nije provjereno</translation>
-    </message>
-</context>
-<context>
-    <name>UpdateInfo::Internal::UpdateInfoPlugin</name>
     <message>
         <source>Qt Updater</source>
         <translation>Qt Updater</translation>

share/qtcreator/translations/qtcreator_ja.ts

@@ -6776,7 +6776,7 @@ Influences the indentation of continuation lines.
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::SettingsWidget</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Configure Filters</source>
         <translation>フィルタの設定</translation>
@@ -30565,7 +30565,7 @@ Will not be applied to whitespace in comments and strings.</source>
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::UpdateInfoPlugin</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Updater</source>
         <translation>更新プログラム</translation>
@@ -30591,9 +30591,6 @@ Will not be applied to whitespace in comments and strings.</source>
         <source>Check for Updates</source>
         <translation>更新の確認</translation>
     </message>
-</context>
-<context>
-    <name>Update</name>
     <message>
         <source>Update</source>
         <translation>更新</translation>
@@ -41643,7 +41640,7 @@ Android パッケージソースディレクトリのファイルはビルドデ
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::SettingsPage</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Daily</source>
         <translation>毎日</translation>
@@ -41668,10 +41665,6 @@ Android パッケージソースディレクトリのファイルはビルドデ
         <source>Checking for updates...</source>
         <translation>更新の確認中...</translation>
     </message>
-    <message>
-        <source>Not checked yet</source>
-        <translation>未確認</translation>
-    </message>
 </context>
 <context>
     <name>::Valgrind</name>
@@ -48674,35 +48667,7 @@ Row: %4, Column: %5
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::UpdateInfoSettingsPage</name>
+    <name>::UpdateInfo</name>
-    <message>
-        <source>Daily</source>
-        <translation>毎日</translation>
-    </message>
-    <message>
-        <source>Weekly</source>
-        <translation>毎週</translation>
-    </message>
-    <message>
-        <source>Monthly</source>
-        <translation>毎月</translation>
-    </message>
-    <message>
-        <source>New updates are available.</source>
-        <translation>新しい更新を利用できます。</translation>
-    </message>
-    <message>
-        <source>No new updates are available.</source>
-        <translation>新しい更新はありません。</translation>
-    </message>
-    <message>
-        <source>Checking for updates...</source>
-        <translation>更新の確認中...</translation>
-    </message>
-    <message>
-        <source>Not checked yet</source>
-        <translation>未確認</translation>
-    </message>
     <message>
         <source>Update</source>
         <comment>Update</comment>

share/qtcreator/translations/qtcreator_pl.ts

@@ -18231,7 +18231,7 @@ Wykluczenia: %3
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::UpdateInfoPlugin</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Updater</source>
         <translation>Aktualizator</translation>
@@ -25566,7 +25566,7 @@ Zdalny: %4</translation>
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::SettingsWidget</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Configure Filters</source>
         <translation>Konfiguracja filtrów</translation>
@@ -26846,7 +26846,7 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani
     </message>
 </context>
 <context>
-    <name>Update</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Update</source>
         <translation>Uaktualnij</translation>
@@ -33326,7 +33326,7 @@ Ustawianie pułapek w liniach plików może się nie udać.</translation>
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::SettingsPage</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Daily</source>
         <translation>Codziennie</translation>
@@ -33351,10 +33351,6 @@ Ustawianie pułapek w liniach plików może się nie udać.</translation>
         <source>Checking for updates...</source>
         <translation>Sprawdzanie dostępności aktualizacji...</translation>
     </message>
-    <message>
-        <source>Not checked yet</source>
-        <translation>Jeszcze nie sprawdzano</translation>
-    </message>
 </context>
 <context>
     <name>::VcsBase</name>

share/qtcreator/translations/qtcreator_ru.ts

@@ -46127,7 +46127,7 @@ The trace data is lost.</source>
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::SettingsWidget</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Configure Filters</source>
         <translation>Настройка фильтров</translation>
@@ -46160,9 +46160,6 @@ The trace data is lost.</source>
         <source>Automatically runs a scheduled check for updates on a time interval basis. The automatic check for updates will be performed at the scheduled date, or the next startup following it.</source>
         <translation>Проверка на наличие обновлений будет запускаться периодически. Она осуществляется в запланированное время или при следующем запуске среды разработки.</translation>
     </message>
-</context>
-<context>
-    <name>UpdateInfo::Internal::UpdateInfoPlugin</name>
     <message>
         <source>Checking for Updates</source>
         <translation>Проверка обновлений</translation>
@@ -46195,9 +46192,6 @@ The trace data is lost.</source>
         <source>Check for Updates</source>
         <translation>Проверить обновления</translation>
     </message>
-</context>
-<context>
-    <name>UpdateInfo::Internal::UpdateInfoSettingsPage</name>
     <message>
         <source>Daily</source>
         <translation>Ежедневно</translation>
@@ -46222,10 +46216,6 @@ The trace data is lost.</source>
         <source>Checking for updates...</source>
         <translation>Проверка обновлений...</translation>
     </message>
-    <message>
-        <source>Not checked yet</source>
-        <translation>не выполнялась</translation>
-    </message>
     <message>
         <source>Update</source>
         <comment>Update</comment>

share/qtcreator/translations/qtcreator_uk.ts

@@ -20078,7 +20078,7 @@ Will not be applied to whitespace in comments and strings.</source>
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::UpdateInfoPlugin</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Updater</source>
         <translation>Оновлючач</translation>
@@ -20119,10 +20119,6 @@ Will not be applied to whitespace in comments and strings.</source>
         <source>Updates available</source>
         <translation type="vanished">Доступні оновлення</translation>
     </message>
-    <message>
-        <source>Update</source>
-        <translation type="vanished">Оновити</translation>
-    </message>
 </context>
 <context>
     <name>Utils::CheckableMessageBox</name>
@@ -33349,7 +33345,7 @@ monitor reset</translation>
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::SettingsWidget</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Configure Filters</source>
         <translation>Налаштування фільтрів</translation>
@@ -34755,7 +34751,7 @@ Please close all running instances of your application before starting a build.<
     </message>
 </context>
 <context>
-    <name>Update</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Update</source>
         <translation>Оновити</translation>
@@ -42698,7 +42694,7 @@ Output:
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::SettingsPage</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Daily</source>
         <translation>Щоденно</translation>
@@ -42723,10 +42719,6 @@ Output:
         <source>Checking for updates...</source>
         <translation>Перевірка оновлень...</translation>
     </message>
-    <message>
-        <source>Not checked yet</source>
-        <translation>Ще не перевірялось</translation>
-    </message>
 </context>
 <context>
     <name>::VcsBase</name>

share/qtcreator/translations/qtcreator_zh_CN.ts

@@ -45228,9 +45228,6 @@ The trace data is lost.</source>
         <source>Start Maintenance Tool</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UpdateInfo::Internal::UpdateInfoPlugin</name>
     <message>
         <source>Could not determine location of maintenance tool. Please check your installation if you did not enable this plugin manually.</source>
         <translation>无法确定维护工具所在位置，请检查安装(有可能没有手动开启插件支持)。</translation>
@@ -45280,9 +45277,6 @@ The trace data is lost.</source>
         <source>Check for Updates</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UpdateInfo::Internal::UpdateInfoSettingsPage</name>
     <message>
         <source>Configure Filters</source>
         <translation type="unfinished">配置过滤器</translation>

share/qtcreator/translations/qtcreator_zh_TW.ts

@@ -24982,7 +24982,7 @@ Filter: %2
     </message>
 </context>
 <context>
-    <name>UpdateInfo::Internal::UpdateInfoPlugin</name>
+    <name>::UpdateInfo</name>
     <message>
         <source>Could not determine location of maintenance tool. Please check your installation if you did not enable this plugin manually.</source>
         <translation>無法決定維護工具所在位置。請檢查您的安裝，確定您是否沒有手動開啟此外掛程式的支援。</translation>

src/plugins/updateinfo/settingspage.cpp

@@ -24,28 +24,26 @@ namespace Internal {
 
 class UpdateInfoSettingsPageWidget final : public Core::IOptionsPageWidget
 {
-    Q_DECLARE_TR_FUNCTIONS(UpdateInfo::Internal::UpdateInfoSettingsPage)
-
 public:
     UpdateInfoSettingsPageWidget(UpdateInfoPlugin *plugin)
         : m_plugin(plugin)
     {
-        setWindowTitle(tr("Configure Filters"));
+        setWindowTitle(Tr::tr("Configure Filters"));
 
-        m_updatesGroupBox = new QGroupBox(tr("Automatic Check for Updates"));
+        m_updatesGroupBox = new QGroupBox(Tr::tr("Automatic Check for Updates"));
         m_updatesGroupBox->setCheckable(true);
         m_updatesGroupBox->setChecked(true);
 
-        m_infoLabel = new QLabel(tr("Automatically runs a scheduled check for updates on "
+        m_infoLabel = new QLabel(Tr::tr("Automatically runs a scheduled check for updates on "
-                                    "a time interval basis. The automatic check for updates "
+                                        "a time interval basis. The automatic check for updates "
-                                    "will be performed at the scheduled date, or the next "
+                                        "will be performed at the scheduled date, or the next "
-                                    "startup following it."));
+                                        "startup following it."));
         m_infoLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
         m_infoLabel->setWordWrap(true);
 
         m_checkIntervalComboBox = new QComboBox;
         m_nextCheckDateLabel = new QLabel;
-        m_checkForNewQtVersions = new QCheckBox(tr("Check for new Qt versions"));
+        m_checkForNewQtVersions = new QCheckBox(Tr::tr("Check for new Qt versions"));
 
         using namespace Utils::Layouting;
 
@@ -53,8 +51,8 @@ public:
             m_infoLabel,
             Row {
                 Form {
-                    new QLabel(tr("Check interval basis:")), m_checkIntervalComboBox, br,
+                    new QLabel(Tr::tr("Check interval basis:")), m_checkIntervalComboBox, br,
-                    new QLabel(tr("Next check date:")), m_nextCheckDateLabel
+                    new QLabel(Tr::tr("Next check date:")), m_nextCheckDateLabel
                 },
                 st
             },
@@ -63,14 +61,14 @@ public:
 
         m_lastCheckDateLabel = new QLabel;
 
-        m_checkNowButton = new QPushButton(tr("Check Now"));
+        m_checkNowButton = new QPushButton(Tr::tr("Check Now"));
 
         m_messageLabel = new QLabel;
 
         Column {
             m_updatesGroupBox,
             Row {
-                new QLabel(tr("Last check date:")),
+                new QLabel(Tr::tr("Last check date:")),
                 m_lastCheckDateLabel,
                 st,
                 Row {
@@ -84,11 +82,11 @@ public:
 
         m_checkIntervalComboBox->setCurrentIndex(-1);
 
-        m_lastCheckDateLabel->setText(tr("Not checked yet"));
+        m_lastCheckDateLabel->setText(Tr::tr("Not checked yet"));
 
-        m_checkIntervalComboBox->addItem(tr("Daily"), UpdateInfoPlugin::DailyCheck);
+        m_checkIntervalComboBox->addItem(Tr::tr("Daily"), UpdateInfoPlugin::DailyCheck);
-        m_checkIntervalComboBox->addItem(tr("Weekly"), UpdateInfoPlugin::WeeklyCheck);
+        m_checkIntervalComboBox->addItem(Tr::tr("Weekly"), UpdateInfoPlugin::WeeklyCheck);
-        m_checkIntervalComboBox->addItem(tr("Monthly"), UpdateInfoPlugin::MonthlyCheck);
+        m_checkIntervalComboBox->addItem(Tr::tr("Monthly"), UpdateInfoPlugin::MonthlyCheck);
         UpdateInfoPlugin::CheckUpdateInterval interval = m_plugin->checkUpdateInterval();
         for (int i = 0; i < m_checkIntervalComboBox->count(); i++) {
             if (m_checkIntervalComboBox->itemData(i).toInt() == interval) {
@@ -147,8 +145,8 @@ UpdateInfoPlugin::CheckUpdateInterval UpdateInfoSettingsPageWidget::currentCheck
 void UpdateInfoSettingsPageWidget::newUpdatesAvailable(bool available)
 {
     const QString message = available
-            ? tr("New updates are available.")
+            ? Tr::tr("New updates are available.")
-            : tr("No new updates are available.");
+            : Tr::tr("No new updates are available.");
     m_messageLabel->setText(message);
 }
 
@@ -169,7 +167,7 @@ void UpdateInfoSettingsPageWidget::checkRunningChanged(bool running)
     }
 
     const QString message = running
-            ? tr("Checking for updates...") : QString();
+            ? Tr::tr("Checking for updates...") : QString();
     m_messageLabel->setText(message);
 }
 
@@ -180,7 +178,7 @@ void UpdateInfoSettingsPageWidget::updateLastCheckDate()
     if (date.isValid())
         lastCheckDateString = date.toString();
     else
-        lastCheckDateString = tr("Not checked yet");
+        lastCheckDateString = Tr::tr("Not checked yet");
 
     m_lastCheckDateLabel->setText(lastCheckDateString);
 
@@ -209,7 +207,7 @@ SettingsPage::SettingsPage(UpdateInfoPlugin *plugin)
 {
     setId(FILTER_OPTIONS_PAGE_ID);
     setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
-    setDisplayName(UpdateInfoSettingsPageWidget::tr("Update", "Update"));
+    setDisplayName(Tr::tr("Update"));
     setWidgetCreator([plugin] { return new UpdateInfoSettingsPageWidget(plugin); });
 }
 

src/plugins/updateinfo/updateinfoplugin.cpp

@@ -153,7 +153,7 @@ void UpdateInfoPlugin::startCheckForUpdates()
     connect(d->m_taskTree.get(), &TaskTree::errorOccurred, this, doCleanup);
     d->m_progress = new TaskProgress(d->m_taskTree.get());
     d->m_progress->setHalfLifeTimePerTask(30000); // 30 seconds
-    d->m_progress->setDisplayName(tr("Checking for Updates"));
+    d->m_progress->setDisplayName(Tr::tr("Checking for Updates"));
     d->m_progress->setKeepOnFinish(FutureProgress::KeepOnFinishTillUserInteraction);
     d->m_progress->setSubtitleVisibleInStatusBar(true);
     d->m_taskTree->start();
@@ -179,14 +179,14 @@ static QString infoTitle(const QList<Update> &updates, const std::optional<QtPac
 {
     static QString blogUrl("href=\"https://www.qt.io/blog/tag/releases\"");
     if (!updates.isEmpty() && newQt) {
-        return UpdateInfoPlugin::tr(
+        return Tr::tr(
                    "%1 and other updates are available. Check the <a %2>Qt blog</a> for details.")
             .arg(newQt->displayName, blogUrl);
     } else if (newQt) {
-        return UpdateInfoPlugin::tr("%1 is available. Check the <a %2>Qt blog</a> for details.")
+        return Tr::tr("%1 is available. Check the <a %2>Qt blog</a> for details.")
             .arg(newQt->displayName, blogUrl);
     }
-    return UpdateInfoPlugin::tr("New updates are available. Start the update?");
+    return Tr::tr("New updates are available. Start the update?");
 }
 
 static void showUpdateInfo(const QList<Update> &updates,
@@ -195,17 +195,17 @@ static void showUpdateInfo(const QList<Update> &updates,
                            const std::function<void()> &startPackageManager)
 {
     InfoBarEntry info(InstallUpdates, infoTitle(updates, newQt));
-    info.addCustomButton(UpdateInfoPlugin::tr("Open Settings"), [] {
+    info.addCustomButton(Tr::tr("Open Settings"), [] {
         ICore::infoBar()->removeInfo(InstallQtUpdates);
         ICore::showOptionsDialog(FILTER_OPTIONS_PAGE_ID);
     });
     if (newQt) {
-        info.addCustomButton(UpdateInfoPlugin::tr("Start Package Manager"), [startPackageManager] {
+        info.addCustomButton(Tr::tr("Start Package Manager"), [startPackageManager] {
             ICore::infoBar()->removeInfo(InstallQtUpdates);
             startPackageManager();
         });
     } else {
-        info.addCustomButton(UpdateInfoPlugin::tr("Start Update"), [startUpdater] {
+        info.addCustomButton(Tr::tr("Start Update"), [startUpdater] {
             ICore::infoBar()->removeInfo(InstallUpdates);
             startUpdater();
         });
@@ -216,12 +216,11 @@ static void showUpdateInfo(const QList<Update> &updates,
             const QStringList packageNames = Utils::transform(updates, [](const Update &u) {
                 if (u.version.isEmpty())
                     return u.name;
-                return UpdateInfoPlugin::tr("%1 (%2)", "Package name and version")
+                return Tr::tr("%1 (%2)", "Package name and version").arg(u.name, u.version);
-                    .arg(u.name, u.version);
             });
             const QString updateText = packageNames.join("</li><li>");
             auto label = new QLabel;
-            label->setText("<qt><p>" + UpdateInfoPlugin::tr("Available updates:") + "<ul><li>"
+            label->setText("<qt><p>" + Tr::tr("Available updates:") + "<ul><li>"
                            + qtText + updateText + "</li></ul></p></qt>");
             label->setContentsMargins(2, 2, 2, 2);
             auto scrollArea = new QScrollArea;
@@ -272,7 +271,7 @@ void UpdateInfoPlugin::checkForUpdatesFinished()
             updates, qtToNag, [this] { startUpdater(); }, [this] { startPackageManager(); });
     } else {
         if (d->m_progress)
-            d->m_progress->setSubtitle(tr("No updates found."));
+            d->m_progress->setSubtitle(Tr::tr("No updates found."));
         emit newUpdatesAvailable(false);
     }
 }
@@ -293,13 +292,13 @@ bool UpdateInfoPlugin::initialize(const QStringList & /* arguments */, QString *
     loadSettings();
 
     if (d->m_maintenanceTool.isEmpty()) {
-        *errorMessage = tr("Could not determine location of maintenance tool. Please check "
+        *errorMessage = Tr::tr("Could not determine location of maintenance tool. Please check "
             "your installation if you did not enable this plugin manually.");
         return false;
     }
 
     if (!d->m_maintenanceTool.isExecutableFile()) {
-        *errorMessage = tr("The maintenance tool at \"%1\" is not an executable. Check your installation.")
+        *errorMessage = Tr::tr("The maintenance tool at \"%1\" is not an executable. Check your installation.")
             .arg(d->m_maintenanceTool.toUserOutput());
         d->m_maintenanceTool.clear();
         return false;
@@ -316,7 +315,7 @@ bool UpdateInfoPlugin::initialize(const QStringList & /* arguments */, QString *
     mmaintenanceTool->menu()->setTitle(Tr::tr("Qt Maintenance Tool"));
     mtools->addMenu(mmaintenanceTool);
 
-    QAction *checkForUpdatesAction = new QAction(tr("Check for Updates"), this);
+    QAction *checkForUpdatesAction = new QAction(Tr::tr("Check for Updates"), this);
     checkForUpdatesAction->setMenuRole(QAction::ApplicationSpecificRole);
     Command *checkForUpdatesCommand = ActionManager::registerAction(checkForUpdatesAction,
                                       "Updates.CheckForUpdates");