3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-02 06:10:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'main' into dev/p2s-pr

Browse source 
# Conflicts:
#	src/slic3r/GUI/DeviceErrorDialog.cpp
This commit is contained in:
Noisyfox 2025-11-09 12:35:32 +08:00
commit 614612ed38
48 changed files with 3533 additions and 3528 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/DeviceErrorDialog.cpp
View file

@ -175,10 +175,10 @@ void DeviceErrorDialog::init_button_list()
init_button(PROBLEM_SOLVED_RESUME, _L("Problem Solved and Resume"));
init_button(TURN_OFF_FIRE_ALARM, _L("Got it, Turn off the Fire Alarm."));
init_button(RETRY_PROBLEM_SOLVED, _L("Retry (problem solved)"));
init_button(CANCLE, _L("Cancle"));
init_button(CANCLE, _L("Cancel"));
init_button(STOP_DRYING, _L("Stop Drying"));
init_button(PROCEED, _L("Proceed"));
init_button(DBL_CHECK_CANCEL, _L("Cancle"));
init_button(DBL_CHECK_CANCEL, _L("Cancel"));
init_button(DBL_CHECK_DONE, _L("Done"));
init_button(DBL_CHECK_RETRY, _L("Retry"));
init_button(DBL_CHECK_RESUME, _L("Resume"));