From 0c321e850d9442c384768e06a740d15882841968 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 19 Nov 2014 13:53:11 +0100 Subject: b2qt-flashing-wizard: Fix strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id56e2c3f9cb77b65ea2aa9d3c968b180142b8ff1 Reviewed-by: Topi Reiniö --- src/b2qt-flashing-wizard/disk_page.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'src/b2qt-flashing-wizard/disk_page.cpp') diff --git a/src/b2qt-flashing-wizard/disk_page.cpp b/src/b2qt-flashing-wizard/disk_page.cpp index c96e347..4435d33 100644 --- a/src/b2qt-flashing-wizard/disk_page.cpp +++ b/src/b2qt-flashing-wizard/disk_page.cpp @@ -40,8 +40,8 @@ DiskPage::DiskPage(QWidget *parent) , mError(createErrorLabel(this)) , mLayout(new QVBoxLayout(this)) { - setTitle("Disk selection"); - setSubTitle("Select a disk to be used"); + setTitle(tr("Disk")); + setSubTitle(tr("Select a disk to be used")); mLayout->addWidget(mListWidget); mLayout->addSpacerItem(new QSpacerItem(40,40,QSizePolicy::Minimum, QSizePolicy::Expanding)); mLayout->addWidget(mError); @@ -161,21 +161,24 @@ void DiskPage::updateDeviceList() if (!currentDevices.contains(di.path)) continue; - QString text = "

%1

Size%2
Removable%3
Mounted%4
"; + QString text = tr("

%1

" + "" + "" + "
Size%2
Removable%3
Mounted%4
"); double size = di.logicalBlockSize * di.blocks; QString sizeText; if (size < 1000) { - sizeText = QString::number(size) + QLatin1String(" B"); + sizeText = QString::number(size) + tr(" B"); } else if (size < 1000000) { - sizeText = QString::number(size / 1000) + QLatin1String(" KB"); + sizeText = QString::number(size / 1000) + tr(" KB"); } else if (size < 1000000000) { - sizeText = QString::number(size / 1000000) + QLatin1String(" MB"); + sizeText = QString::number(size / 1000000) + tr(" MB"); } else { - sizeText = QString::number(qRound(size / 1000 / 1000 / 1000)) + QLatin1String(" GB"); + sizeText = QString::number(qRound(size / 1000 / 1000 / 1000)) + tr(" GB"); } - text = text.arg(di.name, sizeText, di.removable?QLatin1String("yes"):QLatin1String("no"), di.mountPoint.isEmpty()?"no":di.mountPoint); + text = text.arg(di.name, sizeText, di.removable?tr("yes"):tr("no"), di.mountPoint.isEmpty()?tr("no"):di.mountPoint); mDiskInfo[di.path] = di; if (mListItems.contains(di.path)) { @@ -197,7 +200,7 @@ void DiskPage::updateDeviceList() } if (mListWidget->count() == 0) - mError->setText("No suitable disk device found. Insert device now."); + mError->setText(tr("No suitable disk device found. Connect a device.")); else mError->setText(""); @@ -223,7 +226,7 @@ bool DiskPage::validatePage() if (!di.mountPoint.isEmpty()) { // Ask the user before unmount - if (QMessageBox::Ok != QMessageBox::warning(this, "Unmount action", "The disk you selected is mounted at " + di.mountPoint + ". It will be unmounted now.", QMessageBox::Ok | QMessageBox::Cancel)) + if (QMessageBox::Ok != QMessageBox::warning(this, tr("Unmount action"), tr("The disk you selected is mounted at '%1'. It will be unmounted now.").arg(di.mountPoint), QMessageBox::Ok | QMessageBox::Cancel)) return false; QStringList args = elevate(); @@ -231,7 +234,7 @@ bool DiskPage::validatePage() int rc = QProcess::execute(args.takeFirst(), args); if (rc != 0) { - QMessageBox::critical(this, "Unmount failed", "Could not umount the disk."); + QMessageBox::critical(this, tr("Unmount failed"), tr("Could not umount the disk.")); return false; } } -- cgit v1.2.3