diff options
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/installer/fileutils.cpp | 13 | ||||
-rw-r--r-- | src/libs/kdtools/kdupdaterfiledownloader.cpp | 16 | ||||
-rw-r--r-- | src/libs/kdtools/kdupdaterupdatefinder.cpp | 2 |
3 files changed, 19 insertions, 12 deletions
diff --git a/src/libs/installer/fileutils.cpp b/src/libs/installer/fileutils.cpp index 9fb782fec..010c30621 100644 --- a/src/libs/installer/fileutils.cpp +++ b/src/libs/installer/fileutils.cpp @@ -49,6 +49,7 @@ #include <QtCore/QTemporaryFile> #include <QtCore/QThread> #include <QtCore/QUrl> +#include <QtCore/QCoreApplication> #include <QImageReader> #include <errno.h> @@ -141,9 +142,15 @@ QString QInstaller::humanReadableSize(const qint64 &size, int precision) double sizeAsDouble = size; static QStringList measures; if (measures.isEmpty()) - measures << QString::fromLatin1("bytes") << QString::fromLatin1("KiB") << QString::fromLatin1("MiB") - << QString::fromLatin1("GiB") << QString::fromLatin1("TiB") << QString::fromLatin1("PiB") - << QString::fromLatin1("EiB") << QString::fromLatin1("ZiB") << QString::fromLatin1("YiB"); + measures << QCoreApplication::translate("QInstaller", "bytes") + << QCoreApplication::translate("QInstaller", "KiB") + << QCoreApplication::translate("QInstaller", "MiB") + << QCoreApplication::translate("QInstaller", "GiB") + << QCoreApplication::translate("QInstaller", "TiB") + << QCoreApplication::translate("QInstaller", "PiB") + << QCoreApplication::translate("QInstaller", "EiB") + << QCoreApplication::translate("QInstaller", "ZiB") + << QCoreApplication::translate("QInstaller", "YiB"); QStringListIterator it(measures); QString measure(it.next()); diff --git a/src/libs/kdtools/kdupdaterfiledownloader.cpp b/src/libs/kdtools/kdupdaterfiledownloader.cpp index fee2a853e..19ba204c0 100644 --- a/src/libs/kdtools/kdupdaterfiledownloader.cpp +++ b/src/libs/kdtools/kdupdaterfiledownloader.cpp @@ -320,13 +320,13 @@ void KDUpdater::FileDownloader::emitDownloadStatus() if (bytesReceived.endsWith(tmp)) bytesReceived.chop(tmp.length()); - status = bytesReceived + tr(" of ") + bytesToReceive; + status = tr("%1 of %2").arg(bytesReceived).arg(bytesToReceive); } else { if (d->m_bytesReceived > 0) - status = humanReadableSize(d->m_bytesReceived) + tr(" downloaded."); + status = tr("%1 downloaded.").arg(humanReadableSize(d->m_bytesReceived)); } - status += QLatin1String(" (") + humanReadableSize(d->m_downloadSpeed) + tr("/sec") + QLatin1Char(')'); + status += QLatin1Char(' ') + tr("(%1/sec)").arg(humanReadableSize(d->m_downloadSpeed)); if (d->m_bytesToReceive > 0 && d->m_downloadSpeed > 0) { const qint64 time = (d->m_bytesToReceive - d->m_bytesReceived) / d->m_downloadSpeed; @@ -337,22 +337,22 @@ void KDUpdater::FileDownloader::emitDownloadStatus() QString days; if (d > 0) - days = QString::number(d) + (d < 2 ? tr(" day") : tr(" days")) + QLatin1String(", "); + days = tr("%n day(s), ", "", d); QString hours; if (h > 0) - hours = QString::number(h) + (h < 2 ? tr(" hour") : tr(" hours")) + QLatin1String(", "); + hours = tr("%n hour(s), ", "", h); QString minutes; if (m > 0) - minutes = QString::number(m) + (m < 2 ? tr(" minute") : tr(" minutes")); + minutes = tr("%n minute(s)", "", m); QString seconds; if (s >= 0 && minutes.isEmpty()) { s = (s <= 0 ? 1 : s); - seconds = QString::number(s) + (s < 2 ? tr(" second") : tr(" seconds")); + seconds = tr("%n second(s)", "", s); } - status += tr(" - ") + days + hours + minutes + seconds + tr(" remaining."); + status += tr(" - %1%2%3%4 remaining.").arg(days).arg(hours).arg(minutes).arg(seconds); } else { status += tr(" - unknown time remaining."); } diff --git a/src/libs/kdtools/kdupdaterupdatefinder.cpp b/src/libs/kdtools/kdupdaterupdatefinder.cpp index f37fa9244..e53c47280 100644 --- a/src/libs/kdtools/kdupdaterupdatefinder.cpp +++ b/src/libs/kdtools/kdupdaterupdatefinder.cpp @@ -227,7 +227,7 @@ void UpdateFinder::Private::computeUpdates() } // All done - q->reportProgress(100, tr("%1 updates found.").arg(updates.count())); + q->reportProgress(100, tr("%n update(s) found.", "", updates.count())); q->reportDone(); } |