From 3d6d33f60d666c8cdab0aa7bad2ee417323b2ee0 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 15 Apr 2015 14:45:51 +0200 Subject: [PATCH] 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 --- src/plugins/git/gerrit/gerritmodel.cpp | 2 +- src/plugins/perforce/perforcechecker.cpp | 2 +- src/plugins/vcsbase/vcscommand.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp index 9cf7925d566..10b7b8e737f 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 1e6518c9493..35bc149e371 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 cc1d9d2753b..0f8deea498c 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; }