summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@theqtcompany.com>2015-04-15 14:45:51 +0200
committerTobias Hunger <tobias.hunger@theqtcompany.com>2015-04-15 13:06:56 +0000
commit3d6d33f60d666c8cdab0aa7bad2ee417323b2ee0 (patch)
tree01f64f67edf6a39cd00dfd2cab268107ea389abb /src
parent387f7467684aced939308d759521f1c0d2bc8eb3 (diff)
downloadqt-creator-3d6d33f60d666c8cdab0aa7bad2ee417323b2ee0.tar.gz
Fix printing of seconds and milliseconds
We use a space between the number and the unit and use 'ms' or 's'. Change-Id: I689a8639c2d33c2f97789455b1e05693be0b2ccb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/git/gerrit/gerritmodel.cpp2
-rw-r--r--src/plugins/perforce/perforcechecker.cpp2
-rw-r--r--src/plugins/vcsbase/vcscommand.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp
index 9cf7925d56..10b7b8e737 100644
--- a/src/plugins/git/gerrit/gerritmodel.cpp
+++ b/src/plugins/git/gerrit/gerritmodel.cpp
@@ -390,7 +390,7 @@ void QueryContext::timeout()
if (!parent)
parent = QApplication::activeWindow();
QMessageBox box(QMessageBox::Question, tr("Timeout"),
- tr("The gerrit process has not responded within %1s.\n"
+ tr("The gerrit process has not responded within %1 s.\n"
"Most likely this is caused by problems with SSH authentication.\n"
"Would you like to terminate it?").
arg(timeOutMS / 1000), QMessageBox::NoButton, parent);
diff --git a/src/plugins/perforce/perforcechecker.cpp b/src/plugins/perforce/perforcechecker.cpp
index 1e6518c949..35bc149e37 100644
--- a/src/plugins/perforce/perforcechecker.cpp
+++ b/src/plugins/perforce/perforcechecker.cpp
@@ -112,7 +112,7 @@ void PerforceChecker::slotTimeOut()
return;
m_timedOut = true;
Utils::SynchronousProcess::stopProcess(m_process);
- emitFailed(tr("\"%1\" timed out after %2ms.").
+ emitFailed(tr("\"%1\" timed out after %2 ms.").
arg(m_binary).arg(m_timeOutMS));
}
diff --git a/src/plugins/vcsbase/vcscommand.cpp b/src/plugins/vcsbase/vcscommand.cpp
index cc1d9d2753..0f8deea498 100644
--- a/src/plugins/vcsbase/vcscommand.cpp
+++ b/src/plugins/vcsbase/vcscommand.cpp
@@ -545,7 +545,7 @@ bool VcsCommand::runFullySynchronous(const QStringList &arguments, int timeoutS,
if (!Utils::SynchronousProcess::readDataFromProcess(process, timeoutS, outputData, errorData, true)) {
if (errorData)
- errorData->append(tr("Error: Executable timed out after %1s.").arg(timeoutS).toLocal8Bit());
+ errorData->append(tr("Error: Executable timed out after %1 s.").arg(timeoutS).toLocal8Bit());
Utils::SynchronousProcess::stopProcess(process);
return false;
}