diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp index 4d4ba569..dd47e3aa 100644 --- a/DSView/pv/mainwindow.cpp +++ b/DSView/pv/mainwindow.cpp @@ -481,7 +481,7 @@ void MainWindow::test_data_error() _session.stop_capture(); dialogs::DSMessageBox msg(this); msg.mBox()->setText(tr("Data Error")); - msg.mBox()->setInformativeText(tr("the receive data are not consist with pre-defined test data")); + msg.mBox()->setInformativeText(tr("The received data is not consistent with pre-defined test data.")); msg.mBox()->setStandardButtons(QMessageBox::Ok); msg.mBox()->setIcon(QMessageBox::Warning); msg.exec(); @@ -492,7 +492,7 @@ void MainWindow::malloc_error() _session.stop_capture(); dialogs::DSMessageBox msg(this); msg.mBox()->setText(tr("Malloc Error")); - msg.mBox()->setInformativeText(tr("Memory is not enough for this sample!\nPlease reduce the sample depth!")); + msg.mBox()->setInformativeText(tr("Not enough memory for this sample!\nPlease reduce the sample depth!")); msg.mBox()->setStandardButtons(QMessageBox::Ok); msg.mBox()->setIcon(QMessageBox::Warning); msg.exec(); diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp index a42b50e0..805be2d8 100644 --- a/DSView/pv/sigsession.cpp +++ b/DSView/pv/sigsession.cpp @@ -243,7 +243,7 @@ void SigSession::save_file(const QString name, QWidget* parent, int type){ data, unit_size, sample_count, _trigger_time.toMSecsSinceEpoch(), _trigger_pos); }); Qt::WindowFlags flags = Qt::CustomizeWindowHint; - QProgressDialog dlg(tr("Save Capture to File... It can take a while."), + QProgressDialog dlg(tr("Saving capture to file... this can take a while."), tr("Cancel"),0,0,parent,flags); dlg.setWindowModality(Qt::WindowModal); dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint); @@ -400,7 +400,7 @@ void SigSession::export_file(const QString name, QWidget* parent, const QString QFutureWatcher watcher; Qt::WindowFlags flags = Qt::CustomizeWindowHint; - QProgressDialog dlg(tr("Exporting data... It can take a while."), + QProgressDialog dlg(tr("Exporting data... this can take a while."), tr("Cancel"),0,100,parent,flags); dlg.setWindowModality(Qt::WindowModal); watcher.setFuture(future); @@ -1281,10 +1281,10 @@ int SigSession::hotplug_callback(struct libusb_context *ctx, struct libusb_devic if (LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED == event) { _session->_hot_attach = true; - qDebug("DreamSourceLab Hardware Attaced!\n"); + qDebug("DreamSourceLab Hardware Attached!\n"); }else if (LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT == event) { _session->_hot_detach = true; - qDebug("DreamSourceLab Hardware Dettaced!\n"); + qDebug("DreamSourceLab Hardware Detached!\n"); }else{ qDebug("Unhandled event %d\n", event); } diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp index e99929fd..0514e32b 100644 --- a/DSView/pv/toolbars/filebar.cpp +++ b/DSView/pv/toolbars/filebar.cpp @@ -167,7 +167,7 @@ void FileBar::on_actionExport_triggered(){ if (!buf) { dialogs::DSMessageBox msg(this); msg.mBox()->setText(tr("Data Export")); - msg.mBox()->setInformativeText(tr("No Data to Save!")); + msg.mBox()->setInformativeText(tr("No data to save!")); msg.mBox()->setStandardButtons(QMessageBox::Ok); msg.mBox()->setIcon(QMessageBox::Warning); msg.exec(); @@ -205,7 +205,7 @@ void FileBar::on_actionSave_triggered() if (!buf) { dialogs::DSMessageBox msg(this); msg.mBox()->setText(tr("File Save")); - msg.mBox()->setInformativeText(tr("No Data to Save!")); + msg.mBox()->setInformativeText(tr("No data to save!")); msg.mBox()->setStandardButtons(QMessageBox::Ok); msg.mBox()->setIcon(QMessageBox::Warning); msg.exec(); diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp index 06b324c7..b47eeb5f 100644 --- a/DSView/pv/toolbars/samplingbar.cpp +++ b/DSView/pv/toolbars/samplingbar.cpp @@ -705,7 +705,7 @@ void SamplingBar::on_instant_stop() if (zero) { dialogs::DSMessageBox msg(this); msg.mBox()->setText(tr("Zero Adjustment")); - msg.mBox()->setInformativeText(tr("Zero adjustment program will be started. Please keep all channels out of singal input. It can take a while!")); + msg.mBox()->setInformativeText(tr("Zero adjustment program will be started. Please keep all channels out of signal input. This can take a while!")); //msg.mBox()->setStandardButtons(QMessageBox::Ok); msg.mBox()->addButton(tr("Ok"), QMessageBox::AcceptRole); msg.mBox()->addButton(tr("Skip"), QMessageBox::RejectRole); @@ -738,7 +738,7 @@ void SamplingBar::on_device_selected() try { _session.set_device(dev_inst); } catch(QString e) { - show_session_error(tr("Failed to Select ") + dev_inst->dev_inst()->model, e); + show_session_error(tr("Failed to select ") + dev_inst->dev_inst()->model, e); } device_selected(); } diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp index d1bfe666..aab8148c 100644 --- a/DSView/pv/view/decodetrace.cpp +++ b/DSView/pv/view/decodetrace.cpp @@ -509,7 +509,7 @@ void DecodeTrace::draw_nodetail(QPainter &p, { (void)base_colour; const QRectF nodetail_rect(left, y - h/2 + 0.5, right - left, h); - QString info = tr("Zoom in For Detials"); + QString info = tr("Zoom in for details"); int info_left = nodetail_rect.center().x() - p.boundingRect(QRectF(), 0, info).width(); int info_right = nodetail_rect.center().x() + p.boundingRect(QRectF(), 0, info).width(); int height = p.boundingRect(QRectF(), 0, info).height(); diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp index 461aafc9..a285db4a 100644 --- a/DSView/pv/view/dsosignal.cpp +++ b/DSView/pv/view/dsosignal.cpp @@ -779,7 +779,7 @@ QString DsoSignal::get_ms_string(int index) const case DSO_MS_VRMS: return "Vrms"; case DSO_MS_VMEA: return "Vmean"; case DSO_MS_VP2P: return "Vp-p"; - default: return "Error: Out of Bound"; + default: return "Error: Out of Bounds"; } } diff --git a/DSView/pv/widgets/viewstatus.cpp b/DSView/pv/widgets/viewstatus.cpp index 2b57a6c9..50b00b91 100644 --- a/DSView/pv/widgets/viewstatus.cpp +++ b/DSView/pv/widgets/viewstatus.cpp @@ -59,7 +59,7 @@ void ViewStatus::set_trig_time(QDateTime time) void ViewStatus::set_rle_depth(uint64_t depth) { - _rle_depth = tr("RLE FULL: ") + QString::number(depth) + tr(" Samples Captured!"); + _rle_depth = tr("RLE FULL: ") + QString::number(depth) + tr(" samples captured!"); } } // namespace widgets