forked from qt-creator/qt-creator
Debugger: Add missing full stops and quotes
And de-argumentify a string that is easier to handle as two strings. Change-Id: I1ba5d86ae870adb107dd5b0a70c6492f1cacafde Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -2289,9 +2289,9 @@ void CdbEngine::parseOutputLine(QString line)
|
||||
CheckableMessageBox::information(
|
||||
Core::ICore::dialogParent(),
|
||||
Tr::tr("Debugger Start Failed"),
|
||||
Tr::tr("The system prevents loading of %1, which is required for debugging. "
|
||||
Tr::tr("The system prevents loading of \"%1\", which is required for debugging. "
|
||||
"Make sure that your antivirus solution is up to date and if that does not work "
|
||||
"consider adding an exception for %1.")
|
||||
"consider adding an exception for \"%1\".")
|
||||
.arg(m_extensionFileName),
|
||||
QString("SecureInfoCdbextCannotBeLoaded"));
|
||||
notifyEngineSetupFailed();
|
||||
@@ -2778,7 +2778,7 @@ void CdbEngine::setupScripting(const DebuggerResponse &response)
|
||||
if (!toLoad) {
|
||||
Core::AsynchronousMessageBox::critical(
|
||||
Tr::tr("Cannot Find Debugger Initialization Script"),
|
||||
Tr::tr("Cannot read %1: %2").arg(loadOrderFile.toUserOutput(), toLoad.error()));
|
||||
Tr::tr("Cannot read \"%1\": %2").arg(loadOrderFile.toUserOutput(), toLoad.error()));
|
||||
notifyEngineSetupFailed();
|
||||
return;
|
||||
}
|
||||
@@ -2795,7 +2795,8 @@ void CdbEngine::setupScripting(const DebuggerResponse &response)
|
||||
const FilePath codeFile = dumperPath / (module + ".py");
|
||||
const expected_str<QByteArray> code = codeFile.fileContents();
|
||||
if (!code) {
|
||||
qDebug() << Tr::tr("Cannot read %1: %2").arg(codeFile.toUserOutput(), code.error());
|
||||
qDebug() << Tr::tr("Cannot read \"%1\": %2")
|
||||
.arg(codeFile.toUserOutput(), code.error());
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@@ -221,7 +221,7 @@ DebuggerItemModel::DebuggerItemModel()
|
||||
genericGdb.setEngineType(GdbEngineType);
|
||||
genericGdb.setAbi(Abi());
|
||||
genericGdb.setCommand("gdb");
|
||||
genericGdb.setUnexpandedDisplayName(Tr::tr("%1 from PATH on Build Device").arg("GDB"));
|
||||
genericGdb.setUnexpandedDisplayName(Tr::tr("GDB from PATH on Build Device"));
|
||||
generic->appendChild(new DebuggerTreeItem(genericGdb, false));
|
||||
|
||||
DebuggerItem genericLldb(QVariant("lldb"));
|
||||
@@ -230,7 +230,7 @@ DebuggerItemModel::DebuggerItemModel()
|
||||
genericLldb.setGeneric(true);
|
||||
genericLldb.setAbi(Abi());
|
||||
genericLldb.setCommand("lldb");
|
||||
genericLldb.setUnexpandedDisplayName(Tr::tr("%1 from PATH on Build Device").arg("LLDB"));
|
||||
genericLldb.setUnexpandedDisplayName(Tr::tr("LLDB from PATH on Build Device"));
|
||||
generic->appendChild(new DebuggerTreeItem(genericLldb, false));
|
||||
}
|
||||
|
||||
|
@@ -73,19 +73,19 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(Target *target)
|
||||
const auto setSummaryText = [this, details] {
|
||||
QStringList items;
|
||||
if (m_cppAspect->value() == TriState::Enabled)
|
||||
items.append(Tr::tr("Enable C++ debugger"));
|
||||
items.append(Tr::tr("Enable C++ debugger."));
|
||||
else if (m_cppAspect->value() == TriState::Default)
|
||||
items.append(Tr::tr("Try to determine need for C++ debugger"));
|
||||
items.append(Tr::tr("Try to determine need for C++ debugger."));
|
||||
|
||||
if (m_qmlAspect->value() == TriState::Enabled)
|
||||
items.append(Tr::tr("Enable QML debugger"));
|
||||
items.append(Tr::tr("Enable QML debugger."));
|
||||
else if (m_qmlAspect->value() == TriState::Default)
|
||||
items.append(Tr::tr("Try to determine need for QML debugger"));
|
||||
items.append(Tr::tr("Try to determine need for QML debugger."));
|
||||
|
||||
items.append(m_overrideStartupAspect->value().isEmpty()
|
||||
? Tr::tr("Without additional startup commands")
|
||||
: Tr::tr("With additional startup commands"));
|
||||
details->setSummaryText(items.join(". "));
|
||||
? Tr::tr("Without additional startup commands.")
|
||||
: Tr::tr("With additional startup commands."));
|
||||
details->setSummaryText(items.join(" "));
|
||||
};
|
||||
setSummaryText();
|
||||
|
||||
|
@@ -3976,9 +3976,9 @@ void GdbEngine::handleGdbStarted()
|
||||
const FilePath loadOrderFile = dumperPath / "loadorder.txt";
|
||||
const expected_str<QByteArray> toLoad = loadOrderFile.fileContents();
|
||||
if (!toLoad) {
|
||||
AsynchronousMessageBox::critical(
|
||||
Tr::tr("Cannot Find Debugger Initialization Script"),
|
||||
Tr::tr("Cannot read %1: %2").arg(loadOrderFile.toUserOutput(), toLoad.error()));
|
||||
AsynchronousMessageBox::critical(Tr::tr("Cannot Find Debugger Initialization Script"),
|
||||
Tr::tr("Cannot read \"%1\": %2")
|
||||
.arg(loadOrderFile.toUserOutput(), toLoad.error()));
|
||||
notifyEngineSetupFailed();
|
||||
return;
|
||||
}
|
||||
@@ -3995,7 +3995,8 @@ void GdbEngine::handleGdbStarted()
|
||||
const FilePath codeFile = dumperPath / (module + ".py");
|
||||
const expected_str<QByteArray> code = codeFile.fileContents();
|
||||
if (!code) {
|
||||
qDebug() << Tr::tr("Cannot read %1: %2").arg(codeFile.toUserOutput(), code.error());
|
||||
qDebug() << Tr::tr("Cannot read \"%1\": %2")
|
||||
.arg(codeFile.toUserOutput(), code.error());
|
||||
continue;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user