Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r5a4a26f106ba03759e3a89b19690fa678f8a3aca -r9ef6badf8e172436bba2bfad1642ae7e469e0361 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 5a4a26f106ba03759e3a89b19690fa678f8a3aca) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 9ef6badf8e172436bba2bfad1642ae7e469e0361) @@ -120,8 +120,15 @@ title : _GuiView.manufactSetup ? qsTr("Manufacturing Setup") : serviceMode ? qsTr("Service") : qsTr("Device Settings") backVisible : false confirmVisible : serviceMode - confirmText.text: qsTr("SHUTDOWN") - onConfirmClicked: _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData) + confirmText.text: _GuiView.manufactSetup ? qsTr("QUIT") : qsTr("SHUTDOWN") + onConfirmClicked: { + if ( _GuiView.manufactSetup ) { + _GuiView.doQuitApplication() + } + else { + _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData) + } + } itemsText : _root.itemsText itemsEnabled : _root.itemsEnabled itemsVisible : _root.itemsVisible