Merge remote-tracking branch 'origin/13.0'

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
	qbs/modules/qtc/qtc.qbs
	src/plugins/remotelinux/linuxdevicetester.cpp

Change-Id: I8434e41dcfbb50f6ed032a3e0af1591eb19b79eb

2 files changed, 10 insertions, 3 deletions

diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
index 54ac38e8ece..41bbef61bd3 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
@@ -77,10 +77,15 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(Target *target)
 
         const auto setSummaryText = [this, details] {
             const auto describe = [](const TriStateAspect &aspect, const QString &name) {
-                if (aspect() == TriState::Enabled)
+                if (aspect() == TriState::Enabled) {
+                    //: %1 is C++, QML, or Python
                     return Tr::tr("Enable %1 debugger.").arg(name);
-                if (aspect() == TriState::Disabled)
+                }
+                if (aspect() == TriState::Disabled) {
+                    //: %1 is C++, QML, or Python
                     return Tr::tr("Disable %1 debugger.").arg(name);
+                }
+                //: %1 is C++, QML, or Python
                 return Tr::tr("Try to determine need for %1 debugger.").arg(name);
             };
 
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 987122fcf24..0cc67f54161 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -959,8 +959,10 @@ static QString displayType(const WatchItem *item)
         result += QString(":%1").arg(item->bitsize);
     result.remove('\'');
     result = watchModel(item)->removeNamespaces(result);
-    if (item->valuelen > 0)
+    if (item->valuelen > 0) {
+        //: <type> of length <number>, e.g. for strings and byte arrays
         result = Tr::tr("%1 of length %2").arg(result).arg(item->valuelen);
+    }
     return result;
 }