Merge branch 'master' into v1.7.2

This commit is contained in:
Lane.Wei 2023-08-15 21:45:42 +08:00 committed by GitHub
commit 42a69e3e20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 127 additions and 127 deletions

View file

@ -587,7 +587,7 @@ void PressureAdvanceWizard::on_cali_save()
return;
}
if (save_page->is_all_failed()) {
MessageDialog msg_dlg(nullptr, _L("The failed test result has been droped."), wxEmptyString, wxOK);
MessageDialog msg_dlg(nullptr, _L("The failed test result has been dropped."), wxEmptyString, wxOK);
msg_dlg.ShowModal();
show_step(start_step);
return;
@ -945,7 +945,7 @@ void FlowRateWizard::on_cali_save()
return;
}
if (save_page->is_all_failed()) {
MessageDialog msg_dlg(nullptr, _L("The failed test result has been droped."), wxEmptyString, wxOK);
MessageDialog msg_dlg(nullptr, _L("The failed test result has been dropped."), wxEmptyString, wxOK);
msg_dlg.ShowModal();
show_step(start_step);
return;