feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Change "Executing in" to "Running in"

Browse Source 
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 <Friedemann.Kleint@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Kavindra Palaraja
2017-01-08 12:05:05 +01:00
parent 0011d81817
commit ca507f2fe3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/patchtool.cpp
View File

@@ -107,7 +107,7 @@ static bool runPatchHelper(const QByteArray &input, const QString &workingDirect
args << QLatin1String("-R"); args << QLatin1String("-R");
if (withCrlf) if (withCrlf)
args << QLatin1String("--binary"); 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), arg(QDir::toNativeSeparators(workingDirectory),
QDir::toNativeSeparators(patch), args.join(QLatin1Char(' ')))); QDir::toNativeSeparators(patch), args.join(QLatin1Char(' '))));
patchProcess.start(patch, args); patchProcess.start(patch, args);

4
src/plugins/vcsbase/vcsoutputwindow.cpp
View File

@@ -452,8 +452,8 @@ QString VcsOutputWindow::msgExecutionLogEntry(const QString &workingDir,
const QString args = formatArguments(arguments); const QString args = formatArguments(arguments);
const QString nativeExecutable = executable.toUserOutput(); const QString nativeExecutable = executable.toUserOutput();
if (workingDir.isEmpty()) if (workingDir.isEmpty())
return tr("Executing: %1 %2").arg(nativeExecutable, args) + QLatin1Char('\n'); return tr("Running: %1 %2").arg(nativeExecutable, args) + QLatin1Char('\n');
return tr("Executing in %1: %2 %3"). return tr("Running in %1: %2 %3").
arg(QDir::toNativeSeparators(workingDir), nativeExecutable, args) + QLatin1Char('\n'); arg(QDir::toNativeSeparators(workingDir), nativeExecutable, args) + QLatin1Char('\n');
} }