From ca507f2fe30f947d15747128ae4f0a75c6f322c2 Mon Sep 17 00:00:00 2001 From: Kavindra Palaraja Date: Sun, 8 Jan 2017 12:05:05 +0100 Subject: [PATCH] Change "Executing in" to "Running in" While I understand that the term "execute" is techically accurate, to execute has many meanings, not all of them are positive. Execute can also mean to kill someone. We should try to have more geopolitically neutral terms in an IDE like QtCreator since it is used all over the world. Change-Id: Icd6742865afa7a4469764e38eee961d7a96c7d5f Reviewed-by: Friedemann Kleint Reviewed-by: Leena Miettinen --- src/plugins/coreplugin/patchtool.cpp | 2 +- src/plugins/vcsbase/vcsoutputwindow.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/coreplugin/patchtool.cpp b/src/plugins/coreplugin/patchtool.cpp index e4364a32197..10a48817def 100644 --- a/src/plugins/coreplugin/patchtool.cpp +++ b/src/plugins/coreplugin/patchtool.cpp @@ -107,7 +107,7 @@ static bool runPatchHelper(const QByteArray &input, const QString &workingDirect args << QLatin1String("-R"); if (withCrlf) args << QLatin1String("--binary"); - MessageManager::write(QApplication::translate("Core::PatchTool", "Executing in %1: %2 %3"). + MessageManager::write(QApplication::translate("Core::PatchTool", "Running in %1: %2 %3"). arg(QDir::toNativeSeparators(workingDirectory), QDir::toNativeSeparators(patch), args.join(QLatin1Char(' ')))); patchProcess.start(patch, args); diff --git a/src/plugins/vcsbase/vcsoutputwindow.cpp b/src/plugins/vcsbase/vcsoutputwindow.cpp index 7a1f99cab60..51389bdbcc3 100644 --- a/src/plugins/vcsbase/vcsoutputwindow.cpp +++ b/src/plugins/vcsbase/vcsoutputwindow.cpp @@ -452,8 +452,8 @@ QString VcsOutputWindow::msgExecutionLogEntry(const QString &workingDir, const QString args = formatArguments(arguments); const QString nativeExecutable = executable.toUserOutput(); if (workingDir.isEmpty()) - return tr("Executing: %1 %2").arg(nativeExecutable, args) + QLatin1Char('\n'); - return tr("Executing in %1: %2 %3"). + return tr("Running: %1 %2").arg(nativeExecutable, args) + QLatin1Char('\n'); + return tr("Running in %1: %2 %3"). arg(QDir::toNativeSeparators(workingDir), nativeExecutable, args) + QLatin1Char('\n'); }