juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix inconsistencies on new translated strings (#10310)

Browse Source 
* Unmark string that don't need to be translated

* Spellcheck

* Fix calibration strings consistency
This commit is contained in:
Alexandre Folle de Menezes
2025-08-09 12:52:48 -03:00
committed by GitHub
parent 255d7153f4
commit 4cab501f14
29 changed files with 397 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/BackgroundSlicingProcess.cpp
View File

@@ -555,11 +555,11 @@ bool BackgroundSlicingProcess::stop()
m_print->cancel();
// Wait until the background processing stops by being canceled.
m_condition.wait(lck, [this](){ return m_state == STATE_CANCELED; });
// In the "Cancelled" state. Reset the state to "Idle".
// In the "Canceled" state. Reset the state to "Idle".
m_state = STATE_IDLE;
m_print->set_cancel_callback([](){});
} else if (m_state == STATE_FINISHED || m_state == STATE_CANCELED) {
// In the "Finished" or "Cancelled" state. Reset the state to "Idle".
// In the "Finished" or "Canceled" state. Reset the state to "Idle".
m_state = STATE_IDLE;
m_print->set_cancel_callback([](){});
}
@@ -605,7 +605,7 @@ void BackgroundSlicingProcess::stop_internal()
// Lock it back to be in a consistent state.
m_print->state_mutex().lock();
}
// In the "Cancelled" state. Reset the state to "Idle".
// In the "Canceled" state. Reset the state to "Idle".
m_state = STATE_IDLE;
m_print->set_cancel_callback([](){});
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< ", exit"<<std::endl;