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

merge conflicts

Browse Source
This commit is contained in:
Henri van der Riet committed 2024-09-08 01:04:19 +02:00
1 parent e750727743
commit 5b0ddbd5f7
44 files changed
+492 -495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/slic3r/GUI/GUI_App.cpp
+1 -1
View File
@@ -3672,7 +3672,7 @@ void GUI_App::request_user_logout()
/* delete old user settings */
bool transfer_preset_changes = false;
wxString header = _L("Some presets are modified.") + "\n" +
_L("You can keep the modifield presets to the new project, discard or save changes as new presets.");
_L("You can keep the modified presets to the new project, discard or save changes as new presets.");
wxGetApp().check_and_keep_current_preset_changes(_L("User logged out"), header, ActionButtons::KEEP | ActionButtons::SAVE, &transfer_preset_changes);
m_device_manager->clean_user_info();