54a9ee5eb0
Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui
Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui