diff --git a/src/app/main.cpp b/src/app/main.cpp index 3f99950054a..90eae94f2bf 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -157,10 +157,12 @@ static inline QString msgCoreLoadFailure(const QString &why) static inline int askMsgSendFailed() { return QMessageBox::question(0, QApplication::translate("Application","Could not send message"), - QCoreApplication::translate("Application", "Unable to send command line arguments to the already running instance. " - "It appears to be not responding. Do you want to start a new instance of Creator?"), - QMessageBox::Yes | QMessageBox::No | QMessageBox::Retry, - QMessageBox::Retry); + QCoreApplication::translate("Application", "Unable to send command line arguments " + "to the already running instance. It appears to be not " + "responding. Do you want to start a new instance of " + "%1?").arg(Core::Constants::IDE_DISPLAY_NAME), + QMessageBox::Yes | QMessageBox::No | QMessageBox::Retry, + QMessageBox::Retry); } static void setHighDpiEnvironmentVariable() diff --git a/src/libs/qt-breakpad/qtcrashhandler/mainwidget.cpp b/src/libs/qt-breakpad/qtcrashhandler/mainwidget.cpp index 0fc4f2e1d47..5bd1ecadfb7 100644 --- a/src/libs/qt-breakpad/qtcrashhandler/mainwidget.cpp +++ b/src/libs/qt-breakpad/qtcrashhandler/mainwidget.cpp @@ -26,6 +26,8 @@ #include "mainwidget.h" #include "ui_mainwidget.h" +#include + #include #include #include @@ -43,6 +45,8 @@ MainWidget::MainWidget(QWidget *parent) : { ui->setupUi(this); + ui->mainWidgetTopLabel.setText(tr("%1 has crashed").arg(Core::Constants::IDE_DISPLAY_NAME)); + connect(ui->restartButton, &QAbstractButton::clicked, this, &MainWidget::restartApplication); connect(ui->quitButton, &QAbstractButton::clicked, this, &MainWidget::quitApplication); connect(ui->detailButton, &QAbstractButton::clicked, this, &MainWidget::showDetails); diff --git a/src/libs/qt-breakpad/qtcrashhandler/mainwidget.ui b/src/libs/qt-breakpad/qtcrashhandler/mainwidget.ui index f509a705695..e5a06027090 100644 --- a/src/libs/qt-breakpad/qtcrashhandler/mainwidget.ui +++ b/src/libs/qt-breakpad/qtcrashhandler/mainwidget.ui @@ -15,7 +15,7 @@ - + 20 diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index b6b10ce50e1..87b1f2aa5e0 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -29,6 +29,8 @@ #include "cpptoolsplugin.h" #include +#include + #include #include #include @@ -57,7 +59,7 @@ static const char licenseTemplatePathKeyC[] = "LicenseTemplate"; const char *licenseTemplateTemplate = QT_TRANSLATE_NOOP("CppTools::Internal::CppFileSettingsWidget", "/**************************************************************************\n" -"** Qt Creator license header template\n" +"** %1 license header template\n" "** Special keywords: %USER% %DATE% %YEAR%\n" "** Environment variables: %$VARIABLE%\n" "** To protect a percent sign, use '%%'.\n" @@ -339,7 +341,7 @@ void CppFileSettingsWidget::slotEdit() if (path.isEmpty()) return; Utils::FileSaver saver(path, QIODevice::Text); - saver.write(tr(licenseTemplateTemplate).toUtf8()); + saver.write(tr(licenseTemplateTemplate).arg(Core::Constants::IDE_DISPLAY_NAME).toUtf8()); if (!saver.finalize(this)) return; setLicenseTemplatePath(path); diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 1160242c944..6ad904ef825 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -29,6 +29,8 @@ #include "cdboptionspage.h" #include "cdbparsehelpers.h" +#include + #include #include #include @@ -424,15 +426,16 @@ void CdbEngine::setupEngine() const QFileInfo extensionFi(CdbEngine::extensionLibraryName(cdbIs64Bit)); if (!extensionFi.isFile()) { handleSetupFailure(tr("Internal error: The extension %1 cannot be found.\n" - "If you have updated Qt Creator via Maintenance Tool, you may " + "If you have updated %2 via Maintenance Tool, you may " "need to rerun the Tool and select \"Add or remove components\" " - "and then select the\n" - "Qt > Tools > Qt Creator > Qt Creator CDB Debugger Support component.\n" - "If you build Qt Creator from sources and want to use a CDB executable " - "with another bitness than your Qt Creator build,\n" + "and then select the " + "Qt > Tools > Qt Creator CDB Debugger Support component.\n" + "If you build %2 from sources and want to use a CDB executable " + "with another bitness than your %2 build, " "you will need to build a separate CDB extension with the " "same bitness as the CDB you want to use."). - arg(QDir::toNativeSeparators(extensionFi.absoluteFilePath()))); + arg(QDir::toNativeSeparators(extensionFi.absoluteFilePath()), + Core::Constants::IDE_DISPLAY_NAME)); return; } const QString extensionFileName = extensionFi.fileName(); diff --git a/src/plugins/debugger/procinterrupt.cpp b/src/plugins/debugger/procinterrupt.cpp index 7c7e4097fdc..ef49b429e01 100644 --- a/src/plugins/debugger/procinterrupt.cpp +++ b/src/plugins/debugger/procinterrupt.cpp @@ -26,6 +26,8 @@ #include "procinterrupt.h" #include "debuggerconstants.h" +#include + #include #include #include // makes kill visible on Windows. @@ -147,10 +149,10 @@ GDB 32bit | Api | Api | NA | Win32 ? QCoreApplication::applicationDirPath() + QLatin1String("/win32interrupt.exe") : QCoreApplication::applicationDirPath() + QLatin1String("/win64interrupt.exe"); if (!QFile::exists(executable)) { - *errorMessage = QString::fromLatin1("%1 does not exist. If you have built QtCreator " - "on your own ,checkout " + *errorMessage = QString::fromLatin1("%1 does not exist. If you have built %2 " + "on your own, checkout " "https://code.qt.io/cgit/qt-creator/binary-artifacts.git/."). - arg(QDir::toNativeSeparators(executable)); + arg(QDir::toNativeSeparators(executable), Core::Constants::IDE_DISPLAY_NAME); break; } switch (QProcess::execute(executable, QStringList(QString::number(pID)))) { diff --git a/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp b/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp index b2cf328e143..e0ac77deca4 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp +++ b/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp @@ -27,6 +27,8 @@ #include "localprocesslist.h" +#include + #include #include @@ -180,10 +182,11 @@ GDB 32bit | Api | Api | N/A | Win32 ? QLatin1String("/win32interrupt.exe") : QLatin1String("/win64interrupt.exe"); if (!QFile::exists(executable)) { - appendMsgCannotInterrupt(pid, tr( "%1 does not exist. If you built Qt Creator " + appendMsgCannotInterrupt(pid, tr( "%1 does not exist. If you built %2 " "yourself, check out https://code.qt.io/cgit/" "qt-creator/binary-artifacts.git/."). - arg(QDir::toNativeSeparators(executable))); + arg(QDir::toNativeSeparators(executable), + Core::Constants::IDE_DISPLAY_NAME)); } switch (QProcess::execute(executable, QStringList(QString::number(pid)))) { case -2: diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index 93d02e37874..2b9092e2867 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -34,6 +34,8 @@ #include +#include + #include #include #include @@ -315,9 +317,9 @@ static void warnAboutInvalidKit() QCoreApplication::translate("PuppetCreator", "The QML emulation layer (QML Puppet) cannot be built because the kit is not configured correctly. " "For example the compiler can be misconfigured. " - "Fix the kit configuration and restart Qt Creator. " + "Fix the kit configuration and restart %1. " "Otherwise, the fallback emulation layer, which does not support all features, will be used." - )); + ).arg(Core::Constants::IDE_DISPLAY_NAME)); } void PuppetCreator::createQml2PuppetExecutableIfMissing()