From 4e73069358093e2db6e3721c3c022c6201b3b45c Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 13 Jun 2023 15:32:09 +0200 Subject: [PATCH] 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 Reviewed-by: hjk --- src/plugins/debugger/cdb/cdbengine.cpp | 9 +++++---- src/plugins/debugger/debuggeritemmanager.cpp | 4 ++-- .../debugger/debuggerrunconfigurationaspect.cpp | 14 +++++++------- src/plugins/debugger/gdb/gdbengine.cpp | 9 +++++---- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index c60052452a8..28d90c747cf 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -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 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; } diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index aca5a976359..2c97bdc8456 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -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)); } diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp index 8c118f553b6..8cf92fe1da8 100644 --- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp +++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp @@ -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(); diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index e5052d1b89d..d52e2bc7104 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -3976,9 +3976,9 @@ void GdbEngine::handleGdbStarted() const FilePath loadOrderFile = dumperPath / "loadorder.txt"; const expected_str 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 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; }