Python commands entered here will be executed after Qt Creator's " + "
Python commands entered here will be executed after built-in " "debugging helpers have been loaded and fully initialized. You can load additional " "debugging helpers or modify existing ones here.
")); diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index f9017a7f41d..311b1fcf5aa 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -34,6 +34,8 @@ #includeThe remote CDB needs to load the matching Qt Creator CDB extension "
- "(%1 or %2, respectively).
Copy it onto the remote machine and set the "
- "environment variable %3 to point to its folder.
"
- "Launch the remote CDB as %4 <executable> "
+ "
The remote CDB needs to load the matching %1 CDB extension "
+ "(%2 or %3, respectively).
Copy it onto the remote machine and set the "
+ "environment variable %4 to point to its folder.
"
+ "Launch the remote CDB as %5 <executable> "
"to use TCP/IP as communication protocol.
Enter the connection parameters as:
" - "%5"). - arg(ext32, ext64, QLatin1String("_NT_DEBUGGER_EXTENSION_PATH"), - QLatin1String("cdb.exe -server tcp:port=1234"), - QLatin1String(cdbConnectionSyntax)); + "
%6") + .arg(Core::Constants::IDE_DISPLAY_NAME, + ext32, ext64, QLatin1String("_NT_DEBUGGER_EXTENSION_PATH"), + QLatin1String("cdb.exe -server tcp:port=1234"), + QLatin1String(cdbConnectionSyntax)); } StartRemoteCdbDialog::StartRemoteCdbDialog(QWidget *parent) : diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 091acae9340..80cad0e3011 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -67,6 +67,8 @@ #include "analyzer/analyzerconstants.h" #include "analyzer/analyzermanager.h" +#include
If source is specified as a regular expression by starting it with an " - "open parenthesis, Qt Creator matches the paths in the ELF with the " + "open parenthesis, the paths in the ELF are matched with the " "regular expression to automatically determine the source path.
" "Example: (/home/.*/Project)/KnownSubDir -> D:\\Project will " "substitute ELF built by any user to your local project directory.
")); diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 53c00cbfd4d..91a5fea8c5d 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -66,6 +66,7 @@ #include"
+ tr("The selected build of GDB supports Python scripting, "
"but the used version %1.%2 is not sufficient for "
- "Qt Creator. Supported versions are Python 2.7 and 3.x.")
- .arg(pythonMajor).arg(pythonMinor);
+ "%3. Supported versions are Python 2.7 and 3.x.")
+ .arg(pythonMajor).arg(pythonMinor)
+ .arg(Core::Constants::IDE_DISPLAY_NAME);
showStatusMessage(out);
AsynchronousMessageBox::critical(tr("Execution Error"), out);
}
@@ -1649,7 +1651,8 @@ void GdbEngine::handlePythonSetup(const DebuggerResponse &response)
QString msg = response.data["msg"].data();
if (msg.contains("Python scripting is not supported in this copy of GDB.")) {
QString out1 = "The selected build of GDB does not support Python scripting.";
- QString out2 = "It cannot be used in Qt Creator.";
+ QString out2 = QStringLiteral("It cannot be used in %1.")
+ .arg(Core::Constants::IDE_DISPLAY_NAME);
showStatusMessage(out1 + ' ' + out2);
AsynchronousMessageBox::critical(tr("Execution Error"), out1 + " The versioned backup \"%1\" of the settings "
"file is used, because the non-versioned file was "
- "created by an incompatible version of Qt Creator.
" + out2);
}
diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp
index cecf8ccaeae..822e7d8b8cf 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.cpp
+++ b/src/plugins/debugger/gdb/gdboptionspage.cpp
@@ -86,11 +86,11 @@ GdbOptionsPageWidget::GdbOptionsPageWidget()
auto labelGdbWatchdogTimeout = new QLabel(groupBoxGeneral);
labelGdbWatchdogTimeout->setText(GdbOptionsPage::tr("GDB timeout:"));
labelGdbWatchdogTimeout->setToolTip(GdbOptionsPage::tr(
- "The number of seconds Qt Creator will wait before it terminates\n"
- "a non-responsive GDB process. The default value of 20 seconds should\n"
- "be sufficient for most applications, but there are situations when\n"
- "loading big libraries or listing source files takes much longer than\n"
- "that on slow machines. In this case, the value should be increased."));
+ "The number of seconds before a non-responsive GDB process is terminated.\n"
+ "The default value of 20 seconds should be sufficient for most\n"
+ "applications, but there are situations when loading big libraries or\n"
+ "listing source files takes much longer than that on slow machines.\n"
+ "In this case, the value should be increased."));
auto spinBoxGdbWatchdogTimeout = new QSpinBox(groupBoxGeneral);
spinBoxGdbWatchdogTimeout->setToolTip(labelGdbWatchdogTimeout->toolTip());
diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp
index 22c2e73ed9e..98dc0f91437 100644
--- a/src/plugins/debugger/logwindow.cpp
+++ b/src/plugins/debugger/logwindow.cpp
@@ -43,6 +43,9 @@
#include
Settings changes made since the last time this " - "version of Qt Creator was used are ignored, and " + "version of %2 was used are ignored, and " "changes made now will not be propagated to " - "the newer version.
").arg(path.toUserOutput()); + "the newer version.").arg(path.toUserOutput()) + .arg(Core::Constants::IDE_DISPLAY_NAME); result.buttons.insert(QMessageBox::Ok, Continue); } @@ -853,10 +855,11 @@ SettingsAccessor::IssueInfo SettingsAccessor::findIssues(const QVariantMap &data result.title = differentEnvironmentMsg(project()->displayName()); result.message = QApplication::translate("ProjectExplorer::EnvironmentIdAccessor", "No .user settings file created by this instance " - "of Qt Creator was found.
" + "of %1 was found." "Did you work with this project on another machine or " "using a different settings path before?
" - "Do you still want to load the settings file \"%1\"?
") + "Do you still want to load the settings file \"%2\"?
") + .arg(Core::Constants::IDE_DISPLAY_NAME) .arg(path.toUserOutput()); result.defaultButton = QMessageBox::No; result.escapeButton = QMessageBox::No; @@ -1093,8 +1096,9 @@ QVariantMap SettingsAccessor::readSharedSettings(QWidget *parent) const "Unsupported Shared Settings File"), QApplication::translate("ProjectExplorer::SettingsAccessor", "The version of your .shared file is not " - "supported by Qt Creator. " - "Do you want to try loading it anyway?"), + "supported by %1. " + "Do you want to try loading it anyway?") + .arg(Core::Constants::IDE_DISPLAY_NAME), QMessageBox::Yes | QMessageBox::No, parent); msgBox.setDefaultButton(QMessageBox::No); diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp index de40db6c669..c089109fda9 100644 --- a/src/plugins/projectexplorer/targetsettingspanel.cpp +++ b/src/plugins/projectexplorer/targetsettingspanel.cpp @@ -41,6 +41,8 @@ #include "target.h" #include "targetsetuppage.h" +#include"
- "This creates a qmake .pro file that allows you to use Qt Creator as a code editor "
+ "This creates a qmake .pro file that allows you to use %1 as a code editor "
"and as a launcher for debugging and analyzing tools. "
- "If you want to build the project, you might need to edit the generated .pro file."));
+ "If you want to build the project, you might need to edit the generated .pro file.")
+ .arg(Core::Constants::IDE_DISPLAY_NAME));
setCategory(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY);
setDisplayCategory(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY_DISPLAY);
setFlags(IWizardFactory::PlatformIndependent);
@@ -200,7 +203,8 @@ GeneratedFiles SimpleProjectWizard::generateFiles(const QWizard *w,
GeneratedFile generatedProFile(proFileName);
generatedProFile.setAttributes(Core::GeneratedFile::OpenProjectAttribute);
generatedProFile.setContents(
- "# Created by and for Qt Creator. This file was created for editing the project sources only.\n"
+ "# Created by and for " + QLatin1String(Core::Constants::IDE_DISPLAY_NAME)
+ + " This file was created for editing the project sources only.\n"
"# You may attempt to use it for building too, by modifying this file here.\n\n"
"#TARGET = " + projectName + "\n\n"
+ proHeaders + "\n\n"
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp
index cc0136dc4c5..0a32af56eac 100644
--- a/src/plugins/qmldesigner/settingspage.cpp
+++ b/src/plugins/qmldesigner/settingspage.cpp
@@ -29,6 +29,8 @@
#include "designersettings.h"
#include "puppetcreator.h"
+#include