Use double quotes instead of single quotes as per our guidelines.

Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

src/libs/extensionsystem/optionsparser.cpp

@@ -120,7 +120,7 @@ bool OptionsParser::checkForTestOption()
                 if (m_pmPrivate->containsTestSpec(spec)) {
                     if (m_errorString)
                         *m_errorString = QCoreApplication::translate("PluginManager",
-                                                                     "The plugin '%1' is specified twice for testing.").arg(pluginName);
+                                                                     "The plugin \"%1\" is specified twice for testing.").arg(pluginName);
                     m_hasError = true;
                 } else {
                     m_pmPrivate->testSpecs.append(PluginManagerPrivate::TestSpec(spec, args));
@@ -128,7 +128,7 @@ bool OptionsParser::checkForTestOption()
             } else  {
                 if (m_errorString)
                     *m_errorString = QCoreApplication::translate("PluginManager",
-                                                                 "The plugin '%1' does not exist.").arg(pluginName);
+                                                                 "The plugin \"%1\" does not exist.").arg(pluginName);
                 m_hasError = true;
             }
         }
@@ -145,7 +145,7 @@ bool OptionsParser::checkForLoadOption()
         if (!spec) {
             if (m_errorString)
                 *m_errorString = QCoreApplication::translate("PluginManager",
-                                                             "The plugin '%1' does not exist.")
+                                                             "The plugin \"%1\" does not exist.")
                     .arg(m_currentArg);
             m_hasError = true;
         } else {
@@ -165,7 +165,7 @@ bool OptionsParser::checkForNoLoadOption()
         if (!spec) {
             if (m_errorString)
                 *m_errorString = QCoreApplication::translate("PluginManager",
-                                                             "The plugin '%1' does not exist.").arg(m_currentArg);
+                                                             "The plugin \"%1\" does not exist.").arg(m_currentArg);
             m_hasError = true;
         } else {
             spec->setForceDisabled(true);

src/libs/extensionsystem/pluginspec.cpp

@@ -588,22 +588,22 @@ bool PluginSpecPrivate::reportError(const QString &err)
 
 static inline QString msgAttributeMissing(const char *elt, const char *attribute)
 {
-    return QCoreApplication::translate("PluginSpec", "'%1' misses attribute '%2'").arg(QLatin1String(elt), QLatin1String(attribute));
+    return QCoreApplication::translate("PluginSpec", "\"%1\" misses attribute \"%2\"").arg(QLatin1String(elt), QLatin1String(attribute));
 }
 
 static inline QString msgInvalidFormat(const char *content)
 {
-    return QCoreApplication::translate("PluginSpec", "'%1' has invalid format").arg(QLatin1String(content));
+    return QCoreApplication::translate("PluginSpec", "\"%1\" has invalid format").arg(QLatin1String(content));
 }
 
 static inline QString msgInvalidElement(const QString &name)
 {
-    return QCoreApplication::translate("PluginSpec", "Invalid element '%1'").arg(name);
+    return QCoreApplication::translate("PluginSpec", "Invalid element \"%1\"").arg(name);
 }
 
 static inline QString msgUnexpectedClosing(const QString &name)
 {
-    return QCoreApplication::translate("PluginSpec", "Unexpected closing element '%1'").arg(name);
+    return QCoreApplication::translate("PluginSpec", "Unexpected closing element \"%1\"").arg(name);
 }
 
 static inline QString msgUnexpectedToken()
@@ -617,7 +617,7 @@ static inline QString msgUnexpectedToken()
 void PluginSpecPrivate::readPluginSpec(QXmlStreamReader &reader)
 {
     if (reader.name() != QLatin1String(PLUGIN)) {
-        reader.raiseError(QCoreApplication::translate("PluginSpec", "Expected element '%1' as top level element")
+        reader.raiseError(QCoreApplication::translate("PluginSpec", "Expected element \"%1\" as top level element")
                           .arg(QLatin1String(PLUGIN)));
         return;
     }

src/libs/qmljs/qmljsplugindumper.cpp

@@ -398,7 +398,7 @@ void PluginDumper::loadQmltypesFile(const QStringList &qmltypesFilePaths,
         QList<ModuleApiInfo> newModuleApis;
         CppQmlTypesLoader::parseQmlTypeDescriptions(reader.data(), &newObjects, &newModuleApis, &error, &warning, qmltypesFilePath);
         if (!error.isEmpty()) {
-            errors += tr("Failed to parse '%1'.\nError: %2").arg(qmltypesFilePath, error);
+            errors += tr("Failed to parse \"%1\".\nError: %2").arg(qmltypesFilePath, error);
         } else {
             objects += newObjects.values();
             moduleApis += newModuleApis;

src/libs/qmljs/qmljsstaticanalysismessage.cpp

@@ -63,7 +63,7 @@ public:
 
 static inline QString msgInvalidConstructor(const char *what)
 {
-    return StaticAnalysisMessages::tr("Do not use '%1' as a constructor.").arg(QLatin1String(what));
+    return StaticAnalysisMessages::tr("Do not use \"%1\" as a constructor.").arg(QLatin1String(what));
 }
 
 StaticAnalysisMessages::StaticAnalysisMessages()
@@ -97,11 +97,11 @@ StaticAnalysisMessages::StaticAnalysisMessages()
     newMsg(ErrDuplicateId, Error,
            tr("Duplicate id."));
     newMsg(ErrInvalidPropertyName, Error,
-           tr("Invalid property name '%1'."), 1);
+           tr("Invalid property name \"%1\"."), 1);
     newMsg(ErrDoesNotHaveMembers, Error,
-           tr("'%1' does not have members."), 1);
+           tr("\"%1\" does not have members."), 1);
     newMsg(ErrInvalidMember, Error,
-           tr("'%1' is not a member of '%2'."), 2);
+           tr("\"%1\" is not a member of \"%2\"."), 2);
     newMsg(WarnAssignmentInCondition, Warning,
            tr("Assignment in condition."));
     newMsg(WarnCaseWithoutFlowControl, Warning,
@@ -115,19 +115,19 @@ StaticAnalysisMessages::StaticAnalysisMessages()
     newMsg(WarnComma, Warning,
            tr("Do not use comma expressions."));
     newMsg(WarnAlreadyFormalParameter, Warning,
-           tr("'%1' already is a formal parameter."), 1);
+           tr("\"%1\" already is a formal parameter."), 1);
     newMsg(WarnUnnecessaryMessageSuppression, Warning,
            tr("Unnecessary message suppression."));
     newMsg(WarnAlreadyFunction, Warning,
-           tr("'%1' already is a function."), 1);
+           tr("\"%1\" already is a function."), 1);
     newMsg(WarnVarUsedBeforeDeclaration, Warning,
-           tr("var '%1' is used before its declaration."), 1);
+           tr("var \"%1\" is used before its declaration."), 1);
     newMsg(WarnAlreadyVar, Warning,
-           tr("'%1' already is a var."), 1);
+           tr("\"%1\" already is a var."), 1);
     newMsg(WarnDuplicateDeclaration, Warning,
-           tr("'%1' is declared more than once."), 1);
+           tr("\"%1\" is declared more than once."), 1);
     newMsg(WarnFunctionUsedBeforeDeclaration, Warning,
-           tr("Function '%1' is used before its declaration."), 1);
+           tr("Function \"%1\" is used before its declaration."), 1);
     newMsg(WarnBooleanConstructor, Warning,
            msgInvalidConstructor("Boolean"));
     newMsg(WarnStringConstructor, Warning,
@@ -163,13 +163,13 @@ StaticAnalysisMessages::StaticAnalysisMessages()
     newMsg(ErrUnknownComponent, Error,
            tr("Unknown component."));
     newMsg(ErrCouldNotResolvePrototypeOf, Error,
-           tr("Could not resolve the prototype '%1' of '%2'."), 2);
+           tr("Could not resolve the prototype \"%1\" of \"%2\"."), 2);
     newMsg(ErrCouldNotResolvePrototype, Error,
-           tr("Could not resolve the prototype '%1'."), 1);
+           tr("Could not resolve the prototype \"%1\"."), 1);
     newMsg(ErrPrototypeCycle, Error,
-           tr("Prototype cycle, the last non-repeated component is '%1'."), 1);
+           tr("Prototype cycle, the last non-repeated component is \"%1\"."), 1);
     newMsg(ErrInvalidPropertyType, Error,
-           tr("Invalid property type '%1'."), 1);
+           tr("Invalid property type \"%1\"."), 1);
     newMsg(WarnEqualityTypeCoercion, Error,
            tr("== and != perform type coercion, use === or !== to avoid it."));
     newMsg(WarnExpectedNewWithUppercaseFunction, Error,
@@ -185,7 +185,7 @@ StaticAnalysisMessages::StaticAnalysisMessages()
     newMsg(HintPreferNonVarPropertyType, Hint,
            tr("Use %1 instead of 'var' or 'variant' to improve performance."), 1);
     newMsg(ErrMissingRequiredProperty, Error,
-           tr("Missing property '%1'."), 1);
+           tr("Missing property \"%1\"."), 1);
     newMsg(ErrObjectValueExpected, Error,
            tr("Object value expected."));
     newMsg(ErrArrayValueExpected, Error,

src/libs/qmljs/qmljstypedescriptionreader.cpp

@@ -197,7 +197,7 @@ void TypeDescriptionReader::readComponent(UiObjectDefinition *ast)
                 readEnum(component, fmo);
             else
                 addWarning(component->firstSourceLocation(),
-                           tr("Expected only Property, Method, Signal and Enum object definitions, not '%1'.")
+                           tr("Expected only Property, Method, Signal and Enum object definitions, not \"%1\".")
                            .arg(name));
         } else if (script) {
             QString name = toString(script->qualifiedId);
@@ -223,7 +223,7 @@ void TypeDescriptionReader::readComponent(UiObjectDefinition *ast)
                 addWarning(script->firstSourceLocation(),
                            tr("Expected only name, prototype, defaultProperty, attachedType, exports "
                               "isSingleton, isCreatable, isComposite and exportMetaObjectRevisions "
-                              "script bindings, not '%1'.").arg(name));
+                              "script bindings, not \"%1\".").arg(name));
             }
         } else {
             addWarning(member->firstSourceLocation(), tr("Expected only script bindings and object definitions."));

src/libs/ssh/sftpchannel.cpp

@@ -502,14 +502,14 @@ void SftpChannelPrivate::handleMkdirStatus(const JobMap::Iterator &it,
     const QString &remoteDir = dirIt.value().remoteDir;
     if (response.status == SSH_FX_OK) {
         emit dataAvailable(op->parentJob->jobId,
-            tr("Created remote directory '%1'.").arg(remoteDir));
+            tr("Created remote directory \"%1\".").arg(remoteDir));
     } else if (response.status == SSH_FX_FAILURE) {
         emit dataAvailable(op->parentJob->jobId,
-            tr("Remote directory '%1' already exists.").arg(remoteDir));
+            tr("Remote directory \"%1\" already exists.").arg(remoteDir));
     } else {
         op->parentJob->setError();
         emit finished(op->parentJob->jobId,
-            tr("Error creating directory '%1': %2")
+            tr("Error creating directory \"%1\": %2")
             .arg(remoteDir, response.errorString));
         m_jobs.erase(it);
         return;
@@ -533,7 +533,7 @@ void SftpChannelPrivate::handleMkdirStatus(const JobMap::Iterator &it,
         if (!localFile->open(QIODevice::ReadOnly)) {
             op->parentJob->setError();
             emit finished(op->parentJob->jobId,
-                tr("Could not open local file '%1': %2")
+                tr("Could not open local file \"%1\": %2")
                 .arg(fileInfo.absoluteFilePath(), localFile->errorString()));
             m_jobs.erase(it);
             return;

src/libs/ssh/sftpfilesystemmodel.cpp

@@ -358,7 +358,7 @@ void SftpFileSystemModel::handleSftpJobFinished(SftpJobId jobId, const QString &
     if (jobId == d->statJobId) {
         d->statJobId = SftpInvalidJob;
         if (!errorMessage.isEmpty())
-            emit sftpOperationFailed(tr("Error getting 'stat' info about '%1': %2")
+            emit sftpOperationFailed(tr("Error getting \"stat\" info about \"%1\": %2")
                 .arg(rootDirectory(), errorMessage));
         return;
     }
@@ -368,7 +368,7 @@ void SftpFileSystemModel::handleSftpJobFinished(SftpJobId jobId, const QString &
         QSSH_ASSERT(it.value()->lsState == SftpDirNode::LsRunning);
         it.value()->lsState = SftpDirNode::LsFinished;
         if (!errorMessage.isEmpty())
-            emit sftpOperationFailed(tr("Error listing contents of directory '%1': %2")
+            emit sftpOperationFailed(tr("Error listing contents of directory \"%1\": %2")
                 .arg(it.value()->path, errorMessage));
         d->lsOps.erase(it);
         return;

src/libs/ssh/sshconnection.cpp

@@ -384,14 +384,14 @@ void SshConnectionPrivate::handleServerId()
     if (!versionIdpattern.exactMatch(QString::fromLatin1(m_serverId))) {
         throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR,
             "Identification string is invalid.",
-            tr("Server Identification string '%1' is invalid.")
+            tr("Server Identification string \"%1\" is invalid.")
                     .arg(QString::fromLatin1(m_serverId)));
     }
     const QString serverProtoVersion = versionIdpattern.cap(1);
     if (serverProtoVersion != QLatin1String("2.0") && serverProtoVersion != QLatin1String("1.99")) {
         throw SshServerException(SSH_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED,
             "Invalid protocol version.",
-            tr("Server protocol version is '%1', but needs to be 2.0 or 1.99.")
+            tr("Server protocol version is \"%1\", but needs to be 2.0 or 1.99.")
                     .arg(serverProtoVersion));
     }
 

src/libs/ssh/sshkeycreationdialog.cpp

@@ -115,7 +115,7 @@ void SshKeyCreationDialog::saveKeys()
     const QString parentDir = QFileInfo(privateKeyFilePath()).dir().path();
     if (!QDir::root().mkpath(parentDir)) {
         QMessageBox::critical(this, tr("Cannot Save Key File"),
-            tr("Failed to create directory: '%1'.").arg(parentDir));
+            tr("Failed to create directory: \"%1\".").arg(parentDir));
         return;
     }
 

src/libs/ssh/sshremoteprocess.cpp

@@ -381,7 +381,7 @@ void SshRemoteProcessPrivate::handleExitSignal(const SshChannelExitSignal &signa
     }
 
     throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR, "Invalid signal",
-        tr("Server sent invalid signal '%1'").arg(QString::fromUtf8(signal.signal)));
+        tr("Server sent invalid signal \"%1\"").arg(QString::fromUtf8(signal.signal)));
 }
 
 } // namespace Internal

src/libs/utils/buildablehelperlibrary.cpp

@@ -248,7 +248,7 @@ static bool runBuildProcess(QProcess &proc,
         }
         *errorMessage =
                 QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
-                                            "Error running '%1' in %2: %3").
+                                            "Error running \"%1\" in %2: %3").
                                             arg(cmd, proc.workingDirectory(), *errorMessage);
         qWarning("%s", qPrintable(*errorMessage));
     }
@@ -267,7 +267,7 @@ bool BuildableHelperLibrary::buildHelper(const BuildHelperArguments &arguments,
     proc.setProcessChannelMode(QProcess::MergedChannels);
 
     log->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
-                                          "Building helper '%1' in %2\n").arg(arguments.helperName,
+                                          "Building helper \"%1\" in %2\n").arg(arguments.helperName,
                                                                               arguments.directory));
     log->append(newline);
 

src/libs/utils/consoleprocess.cpp

@@ -121,7 +121,7 @@ QString ConsoleProcess::msgCannotWriteTempFile()
 
 QString ConsoleProcess::msgCannotCreateTempDir(const QString & dir, const QString &why)
 {
-    return tr("Cannot create temporary directory '%1': %2").arg(dir, why);
+    return tr("Cannot create temporary directory \"%1\": %2").arg(dir, why);
 }
 
 QString ConsoleProcess::msgUnexpectedOutput(const QByteArray &what)
@@ -131,12 +131,12 @@ QString ConsoleProcess::msgUnexpectedOutput(const QByteArray &what)
 
 QString ConsoleProcess::msgCannotChangeToWorkDir(const QString & dir, const QString &why)
 {
-    return tr("Cannot change to working directory '%1': %2").arg(dir, why);
+    return tr("Cannot change to working directory \"%1\": %2").arg(dir, why);
 }
 
 QString ConsoleProcess::msgCannotExecute(const QString & p, const QString &why)
 {
-    return tr("Cannot execute '%1': %2").arg(p, why);
+    return tr("Cannot execute \"%1\": %2").arg(p, why);
 }
 
 QString ConsoleProcess::terminalEmulator(const QSettings *settings, bool nonEmpty)

src/libs/utils/consoleprocess_unix.cpp

@@ -163,7 +163,7 @@ bool ConsoleProcess::start(const QString &program, const QString &args)
     d->m_process.start(xterm, allArgs);
     if (!d->m_process.waitForStarted()) {
         stubServerShutdown();
-        emit processError(tr("Cannot start the terminal emulator '%1', change the setting in the "
+        emit processError(tr("Cannot start the terminal emulator \"%1\", change the setting in the "
                              "Environment options.").arg(xterm));
         delete d->m_tempFile;
         d->m_tempFile = 0;
@@ -247,7 +247,7 @@ QString ConsoleProcess::stubServerListen()
     const QString stubServer  = stubFifoDir + QLatin1String("/stub-socket");
     if (!d->m_stubServer.listen(stubServer)) {
         ::rmdir(d->m_stubServerDir.constData());
-        return tr("Cannot create socket '%1': %2").arg(stubServer, d->m_stubServer.errorString());
+        return tr("Cannot create socket \"%1\": %2").arg(stubServer, d->m_stubServer.errorString());
     }
     return QString();
 }

src/libs/utils/consoleprocess_win.cpp

@@ -146,7 +146,7 @@ bool ConsoleProcess::start(const QString &program, const QString &args)
         delete d->m_tempFile;
         d->m_tempFile = 0;
         stubServerShutdown();
-        emit processError(tr("The process '%1' could not be started: %2").arg(cmdLine, winErrorMessage(GetLastError())));
+        emit processError(tr("The process \"%1\" could not be started: %2").arg(cmdLine, winErrorMessage(GetLastError())));
         return false;
     }
 

src/libs/utils/elfreader.cpp

@@ -142,7 +142,7 @@ ElfData ElfReader::readHeaders()
 
 static inline QString msgInvalidElfObject(const QString &binary, const QString &why)
 {
-    return ElfReader::tr("'%1' is an invalid ELF object (%2)")
+    return ElfReader::tr("\"%1\" is an invalid ELF object (%2)")
            .arg(QDir::toNativeSeparators(binary), why);
 }
 
@@ -160,12 +160,12 @@ ElfReader::Result ElfReader::readIt()
     const quint64 fdlen = mapper.fdlen;
 
     if (fdlen < 64) {
-        m_errorString = tr("'%1' is not an ELF object (file too small)").arg(QDir::toNativeSeparators(m_binary));
+        m_errorString = tr("\"%1\" is not an ELF object (file too small)").arg(QDir::toNativeSeparators(m_binary));
         return NotElf;
     }
 
     if (strncmp(mapper.start, "\177ELF", 4) != 0) {
-        m_errorString = tr("'%1' is not an ELF object").arg(QDir::toNativeSeparators(m_binary));
+        m_errorString = tr("\"%1\" is not an ELF object").arg(QDir::toNativeSeparators(m_binary));
         return NotElf;
     }
 
@@ -184,7 +184,7 @@ ElfReader::Result ElfReader::readIt()
     // if ((sizeof(void*) == 4 && bits != 32)
     //     || (sizeof(void*) == 8 && bits != 64)) {
     //     if (errorString)
-    //         *errorString = QLibrary::tr("'%1' is an invalid ELF object (%2)")
+    //         *errorString = QLibrary::tr("\"%1\" is an invalid ELF object (%2)")
     //         .arg(m_binary).arg(QLatin1String("wrong cpu architecture"));
     //     return Corrupt;
     // }
@@ -238,7 +238,7 @@ ElfReader::Result ElfReader::readIt()
     quint64 soff = e_shoff + e_shentsize * e_shtrndx;
 
 //    if ((soff + e_shentsize) > fdlen || soff % 4 || soff == 0) {
-//        m_errorString = QLibrary::tr("'%1' is an invalid ELF object (%2)")
+//        m_errorString = QLibrary::tr("\"%1\" is an invalid ELF object (%2)")
 //           .arg(m_binary)
 //           .arg(QLatin1String("shstrtab section header seems to be at %1"))
 //           .arg(QString::number(soff, 16));

src/libs/utils/filenamevalidatinglineedit.cpp

@@ -120,7 +120,7 @@ bool FileNameValidatingLineEdit::validateFileName(const QString &name,
                 if (qc.isSpace())
                     *errorMessage = tr("Name contains white space.");
                 else
-                    *errorMessage = tr("Invalid character '%1'.").arg(qc);
+                    *errorMessage = tr("Invalid character \"%1\".").arg(qc);
             }
             return false;
         }
@@ -130,7 +130,7 @@ bool FileNameValidatingLineEdit::validateFileName(const QString &name,
         const QLatin1String notAllowedSubString(notAllowedSubStrings[s]);
         if (name.contains(notAllowedSubString)) {
             if (errorMessage)
-                *errorMessage = tr("Invalid characters '%1'.").arg(QString(notAllowedSubString));
+                *errorMessage = tr("Invalid characters \"%1\".").arg(QString(notAllowedSubString));
             return false;
         }
     }

src/libs/utils/fileutils.cpp

@@ -99,7 +99,7 @@ bool FileUtils::removeRecursively(const FileName &filePath, QString *error)
         }
         if (!QDir::root().rmdir(dir.path())) {
             if (error) {
-                *error = QCoreApplication::translate("Utils::FileUtils", "Failed to remove directory '%1'.")
+                *error = QCoreApplication::translate("Utils::FileUtils", "Failed to remove directory \"%1\".")
                         .arg(filePath.toUserOutput());
             }
             return false;
@@ -107,7 +107,7 @@ bool FileUtils::removeRecursively(const FileName &filePath, QString *error)
     } else {
         if (!QFile::remove(filePath.toString())) {
             if (error) {
-                *error = QCoreApplication::translate("Utils::FileUtils", "Failed to remove file '%1'.")
+                *error = QCoreApplication::translate("Utils::FileUtils", "Failed to remove file \"%1\".")
                         .arg(filePath.toUserOutput());
             }
             return false;
@@ -142,7 +142,7 @@ bool FileUtils::copyRecursively(const FileName &srcFilePath, const FileName &tgt
         targetDir.cdUp();
         if (!targetDir.mkdir(tgtFilePath.toFileInfo().fileName())) {
             if (error) {
-                *error = QCoreApplication::translate("Utils::FileUtils", "Failed to create directory '%1'.")
+                *error = QCoreApplication::translate("Utils::FileUtils", "Failed to create directory \"%1\".")
                         .arg(tgtFilePath.toUserOutput());
             }
             return false;
@@ -161,7 +161,7 @@ bool FileUtils::copyRecursively(const FileName &srcFilePath, const FileName &tgt
     } else {
         if (!QFile::copy(srcFilePath.toString(), tgtFilePath.toString())) {
             if (error) {
-                *error = QCoreApplication::translate("Utils::FileUtils", "Could not copy file '%1' to '%2'.")
+                *error = QCoreApplication::translate("Utils::FileUtils", "Could not copy file \"%1\" to \"%2\".")
                         .arg(srcFilePath.toUserOutput(), tgtFilePath.toUserOutput());
             }
             return false;

src/libs/utils/newclasswidget.cpp

@@ -502,13 +502,13 @@ bool NewClassWidget::isValid(QString *error) const
 
     if (isHeaderInputVisible() && !d->m_ui.headerFileLineEdit->isValid()) {
         if (error)
-            *error = tr("Invalid header file name: '%1'").arg(d->m_ui.headerFileLineEdit->errorMessage());
+            *error = tr("Invalid header file name: \"%1\"").arg(d->m_ui.headerFileLineEdit->errorMessage());
         return false;
     }
 
     if (isSourceInputVisible() && !d->m_ui.sourceFileLineEdit->isValid()) {
         if (error)
-            *error = tr("Invalid source file name: '%1'").arg(d->m_ui.sourceFileLineEdit->errorMessage());
+            *error = tr("Invalid source file name: \"%1\"").arg(d->m_ui.sourceFileLineEdit->errorMessage());
         return false;
     }
 
@@ -516,7 +516,7 @@ bool NewClassWidget::isValid(QString *error) const
         (!d->m_formInputCheckable || d->m_ui.generateFormCheckBox->isChecked())) {
         if (!d->m_ui.formFileLineEdit->isValid()) {
             if (error)
-                *error = tr("Invalid form file name: '%1'").arg(d->m_ui.formFileLineEdit->errorMessage());
+                *error = tr("Invalid form file name: \"%1\"").arg(d->m_ui.formFileLineEdit->errorMessage());
             return false;
         }
     }

src/libs/utils/pathchooser.cpp

@@ -472,7 +472,7 @@ bool PathChooser::validatePath(const QString &path, QString *errorMessage)
 
     if (expandedPath.isEmpty()) {
         if (errorMessage)
-            *errorMessage = tr("The path '%1' expanded to an empty string.").arg(QDir::toNativeSeparators(path));
+            *errorMessage = tr("The path \"%1\" expanded to an empty string.").arg(QDir::toNativeSeparators(path));
         return false;
     }
     const QFileInfo fi(expandedPath);
@@ -482,52 +482,52 @@ bool PathChooser::validatePath(const QString &path, QString *errorMessage)
     case PathChooser::ExistingDirectory: // fall through
         if (!fi.exists()) {
             if (errorMessage)
-                *errorMessage = tr("The path '%1' does not exist.").arg(QDir::toNativeSeparators(expandedPath));
+                *errorMessage = tr("The path \"%1\" does not exist.").arg(QDir::toNativeSeparators(expandedPath));
             return false;
         }
         if (!fi.isDir()) {
             if (errorMessage)
-                *errorMessage = tr("The path '%1' is not a directory.").arg(QDir::toNativeSeparators(expandedPath));
+                *errorMessage = tr("The path \"%1\" is not a directory.").arg(QDir::toNativeSeparators(expandedPath));
             return false;
         }
         break;
     case PathChooser::File: // fall through
         if (!fi.exists()) {
             if (errorMessage)
-                *errorMessage = tr("The path '%1' does not exist.").arg(QDir::toNativeSeparators(expandedPath));
+                *errorMessage = tr("The path \"%1\" does not exist.").arg(QDir::toNativeSeparators(expandedPath));
             return false;
         }
         break;
     case PathChooser::SaveFile:
         if (!fi.absoluteDir().exists()) {
             if (errorMessage)
-                *errorMessage = tr("The directory '%1' does not exist.").arg(QDir::toNativeSeparators(fi.absolutePath()));
+                *errorMessage = tr("The directory \"%1\" does not exist.").arg(QDir::toNativeSeparators(fi.absolutePath()));
             return false;
         }
         break;
     case PathChooser::ExistingCommand:
         if (!fi.exists()) {
             if (errorMessage)
-                *errorMessage = tr("The path '%1' does not exist.").arg(QDir::toNativeSeparators(expandedPath));
+                *errorMessage = tr("The path \"%1\" does not exist.").arg(QDir::toNativeSeparators(expandedPath));
             return false;
         }
         if (!fi.isExecutable()) {
             if (errorMessage)
-                *errorMessage = tr("Cannot execute '%1'.").arg(QDir::toNativeSeparators(expandedPath));
+                *errorMessage = tr("Cannot execute \"%1\".").arg(QDir::toNativeSeparators(expandedPath));
             return false;
         }
         break;
     case PathChooser::Directory:
         if (fi.exists() && !fi.isDir()) {
             if (errorMessage)
-                *errorMessage = tr("The path '%1' is not a directory.").arg(QDir::toNativeSeparators(expandedPath));
+                *errorMessage = tr("The path \"%1\" is not a directory.").arg(QDir::toNativeSeparators(expandedPath));
             return false;
         }
         break;
     case PathChooser::Command: // fall through
         if (fi.exists() && !fi.isExecutable()) {
             if (errorMessage)
-                *errorMessage = tr("Cannot execute '%1'.").arg(QDir::toNativeSeparators(expandedPath));
+                *errorMessage = tr("Cannot execute \"%1\".").arg(QDir::toNativeSeparators(expandedPath));
             return false;
         }
         break;

src/libs/utils/projectnamevalidatinglineedit.cpp

@@ -48,7 +48,7 @@ bool ProjectNameValidatingLineEdit::validateProjectName(const QString &name, QSt
     int pos = FileUtils::indexOfQmakeUnfriendly(name);
     if (pos >= 0) {
         if (errorMessage)
-            *errorMessage = tr("Invalid character '%1' found!").arg(name.at(pos));
+            *errorMessage = tr("Invalid character \"%1\" found!").arg(name.at(pos));
         return false;
     }
     if (name.contains(QLatin1Char('.'))) {

src/libs/utils/synchronousprocess.cpp

@@ -127,15 +127,15 @@ QString SynchronousProcessResponse::exitMessage(const QString &binary, int timeo
 {
     switch (result) {
     case Finished:
-        return SynchronousProcess::tr("The command '%1' finished successfully.").arg(QDir::toNativeSeparators(binary));
+        return SynchronousProcess::tr("The command \"%1\" finished successfully.").arg(QDir::toNativeSeparators(binary));
     case FinishedError:
-        return SynchronousProcess::tr("The command '%1' terminated with exit code %2.").arg(QDir::toNativeSeparators(binary)).arg(exitCode);
+        return SynchronousProcess::tr("The command \"%1\" terminated with exit code %2.").arg(QDir::toNativeSeparators(binary)).arg(exitCode);
     case TerminatedAbnormally:
-        return SynchronousProcess::tr("The command '%1' terminated abnormally.").arg(QDir::toNativeSeparators(binary));
+        return SynchronousProcess::tr("The command \"%1\" terminated abnormally.").arg(QDir::toNativeSeparators(binary));
     case StartFailed:
-        return SynchronousProcess::tr("The command '%1' could not be started.").arg(QDir::toNativeSeparators(binary));
+        return SynchronousProcess::tr("The command \"%1\" could not be started.").arg(QDir::toNativeSeparators(binary));
     case Hang:
-        return SynchronousProcess::tr("The command '%1' did not respond within the timeout limit (%2 ms).").
+        return SynchronousProcess::tr("The command \"%1\" did not respond within the timeout limit (%2 ms).").
                 arg(QDir::toNativeSeparators(binary)).arg(timeoutMS);
     }
     return QString();
@@ -432,7 +432,7 @@ static inline bool askToKill(const QString &binary = QString())
     const QString title = SynchronousProcess::tr("Process not Responding");
     QString msg = binary.isEmpty() ?
                   SynchronousProcess::tr("The process is not responding.") :
-                  SynchronousProcess::tr("The process '%1' is not responding.").arg(QDir::toNativeSeparators(binary));
+                  SynchronousProcess::tr("The process \"%1\" is not responding.").arg(QDir::toNativeSeparators(binary));
     msg += QLatin1Char(' ');
     msg += SynchronousProcess::tr("Would you like to terminate it?");
     // Restore the cursor that is set to wait while running.

src/libs/zeroconf/avahiLib.cpp

@@ -133,7 +133,7 @@ public:
         // dynamic linking
         if (!nativeLib.load()) {
             setError(true,
-                     ZConfLib::tr("AvahiZConfLib could not load the native library '%1': %2").arg(libName, nativeLib.errorString()));
+                     ZConfLib::tr("AvahiZConfLib could not load the native library \"%1\": %2").arg(libName, nativeLib.errorString()));
         }
         m_simplePollGet = reinterpret_cast<AvahiSimplePollGet>(nativeLib.resolve("avahi_simple_poll_get"));
         m_simplePollNew = reinterpret_cast<AvahiSimplePollNewPtr>(nativeLib.resolve("avahi_simple_poll_new"));

src/libs/zeroconf/embeddedLib.cpp

@@ -106,7 +106,7 @@ public:
             if (killAllFailed) {
                 if (logger)
                     logger->appendError(ErrorMessage::WarningLevel,
-                                        ZConfLib::tr("%1 failed to kill other daemons with '%2'.")
+                                        ZConfLib::tr("%1 failed to kill other daemons with \"%2\".")
                                         .arg(name()).arg(cmd));
                 if (DEBUG_ZEROCONF)
                     qDebug() << name() << " had an error trying to kill other daemons with " << cmd;
@@ -126,7 +126,7 @@ public:
                 if (logger) {
                     QByteArray logBA = oldLog.readAll();
                     logger->appendError(ErrorMessage::NoteLevel,
-                                        ZConfLib::tr("%1: log of previous daemon run is: '%2'.")
+                                        ZConfLib::tr("%1: log of previous daemon run is: \"%2\".")
                                         .arg(name(), QString::fromLatin1(logBA.constData(), logBA.size())) + QLatin1Char('\n'));
                     qDebug()<<logBA.size()<<oldLog.error()<<oldLog.errorString();
                 }

src/plugins/android/androidmanager.cpp

@@ -580,7 +580,7 @@ bool AndroidManager::createAndroidTemplatesIfNecessary(ProjectExplorer::Target *
     forceUpdate &= androidPath.toFileInfo().exists();
 
     if (!dirPath(target).toFileInfo().exists() && !projectDir.mkdir(AndroidDirName)) {
-        raiseError(tr("Error creating Android directory '%1'.").arg(AndroidDirName));
+        raiseError(tr("Error creating Android directory \"%1\".").arg(AndroidDirName));
         return false;
     }
 
@@ -1046,7 +1046,7 @@ bool AndroidManager::openXmlFile(QDomDocument &doc, const Utils::FileName &fileN
         return false;
 
     if (!doc.setContent(f.readAll())) {
-        raiseError(tr("Cannot parse '%1'.").arg(fileName.toUserOutput()));
+        raiseError(tr("Cannot parse \"%1\".").arg(fileName.toUserOutput()));
         return false;
     }
     return true;
@@ -1059,7 +1059,7 @@ bool AndroidManager::saveXmlFile(ProjectExplorer::Target *target, QDomDocument &
 
     QFile f(fileName.toString());
     if (!f.open(QIODevice::WriteOnly)) {
-        raiseError(tr("Cannot open '%1'.").arg(fileName.toUserOutput()));
+        raiseError(tr("Cannot open \"%1\".").arg(fileName.toUserOutput()));
         return false;
     }
     return f.write(doc.toByteArray(4)) >= 0;

src/plugins/android/androidmanifesteditorwidget.cpp

@@ -706,9 +706,9 @@ void AndroidManifestEditorWidget::updateInfoBar(const QString &errorMessage, int
     Core::InfoBar *infoBar = m_textEditorWidget->baseTextDocument()->infoBar();
     QString text;
     if (line < 0)
-        text = tr("Could not parse file: '%1'.").arg(errorMessage);
+        text = tr("Could not parse file: \"%1\".").arg(errorMessage);
     else
-        text = tr("%2: Could not parse file: '%1'.").arg(errorMessage).arg(line);
+        text = tr("%2: Could not parse file: \"%1\".").arg(errorMessage).arg(line);
     Core::InfoBarEntry infoBarEntry(infoBarId, text);
     infoBarEntry.setCustomButtonInfo(tr("Goto error"), this, SLOT(gotoError()));
     infoBar->removeInfo(infoBarId);

src/plugins/android/androidpackagecreationstep.cpp

@@ -162,7 +162,7 @@ static inline QString msgCannotFindElfInformation()
 
 static inline QString msgCannotFindExecutable(const QString &appPath)
 {
-    return AndroidPackageCreationStep::tr("Cannot find '%1'.\n"
+    return AndroidPackageCreationStep::tr("Cannot find \"%1\".\n"
         "Please make sure your application is "
         "built successfully and is selected in Application tab ('Run option').").arg(appPath);
 }
@@ -621,7 +621,7 @@ bool AndroidPackageCreationStep::createPackage()
         QDir dir;
         dir.mkpath(m_gdbServerDestination.toFileInfo().absolutePath());
         if (!QFile::copy(m_gdbServerSource.toString(), m_gdbServerDestination.toString())) {
-            raiseError(tr("Can't copy gdbserver from '%1' to '%2'").arg(m_gdbServerSource.toUserOutput())
+            raiseError(tr("Can't copy gdbserver from \"%1\" to \"%2\"").arg(m_gdbServerSource.toUserOutput())
                        .arg(m_gdbServerDestination.toUserOutput()));
             return false;
         }

src/plugins/android/androidrunconfiguration.cpp

@@ -104,7 +104,7 @@ bool AndroidRunConfiguration::isEnabled() const
 QString AndroidRunConfiguration::disabledReason() const
 {
     if (m_parseInProgress)
-        return tr("The .pro file '%1' is currently being parsed.")
+        return tr("The .pro file \"%1\" is currently being parsed.")
                 .arg(QFileInfo(m_proFilePath).fileName());
 
     if (!m_parseSuccess)

src/plugins/android/androidrunner.cpp

@@ -285,7 +285,7 @@ void AndroidRunner::asyncStart()
     }
     if (!adb.waitForFinished(5000)) {
         adb.terminate();
-        emit remoteProcessFinished(tr("Unable to start '%1'.").arg(m_packageName));
+        emit remoteProcessFinished(tr("Unable to start \"%1\".").arg(m_packageName));
         return;
     }
 
@@ -308,7 +308,7 @@ void AndroidRunner::asyncStart()
                 break;
 
             if (i == 20) {
-                emit remoteProcessFinished(tr("Unable to start '%1'.").arg(m_packageName));
+                emit remoteProcessFinished(tr("Unable to start \"%1\".").arg(m_packageName));
                 return;
             }
             qDebug() << "WAITING FOR " << tmp.fileName();

src/plugins/autotoolsprojectmanager/autotoolsmanager.cpp

@@ -49,7 +49,7 @@ Project *AutotoolsManager::openProject(const QString &fileName, QString *errorSt
 {
     if (!QFileInfo(fileName).isFile()) {
         if (errorString)
-            *errorString = tr("Failed opening project '%1': Project is not a file")
+            *errorString = tr("Failed opening project \"%1\": Project is not a file")
                 .arg(fileName);
         return 0;
     }

src/plugins/beautifier/configurationdialog.cpp

@@ -147,7 +147,7 @@ void ConfigurationDialog::updateDocumentation(const QString &word, const QString
     if (word.isEmpty())
         ui->documentationHeader->setText(tr("Documentation"));
     else
-        ui->documentationHeader->setText(tr("Documentation for '%1'").arg(word));
+        ui->documentationHeader->setText(tr("Documentation for \"%1\"").arg(word));
     ui->documentation->setHtml(docu);
 }
 

src/plugins/clangcodemodel/test/clangcompletion_test.cpp

@@ -180,7 +180,7 @@ void ClangCodeModelPlugin::test_CXX_snippets()
         const QString snippetError =
                 QLatin1String("Text and snippet mismatch: text '") + text
                 + QLatin1String("', snippet '") + snippet
-                + QLatin1String("', got snippet '%1'");
+                + QLatin1String("', got snippet \"%1\"");
 
         bool hasText = false;
         foreach (const CodeCompletionResult &ccr, proposals) {
@@ -285,11 +285,11 @@ void ClangCodeModelPlugin::test_ObjC_hints()
         const QString snippetError =
                 QLatin1String("Text and snippet mismatch: text '") + text
                 + QLatin1String("', snippet '") + snippet
-                + QLatin1String("', got snippet '%1'");
+                + QLatin1String("', got snippet \"%1\"");
         const QString hintError =
                 QLatin1String("Text and hint mismatch: text '") + text
                 + QLatin1String("', hint\n'") + hint
-                + QLatin1String(", got hint\n'%1'");
+                + QLatin1String(", got hint\n\"%1\"");
 
         bool hasText = false;
         QStringList texts;
@@ -301,7 +301,7 @@ void ClangCodeModelPlugin::test_ObjC_hints()
             QVERIFY2(snippet == ccr.snippet(), snippetError.arg(ccr.snippet()).toAscii());
             QVERIFY2(hint == ccr.hint(), hintError.arg(ccr.hint()).toAscii());
         }
-        const QString textError(QString::fromLatin1("Text '%1' not found in set %2")
+        const QString textError(QString::fromLatin1("Text \"%1\" not found in set %2")
                                 .arg(text).arg(texts.join(QLatin1Char(','))));
         QVERIFY2(hasText, textError.toAscii());
     }

src/plugins/clearcase/clearcaseplugin.cpp

@@ -913,7 +913,7 @@ void ClearCasePlugin::undoCheckOutCurrent()
         Ui::UndoCheckOut uncoUi;
         QDialog uncoDlg;
         uncoUi.setupUi(&uncoDlg);
-        uncoUi.lblMessage->setText(tr("Do you want to undo the check out of '%1'?").arg(fileName));
+        uncoUi.lblMessage->setText(tr("Do you want to undo the check out of \"%1\"?").arg(fileName));
         if (uncoDlg.exec() != QDialog::Accepted)
             return;
         keep = uncoUi.chkKeep->isChecked();
@@ -994,7 +994,7 @@ void ClearCasePlugin::undoHijackCurrent()
         QDialog unhijackDlg;
         unhijackUi.setupUi(&unhijackDlg);
         unhijackDlg.setWindowTitle(tr("Undo Hijack File"));
-        unhijackUi.lblMessage->setText(tr("Do you want to undo hijack of '%1'?")
+        unhijackUi.lblMessage->setText(tr("Do you want to undo hijack of \"%1\"?")
                                        .arg(QDir::toNativeSeparators(fileName)));
         if (unhijackDlg.exec() != QDialog::Accepted)
             return;

src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp

@@ -125,7 +125,7 @@ ProjectExplorer::Project *CMakeManager::openProject(const QString &fileName, QSt
 {
     if (!QFileInfo(fileName).isFile()) {
         if (errorString)
-            *errorString = tr("Failed opening project '%1': Project is not a file")
+            *errorString = tr("Failed opening project \"%1\": Project is not a file")
                 .arg(fileName);
         return 0;
     }

src/plugins/coreplugin/basefilewizard.cpp

@@ -374,7 +374,7 @@ bool BaseFileWizard::postGenerateOpenEditors(const GeneratedFiles &l, QString *e
         if (file.attributes() & GeneratedFile::OpenEditorAttribute) {
             if (!EditorManager::openEditor(file.path(), file.editorId())) {
                 if (errorMessage)
-                    *errorMessage = tr("Failed to open an editor for '%1'.").arg(QDir::toNativeSeparators(file.path()));
+                    *errorMessage = tr("Failed to open an editor for \"%1\".").arg(QDir::toNativeSeparators(file.path()));
                 return false;
             }
         }

src/plugins/coreplugin/dialogs/openwithdialog.cpp

@@ -40,7 +40,7 @@ OpenWithDialog::OpenWithDialog(const QString &fileName, QWidget *parent)
 {
     setupUi(this);
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    label->setText(tr("Open file '%1' with:").arg(QFileInfo(fileName).fileName()));
+    label->setText(tr("Open file \"%1\" with:").arg(QFileInfo(fileName).fileName()));
     buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
 
     connect(buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()),

src/plugins/coreplugin/documentmanager.cpp

@@ -693,7 +693,7 @@ QString DocumentManager::getSaveFileName(const QString &title, const QString &pa
             }
             if (QFile::exists(fileName)) {
                 if (QMessageBox::warning(ICore::dialogParent(), tr("Overwrite?"),
-                    tr("An item named '%1' already exists at this location. "
+                    tr("An item named \"%1\" already exists at this location. "
                        "Do you want to overwrite it?").arg(fileName),
                     QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) {
                     repeat = true;

src/plugins/coreplugin/externaltool.cpp

@@ -561,7 +561,7 @@ bool ExternalToolRunner::resolve()
         if (m_resolvedExecutable.isEmpty()) {
             m_hasError = true;
             for (int i = 0; i < expandedExecutables.size(); ++i) {
-                m_errorString += tr("Could not find executable for '%1' (expanded '%2')")
+                m_errorString += tr("Could not find executable for \"%1\" (expanded \"%2\")")
                         .arg(m_tool->executables().at(i))
                         .arg(expandedExecutables.at(i));
                 m_errorString += QLatin1Char('\n');
@@ -610,7 +610,7 @@ void ExternalToolRunner::run()
         m_process->setWorkingDirectory(m_resolvedWorkingDirectory);
     m_process->setCommand(m_resolvedExecutable, m_resolvedArguments);
     MessageManager::write(
-                tr("Starting external tool '%1' %2").arg(m_resolvedExecutable, m_resolvedArguments), MessageManager::Silent);
+                tr("Starting external tool \"%1\" %2").arg(m_resolvedExecutable, m_resolvedArguments), MessageManager::Silent);
     m_process->start();
 }
 
@@ -631,7 +631,7 @@ void ExternalToolRunner::finished(int exitCode, QProcess::ExitStatus status)
     if (m_tool->modifiesCurrentDocument())
         DocumentManager::unexpectFileChange(m_expectedFileName);
     MessageManager::write(
-                tr("'%1' finished").arg(m_resolvedExecutable), MessageManager::Silent);
+                tr("\"%1\" finished").arg(m_resolvedExecutable), MessageManager::Silent);
     deleteLater();
 }
 

src/plugins/coreplugin/fileutils.cpp

@@ -65,7 +65,7 @@ static void showGraphicalShellError(QWidget *parent, const QString &app, const Q
     QMessageBox mbox(QMessageBox::Warning, title, msg, QMessageBox::Close, parent);
     if (!error.isEmpty())
         mbox.setDetailedText(QApplication::translate("Core::Internal",
-                                                     "'%1' returned the following error:\n\n%2").arg(app, error));
+                                                     "\"%1\" returned the following error:\n\n%2").arg(app, error));
     QAbstractButton *settingsButton = mbox.addButton(Core::ICore::msgShowOptionsDialog(),
                                                      QMessageBox::ActionRole);
     mbox.exec();

src/plugins/coreplugin/locator/executefilter.cpp

@@ -106,7 +106,7 @@ void ExecuteFilter::accept(LocatorFilterEntry selection) const
     }
 
     if (m_process->state() != QProcess::NotRunning) {
-        const QString info(tr("Previous command is still running ('%1').\nDo you want to kill it?")
+        const QString info(tr("Previous command is still running (\"%1\").\nDo you want to kill it?")
                            .arg(p->headCommand()));
         int r = QMessageBox::question(ICore::dialogParent(), tr("Kill Previous Process?"), info,
                                       QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel,
@@ -127,9 +127,9 @@ void ExecuteFilter::finished(int exitCode, QProcess::ExitStatus status)
     const QString commandName = headCommand();
     QString message;
     if (status == QProcess::NormalExit && exitCode == 0)
-        message = tr("Command '%1' finished.").arg(commandName);
+        message = tr("Command \"%1\" finished.").arg(commandName);
     else
-        message = tr("Command '%1' failed.").arg(commandName);
+        message = tr("Command \"%1\" failed.").arg(commandName);
     MessageManager::write(message);
 
     m_taskQueue.dequeue();
@@ -158,12 +158,12 @@ void ExecuteFilter::runHeadCommand()
         const ExecuteData &d = m_taskQueue.head();
         const QString fullPath = Utils::Environment::systemEnvironment().searchInPath(d.executable);
         if (fullPath.isEmpty()) {
-            MessageManager::write(tr("Could not find executable for '%1'.").arg(d.executable));
+            MessageManager::write(tr("Could not find executable for \"%1\".").arg(d.executable));
             m_taskQueue.dequeue();
             runHeadCommand();
             return;
         }
-        MessageManager::write(tr("Starting command '%1'.").arg(headCommand()));
+        MessageManager::write(tr("Starting command \"%1\".").arg(headCommand()));
         m_process->setWorkingDirectory(d.workingDirectory);
         m_process->setCommand(fullPath, d.arguments);
         m_process->start();

src/plugins/coreplugin/mimedatabase.cpp

@@ -1031,7 +1031,7 @@ static bool parseNumber(const QString &n, int *target, QString *errorMessage)
     bool ok;
     *target = n.toInt(&ok);
     if (!ok) {
-        *errorMessage = QString::fromLatin1("Not a number '%1'.").arg(n);
+        *errorMessage = QString::fromLatin1("Not a number \"%1\".").arg(n);
         return false;
     }
     return true;

src/plugins/cvs/cvsplugin.cpp

@@ -83,7 +83,7 @@ namespace Internal {
 
 static inline QString msgCannotFindTopLevel(const QString &f)
 {
-    return CvsPlugin::tr("Cannot find repository for '%1'").
+    return CvsPlugin::tr("Cannot find repository for \"%1\"").
             arg(QDir::toNativeSeparators(f));
 }
 
@@ -858,8 +858,8 @@ bool CvsPlugin::unedit(const QString &topLevel, const QStringList &files)
         return false;
     if (modified) {
         const QString question = files.isEmpty() ?
-                      tr("Would you like to discard your changes to the repository '%1'?").arg(topLevel) :
-                      tr("Would you like to discard your changes to the file '%1'?").arg(files.front());
+                      tr("Would you like to discard your changes to the repository \"%1\"?").arg(topLevel) :
+                      tr("Would you like to discard your changes to the file \"%1\"?").arg(files.front());
         if (!messageBoxQuestion(tr("Unedit"), question))
             return false;
     }
@@ -1032,7 +1032,7 @@ bool CvsPlugin::describe(const QString &toplevel, const QString &file, const
         // Describe all files found, pass on dir to obtain correct absolute paths.
         const QList<CvsLogEntry> repoEntries = parseLogEntries(repoLogResponse.stdOut, QString(), commitId);
         if (repoEntries.empty()) {
-            *errorMessage = tr("Could not find commits of id '%1' on %2.").arg(commitId, dateS);
+            *errorMessage = tr("Could not find commits of id \"%1\" on %2.").arg(commitId, dateS);
             return false;
         }
         return describe(toplevel, repoEntries, errorMessage);

src/plugins/debugger/cdb/cdbengine.cpp

@@ -552,7 +552,7 @@ bool CdbEngine::startConsole(const DebuggerStartParameters &sp, QString *errorMe
     if (sp.environment.size())
         m_consoleStub->setEnvironment(sp.environment);
     if (!m_consoleStub->start(sp.executable, sp.processArgs)) {
-        *errorMessage = tr("The console process '%1' could not be started.").arg(sp.executable);
+        *errorMessage = tr("The console process \"%1\" could not be started.").arg(sp.executable);
         return false;
     }
     return true;
@@ -1057,7 +1057,7 @@ void CdbEngine::handleAddWatch(const CdbExtensionCommandPtr &reply)
     } else {
         item.setError(tr("Unable to add expression"));
         watchHandler()->insertIncompleteData(item);
-        showMessage(QString::fromLatin1("Unable to add watch item '%1'/'%2': %3").
+        showMessage(QString::fromLatin1("Unable to add watch item \"%1\"/\"%2\": %3").
                     arg(QString::fromLatin1(item.iname), QString::fromLatin1(item.exp),
                         QString::fromLocal8Bit(reply->errorMessage)), LogError);
     }
@@ -1397,7 +1397,7 @@ void CdbEngine::postBuiltinCommand(const QByteArray &cmd, unsigned flags,
                                    const QVariant &cookie)
 {
     if (!m_accessible) {
-        const QString msg = QString::fromLatin1("Attempt to issue builtin command '%1' to non-accessible session (%2)")
+        const QString msg = QString::fromLatin1("Attempt to issue builtin command \"%1\" to non-accessible session (%2)")
                 .arg(QString::fromLocal8Bit(cmd), QString::fromLatin1(stateName(state())));
         showMessage(msg, LogError);
         return;
@@ -1434,7 +1434,7 @@ void CdbEngine::postExtensionCommand(const QByteArray &cmd,
                                      const QVariant &cookie)
 {
     if (!m_accessible) {
-        const QString msg = QString::fromLatin1("Attempt to issue extension command '%1' to non-accessible session (%2)")
+        const QString msg = QString::fromLatin1("Attempt to issue extension command \"%1\" to non-accessible session (%2)")
                 .arg(QString::fromLocal8Bit(cmd), QString::fromLatin1(stateName(state())));
         showMessage(msg, LogError);
         return;
@@ -2053,7 +2053,7 @@ static inline QString msgCheckingConditionalBreakPoint(BreakpointModelId id, con
                                                        const QByteArray &condition,
                                                        const QString &threadId)
 {
-    return CdbEngine::tr("Conditional breakpoint %1 (%2) in thread %3 triggered, examining expression '%4'.")
+    return CdbEngine::tr("Conditional breakpoint %1 (%2) in thread %3 triggered, examining expression \"%4\".")
             .arg(id.toString()).arg(number).arg(threadId, QString::fromLatin1(condition));
 }
 
@@ -3257,7 +3257,7 @@ void CdbEngine::watchPoint(const QPoint &p)
         showMessage(tr("\"Select Widget to Watch\": Please stop the application first."), LogWarning);
         break;
     default:
-        showMessage(tr("\"Select Widget to Watch\": Not supported in state '%1'.").
+        showMessage(tr("\"Select Widget to Watch\": Not supported in state \"%1\".").
                     arg(QString::fromLatin1(stateName(state()))), LogWarning);
         break;
     }

src/plugins/debugger/debuggerkitinformation.cpp

@@ -269,10 +269,10 @@ QList<Task> DebuggerKitInformation::validateDebugger(const Kit *k)
         result << Task(Task::Warning, tr("No debugger set up."), FileName(), -1, id);
 
     if (errors & DebuggerNotFound)
-        result << Task(Task::Error, tr("Debugger '%1' not found.").arg(path),
+        result << Task(Task::Error, tr("Debugger \"%1\" not found.").arg(path),
                        FileName(), -1, id);
     if (errors & DebuggerNotExecutable)
-        result << Task(Task::Error, tr("Debugger '%1' not executable.").arg(path), FileName(), -1, id);
+        result << Task(Task::Error, tr("Debugger \"%1\" not executable.").arg(path), FileName(), -1, id);
 
     if (errors & DebuggerNeedsAbsolutePath) {
         const QString message =

src/plugins/debugger/debuggerplugin.cpp

@@ -1355,7 +1355,7 @@ DebuggerCore *debuggerCore()
 
 static QString msgParameterMissing(const QString &a)
 {
-    return DebuggerPlugin::tr("Option '%1' is missing the parameter.").arg(a);
+    return DebuggerPlugin::tr("Option \"%1\" is missing the parameter.").arg(a);
 }
 
 bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
@@ -1440,7 +1440,7 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
         sp.displayName = tr("Crashed process %1").arg(sp.attachPID);
         sp.startMessage = tr("Attaching to crashed process %1").arg(sp.attachPID);
         if (!sp.attachPID) {
-            *errorMessage = DebuggerPlugin::tr("The parameter '%1' of option '%2' "
+            *errorMessage = DebuggerPlugin::tr("The parameter \"%1\" of option \"%2\" "
                 "does not match the pattern <handle>:<pid>.").arg(*it, option);
             return false;
         }
@@ -2398,7 +2398,7 @@ void DebuggerPluginPrivate::updateDebugActions()
         QString toolTip;
         if (canRunAndBreakMain) {
             QTC_ASSERT(project, return ; );
-            toolTip = tr("Start '%1' and break at function 'main()'")
+            toolTip = tr("Start \"%1\" and break at function \"main()\"")
                       .arg(project->displayName());
         } else {
             // Do not display long tooltip saying run mode is not supported

src/plugins/debugger/debuggerrunner.cpp

@@ -512,7 +512,7 @@ DebuggerEngine *DebuggerRunControlFactory::createEngine(DebuggerEngineType et,
     default:
         break;
     }
-    *errorMessage = DebuggerPlugin::tr("Unable to create a debugger engine of the type '%1'").
+    *errorMessage = DebuggerPlugin::tr("Unable to create a debugger engine of the type \"%1\"").
                     arg(_(engineTypeName(et)));
     return 0;
 }

src/plugins/debugger/disassembleragent.cpp

@@ -230,7 +230,7 @@ void DisassemblerAgent::setLocation(const Location &loc)
     if (index != -1) {
         const FrameKey &key = d->cache.at(index).first;
         const QString msg =
-            _("Using cached disassembly for 0x%1 (0x%2-0x%3) in '%4'/ '%5'")
+            _("Using cached disassembly for 0x%1 (0x%2-0x%3) in \"%4\"/ \"%5\"")
                 .arg(loc.address(), 0, 16)
                 .arg(key.startAddress, 0, 16).arg(key.endAddress, 0, 16)
                 .arg(loc.functionName(), QDir::toNativeSeparators(loc.fileName()));

src/plugins/debugger/gdb/gdbengine.cpp

@@ -970,7 +970,7 @@ void GdbEngine::flushCommand(const GdbCommand &cmd0)
         QByteArray buffer = m_scheduledTestResponses.value(token);
         buffer.replace("@TOKEN@", QByteArray::number(token));
         m_scheduledTestResponses.remove(token);
-        showMessage(_("FAKING TEST RESPONSE (TOKEN: %2, RESPONSE: '%3')")
+        showMessage(_("FAKING TEST RESPONSE (TOKEN: %2, RESPONSE: %3)")
             .arg(token).arg(_(buffer)));
         QMetaObject::invokeMethod(this, "handleResponse",
             Q_ARG(QByteArray, buffer));
@@ -1998,7 +1998,7 @@ int GdbEngine::currentFrame() const
 
 static QString msgNoGdbBinaryForToolChain(const Abi &tc)
 {
-    return GdbEngine::tr("There is no GDB binary available for binaries in format '%1'")
+    return GdbEngine::tr("There is no GDB binary available for binaries in format \"%1\"")
         .arg(tc.toString());
 }
 
@@ -4466,7 +4466,7 @@ void GdbEngine::loadInitScript()
         } else {
             showMessageBox(QMessageBox::Warning,
             tr("Cannot find debugger initialization script"),
-            tr("The debugger settings point to a script file at '%1' "
+            tr("The debugger settings point to a script file at \"%1\" "
                "which is not accessible. If a script file is not needed, "
                "consider clearing that entry to avoid this warning. "
               ).arg(script));
@@ -4803,7 +4803,7 @@ void GdbEngine::scheduleTestResponse(int testCase, const QByteArray &response)
         return;
 
     int token = currentToken() + 1;
-    showMessage(_("SCHEDULING TEST RESPONSE (CASE: %1, TOKEN: %2, RESPONSE: '%3')")
+    showMessage(_("SCHEDULING TEST RESPONSE (CASE: %1, TOKEN: %2, RESPONSE: %3)")
         .arg(testCase).arg(token).arg(_(response)));
     m_scheduledTestResponses[token] = response;
 }

src/plugins/debugger/memoryview.cpp

@@ -154,7 +154,7 @@ void RegisterMemoryView::slotRegisterSet(const QModelIndex &index)
 
 QString RegisterMemoryView::title(const QString &registerName, quint64 a)
 {
-    return tr("Memory at Register '%1' (0x%2)").arg(registerName).arg(a, 0, 16);
+    return tr("Memory at Register \"%1\" (0x%2)").arg(registerName).arg(a, 0, 16);
 }
 
 void RegisterMemoryView::setRegisterAddress(quint64 v)
@@ -174,7 +174,7 @@ QList<MemoryMarkup> RegisterMemoryView::registerMarkup(quint64 a, const QString
 {
     QList<MemoryMarkup> result;
     result.push_back(MemoryMarkup(a, 1, QColor(Qt::blue).lighter(),
-                                  tr("Register '%1'").arg(name)));
+                                  tr("Register \"%1\"").arg(name)));
     return result;
 }
 

src/plugins/debugger/namedemangler/namedemangler.cpp

@@ -78,7 +78,7 @@ bool NameDemanglerPrivate::demangle(const QString &mangledName)
         m_demangledName = QLatin1String(m_parseState.stackTop()->toByteArray());
         success = true;
     } catch (const ParseException &p) {
-        m_errorString = QString::fromLatin1("Parse error at index %1 of mangled name '%2': %3.")
+        m_errorString = QString::fromLatin1("Parse error at index %1 of mangled name \"%2\": %3.")
                 .arg(m_parseState.m_pos).arg(mangledName, p.error);
         success = false;
     } catch (const InternalDemanglerException &e) {

src/plugins/debugger/namedemangler/parsetreenodes.cpp

@@ -1180,7 +1180,7 @@ void OperatorNameNode::parse()
         } else if (id == "az") {
             m_type = AlignofExprType;
         } else {
-            throw ParseException(QString::fromLatin1("Invalid operator encoding '%1'")
+            throw ParseException(QString::fromLatin1("Invalid operator encoding \"%1\"")
                     .arg(QString::fromLocal8Bit(id)));
         }
     }

src/plugins/debugger/pdb/pdbengine.cpp

@@ -176,7 +176,7 @@ void PdbEngine::setupEngine()
     m_pdbProc.start(m_pdb, QStringList() << _("-i"));
 
     if (!m_pdbProc.waitForStarted()) {
-        const QString msg = tr("Unable to start pdb '%1': %2")
+        const QString msg = tr("Unable to start pdb \"%1\": %2")
             .arg(m_pdb, m_pdbProc.errorString());
         notifyEngineSetupFailed();
         showMessage(_("ADAPTER START FAILED"));
@@ -488,7 +488,7 @@ bool PdbEngine::setToolTipExpression(const QPoint &mousePos,
     }
 
     if (!hasLetterOrNumber(exp)) {
-        QToolTip::showText(m_toolTipPos, tr("'%1' contains no identifier").arg(exp));
+        QToolTip::showText(m_toolTipPos, tr("\"%1\" contains no identifier").arg(exp));
         return true;
     }
 
@@ -508,7 +508,7 @@ bool PdbEngine::setToolTipExpression(const QPoint &mousePos,
 
     if (hasSideEffects(exp)) {
         QToolTip::showText(m_toolTipPos,
-            tr("Cowardly refusing to evaluate expression '%1' "
+            tr("Cowardly refusing to evaluate expression \"%1\" "
                "with potential side effects").arg(exp));
         return true;
     }
@@ -578,7 +578,7 @@ QString PdbEngine::errorMessage(QProcess::ProcessError error) const
     switch (error) {
         case QProcess::FailedToStart:
             return tr("The Pdb process failed to start. Either the "
-                "invoked program '%1' is missing, or you may have insufficient "
+                "invoked program \"%1\" is missing, or you may have insufficient "
                 "permissions to invoke the program.")
                 .arg(m_pdb);
         case QProcess::Crashed:

src/plugins/debugger/qml/qmladapter.cpp

@@ -247,18 +247,18 @@ void QmlAdapter::logServiceStatusChange(const QString &service, float version,
 {
     switch (newStatus) {
     case QmlDebug::Unavailable: {
-        showConnectionStatusMessage(_("Status of '%1' Version: %2 changed to 'unavailable'.").
+        showConnectionStatusMessage(_("Status of \"%1\" Version: %2 changed to \"unavailable\".").
                                     arg(service).arg(QString::number(version)));
         break;
     }
     case QmlDebug::Enabled: {
-        showConnectionStatusMessage(_("Status of '%1' Version: %2 changed to 'enabled'.").
+        showConnectionStatusMessage(_("Status of \"%1\" Version: %2 changed to \"enabled\".").
                                     arg(service).arg(QString::number(version)));
         break;
     }
 
     case QmlDebug::NotConnected: {
-        showConnectionStatusMessage(_("Status of '%1' Version: %2 changed to 'not connected'.").
+        showConnectionStatusMessage(_("Status of \"%1\" Version: %2 changed to \"not connected\".").
                                     arg(service).arg(QString::number(version)));
         break;
     }

src/plugins/debugger/qml/qmlengine.cpp

@@ -512,7 +512,7 @@ void QmlEngine::connectionError(QAbstractSocket::SocketError socketError)
 
 void QmlEngine::serviceConnectionError(const QString &serviceName)
 {
-    showMessage(tr("QML Debugger: Could not connect to service '%1'.")
+    showMessage(tr("QML Debugger: Could not connect to service \"%1\".")
         .arg(serviceName), StatusBar);
 }
 

src/plugins/debugger/qml/qscriptdebuggerclient.cpp

@@ -445,7 +445,7 @@ void QScriptDebuggerClient::messageReceived(const QByteArray &data)
             QString msg = stackFrames.isEmpty()
                     ? tr("<p>An uncaught exception occurred:</p><p>%1</p>")
                       .arg(Qt::escape(error))
-                    : tr("<p>An uncaught exception occurred in '%1':</p><p>%2</p>")
+                    : tr("<p>An uncaught exception occurred in \"%1\":</p><p>%2</p>")
                       .arg(QLatin1String(stackFrames.value(0).fileUrl), Qt::escape(error));
             showMessageBox(QMessageBox::Information, tr("Uncaught Exception"), msg);
         } else {

src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp

@@ -98,14 +98,14 @@ void CacheDirectoryDialog::accept()
     // Does a file of the same name exist?
     if (fi.exists()) {
         QMessageBox::warning(this, tr("Already Exists"),
-                             tr("A file named '%1' already exists.").arg(cache));
+                             tr("A file named \"%1\" already exists.").arg(cache));
         return;
     }
     // Create
     QDir root(QDir::root());
     if (!root.mkpath(cache)) {
         QMessageBox::warning(this, tr("Cannot Create"),
-                             tr("The folder '%1' could not be created.").arg(cache));
+                             tr("The folder \"%1\" could not be created.").arg(cache));
         return;
     }
     QDialog::accept();

src/plugins/debugger/shared/peutils.cpp

@@ -236,7 +236,7 @@ bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString *
         hFile = CreateFile(reinterpret_cast<const WCHAR*>(peExecutableFileName.utf16()), GENERIC_READ, FILE_SHARE_READ, NULL,
                              OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
         if (hFile == INVALID_HANDLE_VALUE || hFile == NULL) {
-            *errorMessage = QString::fromLatin1("Cannot open '%1': %2")
+            *errorMessage = QString::fromLatin1("Cannot open \"%1\": %2")
                             .arg(QDir::toNativeSeparators(peExecutableFileName),
                                  winErrorMessage(GetLastError()));
             break;
@@ -244,7 +244,7 @@ bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString *
 
         hFileMap = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
         if (hFileMap == NULL) {
-            *errorMessage = QString::fromLatin1("Cannot create file mapping of '%1': %2")
+            *errorMessage = QString::fromLatin1("Cannot create file mapping of \"%1\": %2")
                             .arg(QDir::toNativeSeparators(peExecutableFileName),
                                  winErrorMessage(GetLastError()));
             break;
@@ -252,7 +252,7 @@ bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString *
 
         fileMemory = MapViewOfFile(hFileMap, FILE_MAP_READ, 0, 0, 0);
         if (!fileMemory) {
-            *errorMessage = QString::fromLatin1("Cannot map '%1': %2")
+            *errorMessage = QString::fromLatin1("Cannot map \"%1\": %2")
                             .arg(QDir::toNativeSeparators(peExecutableFileName),
                                  winErrorMessage(GetLastError()));
             break;

src/plugins/designer/codemodelhelpers.cpp

@@ -115,13 +115,13 @@ bool navigateToSlot(const QString &uiFileName,
     // Find the generated header.
     const QString generatedHeaderFile = generatedHeaderOf(uiFileName);
     if (generatedHeaderFile.isEmpty()) {
-        *errorMessage = QCoreApplication::translate("Designer", "The generated header of the form '%1' could not be found.\nRebuilding the project might help.").arg(uiFileName);
+        *errorMessage = QCoreApplication::translate("Designer", "The generated header of the form \"%1\" could not be found.\nRebuilding the project might help.").arg(uiFileName);
         return false;
     }
     const CPlusPlus::Snapshot snapshot = CppTools::CppModelManagerInterface::instance()->snapshot();
     const DocumentPtr generatedHeaderDoc = snapshot.document(generatedHeaderFile);
     if (!generatedHeaderDoc) {
-        *errorMessage = QCoreApplication::translate("Designer", "The generated header '%1' could not be found in the code model.\nRebuilding the project might help.").arg(generatedHeaderFile);
+        *errorMessage = QCoreApplication::translate("Designer", "The generated header \"%1\" could not be found in the code model.\nRebuilding the project might help.").arg(generatedHeaderFile);
         return false;
     }
 
@@ -129,7 +129,7 @@ bool navigateToSlot(const QString &uiFileName,
     SearchFunction searchFunc(setupUiC);
     const SearchFunction::FunctionList funcs = searchFunc(generatedHeaderDoc);
     if (funcs.size() != 1) {
-        *errorMessage = QString::fromLatin1("Internal error: The function '%1' could not be found in in %2").arg(QLatin1String(setupUiC), generatedHeaderFile);
+        *errorMessage = QString::fromLatin1("Internal error: The function \"%1\" could not be found in %2").arg(QLatin1String(setupUiC), generatedHeaderFile);
         return false;
     }
     return true;

src/plugins/designer/qtcreatorintegration.cpp

@@ -70,7 +70,7 @@ static QString msgClassNotFound(const QString &uiClassName, const QList<Document
         files += QDir::toNativeSeparators(doc->fileName());
     }
     return QtCreatorIntegration::tr(
-        "The class containing '%1' could not be found in %2.\n"
+        "The class containing \"%1\" could not be found in %2.\n"
         "Please verify the #include-directives.")
         .arg(uiClassName, files);
 }
@@ -578,7 +578,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
     if (Designer::Constants::Internal::debug)
         qDebug() << Q_FUNC_INFO << objectName << signalSignature << "Looking for " << uicedName << " returned " << docList.size();
     if (docMap.isEmpty()) {
-        *errorMessage = tr("No documents matching '%1' could be found.\nRebuilding the project might help.").arg(uicedName);
+        *errorMessage = tr("No documents matching \"%1\" could be found.\nRebuilding the project might help.").arg(uicedName);
         return false;
     }
 

src/plugins/fakevim/fakevimhandler.cpp

@@ -939,7 +939,7 @@ static bool startsWithWhitespace(const QString &str, int col)
 
 inline QString msgMarkNotSet(const QString &text)
 {
-    return FakeVimHandler::tr("Mark '%1' not set.").arg(text);
+    return FakeVimHandler::tr("Mark \"%1\" not set.").arg(text);
 }
 
 class Input

src/plugins/genericprojectmanager/genericprojectmanager.cpp

@@ -53,7 +53,7 @@ ProjectExplorer::Project *Manager::openProject(const QString &fileName, QString
 {
     if (!QFileInfo(fileName).isFile()) {
         if (errorString)
-            *errorString = tr("Failed opening project '%1': Project is not a file")
+            *errorString = tr("Failed opening project \"%1\": Project is not a file.")
                 .arg(fileName);
         return 0;
     }

src/plugins/git/branchdialog.cpp

@@ -256,11 +256,11 @@ void BranchDialog::remove()
     const bool wasMerged = isTag ? true : m_model->branchIsMerged(selected);
     QString message;
     if (isTag)
-        message = tr("Would you like to delete the tag '%1'?").arg(branchName);
+        message = tr("Would you like to delete the tag \"%1\"?").arg(branchName);
     else if (wasMerged)
-        message = tr("Would you like to delete the branch '%1'?").arg(branchName);
+        message = tr("Would you like to delete the branch \"%1\"?").arg(branchName);
     else
-        message = tr("Would you like to delete the <b>unmerged</b> branch '%1'?").arg(branchName);
+        message = tr("Would you like to delete the <b>unmerged</b> branch \"%1\"?").arg(branchName);
 
     if (QMessageBox::question(this, isTag ? tr("Delete Tag") : tr("Delete Branch"),
                               message, QMessageBox::Yes | QMessageBox::No,
@@ -329,7 +329,7 @@ void BranchDialog::reset()
     if (currentName.isEmpty() || branchName.isEmpty())
         return;
 
-    if (QMessageBox::question(this, tr("Git Reset"), tr("Hard reset branch '%1' to '%2'?")
+    if (QMessageBox::question(this, tr("Git Reset"), tr("Hard reset branch \"%1\" to \"%2\"?")
                               .arg(currentName).arg(branchName),
                               QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) {
         GitPlugin::instance()->gitClient()->reset(QString(m_repository), QLatin1String("--hard"),

src/plugins/git/gerrit/gerritmodel.cpp

@@ -544,7 +544,7 @@ static bool parseOutput(const QSharedPointer<GerritParameters> &parameters,
         QJsonParseError error;
         const QJsonDocument doc = QJsonDocument::fromJson(line, &error);
         if (doc.isNull()) {
-            QString errorMessage = GerritModel::tr("Parse error: '%1' -> %2")
+            QString errorMessage = GerritModel::tr("Parse error: \"%1\" -> %2")
                     .arg(QString::fromLocal8Bit(line))
                     .arg(error.errorString());
             qWarning() << errorMessage;
@@ -597,7 +597,7 @@ static bool parseOutput(const QSharedPointer<GerritParameters> &parameters,
         } else {
             qWarning("%s: Parse error: '%s'.", Q_FUNC_INFO, line.constData());
             VcsBase::VcsBaseOutputWindow::instance()
-                    ->appendError(GerritModel::tr("Parse error: '%1'")
+                    ->appendError(GerritModel::tr("Parse error: \"%1\"")
                                   .arg(QString::fromLocal8Bit(line)));
             res = false;
         }
@@ -669,7 +669,7 @@ static bool parseOutput(const QSharedPointer<GerritParameters> &parameters,
             continue;
         Utils::JsonValue *objectValue = Utils::JsonValue::create(QString::fromUtf8(line), &pool);
         if (!objectValue) {
-            QString errorMessage = GerritModel::tr("Parse error: '%1'")
+            QString errorMessage = GerritModel::tr("Parse error: \"%1\"")
                     .arg(QString::fromLocal8Bit(line));
             qWarning() << errorMessage;
             VcsBase::VcsBaseOutputWindow::instance()->appendError(errorMessage);
@@ -740,7 +740,7 @@ static bool parseOutput(const QSharedPointer<GerritParameters> &parameters,
         if (change->isValid()) {
             result.push_back(change);
         } else {
-            QString errorMessage = GerritModel::tr("Parse error in line '%1'")
+            QString errorMessage = GerritModel::tr("Parse error in line \"%1\"")
                     .arg(QString::fromLocal8Bit(line));
             VcsBase::VcsBaseOutputWindow::instance()->appendError(errorMessage);
             qWarning("%s: Parse error in line '%s'.", Q_FUNC_INFO, line.constData());

src/plugins/git/gerrit/gerritplugin.cpp

@@ -491,7 +491,7 @@ void GerritPlugin::fetch(const QSharedPointer<GerritChange> &change, int mode)
     if (!verifiedRepository) {
         // Ask the user for a repository to retrieve the change.
         const QString title =
-                tr("Enter Local Repository for '%1' (%2)").arg(change->project, change->branch);
+                tr("Enter Local Repository for \"%1\" (%2)").arg(change->project, change->branch);
         const QString suggestedRespository =
                 findLocalRepository(change->project, change->branch);
         repository = QFileDialog::getExistingDirectory(m_dialog.data(),

src/plugins/git/gitorious/gitorious.cpp

@@ -462,7 +462,7 @@ void Gitorious::listProjectsReply(int hostIndex, int page, const QByteArray &dat
     }
 
     if (!errorMessage.isEmpty()) {
-        emitError(tr("Error parsing reply from '%1': %2").arg(hostName(hostIndex), errorMessage));
+        emitError(tr("Error parsing reply from \"%1\": %2").arg(hostName(hostIndex), errorMessage));
         if (projects.empty())
             m_hosts[hostIndex].state = GitoriousHost::Error;
     }
@@ -507,7 +507,7 @@ void Gitorious::slotReplyFinished()
 
             } // switch protocol
         } else {
-            const QString msg = tr("Request failed for '%1': %2").arg(m_hosts.at(hostIndex).hostName, reply->errorString());
+            const QString msg = tr("Request failed for \"%1\": %2").arg(m_hosts.at(hostIndex).hostName, reply->errorString());
             emitError(msg);
         }
         reply->deleteLater();

src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp

@@ -53,7 +53,7 @@ GitoriousProjectWizardPage::GitoriousProjectWizardPage(const GitoriousHostWizard
 
 static inline QString msgChooseProject(const QString &h)
 {
-    return GitoriousProjectWizardPage::tr("Choose a project from '%1'").arg((h));
+    return GitoriousProjectWizardPage::tr("Choose a project from \"%1\"").arg((h));
 }
 
 QString GitoriousProjectWizardPage::selectedHostName() const

src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp

@@ -151,7 +151,7 @@ void GitoriousRepositoryWizardPage::initializePage()
     ui->filterLineEdit->clear();
     // fill model
     const QSharedPointer<GitoriousProject> proj = m_projectPage->project();
-    setSubTitle(tr("Choose a repository of the project '%1'.").arg(proj->name));
+    setSubTitle(tr("Choose a repository of the project \"%1\".").arg(proj->name));
     // Create a hierarchical list by repository type, sort by type
     QList<GitoriousRepository> repositories = proj->repositories;
     QStandardItem *firstEntry = 0;

src/plugins/git/gitsettings.cpp

@@ -87,7 +87,7 @@ QString GitSettings::gitBinaryPath(bool *ok, QString *errorMessage) const
             *ok = false;
         if (errorMessage)
             *errorMessage = QCoreApplication::translate("Git::Internal::GitSettings",
-                                                        "The binary '%1' could not be located in the path '%2'")
+                                                        "The binary \"%1\" could not be located in the path \"%2\"")
                 .arg(stringValue(binaryPathKey), stringValue(pathKey));
     }
     return binPath;

src/plugins/git/mergetool.cpp

@@ -190,7 +190,7 @@ void MergeTool::chooseAction()
     msgBox.setWindowTitle(tr("Merge Conflict"));
     msgBox.setIcon(QMessageBox::Question);
     msgBox.setStandardButtons(QMessageBox::Abort);
-    msgBox.setText(tr("%1 merge conflict for '%2'\nLocal: %3\nRemote: %4")
+    msgBox.setText(tr("%1 merge conflict for \"%2\"\nLocal: %3\nRemote: %4")
                    .arg(mergeTypeName())
                    .arg(m_fileName)
                    .arg(stateName(m_localState, m_localInfo))

src/plugins/git/settingspage.cpp

@@ -50,12 +50,12 @@ SettingsPageWidget::SettingsPageWidget(QWidget *parent) :
     if (Utils::HostOsInfo::isWindowsHost()) {
         const QByteArray currentHome = qgetenv("HOME");
         const QString toolTip
-                = tr("Set the environment variable HOME to '%1'\n(%2).\n"
+                = tr("Set the environment variable HOME to \"%1\"\n(%2).\n"
                      "This causes msysgit to look for the SSH-keys in that location\n"
                      "instead of its installation directory when run outside git bash.").
                 arg(QDir::homePath(),
                     currentHome.isEmpty() ? tr("not currently set") :
-                            tr("currently set to '%1'").arg(QString::fromLocal8Bit(currentHome)));
+                            tr("currently set to \"%1\"").arg(QString::fromLocal8Bit(currentHome)));
         m_ui.winHomeCheckBox->setToolTip(toolTip);
     } else {
         m_ui.winHomeCheckBox->setVisible(false);

src/plugins/help/helpviewer_qtb.cpp

@@ -172,7 +172,7 @@ void HelpViewer::setSource(const QUrl &url)
         : HelpViewer::tr("<html><head><meta http-equiv=\""
             "content-type\" content=\"text/html; charset=UTF-8\"><title>Error 404...</title>"
             "</head><body><div align=\"center\"><br/><br/><h1>The page could not be found</h1>"
-            "<br/><h3>'%1'</h3></div></body></html>")
+            "<br/><h3>\"%1\"</h3></div></body></html>")
           .arg(url.toString()));
 
     emit loadFinished(true);

src/plugins/ios/iosprobe.cpp

@@ -115,7 +115,7 @@ void IosProbe::detectDeveloperPaths()
 void IosProbe::setupDefaultToolchains(const QString &devPath, const QString &xcodeName)
 {
     if (debugProbe)
-        qDebug() << QString::fromLatin1("Setting up platform '%1'.").arg(xcodeName);
+        qDebug() << QString::fromLatin1("Setting up platform \"%1\".").arg(xcodeName);
     QString indent = QLatin1String("  ");
 
     // detect clang (default toolchain)

src/plugins/ios/iosrunconfiguration.cpp

@@ -303,7 +303,7 @@ bool IosRunConfiguration::isEnabled() const
 QString IosRunConfiguration::disabledReason() const
 {
     if (m_parseInProgress)
-        return tr("The .pro file '%1' is currently being parsed.")
+        return tr("The .pro file \"%1\" is currently being parsed.")
                 .arg(QFileInfo(m_profilePath).fileName());
     if (!m_parseSuccess)
         return static_cast<QmakeProject *>(target()->project())

src/plugins/perforce/perforceplugin.cpp

@@ -960,7 +960,7 @@ PerforcePlugin::createTemporaryArgumentFile(const QStringList &extraArgs,
 
 static inline QString msgNotStarted(const QString &cmd)
 {
-    return PerforcePlugin::tr("Could not start perforce '%1'. Please check your settings in the preferences.").arg(cmd);
+    return PerforcePlugin::tr("Could not start perforce \"%1\". Please check your settings in the preferences.").arg(cmd);
 }
 
 static inline QString msgTimeout(int timeOut)

src/plugins/projectexplorer/buildmanager.cpp

@@ -398,7 +398,7 @@ void BuildManager::nextBuildQueue()
         const QString projectName = d->m_currentBuildStep->project()->displayName();
         const QString targetName = d->m_currentBuildStep->target()->displayName();
         addToOutputWindow(tr("Error while building/deploying project %1 (kit: %2)").arg(projectName, targetName), BuildStep::ErrorOutput);
-        addToOutputWindow(tr("When executing step '%1'").arg(d->m_currentBuildStep->displayName()), BuildStep::ErrorOutput);
+        addToOutputWindow(tr("When executing step \"%1\"").arg(d->m_currentBuildStep->displayName()), BuildStep::ErrorOutput);
         // NBS TODO fix in qtconcurrent
         d->m_progressFutureInterface->setProgressValueAndText(d->m_progress*100, tr("Error while building/deploying project %1 (kit: %2)").arg(projectName, targetName));
     }
@@ -513,7 +513,7 @@ bool BuildManager::buildQueueAppend(QList<BuildStep *> steps, QStringList names,
         const QString projectName = bs->project()->displayName();
         const QString targetName = bs->target()->displayName();
         addToOutputWindow(tr("Error while building/deploying project %1 (kit: %2)").arg(projectName, targetName), BuildStep::ErrorOutput);
-        addToOutputWindow(tr("When executing step '%1'").arg(bs->displayName()), BuildStep::ErrorOutput);
+        addToOutputWindow(tr("When executing step \"%1\"").arg(bs->displayName()), BuildStep::ErrorOutput);
 
         // disconnect the buildsteps again
         for (int j = 0; j <= i; ++j)

src/plugins/projectexplorer/currentprojectfind.cpp

@@ -92,7 +92,7 @@ Utils::FileIterator *CurrentProjectFind::files(const QStringList &nameFilters,
 QString CurrentProjectFind::label() const
 {
     QTC_ASSERT(ProjectExplorerPlugin::currentProject(), return QString());
-    return tr("Project '%1':").arg(ProjectExplorerPlugin::currentProject()->displayName());
+    return tr("Project \"%1\":").arg(ProjectExplorerPlugin::currentProject()->displayName());
 }
 
 void CurrentProjectFind::handleProjectChanged()

src/plugins/projectexplorer/customwizard/customwizard.cpp

@@ -267,7 +267,7 @@ bool CustomWizard::writeFiles(const Core::GeneratedFiles &files, QString *errorM
         if (CustomWizardPrivate::verbose)
             qDebug("Creating directory %s", qPrintable(scriptWorkingDir));
         if (!scriptWorkingDirDir.mkpath(scriptWorkingDir)) {
-            *errorMessage = QString::fromLatin1("Unable to create the target directory '%1'").arg(scriptWorkingDir);
+            *errorMessage = QString::fromLatin1("Unable to create the target directory \"%1\"").arg(scriptWorkingDir);
             return false;
         }
     }
@@ -407,7 +407,7 @@ QList<CustomWizard*> CustomWizard::createWizards()
 
     const QDir templateDir(templateDirName);
     if (CustomWizardPrivate::verbose)
-        verboseLog = QString::fromLatin1("### CustomWizard: Checking '%1'\n").arg(templateDirName);
+        verboseLog = QString::fromLatin1("### CustomWizard: Checking \"%1\"\n").arg(templateDirName);
     if (!templateDir.exists()) {
         if (CustomWizardPrivate::verbose)
            qWarning("Custom project template path %s does not exist.", qPrintable(templateDir.absolutePath()));
@@ -416,14 +416,14 @@ QList<CustomWizard*> CustomWizard::createWizards()
 
     const QDir userTemplateDir(userTemplateDirName);
     if (CustomWizardPrivate::verbose)
-        verboseLog = QString::fromLatin1("### CustomWizard: Checking '%1'\n").arg(userTemplateDirName);
+        verboseLog = QString::fromLatin1("### CustomWizard: Checking \"%1\"\n").arg(userTemplateDirName);
 
     const QDir::Filters filters = QDir::Dirs|QDir::Readable|QDir::NoDotAndDotDot;
     const QDir::SortFlags sortflags = QDir::Name|QDir::IgnoreCase;
     QList<QFileInfo> dirs = templateDir.entryInfoList(filters, sortflags);
     if (userTemplateDir.exists()) {
         if (CustomWizardPrivate::verbose)
-            verboseLog = QString::fromLatin1("### CustomWizard: userTemplateDir '%1' found, adding\n").arg(userTemplateDirName);
+            verboseLog = QString::fromLatin1("### CustomWizard: userTemplateDir \"%1\" found, adding\n").arg(userTemplateDirName);
         dirs += userTemplateDir.entryInfoList(filters, sortflags);
     }
 
@@ -468,7 +468,7 @@ QList<CustomWizard*> CustomWizard::createWizards()
                 dirs.swap(subDirs);
                 dirs.append(subDirs);
             } else if (CustomWizardPrivate::verbose) {
-                verboseLog += QString::fromLatin1("CustomWizard: '%1' not found\n").arg(configFile);
+                verboseLog += QString::fromLatin1("CustomWizard: \"%1\" not found\n").arg(configFile);
             }
         }
     }

src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp

@@ -144,7 +144,7 @@ bool evaluateBooleanJavaScriptExpression(QScriptEngine &engine, const QString &e
     engine.clearExceptions();
     const QScriptValue value = engine.evaluate(expression);
     if (engine.hasUncaughtException()) {
-        *errorMessage = QString::fromLatin1("Error in '%1': %2").
+        *errorMessage = QString::fromLatin1("Error in \"%1\": %2").
                         arg(expression, engine.uncaughtException().toString());
         return false;
     }
@@ -161,7 +161,7 @@ bool evaluateBooleanJavaScriptExpression(QScriptEngine &engine, const QString &e
         *result = !value.toString().isEmpty();
         return true;
     }
-    *errorMessage = QString::fromLatin1("Cannot convert result of '%1' ('%2'to bool.").
+    *errorMessage = QString::fromLatin1("Cannot convert result of \"%1\" (\"%2\"to bool.").
                         arg(expression, value.toString());
     return false;
 }

src/plugins/projectexplorer/projectexplorer.cpp

@@ -1387,7 +1387,7 @@ QList<Project *> ProjectExplorerPlugin::openProjects(const QStringList &fileName
             }
         }
         if (found) {
-            appendError(errorString, tr("Failed opening project '%1': Project already open.")
+            appendError(errorString, tr("Failed opening project \"%1\": Project already open.")
                         .arg(QDir::toNativeSeparators(fileName)));
             SessionManager::reportProjectLoadingProgress();
             continue;
@@ -1408,7 +1408,7 @@ QList<Project *> ProjectExplorerPlugin::openProjects(const QStringList &fileName
                                 setCurrentNode(pro->rootProjectNode());
                             openedPro += pro;
                         } else {
-                            appendError(errorString, tr("Failed opening project '%1': Settings could not be restored.")
+                            appendError(errorString, tr("Failed opening project \"%1\": Settings could not be restored.")
                                         .arg(QDir::toNativeSeparators(fileName)));
                             delete pro;
                         }
@@ -1419,12 +1419,12 @@ QList<Project *> ProjectExplorerPlugin::openProjects(const QStringList &fileName
                 }
             }
             if (!foundProjectManager) {
-                appendError(errorString, tr("Failed opening project '%1': No plugin can open project type '%2'.")
+                appendError(errorString, tr("Failed opening project \"%1\": No plugin can open project type \"%2\".")
                             .arg(QDir::toNativeSeparators(fileName))
                             .arg((mt.type())));
             }
         } else {
-            appendError(errorString, tr("Failed opening project '%1': Unknown project type.")
+            appendError(errorString, tr("Failed opening project \"%1\": Unknown project type.")
                         .arg(QDir::toNativeSeparators(fileName)));
         }
         SessionManager::reportProjectLoadingProgress();
@@ -2236,7 +2236,7 @@ QPair<bool, QString> ProjectExplorerPlugin::buildSettingsEnabled(Project *pro)
                     && project->activeTarget()->activeBuildConfiguration()
                     && !project->activeTarget()->activeBuildConfiguration()->isEnabled()) {
                 result.first = false;
-                result.second += tr("Building '%1' is disabled: %2<br>")
+                result.second += tr("Building \"%1\" is disabled: %2<br>")
                         .arg(project->displayName(),
                              project->activeTarget()->activeBuildConfiguration()->disabledReason());
             }
@@ -2265,7 +2265,7 @@ QPair<bool, QString> ProjectExplorerPlugin::buildSettingsEnabledForSession()
                     && project->activeTarget()->activeBuildConfiguration()
                     && !project->activeTarget()->activeBuildConfiguration()->isEnabled()) {
                 result.first = false;
-                result.second += tr("Building '%1' is disabled: %2")
+                result.second += tr("Building \"%1\" is disabled: %2")
                         .arg(project->displayName(),
                              project->activeTarget()->activeBuildConfiguration()->disabledReason());
                 result.second += QLatin1Char('\n');
@@ -2532,10 +2532,10 @@ QString ProjectExplorerPlugin::cannotRunReason(Project *project, RunMode runMode
         return tr("The project %1 is not configured.").arg(project->displayName());
 
     if (!project->activeTarget())
-        return tr("The project '%1' has no active kit.").arg(project->displayName());
+        return tr("The project \"%1\" has no active kit.").arg(project->displayName());
 
     if (!project->activeTarget()->activeRunConfiguration())
-        return tr("The kit '%1' for the project '%2' has no active run configuration.")
+        return tr("The kit \"%1\" for the project \"%2\" has no active run configuration.")
                 .arg(project->activeTarget()->displayName(), project->displayName());
 
 
@@ -2554,7 +2554,7 @@ QString ProjectExplorerPlugin::cannotRunReason(Project *project, RunMode runMode
 
     // shouldn't actually be shown to the user...
     if (!findRunControlFactory(activeRC, runMode))
-        return tr("Cannot run '%1'.").arg(activeRC->displayName());
+        return tr("Cannot run \"%1\".").arg(activeRC->displayName());
 
     if (BuildManager::isBuilding())
         return tr("A build is still in progress.");

src/plugins/projectexplorer/projectfilewizardextension.cpp

@@ -535,7 +535,7 @@ bool ProjectFileWizardExtension::processProject(
     FolderNode *folder = m_context->projects.at(folderIndex).node;
     if (m_context->wizard->kind() == IWizard::ProjectWizard) {
         if (!static_cast<ProjectNode *>(folder)->addSubProjects(QStringList(generatedProject))) {
-            *errorMessage = tr("Failed to add subproject '%1'\nto project '%2'.")
+            *errorMessage = tr("Failed to add subproject \"%1\"\nto project \"%2\".")
                             .arg(generatedProject).arg(folder->path());
             return false;
         }
@@ -545,7 +545,7 @@ bool ProjectFileWizardExtension::processProject(
         foreach (const GeneratedFile &generatedFile, files)
             filePaths << generatedFile.path();
         if (!folder->addFiles(filePaths)) {
-            *errorMessage = tr("Failed to add one or more files to project\n'%1' (%2).").
+            *errorMessage = tr("Failed to add one or more files to project\n\"%1\" (%2).").
                     arg(folder->path(), filePaths.join(QString(QLatin1Char(','))));
             return false;
         }
@@ -565,7 +565,7 @@ bool ProjectFileWizardExtension::processVersionControl(const QList<GeneratedFile
     if (!m_context->repositoryExists) {
         QTC_ASSERT(versionControl->supportsOperation(IVersionControl::CreateRepositoryOperation), return false);
         if (!versionControl->vcsCreateRepository(m_context->commonDirectory)) {
-            *errorMessage = tr("A version control system repository could not be created in '%1'.").arg(m_context->commonDirectory);
+            *errorMessage = tr("A version control system repository could not be created in \"%1\".").arg(m_context->commonDirectory);
             return false;
         }
     }
@@ -573,7 +573,7 @@ bool ProjectFileWizardExtension::processVersionControl(const QList<GeneratedFile
     if (versionControl->supportsOperation(IVersionControl::AddOperation)) {
         foreach (const GeneratedFile &generatedFile, files) {
             if (!versionControl->vcsAdd(generatedFile.path())) {
-                *errorMessage = tr("Failed to add '%1' to the version control system.").arg(generatedFile.path());
+                *errorMessage = tr("Failed to add \"%1\" to the version control system.").arg(generatedFile.path());
                 return false;
             }
         }

src/plugins/projectexplorer/settingsaccessor.cpp

@@ -797,14 +797,14 @@ QVariantMap SettingsAccessor::readUserSettings(QWidget *parent) const
         QMessageBox msgBox(
             QMessageBox::Question,
             QApplication::translate("ProjectExplorer::SettingsAccessor",
-                                    "Settings File for '%1' from a different Environment?")
+                                    "Settings File for \"%1\" from a different Environment?")
                     .arg(project()->displayName()),
             QApplication::translate("ProjectExplorer::SettingsAccessor",
                                     "<p>No .user settings file created by this instance "
                                     "of Qt Creator was found.</p>"
                                     "<p>Did you work with this project on another machine or "
                                     "using a different settings path before?</p>"
-                                    "<p>Do you still want to load the settings file '%1'?</p>")
+                                    "<p>Do you still want to load the settings file \"%1\"?</p>")
                     .arg(result.path.toUserOutput()),
             QMessageBox::Yes | QMessageBox::No,
             parent);
@@ -819,7 +819,7 @@ QVariantMap SettingsAccessor::readUserSettings(QWidget *parent) const
                     QApplication::translate("ProjectExplorer::SettingsAccessor",
                                             "Using Old Settings"),
                     QApplication::translate("ProjectExplorer::SettingsAccessor",
-                                            "<p>The versioned backup '%1' of the .user settings "
+                                            "<p>The versioned backup \"%1\" of the .user settings "
                                             "file is used, because the non-versioned file was "
                                             "created by an incompatible version of Qt Creator.</p>"
                                             "<p>Project settings changes made since "

src/plugins/qbsprojectmanager/qbsprojectmanager.cpp

@@ -101,7 +101,7 @@ ProjectExplorer::Project *QbsManager::openProject(const QString &fileName, QStri
 {
     if (!QFileInfo(fileName).isFile()) {
         if (errorString)
-            *errorString = tr("Failed opening project '%1': Project is not a file.")
+            *errorString = tr("Failed opening project \"%1\": Project is not a file.")
                 .arg(fileName);
         return 0;
     }

src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp

@@ -118,7 +118,7 @@ bool DesktopQmakeRunConfiguration::isEnabled() const
 QString DesktopQmakeRunConfiguration::disabledReason() const
 {
     if (m_parseInProgress)
-        return tr("The .pro file '%1' is currently being parsed.")
+        return tr("The .pro file \"%1\" is currently being parsed.")
                 .arg(QFileInfo(m_proFilePath).fileName());
 
     if (!m_parseSuccess)

src/plugins/qmakeprojectmanager/qmakenodes.cpp

@@ -2191,7 +2191,7 @@ QStringList QmakeProFileNode::subDirsPaths(QtSupport::ProFileReader *reader, QSt
             }
         } else {
             if (!silent)
-                QmakeProject::proFileParseError(tr("Could not find .pro file for sub dir '%1' in '%2'")
+                QmakeProject::proFileParseError(tr("Could not find .pro file for sub dir \"%1\" in \"%2\"")
                                               .arg(subDirVar).arg(realDir));
         }
     }

src/plugins/qmakeprojectmanager/qmakeproject.cpp

@@ -1415,17 +1415,17 @@ bool QmakeProject::supportsNoTargetPanel() const
 QString QmakeProject::disabledReasonForRunConfiguration(const QString &proFilePath)
 {
     if (!QFileInfo(proFilePath).exists())
-        return tr("The .pro file '%1' does not exist.")
+        return tr("The .pro file \"%1\" does not exist.")
                 .arg(QFileInfo(proFilePath).fileName());
 
     if (!m_rootProjectNode) // Shutting down
         return QString();
 
     if (!m_rootProjectNode->findProFileFor(proFilePath))
-        return tr("The .pro file '%1' is not part of the project.")
+        return tr("The .pro file \"%1\" is not part of the project.")
                 .arg(QFileInfo(proFilePath).fileName());
 
-    return tr("The .pro file '%1' could not be parsed.")
+    return tr("The .pro file \"%1\" could not be parsed.")
             .arg(QFileInfo(proFilePath).fileName());
 }
 

src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp

@@ -92,7 +92,7 @@ ProjectExplorer::Project *QmakeManager::openProject(const QString &fileName, QSt
 {
     if (!QFileInfo(fileName).isFile()) {
         if (errorString)
-            *errorString = tr("Failed opening project '%1': Project is not a file")
+            *errorString = tr("Failed opening project \"%1\": Project is not a file")
                 .arg(fileName);
         return 0;
     }

src/plugins/qmakeprojectmanager/wizards/html5app.cpp

@@ -193,7 +193,7 @@ QByteArray Html5App::appViewerCppFileCode(QString *errorMessage) const
         if (!touchNavigavigationFile.open(QIODevice::ReadOnly)) {
             if (errorMessage)
                 *errorMessage = QCoreApplication::translate("QmakeProjectManager::AbstractMobileApp",
-                    "Could not open template file '%1'.").arg(QLatin1String(touchNavigavigationFiles[i]));
+                    "Could not open template file \"%1\".").arg(QLatin1String(touchNavigavigationFiles[i]));
             return QByteArray();
         }
         QTextStream touchNavigavigationFileIn(&touchNavigavigationFile);
@@ -214,7 +214,7 @@ QByteArray Html5App::appViewerCppFileCode(QString *errorMessage) const
     if (!appViewerCppFile.open(QIODevice::ReadOnly)) {
         if (errorMessage)
             *errorMessage = QCoreApplication::translate("QmakeProjectManager::AbstractMobileApp",
-                "Could not open template file '%1'.").arg(path(AppViewerCppOrigin));
+                "Could not open template file \"%1\".").arg(path(AppViewerCppOrigin));
         return QByteArray();
     }
     QTextStream in(&appViewerCppFile);

src/plugins/qmljseditor/qmljswrapinloader.cpp

@@ -135,7 +135,7 @@ public:
                              "//       Check all uses of 'parent' inside the root element of the component.")
                           + QLatin1Char('\n');
         if (idBinding) {
-            comment += tr("//       Rename all outer uses of the id '%1' to '%2.item'.").arg(
+            comment += tr("//       Rename all outer uses of the id \"%1\" to \"%2.item\".").arg(
                         id, loaderId) + QLatin1Char('\n');
         }
 
@@ -145,7 +145,7 @@ public:
         while (it.hasNext()) {
             it.next();
             const QString innerId = it.key();
-            comment += tr("//       Rename all outer uses of the id '%1' to '%2.item.%1'.\n").arg(
+            comment += tr("//       Rename all outer uses of the id \"%1\" to \"%2.item.%1\".\n").arg(
                         innerId, loaderId);
             changes.replace(it.value().begin(), it.value().end(), QString::fromLatin1("inner_%1").arg(innerId));
             innerIdForwarders += QString::fromLatin1("\nproperty alias %1: inner_%1").arg(innerId);

src/plugins/qmlprojectmanager/qmlapp.cpp

@@ -280,7 +280,7 @@ QString QmlApp::readAndAdaptTemplateFile(const QString &filePath, bool &ok) cons
             const QString replaceWhat = replaceXWithY.at(0).trimmed();
             const QString replaceWith = replaceXWithY.at(1).trimmed();
             if (!m_replacementVariables.contains(replaceWith)) {
-                qWarning().nospace() << QString::fromLatin1("Error in %1:%2. Unknown %3 option '%4'.")
+                qWarning().nospace() << QString::fromLatin1("Error in %1:%2. Unknown %3 option \"%4\".")
                               .arg(QDir::toNativeSeparators(filePath)).arg(lineNr).arg(markerQtcReplace).arg(replaceWith);
                 ok = false;
                 return QString();
@@ -288,7 +288,7 @@ QString QmlApp::readAndAdaptTemplateFile(const QString &filePath, bool &ok) cons
             line = tsIn.readLine(); // Following line which is to be patched.
             lineNr++;
             if (line.indexOf(replaceWhat) < 0) {
-                qWarning().nospace() << QString::fromLatin1("Error in %1:%2. Replacement '%3' not found.")
+                qWarning().nospace() << QString::fromLatin1("Error in %1:%2. Replacement \"%3\" not found.")
                               .arg(QDir::toNativeSeparators(filePath)).arg(lineNr).arg(replaceWhat);
                 ok = false;
                 return QString();

src/plugins/qmlprojectmanager/qmlprojectmanager.cpp

@@ -51,7 +51,7 @@ ProjectExplorer::Project *Manager::openProject(const QString &fileName, QString
 {
     if (!QFileInfo(fileName).isFile()) {
         if (errorString)
-            *errorString = tr("Failed opening project '%1': Project is not a file")
+            *errorString = tr("Failed opening project \"%1\": Project is not a file.")
                 .arg(fileName);
         return 0;
     }

src/plugins/qnx/bardescriptoreditorentrypointwidget.cpp

@@ -260,7 +260,7 @@ void BarDescriptorEditorEntryPointWidget::validateImage(const QString &path, QLa
 
     switch (result) {
     case CouldNotLoad:
-        warningMessage->setText(tr("<font color=\"red\">Could not open '%1' for reading.</font>").arg(path));
+        warningMessage->setText(tr("<font color=\"red\">Could not open \"%1\" for reading.</font>").arg(path));
         warningMessage->setVisible(true);
         warningPixmap->setVisible(true);
         break;

src/plugins/qnx/blackberryapplicationrunner.cpp

@@ -365,7 +365,7 @@ void BlackBerryApplicationRunner::checkQmlJsDebugArgumentsManifestLoaded()
 
     QTemporaryFile *manifestFile = new QTemporaryFile(m_checkQmlJsDebugArgumentsProcess);
     if (!manifestFile->open()) {
-        emit output(tr("Internal error: Cannot create temporary manifest file '%1'")
+        emit output(tr("Internal error: Cannot create temporary manifest file \"%1\"")
             .arg(manifestFile->fileName()), Utils::StdErrFormat);
         delete manifestFile;
         return;

src/plugins/qnx/blackberrycreatecertificatedialog.cpp

@@ -134,7 +134,7 @@ void BlackBerryCreateCertificateDialog::createCertificate()
 
     if (file.exists()) {
         const int result = QMessageBox::question(this, tr("Are you sure?"),
-                tr("The file '%1' will be overwritten. Do you want to proceed?")
+                tr("The file \"%1\" will be overwritten. Do you want to proceed?")
                 .arg(file.fileName()), QMessageBox::Yes | QMessageBox::No);
 
         if (result & QMessageBox::Yes) {

src/plugins/qnx/blackberrycreatepackagestep.cpp

@@ -95,7 +95,7 @@ bool BlackBerryCreatePackageStep::init()
 
     const QString packageCmd = target()->activeBuildConfiguration()->environment().searchInPath(QLatin1String(PACKAGER_CMD));
     if (packageCmd.isEmpty()) {
-        raiseError(tr("Could not find packager command '%1' in the build environment.")
+        raiseError(tr("Could not find packager command \"%1\" in the build environment.")
                    .arg(QLatin1String(PACKAGER_CMD)));
         return false;
     }
@@ -124,7 +124,7 @@ bool BlackBerryCreatePackageStep::init()
         QDir dir(buildDir);
         if (!dir.exists()) {
             if (!dir.mkpath(buildDir)) {
-                raiseError(tr("Could not create build directory '%1'.").arg(buildDir));
+                raiseError(tr("Could not create build directory \"%1\".").arg(buildDir));
                 return false;
             }
         }
@@ -290,7 +290,7 @@ bool BlackBerryCreatePackageStep::prepareAppDescriptorFile(const QString &appDes
     BarDescriptorDocument doc;
     QString errorString;
     if (!doc.open(&errorString, appDescriptorPath)) {
-        raiseError(tr("Error opening BAR application descriptor file '%1' - %2")
+        raiseError(tr("Error opening BAR application descriptor file \"%1\" - %2")
             .arg(QDir::toNativeSeparators(appDescriptorPath))
             .arg(errorString));
         return false;
@@ -375,7 +375,7 @@ bool BlackBerryCreatePackageStep::prepareAppDescriptorFile(const QString &appDes
 
     doc.setFilePath(preparedFilePath);
     if (!doc.save(&errorString)) {
-        raiseError(tr("Error saving prepared BAR application descriptor file '%1' - %2")
+        raiseError(tr("Error saving prepared BAR application descriptor file \"%1\" - %2")
             .arg(QDir::toNativeSeparators(preparedFilePath))
             .arg(errorString));
         return false;

src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp

@@ -131,7 +131,7 @@ void BlackBerryDebugTokenRequestDialog::requestDebugToken()
 
     if (file.exists()) {
         const int result = QMessageBox::question(this, tr("Are you sure?"),
-                tr("The file '%1' will be overwritten. Do you want to proceed?")
+                tr("The file \"%1\" will be overwritten. Do you want to proceed?")
                 .arg(file.fileName()), QMessageBox::Yes | QMessageBox::No);
 
         if (result & QMessageBox::Yes) {

src/plugins/qnx/blackberrydeployqtlibrariesdialog.cpp

@@ -195,7 +195,7 @@ void BlackBerryDeployQtLibrariesDialog::handleRemoteProcessCompleted()
         // Directory exists
         if (m_processRunner->processExitCode() == 0) {
             int answer = QMessageBox::question(this, windowTitle(),
-                                               tr("The remote directory '%1' already exists. "
+                                               tr("The remote directory \"%1\" already exists. "
                                                   "Deploying to that directory will remove any files "
                                                   "already present.\n\n"
                                                   "Are you sure you want to continue?")
@@ -278,7 +278,7 @@ void BlackBerryDeployQtLibrariesDialog::checkRemoteDirectoryExistance()
 
     m_state = CheckingRemoteDirectory;
 
-    m_ui->deployLogWindow->appendPlainText(tr("Checking existence of '%1'")
+    m_ui->deployLogWindow->appendPlainText(tr("Checking existence of \"%1\"")
                                            .arg(fullRemoteDirectory()));
 
     const QByteArray cmd = "test -d " + fullRemoteDirectory().toLatin1();
@@ -291,7 +291,7 @@ void BlackBerryDeployQtLibrariesDialog::removeRemoteDirectory()
 
     m_state = RemovingRemoteDirectory;
 
-    m_ui->deployLogWindow->appendPlainText(tr("Removing '%1'").arg(fullRemoteDirectory()));
+    m_ui->deployLogWindow->appendPlainText(tr("Removing \"%1\"").arg(fullRemoteDirectory()));
 
     const QByteArray cmd = "rm -rf " + fullRemoteDirectory().toLatin1();
     m_processRunner->run(cmd, m_device->sshParameters());

src/plugins/qnx/blackberrydeploystep.cpp

@@ -71,7 +71,7 @@ bool BlackBerryDeployStep::init()
 
     QString deployCmd = target()->activeBuildConfiguration()->environment().searchInPath(QLatin1String(Constants::QNX_BLACKBERRY_DEPLOY_CMD));
     if (deployCmd.isEmpty()) {
-        raiseError(tr("Could not find deploy command '%1' in the build environment")
+        raiseError(tr("Could not find deploy command \"%1\" in the build environment")
                        .arg(QLatin1String(Constants::QNX_BLACKBERRY_DEPLOY_CMD)));
         return false;
     }
@@ -112,7 +112,7 @@ void BlackBerryDeployStep::run(QFutureInterface<bool> &fi)
     QList<BarPackageDeployInformation> packagesToDeploy = deployConfig->deploymentInfo()->enabledPackages();
     foreach (const BarPackageDeployInformation &info, packagesToDeploy) {
         if (!QFileInfo(info.packagePath()).exists()) {
-            raiseError(tr("Package '%1' does not exist. Create the package first.").arg(info.packagePath()));
+            raiseError(tr("Package \"%1\" does not exist. Create the package first.").arg(info.packagePath()));
             fi.reportResult(false);
             return;
         }

src/plugins/qnx/cascadesimport/bardescriptorconverter.cpp

@@ -213,7 +213,7 @@ bool BarDescriptorConverter::convertFile(Core::GeneratedFile &file, QString &err
     if (errorMessage.isEmpty()) {
         QDomDocument doc;
         if (!doc.setContent(file.binaryContents(), &errorMessage)) {
-            errorMessage = tr("Error parsing XML file '%1': %2").arg(file.path()).arg(errorMessage);
+            errorMessage = tr("Error parsing XML file \"%1\": %2").arg(file.path()).arg(errorMessage);
             return false;
         }
 

src/plugins/qnx/cascadesimport/cascadesimportwizard.cpp

@@ -265,7 +265,7 @@ Core::GeneratedFiles CascadesImportWizard::generateFiles(const QWizard *w, QStri
                         files << file;
                 }
                 if (!errorMessage.isEmpty()) {
-                    errorMessage = tr("Error generating file '%1': %2").arg(filePath).arg(errorMessage);
+                    errorMessage = tr("Error generating file \"%1\": %2").arg(filePath).arg(errorMessage);
                     break;
                 }
             }

src/plugins/qnx/cascadesimport/projectfileconverter.cpp

@@ -159,7 +159,7 @@ bool ProjectFileConverter::convertFile(Core::GeneratedFile &file, QString &error
             // include all the content of the src directory
             otherFiles << filePath;
         else if (ext.compare(QLatin1String("log"), Qt::CaseInsensitive) != 0)
-                log.logWarning(tr("File '%1' not listed in '%2' file, should it be?")
+                log.logWarning(tr("File \"%1\" not listed in \"%2\" file, should it be?")
                         .arg(filePath).arg(file.path()));
     }
 

src/plugins/qtsupport/baseqtversion.cpp

@@ -315,10 +315,10 @@ QList<Task> BaseQtVersion::validateKit(const Kit *k)
         if (!fullMatch) {
             if (!fuzzyMatch)
                 message = QCoreApplication::translate("BaseQtVersion",
-                                                      "The compiler '%1' (%2) cannot produce code for the Qt version '%3' (%4).");
+                                                      "The compiler \"%1\" (%2) cannot produce code for the Qt version \"%3\" (%4).");
             else
                 message = QCoreApplication::translate("BaseQtVersion",
-                                                      "The compiler '%1' (%2) may not produce code compatible with the Qt version '%3' (%4).");
+                                                      "The compiler \"%1\" (%2) may not produce code compatible with the Qt version \"%3\" (%4).");
             message = message.arg(tc->displayName(), targetAbi.toString(),
                                   version->displayName(), qtAbiString);
             result << Task(fuzzyMatch ? Task::Warning : Task::Error, message, FileName(), -1,
@@ -1215,16 +1215,16 @@ static QByteArray runQmakeQuery(const FileName &binary, const Environment &env,
     process.start(binary.toString(), QStringList(QLatin1String("-query")), QIODevice::ReadOnly);
 
     if (!process.waitForStarted()) {
-        *error = QCoreApplication::translate("QtVersion", "Cannot start '%1': %2").arg(binary.toUserOutput()).arg(process.errorString());
+        *error = QCoreApplication::translate("QtVersion", "Cannot start \"%1\": %2").arg(binary.toUserOutput()).arg(process.errorString());
         return QByteArray();
     }
     if (!process.waitForFinished(timeOutMS)) {
         SynchronousProcess::stopProcess(process);
-        *error = QCoreApplication::translate("QtVersion", "Timeout running '%1' (%2 ms).").arg(binary.toUserOutput()).arg(timeOutMS);
+        *error = QCoreApplication::translate("QtVersion", "Timeout running \"%1\" (%2 ms).").arg(binary.toUserOutput()).arg(timeOutMS);
         return QByteArray();
     }
     if (process.exitStatus() != QProcess::NormalExit) {
-        *error = QCoreApplication::translate("QtVersion", "'%1' crashed.").arg(binary.toUserOutput());
+        *error = QCoreApplication::translate("QtVersion", "\"%1\" crashed.").arg(binary.toUserOutput());
         return QByteArray();
     }
 
@@ -1241,7 +1241,7 @@ bool BaseQtVersion::queryQMakeVariables(const FileName &binary, const Environmen
 
     const QFileInfo qmake = binary.toFileInfo();
     if (!qmake.exists() || !qmake.isExecutable() || qmake.isDir()) {
-        *error = QCoreApplication::translate("QtVersion", "qmake '%1' is not an executable.").arg(binary.toUserOutput());
+        *error = QCoreApplication::translate("QtVersion", "qmake \"%1\" is not an executable.").arg(binary.toUserOutput());
         return false;
     }