Merge remote-tracking branch 'origin/13.0'

Change-Id: If752e3383b35873b696e8beca27d8838a4096c8a
2024-02-27 09:04:51 +01:00
parent 69a0f16547 fdabbfcbcf
commit a8414effd8
176 changed files with 3444 additions and 2000 deletions
--- a/src/libs/utils/devicefileaccess.cpp
+++ b/src/libs/utils/devicefileaccess.cpp
@@ -566,8 +566,8 @@ static bool checkToRefuseRemoveStandardLocationDirectory(const QString &dirPath,
 {
    if (QStandardPaths::standardLocations(location).contains(dirPath)) {
        if (error) {
-            *error = Tr::tr("Refusing to remove your %1 directory.").arg(
-                QStandardPaths::displayName(location));
+            *error = Tr::tr("Refusing to remove the standard directory \"%1\".")
+                         .arg(QStandardPaths::displayName(location));
        }
        return false;
    }