From 970430f72127b0c7a9b0718106e9141eb3312d2a Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Thu, 6 Jan 2022 16:58:11 +0600 Subject: [PATCH] Even more strings changes --- src/qt/CMakeLists.txt | 4 +- src/qt/qt_deviceconfig.cpp | 2 +- src/qt/qt_harddiskdialog.cpp | 60 ++++++++++++------------- src/qt/qt_harddrive_common.cpp | 8 ++-- src/qt/qt_platform.cpp | 4 +- src/qt/qt_settingsfloppycdrom.cpp | 26 +++++------ src/qt/qt_settingsfloppycdrom.ui | 14 +++--- src/qt/qt_settingsharddisks.cpp | 12 ++--- src/qt/qt_settingsharddisks.ui | 4 +- src/qt/qt_settingsnetwork.cpp | 4 +- src/qt/qt_settingsnetwork.ui | 6 +-- src/qt/qt_settingsotherremovable.ui | 14 +++--- src/qt/qt_settingsports.cpp | 2 +- src/qt/qt_settingsports.ui | 20 ++++----- src/qt/qt_settingsstoragecontrollers.ui | 12 ++--- 15 files changed, 97 insertions(+), 95 deletions(-) diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt index d9597ec2c..b1f37c4dc 100644 --- a/src/qt/CMakeLists.txt +++ b/src/qt/CMakeLists.txt @@ -177,10 +177,12 @@ set(QM_FILES) file(GLOB po_files "${CMAKE_CURRENT_SOURCE_DIR}/languages/*.po") foreach(po_file ${po_files}) get_target_property(LCONVERT_EXECUTABLE Qt${QT_MAJOR}::lconvert IMPORTED_LOCATION) + get_filename_component(_lconvert_bin_dir "${LCONVERT_EXECUTABLE}" DIRECTORY) + find_program(LCONVERT_EXECUTABLE lconvert HINTS "${_lconvert_bin_dir}") get_filename_component(PO_FILE_NAME ${po_file} NAME_WE) add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/86box_${PO_FILE_NAME}.qm" - COMMAND ${LCONVERT_EXECUTABLE} -input-format po -input-file ${po_file} -output-format qm -output-file ${CMAKE_CURRENT_BINARY_DIR}/86box_${PO_FILE_NAME}.qm + COMMAND ${LCONVERT_EXECUTABLE} -i ${po_file} -o ${CMAKE_CURRENT_BINARY_DIR}/86box_${PO_FILE_NAME}.qm WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" DEPENDS "${po_file}") list(APPEND QM_FILES "${CMAKE_CURRENT_BINARY_DIR}/86box_${PO_FILE_NAME}.qm") diff --git a/src/qt/qt_deviceconfig.cpp b/src/qt/qt_deviceconfig.cpp index 65fb865ac..ede8342dd 100644 --- a/src/qt/qt_deviceconfig.cpp +++ b/src/qt/qt_deviceconfig.cpp @@ -206,6 +206,6 @@ QString DeviceConfig::DeviceName(const _device_* device, const char *internalNam } else { char temp[512]; device_get_name(device, bus, temp); - return temp; + return tr(temp, nullptr, 512); } } diff --git a/src/qt/qt_harddiskdialog.cpp b/src/qt/qt_harddiskdialog.cpp index 7a85c754a..1bdb24f97 100644 --- a/src/qt/qt_harddiskdialog.cpp +++ b/src/qt/qt_harddiskdialog.cpp @@ -30,7 +30,7 @@ HarddiskDialog::HarddiskDialog(bool existing, QWidget *parent) : ui->setupUi(this); if (existing) { - setWindowTitle("Add Existing Hard Disk"); + setWindowTitle(tr("Add Existing Hard Disk")); ui->lineEditCylinders->setEnabled(false); ui->lineEditHeads->setEnabled(false); ui->lineEditSectors->setEnabled(false); @@ -42,24 +42,24 @@ HarddiskDialog::HarddiskDialog(bool existing, QWidget *parent) : connect(ui->fileField, &FileField::fileSelected, this, &HarddiskDialog::onExistingFileSelected); } else { - setWindowTitle("Add New Hard Disk"); + setWindowTitle(tr("Add New Hard Disk")); ui->fileField->setCreateFile(true); connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &HarddiskDialog::onCreateNewFile); } auto* model = ui->comboBoxFormat->model(); model->insertRows(0, 6); - model->setData(model->index(0, 0), "Raw image (.img)"); - model->setData(model->index(1, 0), "HDI image (.hdi)"); - model->setData(model->index(2, 0), "HDX image (.hdx)"); - model->setData(model->index(3, 0), "Fixed-size VHD (.vhd)"); - model->setData(model->index(4, 0), "Dynamic-size VHD (.vhd)"); - model->setData(model->index(5, 0), "Differencing VHD (.vhd)"); + model->setData(model->index(0, 0), tr("Raw image (.img)")); + model->setData(model->index(1, 0), tr("HDI image (.hdi)")); + model->setData(model->index(2, 0), tr("HDX image (.hdx)")); + model->setData(model->index(3, 0), tr("Fixed-size VHD (.vhd)")); + model->setData(model->index(4, 0), tr("Dynamic-size VHD (.vhd)")); + model->setData(model->index(5, 0), tr("Differencing VHD (.vhd)")); model = ui->comboBoxBlockSize->model(); model->insertRows(0, 2); - model->setData(model->index(0, 0), "Large blocks (2 MiB)"); - model->setData(model->index(1, 0), "Small blocks (512 KiB)"); + model->setData(model->index(0, 0), tr("Large blocks (2 MiB)")); + model->setData(model->index(1, 0), tr("Small blocks (512 KiB)")); ui->comboBoxBlockSize->hide(); ui->labelBlockSize->hide(); @@ -74,8 +74,8 @@ HarddiskDialog::HarddiskDialog(bool existing, QWidget *parent) : QString text = QString("%1 MiB (CHS: %2, %3, %4)").arg(size_mb).arg(hdd_table[i][0]).arg(hdd_table[i][1]).arg(hdd_table[i][2]); Models::AddEntry(model, text, i); } - Models::AddEntry(model, "Custom...", 127); - Models::AddEntry(model, "Custom (large)...", 128); + Models::AddEntry(model, tr("Custom..."), 127); + Models::AddEntry(model, tr("Custom (large)..."), 128); ui->lineEditSize->setValidator(new QIntValidator()); ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); @@ -105,10 +105,10 @@ void HarddiskDialog::on_comboBoxFormat_currentIndexChanged(int index) { bool enabled; if (index == 5) { /* They switched to a diff VHD; disable the geometry fields. */ enabled = false; - ui->lineEditCylinders->setText(QStringLiteral("(N/A)")); - ui->lineEditHeads->setText(QStringLiteral("(N/A)")); - ui->lineEditSectors->setText(QStringLiteral("(N/A)")); - ui->lineEditSize->setText(QStringLiteral("(N/A)")); + ui->lineEditCylinders->setText(tr("(N/A)")); + ui->lineEditHeads->setText(tr("(N/A)")); + ui->lineEditSectors->setText(tr("(N/A)")); + ui->lineEditSize->setText(tr("(N/A)")); } else { enabled = true; ui->lineEditCylinders->setText(QString::number(cylinders_)); @@ -246,7 +246,7 @@ static MVHDGeom create_drive_vhd_diff(const QString& fileName, const QString& pa void HarddiskDialog::onCreateNewFile() { qint64 size = ui->lineEditSize->text().toUInt() << 20U; if (size > 0x1FFFFFFE00ll) { - QMessageBox::critical(this, "Disk image too large", "Disk images cannot be larger than 127 GiB"); + QMessageBox::critical(this, tr("Disk image too large"), tr("Disk images cannot be larger than 127 GiB")); return; } @@ -280,7 +280,7 @@ void HarddiskDialog::onCreateNewFile() { QFile file(fileName); if (! file.open(QIODevice::WriteOnly)) { - QMessageBox::critical(this, "Unable to write file", "Make sure the file is being saved to a writable directory"); + QMessageBox::critical(this, tr("Unable to write file"), tr("Make sure the file is being saved to a writable directory")); return; } @@ -288,7 +288,7 @@ void HarddiskDialog::onCreateNewFile() { QDataStream stream(&file); stream.setByteOrder(QDataStream::LittleEndian); if (size >= 0x100000000ll) { - QMessageBox::critical(this, "Disk image too large", "HDI disk images cannot be larger than 4 GiB"); + QMessageBox::critical(this, tr("Disk image too large"), tr("HDI disk images cannot be larger than 4 GiB")); return; } uint32_t s = static_cast(size); @@ -324,7 +324,7 @@ void HarddiskDialog::onCreateNewFile() { switch (img_format) { case 3: { - QProgressDialog progress("Creating disk image", QString(), 0, 100, this); + QProgressDialog progress(tr("Creating disk image"), QString(), 0, 100, this); connect(this, &HarddiskDialog::fileProgress, &progress, &QProgressDialog::setValue); std::thread writer([&_86box_geometry, fileName, this] { _86box_geometry = create_drive_vhd_fixed(fileName, this, cylinders_, heads_, sectors_); @@ -337,7 +337,7 @@ void HarddiskDialog::onCreateNewFile() { _86box_geometry = create_drive_vhd_dynamic(fileName, cylinders_, heads_, sectors_, block_size); break; case 5: - QString vhdParent = QFileDialog::getOpenFileName(this, "Select the parent VHD", QString(), "VHD files (*.vhd);;All files (*)"); + QString vhdParent = QFileDialog::getOpenFileName(this, tr("Select the parent VHD"), QString(), tr("VHD files (*.vhd);;All files (*)")); if (vhdParent.isEmpty()) { return; } @@ -346,7 +346,7 @@ void HarddiskDialog::onCreateNewFile() { } if (img_format != 5) { - QMessageBox::information(this, "Disk image created", "Remember to partition and format the newly-created drive"); + QMessageBox::information(this, tr("Disk image created"), tr("Remember to partition and format the newly-created drive")); } ui->lineEditCylinders->setText(QString::number(_86box_geometry.cyl)); @@ -360,7 +360,7 @@ void HarddiskDialog::onCreateNewFile() { } // formats 0, 1 and 2 - QProgressDialog progress("Creating disk image", QString(), 0, 100, this); + QProgressDialog progress(tr("Creating disk image"), QString(), 0, 100, this); connect(this, &HarddiskDialog::fileProgress, &progress, &QProgressDialog::setValue); std::thread writer([size, &file, this] { QDataStream stream(&file); @@ -385,7 +385,7 @@ void HarddiskDialog::onCreateNewFile() { progress.exec(); writer.join(); - QMessageBox::information(this, "Disk image created", "Remember to partition and format the newly-created drive"); + QMessageBox::information(this, tr("Disk image created"), tr("Remember to partition and format the newly-created drive")); } static void adjust_vhd_geometry_for_86box(MVHDGeom *vhd_geometry) { @@ -449,7 +449,7 @@ void HarddiskDialog::onExistingFileSelected(const QString &fileName) { QFile file(fileName); if (! file.open(QIODevice::ReadOnly)) { - QMessageBox::critical(this, "Unable to read file", "Make sure the file exists and is readable"); + QMessageBox::critical(this, tr("Unable to read file"), tr("Make sure the file exists and is readable")); return; } QByteArray fileNameUtf8 = fileName.toUtf8(); @@ -461,7 +461,7 @@ void HarddiskDialog::onExistingFileSelected(const QString &fileName) { stream.setByteOrder(QDataStream::LittleEndian); stream >> sector_size; if (sector_size != 512) { - QMessageBox::critical(this, "Unsupported disk image", "HDI or HDX images with a sector size other than 512 are not supported"); + QMessageBox::critical(this, tr("Unsupported disk image"), tr("HDI or HDX images with a sector size other than 512 are not supported")); return; } @@ -472,14 +472,14 @@ void HarddiskDialog::onExistingFileSelected(const QString &fileName) { } else if (image_is_vhd(fileNameUtf8.data(), 1)) { MVHDMeta* vhd = mvhd_open(fileNameUtf8.data(), 0, &vhd_error); if (vhd == nullptr) { - QMessageBox::critical(this, "Unable to read file", "Make sure the file exists and is readable"); + QMessageBox::critical(this, tr("Unable to read file"), tr("Make sure the file exists and is readable")); return; } else if (vhd_error == MVHD_ERR_TIMESTAMP) { - QMessageBox::StandardButton btn = QMessageBox::warning(this, "Parent and child disk timestamps do not match", "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?", QMessageBox::Yes | QMessageBox::No); + QMessageBox::StandardButton btn = QMessageBox::warning(this, tr("Parent and child disk timestamps do not match"), tr("This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"), QMessageBox::Yes | QMessageBox::No); if (btn == QMessageBox::Yes) { int ts_res = mvhd_diff_update_par_timestamp(vhd, &vhd_error); if (ts_res != 0) { - QMessageBox::critical(this, "Error", "Could not fix VHD timestamp"); + QMessageBox::critical(this, tr("Error"), tr("Could not fix VHD timestamp")); mvhd_close(vhd); return; } @@ -523,7 +523,7 @@ void HarddiskDialog::onExistingFileSelected(const QString &fileName) { } if ((sectors > max_sectors) || (heads > max_heads) || (cylinders > max_cylinders)) { - QMessageBox::critical(this, "Unable to read file", "Make sure the file exists and is readable"); + QMessageBox::critical(this, tr("Unable to read file"), tr("Make sure the file exists and is readable")); return; } diff --git a/src/qt/qt_harddrive_common.cpp b/src/qt/qt_harddrive_common.cpp index 8c6b478f3..fbc60f627 100644 --- a/src/qt/qt_harddrive_common.cpp +++ b/src/qt/qt_harddrive_common.cpp @@ -29,9 +29,9 @@ void Harddrives::populateBuses(QAbstractItemModel *model) { void Harddrives::populateRemovableBuses(QAbstractItemModel *model) { model->removeRows(0, model->rowCount()); model->insertRows(0, 3); - model->setData(model->index(0, 0), "Disabled"); - model->setData(model->index(1, 0), "ATAPI"); - model->setData(model->index(2, 0), "SCSI"); + model->setData(model->index(0, 0), QObject::tr("Disabled")); + model->setData(model->index(1, 0), QObject::tr("ATAPI")); + model->setData(model->index(2, 0), QObject::tr("SCSI")); model->setData(model->index(0, 0), HDD_BUS_DISABLED, Qt::UserRole); model->setData(model->index(1, 0), HDD_BUS_ATAPI, Qt::UserRole); @@ -75,7 +75,7 @@ QString Harddrives::BusChannelName(uint8_t bus, uint8_t channel) { QString busName; switch(bus) { case HDD_BUS_DISABLED: - busName = QString("Disabled"); + busName = QString(QObject::tr("Disabled")); break; case HDD_BUS_MFM: busName = QString("MFM/RLL (%1:%2)").arg(channel >> 1).arg(channel & 1); diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp index b813ddec0..6211d12de 100644 --- a/src/qt/qt_platform.cpp +++ b/src/qt/qt_platform.cpp @@ -495,8 +495,8 @@ static void reload_strings() { translatedstrings.clear(); translatedstrings[IDS_2077] = QCoreApplication::translate("", "Click to capture mouse").toStdWString(); - translatedstrings[IDS_2078] = QCoreApplication::translate("", "Press F8+F12 to release mouse").replace("F8+F12", MOUSE_CAPTURE_KEYSEQ).toStdWString(); - translatedstrings[IDS_2079] = QCoreApplication::translate("", "Press F8+F12 or middle button to release mouse").replace("F8+F12", MOUSE_CAPTURE_KEYSEQ).toStdWString(); + translatedstrings[IDS_2078] = QCoreApplication::translate("", "Press F8+F12 to release mouse").replace("F8+F12", MOUSE_CAPTURE_KEYSEQ).replace("CTRL-END", QLocale::system().name() == "de_DE" ? "Strg+Ende" : "CTRL-END").toStdWString(); + translatedstrings[IDS_2079] = QCoreApplication::translate("", "Press F8+F12 or middle button to release mouse").replace("F8+F12", MOUSE_CAPTURE_KEYSEQ).replace("CTRL-END", QLocale::system().name() == "de_DE" ? "Strg+Ende" : "CTRL-END").toStdWString(); translatedstrings[IDS_2080] = QCoreApplication::translate("", "Failed to initialize FluidSynth").toStdWString(); translatedstrings[IDS_4099] = QCoreApplication::translate("", "MFM/RLL or ESDI CD-ROM drives never existed").toStdWString(); translatedstrings[IDS_2093] = QCoreApplication::translate("", "Failed to set up PCap").toStdWString(); diff --git a/src/qt/qt_settingsfloppycdrom.cpp b/src/qt/qt_settingsfloppycdrom.cpp index 02c890125..f42a701d8 100644 --- a/src/qt/qt_settingsfloppycdrom.cpp +++ b/src/qt/qt_settingsfloppycdrom.cpp @@ -73,9 +73,9 @@ SettingsFloppyCDROM::SettingsFloppyCDROM(QWidget *parent) : model = new QStandardItemModel(0, 3, this); ui->tableViewFloppy->setModel(model); - model->setHeaderData(0, Qt::Horizontal, "Type"); - model->setHeaderData(1, Qt::Horizontal, "Turbo"); - model->setHeaderData(2, Qt::Horizontal, "Check BPB"); + model->setHeaderData(0, Qt::Horizontal, tr("Type")); + model->setHeaderData(1, Qt::Horizontal, tr("Turbo")); + model->setHeaderData(2, Qt::Horizontal, tr("Check BPB")); model->insertRows(0, FDD_NUM); /* Floppy drives category */ @@ -83,8 +83,8 @@ SettingsFloppyCDROM::SettingsFloppyCDROM(QWidget *parent) : auto idx = model->index(i, 0); int type = fdd_get_type(i); setFloppyType(model, idx, type); - model->setData(idx.siblingAtColumn(1), fdd_get_turbo(i) > 0 ? "On" : "Off"); - model->setData(idx.siblingAtColumn(2), fdd_get_check_bpb(i) > 0 ? "On" : "Off"); + model->setData(idx.siblingAtColumn(1), fdd_get_turbo(i) > 0 ? tr("On") : tr("Off")); + model->setData(idx.siblingAtColumn(2), fdd_get_check_bpb(i) > 0 ? tr("On") : tr("Off")); } ui->tableViewFloppy->resizeColumnsToContents(); @@ -102,8 +102,8 @@ SettingsFloppyCDROM::SettingsFloppyCDROM(QWidget *parent) : model = new QStandardItemModel(0, 2, this); ui->tableViewCDROM->setModel(model); - model->setHeaderData(0, Qt::Horizontal, "Bus"); - model->setHeaderData(1, Qt::Horizontal, "Speed"); + model->setHeaderData(0, Qt::Horizontal, tr("Bus")); + model->setHeaderData(1, Qt::Horizontal, tr("Speed")); model->insertRows(0, CDROM_NUM); for (int i = 0; i < CDROM_NUM; i++) { auto idx = model->index(i, 0); @@ -126,8 +126,8 @@ void SettingsFloppyCDROM::save() { auto* model = ui->tableViewFloppy->model(); for (int i = 0; i < FDD_NUM; i++) { fdd_set_type(i, model->index(i, 0).data(Qt::UserRole).toInt()); - fdd_set_turbo(i, model->index(i, 1).data() == "On" ? 1 : 0); - fdd_set_check_bpb(i, model->index(i, 2).data() == "On" ? 1 : 0); + fdd_set_turbo(i, model->index(i, 1).data() == tr("On") ? 1 : 0); + fdd_set_check_bpb(i, model->index(i, 2).data() == tr("On") ? 1 : 0); } /* Removable devices category */ @@ -150,8 +150,8 @@ void SettingsFloppyCDROM::save() { void SettingsFloppyCDROM::onFloppyRowChanged(const QModelIndex ¤t) { int type = current.siblingAtColumn(0).data(Qt::UserRole).toInt(); ui->comboBoxFloppyType->setCurrentIndex(type); - ui->checkBoxTurboTimings->setChecked(current.siblingAtColumn(1).data() == "On"); - ui->checkBoxCheckBPB->setChecked(current.siblingAtColumn(2).data() == "On"); + ui->checkBoxTurboTimings->setChecked(current.siblingAtColumn(1).data() == tr("On")); + ui->checkBoxCheckBPB->setChecked(current.siblingAtColumn(2).data() == tr("On")); } void SettingsFloppyCDROM::onCDROMRowChanged(const QModelIndex ¤t) { @@ -176,12 +176,12 @@ void SettingsFloppyCDROM::onCDROMRowChanged(const QModelIndex ¤t) { void SettingsFloppyCDROM::on_checkBoxTurboTimings_stateChanged(int arg1) { auto idx = ui->tableViewFloppy->selectionModel()->currentIndex(); - ui->tableViewFloppy->model()->setData(idx.siblingAtColumn(1), arg1 == Qt::Checked ? "On" : "Off"); + ui->tableViewFloppy->model()->setData(idx.siblingAtColumn(1), arg1 == Qt::Checked ? tr("On") : tr("Off")); } void SettingsFloppyCDROM::on_checkBoxCheckBPB_stateChanged(int arg1) { auto idx = ui->tableViewFloppy->selectionModel()->currentIndex(); - ui->tableViewFloppy->model()->setData(idx.siblingAtColumn(2), arg1 == Qt::Checked ? "On" : "Off"); + ui->tableViewFloppy->model()->setData(idx.siblingAtColumn(2), arg1 == Qt::Checked ? tr("On") : tr("Off")); } void SettingsFloppyCDROM::on_comboBoxFloppyType_activated(int index) { diff --git a/src/qt/qt_settingsfloppycdrom.ui b/src/qt/qt_settingsfloppycdrom.ui index 222728356..dfe8283ab 100644 --- a/src/qt/qt_settingsfloppycdrom.ui +++ b/src/qt/qt_settingsfloppycdrom.ui @@ -29,7 +29,7 @@ - Floppy Drives + Floppy drives: @@ -51,7 +51,7 @@ - Type + Type: @@ -61,7 +61,7 @@ - Turbo Timings + Turbo timings @@ -90,7 +90,7 @@ - CD-ROM Drives + CD-ROM drives: @@ -112,7 +112,7 @@ - Channel + Channel: @@ -122,14 +122,14 @@ - Speed + Speed: - Bus + Bus: diff --git a/src/qt/qt_settingsharddisks.cpp b/src/qt/qt_settingsharddisks.cpp index f3e399ef8..ecf8df882 100644 --- a/src/qt/qt_settingsharddisks.cpp +++ b/src/qt/qt_settingsharddisks.cpp @@ -79,12 +79,12 @@ SettingsHarddisks::SettingsHarddisks(QWidget *parent) : ui->setupUi(this); QAbstractItemModel* model = new QStandardItemModel(0, 6, this); - model->setHeaderData(ColumnBus, Qt::Horizontal, "Bus"); - model->setHeaderData(ColumnFilename, Qt::Horizontal, "File"); - model->setHeaderData(ColumnCylinders, Qt::Horizontal, "C"); - model->setHeaderData(ColumnHeads, Qt::Horizontal, "H"); - model->setHeaderData(ColumnSectors, Qt::Horizontal, "S"); - model->setHeaderData(ColumnSize, Qt::Horizontal, "MiB"); + model->setHeaderData(ColumnBus, Qt::Horizontal, tr("Bus")); + model->setHeaderData(ColumnFilename, Qt::Horizontal, tr("File")); + model->setHeaderData(ColumnCylinders, Qt::Horizontal, tr("C")); + model->setHeaderData(ColumnHeads, Qt::Horizontal, tr("H")); + model->setHeaderData(ColumnSectors, Qt::Horizontal, tr("S")); + model->setHeaderData(ColumnSize, Qt::Horizontal, tr("MiB")); ui->tableView->setModel(model); for (int i = 0; i < HDD_NUM; i++) { diff --git a/src/qt/qt_settingsharddisks.ui b/src/qt/qt_settingsharddisks.ui index 4bded8aab..762315021 100644 --- a/src/qt/qt_settingsharddisks.ui +++ b/src/qt/qt_settingsharddisks.ui @@ -44,7 +44,7 @@ - Bus + Bus: @@ -54,7 +54,7 @@ - ID + ID: diff --git a/src/qt/qt_settingsnetwork.cpp b/src/qt/qt_settingsnetwork.cpp index 201a61fea..64b60b55e 100644 --- a/src/qt/qt_settingsnetwork.cpp +++ b/src/qt/qt_settingsnetwork.cpp @@ -28,7 +28,7 @@ SettingsNetwork::SettingsNetwork(QWidget *parent) : ui->setupUi(this); auto* model = ui->comboBoxNetwork->model(); - Models::AddEntry(model, "None", NET_TYPE_NONE); + Models::AddEntry(model, tr("None"), NET_TYPE_NONE); Models::AddEntry(model, "PCap", NET_TYPE_PCAP); Models::AddEntry(model, "SLiRP", NET_TYPE_SLIRP); ui->comboBoxNetwork->setCurrentIndex(network_type); @@ -38,7 +38,7 @@ SettingsNetwork::SettingsNetwork(QWidget *parent) : QString currentPcapDevice = network_host; for (int c = 0; c < network_ndev; c++) { - Models::AddEntry(model, network_devs[c].description, c); + Models::AddEntry(model, tr(network_devs[c].description), c); if (QString(network_devs[c].device) == currentPcapDevice) { selectedRow = c; } diff --git a/src/qt/qt_settingsnetwork.ui b/src/qt/qt_settingsnetwork.ui index 045ddbbae..0b99769a7 100644 --- a/src/qt/qt_settingsnetwork.ui +++ b/src/qt/qt_settingsnetwork.ui @@ -29,14 +29,14 @@ - PCap Device + PCap device: - Network Adapter + Network adapter: @@ -62,7 +62,7 @@ - Network Type + Network type: diff --git a/src/qt/qt_settingsotherremovable.ui b/src/qt/qt_settingsotherremovable.ui index 7d2b7a6d7..81b76f10a 100644 --- a/src/qt/qt_settingsotherremovable.ui +++ b/src/qt/qt_settingsotherremovable.ui @@ -29,7 +29,7 @@ - MO Drives + MO drives: @@ -51,14 +51,14 @@ - Bus + Bus: - Channel + Channel: @@ -71,7 +71,7 @@ - Type + Type: @@ -96,7 +96,7 @@ - ZIP Drives + ZIP drives: @@ -118,7 +118,7 @@ - Bus + Bus: @@ -128,7 +128,7 @@ - Channel + Channel: diff --git a/src/qt/qt_settingsports.cpp b/src/qt/qt_settingsports.cpp index 4c6446ef4..e2a0a4fdc 100644 --- a/src/qt/qt_settingsports.cpp +++ b/src/qt/qt_settingsports.cpp @@ -29,7 +29,7 @@ SettingsPorts::SettingsPorts(QWidget *parent) : break; } - Models::AddEntry(model, lptName, c); + Models::AddEntry(model, tr(lptName), c); if (c == lpt_ports[i].device) { selectedRow = c; } diff --git a/src/qt/qt_settingsports.ui b/src/qt/qt_settingsports.ui index 4831948dc..0e52b4f3f 100644 --- a/src/qt/qt_settingsports.ui +++ b/src/qt/qt_settingsports.ui @@ -31,7 +31,7 @@ - LPT1 Device + LPT1 Device: @@ -41,7 +41,7 @@ - LPT2 Device + LPT2 Device: @@ -51,7 +51,7 @@ - LPT3 Device + LPT3 Device: @@ -65,49 +65,49 @@ - Serial Port 1 + Serial port 1 - Parallel Port 1 + Parallel port 1 - Serial Port 2 + Serial port 2 - Parallel Port 2 + Parallel port 2 - Serial Port 3 + Serial port 3 - Parallel Port 3 + Parallel port 3 - Serial Port 4 + Serial port 4 diff --git a/src/qt/qt_settingsstoragecontrollers.ui b/src/qt/qt_settingsstoragecontrollers.ui index 3d1bf7dba..00f7c9619 100644 --- a/src/qt/qt_settingsstoragecontrollers.ui +++ b/src/qt/qt_settingsstoragecontrollers.ui @@ -31,7 +31,7 @@ - HD Controller + HD Controller: @@ -45,7 +45,7 @@ - FD Controller + FD Controller: @@ -117,7 +117,7 @@ - Controller 1 + Controller 1: @@ -130,14 +130,14 @@ - Controller 4 + Controller 4: - Controller 2 + Controller 2: @@ -158,7 +158,7 @@ - Controller 3 + Controller 3: