Merge PR #5799: FEAT(client, ui): Extended quit behavior setting

This commit extends the quit behavior setting from being a binary toggle
between ask or don't ask, when quitting while connected to a server, to
give the user the options for Mumble to ask, minimize or quit straight
away, either always or only while connected to a server.

Fixes #5282

src/mumble/CMakeLists.txt

@@ -134,6 +134,7 @@ set(MUMBLE_SOURCES
 	"ConnectDialogEdit.ui"
 	"ConnectDialog.h"
 	"ConnectDialog.ui"
+	"QuitBehavior.h"
 	"CustomElements.cpp"
 	"CustomElements.h"
 	"Database.cpp"

src/mumble/EnumStringConversions.cpp

@@ -69,6 +69,13 @@
 	PROCESS(Settings::AlwaysOnTopBehaviour, OnTopInMinimal, "InMinimal") \
 	PROCESS(Settings::AlwaysOnTopBehaviour, OnTopInNormal, "InNormal")
 
+#define QUIT_VALUES                                                         \
+	PROCESS(QuitBehavior, ALWAYS_ASK, "AlwaysAsk")                          \
+	PROCESS(QuitBehavior, ASK_WHEN_CONNECTED, "AskWhenConnected")           \
+	PROCESS(QuitBehavior, ALWAYS_MINIMIZE, "AlwaysMinimize")                \
+	PROCESS(QuitBehavior, MINIMIZE_WHEN_CONNECTED, "MinimizeWhenConnected") \
+	PROCESS(QuitBehavior, ALWAYS_QUIT, "AlwaysQuit")
+
 #define WINDOW_LAYOUT_VALUES                                  \
 	PROCESS(Settings::WindowLayout, LayoutClassic, "Classic") \
 	PROCESS(Settings::WindowLayout, LayoutStacked, "Stacked") \
@@ -178,6 +185,9 @@
 	BEFORE_CODE(Settings::AlwaysOnTopBehaviour)        \
 	ALWAYS_ON_TOP_VALUES                               \
 	AFTER_CODE                                         \
+	BEFORE_CODE(QuitBehavior)                          \
+	QUIT_VALUES                                        \
+	AFTER_CODE                                         \
 	BEFORE_CODE(Settings::WindowLayout)                \
 	WINDOW_LAYOUT_VALUES                               \
 	AFTER_CODE                                         \
@@ -253,6 +263,7 @@ PROCESS_ALL_ENUMS
 #undef RECORDING_MODE_VALUES
 #undef WINDOW_LAYOUT_VALUES
 #undef ALWAYS_ON_TOP_VALUES
+#undef QUIT_VALUES
 #undef PROXY_TYPE_VALUES
 #undef ECHO_CANCEL_VALUES
 #undef NOISE_CANCEL_VALUES

src/mumble/EnumStringConversions.h

@@ -26,6 +26,7 @@ const char *enumToString(Settings::NoiseCancel e);
 const char *enumToString(EchoCancelOptionID e);
 const char *enumToString(Settings::ProxyType e);
 const char *enumToString(Settings::AlwaysOnTopBehaviour e);
+const char *enumToString(QuitBehavior e);
 const char *enumToString(Settings::WindowLayout e);
 const char *enumToString(Settings::RecordingMode e);
 const char *enumToString(Search::SearchDialog::UserAction e);
@@ -50,6 +51,7 @@ void stringToEnum(const std::string &str, Settings::NoiseCancel &e);
 void stringToEnum(const std::string &str, EchoCancelOptionID &e);
 void stringToEnum(const std::string &str, Settings::ProxyType &e);
 void stringToEnum(const std::string &str, Settings::AlwaysOnTopBehaviour &e);
+void stringToEnum(const std::string &str, QuitBehavior &e);
 void stringToEnum(const std::string &str, Settings::WindowLayout &e);
 void stringToEnum(const std::string &str, Settings::RecordingMode &e);
 void stringToEnum(const std::string &str, Search::SearchDialog::UserAction &e);

src/mumble/JSONSerialization.cpp

@@ -149,11 +149,20 @@ void to_json(nlohmann::json &j, const Settings &settings) {
 	j[SettingsKeys::MUMBLE_QUIT_NORMALLY_KEY] = settings.mumbleQuitNormally;
 }
 
-void migrateSettings(nlohmann::json json, int settingsVersion) {
+void migrateSettings(nlohmann::json &json, int settingsVersion) {
 	// Perform conversions required to transform the given JSON into the format applicable to be read out by the most
 	// recent standards
 
-	(void) json;
+	// Check if the old ask_on_quit key exists and the new one does not exist within the json file
+	if (json.contains("ask_on_quit")
+		&& (!json.contains(static_cast< const char * >(SettingsKeys::QUIT_BEHAVIOR_KEY)))) {
+		if (!json.at("ask_on_quit").get< bool >()) {
+			json[SettingsKeys::QUIT_BEHAVIOR_KEY] = QuitBehavior::ALWAYS_QUIT;
+		} else {
+			json[SettingsKeys::QUIT_BEHAVIOR_KEY] = QuitBehavior::ALWAYS_ASK;
+		}
+	}
+
 	(void) settingsVersion;
 }
 

src/mumble/LookConfig.cpp

@@ -186,7 +186,9 @@ void LookConfig::load(const Settings &r) {
 	loadComboBox(qcbChannelDrag, r.ceChannelDrag);
 	loadComboBox(qcbUserDrag, r.ceUserDrag);
 	loadCheckBox(qcbUsersTop, r.bUserTop);
-	loadCheckBox(qcbAskOnQuit, r.bAskOnQuit);
+
+	loadComboBox(qcbQuitBehavior, static_cast< int >(r.quitBehavior));
+
 	loadCheckBox(qcbEnableDeveloperMenu, r.bEnableDeveloperMenu);
 	loadCheckBox(qcbLockLayout, (r.wlWindowLayout == Settings::LayoutCustom) && r.bLockLayout);
 	loadCheckBox(qcbHideTray, r.bHideInTray);
@@ -253,7 +255,7 @@ void LookConfig::save() const {
 	}
 
 	s.aotbAlwaysOnTop           = static_cast< Settings::AlwaysOnTopBehaviour >(qcbAlwaysOnTop->currentIndex());
-	s.bAskOnQuit                = qcbAskOnQuit->isChecked();
+	s.quitBehavior              = static_cast< QuitBehavior >(qcbQuitBehavior->currentIndex());
 	s.bEnableDeveloperMenu      = qcbEnableDeveloperMenu->isChecked();
 	s.bLockLayout               = qcbLockLayout->isChecked();
 	s.bHideInTray               = qcbHideTray->isChecked();

src/mumble/LookConfig.ui

@@ -447,17 +447,46 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="2">
-       <widget class="QCheckBox" name="qcbAskOnQuit">
+      <item row="2" column="0">
+       <widget class="QLabel" name="qliQuitBehavior">
+        <property name="text">
+         <string>Quit Behavior</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="MUComboBox" name="qcbQuitBehavior">
         <property name="toolTip">
-         <string>Ask whether to close or minimize when quitting Mumble.</string>
+         <string>This setting controls the behavior of clicking on the X in the top right corner.</string>
         </property>
         <property name="whatsThis">
-         <string>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</string>
-        </property>
-        <property name="text">
-         <string>Ask on quit while connected</string>
+         <string>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</string>
         </property>
+        <item>
+         <property name="text">
+          <string>Always Ask</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Ask when connected</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Always Minimize</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Minimize when connected</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Always Quit</string>
+         </property>
+        </item>
        </widget>
       </item>
       <item row="3" column="0" colspan="2">

src/mumble/MainWindow.cpp

@@ -132,9 +132,9 @@ MainWindow::MainWindow(QWidget *p)
 #ifdef Q_OS_WIN
 	uiNewHardware = 1;
 #endif
-	bSuppressAskOnQuit = false;
-	restartOnQuit      = false;
-	bAutoUnmute        = false;
+	forceQuit     = false;
+	restartOnQuit = false;
+	bAutoUnmute   = false;
 
 	Channel::add(Channel::ROOT_ID, tr("Root"));
 
@@ -524,29 +524,56 @@ bool MainWindow::nativeEvent(const QByteArray &, void *message, long *) {
 #endif
 
 void MainWindow::closeEvent(QCloseEvent *e) {
+	ServerHandlerPtr sh               = Global::get().sh;
+	QuitBehavior quitBehavior         = Global::get().s.quitBehavior;
+	const bool alwaysAsk              = quitBehavior == QuitBehavior::ALWAYS_ASK;
+	const bool askDueToConnected      = sh && sh->isRunning() && quitBehavior == QuitBehavior::ASK_WHEN_CONNECTED;
+	const bool alwaysMinimize         = quitBehavior == QuitBehavior::ALWAYS_MINIMIZE;
+	const bool minimizeDueToConnected = sh && sh->isRunning() && quitBehavior == QuitBehavior::MINIMIZE_WHEN_CONNECTED;
+
+	if (!forceQuit && (alwaysAsk || askDueToConnected)) {
 #ifndef Q_OS_MAC
-	ServerHandlerPtr sh = Global::get().sh;
-	if (sh && sh->isRunning() && Global::get().s.bAskOnQuit && !bSuppressAskOnQuit) {
 		QMessageBox mb(QMessageBox::Warning, QLatin1String("Mumble"),
-					   tr("Mumble is currently connected to a server. Do you want to Close or Minimize it?"),
+					   tr("Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?"),
 					   QMessageBox::NoButton, this);
+		QCheckBox *qcbRemember   = new QCheckBox(tr("Remember this setting"));
 		QPushButton *qpbClose    = mb.addButton(tr("Close"), QMessageBox::YesRole);
 		QPushButton *qpbMinimize = mb.addButton(tr("Minimize"), QMessageBox::NoRole);
 		QPushButton *qpbCancel   = mb.addButton(tr("Cancel"), QMessageBox::RejectRole);
 		mb.setDefaultButton(qpbClose);
 		mb.setEscapeButton(qpbCancel);
+		mb.setCheckBox(qcbRemember);
 		mb.exec();
 		if (mb.clickedButton() == qpbMinimize) {
 			showMinimized();
 			e->ignore();
+
+			// If checkbox is checked and not connected, always minimize
+			// If checkbox is checked and connected, always minimize when connected
+			if (qcbRemember->isChecked() && !(sh && sh->isRunning())) {
+				Global::get().s.quitBehavior = QuitBehavior::ALWAYS_MINIMIZE;
+			} else if (qcbRemember->isChecked()) {
+				Global::get().s.quitBehavior = QuitBehavior::MINIMIZE_WHEN_CONNECTED;
+			}
+
 			return;
 		} else if (mb.clickedButton() == qpbCancel) {
 			e->ignore();
 			return;
 		}
-	}
-	sh.reset();
+
+		// If checkbox is checked, quit always
+		if (qcbRemember->isChecked()) {
+			Global::get().s.quitBehavior = QuitBehavior::ALWAYS_QUIT;
+		}
 #endif
+	} else if (!forceQuit && (alwaysMinimize || minimizeDueToConnected)) {
+		showMinimized();
+		e->ignore();
+		return;
+	}
+
+	sh.reset();
 
 	if (Global::get().s.bMinimalView) {
 		Global::get().s.qbaMinimalViewGeometry = saveGeometry();
@@ -2091,7 +2118,7 @@ void MainWindow::on_qaHide_triggered() {
 }
 
 void MainWindow::on_qaQuit_triggered() {
-	bSuppressAskOnQuit = true;
+	forceQuit = true;
 	this->close();
 }
 
@@ -2716,8 +2743,8 @@ void MainWindow::on_qaConfigDialog_triggered() {
 					   tr("Some settings will only apply after a restart of Mumble. Restart Mumble now?"),
 					   QMessageBox::Yes | QMessageBox::No)
 					   == QMessageBox::Yes) {
-				bSuppressAskOnQuit = true;
-				restartOnQuit      = true;
+				forceQuit     = true;
+				restartOnQuit = true;
 
 				close();
 			}

src/mumble/MainWindow.h

@@ -113,7 +113,7 @@ public:
 	bool bRetryServer;
 	QString qsDesiredChannel;
 
-	bool bSuppressAskOnQuit;
+	bool forceQuit;
 	/// Restart the client after shutdown
 	bool restartOnQuit;
 	bool bAutoUnmute;

src/mumble/MumbleApplication.cpp

@@ -38,7 +38,7 @@ void MumbleApplication::onCommitDataRequest(QSessionManager &) {
 	if (Global::get().mw) {
 		Global::get().s.mumbleQuitNormally = true;
 		Global::get().s.save();
-		Global::get().mw->bSuppressAskOnQuit = true;
+		Global::get().mw->forceQuit = true;
 		qWarning() << "Session likely ending. Suppressing ask on quit";
 	}
 }

src/mumble/QuitBehavior.h

@@ -0,0 +1,18 @@
+// Copyright 2022 The Mumble Developers. All rights reserved.
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file at the root of the
+// Mumble source tree or at <https://www.mumble.info/LICENSE>.
+
+#ifndef MUMBLE_QUITBEHAVIOR_H
+#define MUMBLE_QUITBEHAVIOR_H
+
+/// This enum lists a series of quit options
+enum class QuitBehavior {
+	ALWAYS_ASK              = 0,
+	ASK_WHEN_CONNECTED      = 1,
+	ALWAYS_MINIMIZE         = 2,
+	MINIMIZE_WHEN_CONNECTED = 3,
+	ALWAYS_QUIT             = 4
+};
+
+#endif // MUMBLE_QUITBEHAVIOR_H

src/mumble/Settings.cpp

@@ -953,7 +953,6 @@ void Settings::legacyLoad(const QString &path) {
 	LOADENUM(ceChannelDrag, "ui/drag");
 	LOADENUM(ceUserDrag, "ui/userdrag");
 	LOADENUM(aotbAlwaysOnTop, "ui/alwaysontop");
-	LOAD(bAskOnQuit, "ui/askonquit");
 	LOAD(bEnableDeveloperMenu, "ui/developermenu");
 	LOAD(bLockLayout, "ui/locklayout");
 	LOAD(bMinimalView, "ui/minimalview");
@@ -994,6 +993,15 @@ void Settings::legacyLoad(const QString &path) {
 	LOAD(iChatMessageMargins, "ui/ChatMessageMargins");
 	LOAD(bDisablePublicList, "ui/disablepubliclist");
 
+	if (settings_ptr->contains("ui/askonquit")) {
+		// Compatibility layer for overtaking the old (now deprecated) settings
+		// This block should only be called once at the first start of the new Mumble version
+		bool deprecatedAskOnQuit = true;
+		LOAD(deprecatedAskOnQuit, "ui/askonquit");
+
+		quitBehavior = deprecatedAskOnQuit ? QuitBehavior::ALWAYS_ASK : QuitBehavior::ALWAYS_QUIT;
+	}
+
 	// TalkingUI
 	LOAD(qpTalkingUI_Position, "ui/talkingUIPosition");
 	LOAD(bShowTalkingUI, "ui/showTalkingUI");

src/mumble/Settings.h

@@ -25,6 +25,7 @@
 
 #include "Channel.h"
 #include "EchoCancelOption.h"
+#include "QuitBehavior.h"
 #include "SSL.h"
 #include "SearchDialog.h"
 
@@ -407,7 +408,7 @@ struct Settings {
 	bool bMinimalView                    = false;
 	bool bHideFrame                      = false;
 	AlwaysOnTopBehaviour aotbAlwaysOnTop = OnTopNever;
-	bool bAskOnQuit                      = true;
+	QuitBehavior quitBehavior            = QuitBehavior::ALWAYS_ASK;
 	bool bEnableDeveloperMenu            = false;
 	bool bLockLayout                     = false;
 	bool bHideInTray                     = false;

src/mumble/SettingsKeys.h

@@ -169,7 +169,7 @@ const SettingsKey CHANNEL_EXPANSION_MODE_KEY           = { "channel_expansion_mo
 const SettingsKey CHANNEL_DRAG_MODE_KEY                = { "channel_drag_mode" };
 const SettingsKey USER_DRAG_MODE_KEY                   = { "user_drag_mode" };
 const SettingsKey ALWAYS_ON_TOP_KEY                    = { "always_on_top" };
-const SettingsKey ASK_ON_QUIT_KEY                      = { "ask_on_quit" };
+const SettingsKey QUIT_BEHAVIOR_KEY                    = { "quit_behavior" };
 const SettingsKey SHOW_DEVELOPER_MENU_KEY              = { "show_developer_menu" };
 const SettingsKey LOCK_LAYOUT_KEY                      = { "lock_layout" };
 const SettingsKey MINIMAL_VIEW_KEY                     = { "minimal_view" };

src/mumble/SettingsMacros.h

@@ -143,7 +143,7 @@
 	PROCESS(ui, CHANNEL_DRAG_MODE_KEY, ceChannelDrag)                            \
 	PROCESS(ui, USER_DRAG_MODE_KEY, ceUserDrag)                                  \
 	PROCESS(ui, ALWAYS_ON_TOP_KEY, aotbAlwaysOnTop)                              \
-	PROCESS(ui, ASK_ON_QUIT_KEY, bAskOnQuit)                                     \
+	PROCESS(ui, QUIT_BEHAVIOR_KEY, quitBehavior)                                 \
 	PROCESS(ui, SHOW_DEVELOPER_MENU_KEY, bEnableDeveloperMenu)                   \
 	PROCESS(ui, LOCK_LAYOUT_KEY, bLockLayout)                                    \
 	PROCESS(ui, MINIMAL_VIEW_KEY, bMinimalView)                                  \

src/mumble/VersionCheck.cpp

@@ -150,7 +150,7 @@ void VersionCheck::fetched(QByteArray a, QUrl url) {
 								execinfo.nShow       = SW_NORMAL;
 
 								if (ShellExecuteExW(&execinfo)) {
-									Global::get().mw->bSuppressAskOnQuit = true;
+									Global::get().mw->forceQuit = true;
 									qApp->closeAllWindows();
 								} else {
 									Global::get().mw->msgBox(tr("Failed to launch snapshot installer."));

src/mumble/mumble_ar.ts

@@ -4147,10 +4147,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>عرض عدد المستخدمين في كل قناة</translation>
@@ -4216,14 +4212,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4528,6 +4516,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4619,10 +4639,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6375,6 +6391,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_bg.ts

@@ -4144,10 +4144,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4213,14 +4209,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4525,6 +4513,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4616,10 +4636,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>Затваряне</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6372,6 +6388,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_br.ts

@@ -4143,10 +4143,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4212,14 +4208,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4524,6 +4512,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4615,10 +4635,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6371,6 +6387,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_ca.ts

@@ -4169,10 +4169,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4238,14 +4234,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4550,6 +4538,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4641,10 +4661,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6397,6 +6413,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_cs.ts

@@ -4198,10 +4198,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation>Uživatelé nad Kanály</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Je-li nastaveno, potvrdí, zda chcete odejít, pokud jste připojeni.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Zobrazí počet uživatelů v každém kanále</translation>
@@ -4267,14 +4263,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation>Táhnutí Kanálů</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Zeptat se, jestli zavřít či minimalizovat při ukončení Mumble.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Zeptat se na ukončení, je-li připojeno</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Vždy Nahoře</translation>
@@ -4579,6 +4567,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4670,10 +4690,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble je nyní připojen k serveru. Opravdu ho chcete Zavřit nebo Minimalizovat?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6431,6 +6447,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_cy.ts

@@ -4147,10 +4147,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4216,14 +4212,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4528,6 +4516,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4619,10 +4639,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6375,6 +6391,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_da.ts

@@ -4196,10 +4196,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation>Brugere over underkanaler</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Hvis denne er markeret, vil du skulle bekræfte, at du vil afslutte, hvis du har oprettet forbindelse.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Vis antallet af brugere i hver kanal</translation>
@@ -4265,14 +4261,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation>Flytning af kanaler</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Spørg om du vil lukke eller minimere, når du afslutter Mumble.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Spørg før afslutning (hvis forbindelse er oprettet)</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Altid øverst</translation>
@@ -4577,6 +4565,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4668,10 +4688,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>Luk</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble har i øjeblikket forbindelse til en server. Vil du lukke eller minimere det?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6427,6 +6443,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_de.ts

@@ -4205,10 +4205,6 @@ Die Einstellung gilt nur für neue Nachrichten, die bereits angezeigten behalten
         <source>Users above Channels</source>
         <translation>Benutzer über Kanälen</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Wenn aktiviert, kommt beim Beenden eine Abfrage.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Zeige die Anzahl der Benutzer in jedem Kanal</translation>
@@ -4274,14 +4270,6 @@ Die Einstellung gilt nur für neue Nachrichten, die bereits angezeigten behalten
         <source>Channel Dragging</source>
         <translation>Kanal ziehen</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Fragen, ob das Mumblefenster geschlossen oder minimiert werden soll, wenn Mumble beendet wird.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Frage beim Beenden mit aktiver Verbindung nach</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Immer oben</translation>
@@ -4586,6 +4574,38 @@ Die Einstellung gilt nur für neue Nachrichten, die bereits angezeigten behalten
         <source>Action (Channel):</source>
         <translation>Aktion (Kanal):</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4677,10 +4697,6 @@ Die Einstellung gilt nur für neue Nachrichten, die bereits angezeigten behalten
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble ist gerade zu einem Server verbunden. Möchten Sie es schließen oder minimieren?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6518,6 +6534,14 @@ Gültige Optionen sind:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_el.ts

@@ -4205,10 +4205,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation>Χρήστες πάνω από τα κανάλια</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Εάν επιλεχθεί, θα επαληθεύει ότι θέλετε να τερματίσετε τη σύνδεση, εάν είστε συνδεδεμένοι.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Εμφάνιση αριθμού χρηστών σε κάθε κανάλι</translation>
@@ -4274,14 +4270,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation>Σύρσιμο καναλιών</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Να ρωτάστε το εαν θα κλείσει ή θα ελαχιστοποιηθεί το Mumble κατά τον τερματισμό.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Να ρωτάστε κατά τον τερματισμό όταν είστε συνδεδεμένοι</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Πάντα Στην Κορυφή</translation>
@@ -4586,6 +4574,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation>Ενέργεια (Κανάλι):</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4677,10 +4697,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>Κλείσιμο</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Το Mumble είναι συνδεδεμένο αυτήν τη στιγμή με έναν διακομιστή. Θέλετε να το Κλείσετε ή να το Ελαχιστοποιήσετε;</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6465,6 +6481,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_en.ts

@@ -4142,10 +4142,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4211,14 +4207,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4523,6 +4511,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4614,10 +4634,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6370,6 +6386,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_en_GB.ts

@@ -4179,10 +4179,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4248,14 +4244,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Ask whether to close or minimise when quitting Mumble.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4560,6 +4548,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4651,10 +4671,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble is currently connected to a server. Do you want to Close or Minimise it?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6407,6 +6423,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_eo.ts

@@ -4154,10 +4154,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation>Uzantoj supre de la Kanaloj</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Agordite, kontrolos ke vi volas ĉesi, se vi estos konektita.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Montri nombron da uzantoj en ĉiu kanalo</translation>
@@ -4223,14 +4219,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4535,6 +4523,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4626,10 +4646,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>Fermi</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6383,6 +6399,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_es.ts

@@ -4206,10 +4206,6 @@ La configuración solo se aplica a los mensajes nuevos, los que ya se muestran c
         <source>Users above Channels</source>
         <translation>Usuarios encima de los canales</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Si se marca, le pedirá confirmar que desea salir si está conectado.&lt;b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Muestra el número de usuarios en cada canal</translation>
@@ -4275,14 +4271,6 @@ La configuración solo se aplica a los mensajes nuevos, los que ya se muestran c
         <source>Channel Dragging</source>
         <translation>Arrastre de canales</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Preguntar si cerrar o minimizar al salir de Mumble.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Preguntar al salir mientras esté conectado</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Siempre visible</translation>
@@ -4587,6 +4575,38 @@ La configuración solo se aplica a los mensajes nuevos, los que ya se muestran c
         <source>Action (Channel):</source>
         <translation>Acción (Canal):</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4678,10 +4698,6 @@ La configuración solo se aplica a los mensajes nuevos, los que ya se muestran c
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble está conectado a un servidor actualmente. ¿Desea cerrarlo o minimizarlo?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6443,6 +6459,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_et.ts

@@ -4144,10 +4144,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation>Kasutjad kanalist kõrgemal</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4213,14 +4209,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation>Kanali lohistamine</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Alati kõige pealmine</translation>
@@ -4525,6 +4513,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4616,10 +4636,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>Sulge</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6372,6 +6388,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_eu.ts

@@ -4161,10 +4161,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Erakutsi kanal bakoitzeko erabiltzaile kopurua</translation>
@@ -4230,14 +4226,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Mumble ixtean, itxi edo txikitu nahi duzun galdetu.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Galdetu irteterakoan konektatua zauden bitarten</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Beti gainean</translation>
@@ -4542,6 +4530,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4633,10 +4653,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>Itxi</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble zerbitzari batera dago konektatuta orain. Itxi edo Minimizatu nahi al duzu?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6392,6 +6408,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_fa_IR.ts

@@ -4142,10 +4142,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4211,14 +4207,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4523,6 +4511,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4614,10 +4634,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6370,6 +6386,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_fi.ts

@@ -4205,10 +4205,6 @@ Tämä vaikuttaa vain uusiin viesteihin, vanhojen viestien aikaleima ei muutu.</
         <source>Users above Channels</source>
         <translation>Käyttäjät yläkanavilla</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Valittuna vahvistaa haluatko sulkea ohjelman kun olet yhdistettynä palvelimeen.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Näytä käyttäjien määrän jokaisella kanavalla</translation>
@@ -4274,14 +4270,6 @@ Tämä vaikuttaa vain uusiin viesteihin, vanhojen viestien aikaleima ei muutu.</
         <source>Channel Dragging</source>
         <translation>Kanavien vetäminen</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Kysyy haluatko sulkea vai pienentää Mumblen sulkemisen yhteydessä.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Kysy lopettamisesta yhdistettynä</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Aina päällimmäisenä</translation>
@@ -4586,6 +4574,38 @@ Tämä vaikuttaa vain uusiin viesteihin, vanhojen viestien aikaleima ei muutu.</
         <source>Action (Channel):</source>
         <translation>Toiminta (Kanava):</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4677,10 +4697,6 @@ Tämä vaikuttaa vain uusiin viesteihin, vanhojen viestien aikaleima ei muutu.</
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble on yhdistetty palvelimeen. Haluatko sulkea vai pienentää sen?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6464,6 +6480,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_fr.ts

@@ -4205,10 +4205,6 @@ Le paramètre ne s'applique qu'aux nouveaux messages, ceux déjà affi
         <source>Users above Channels</source>
         <translation>Utilisateurs en haut des salons</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Si cochée, vérifie que vous voulez quitter si vous êtes connecté.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Affiche le nombre d&apos;utilisateurs dans chaque salon</translation>
@@ -4274,14 +4270,6 @@ Le paramètre ne s&apos;applique qu&apos;aux nouveaux messages, ceux déjà affi
         <source>Channel Dragging</source>
         <translation>Faire glisser le salon</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Demande si on quitte ou réduit la fenêtre en fermant Mumble.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Confirmer l&apos;arrêt si connecté</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Toujours au-dessus</translation>
@@ -4586,6 +4574,38 @@ Le paramètre ne s&apos;applique qu&apos;aux nouveaux messages, ceux déjà affi
         <source>Action (Channel):</source>
         <translation>Action (Salon) :</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4677,10 +4697,6 @@ Le paramètre ne s&apos;applique qu&apos;aux nouveaux messages, ceux déjà affi
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble est actuellement connecté à un serveur. Voulez-vous le fermer ou le réduire dans la barre des tâches&#xa0;?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6526,6 +6542,14 @@ Les options valides sont&#xa0;:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_gl.ts

@@ -4145,10 +4145,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4214,14 +4210,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4526,6 +4514,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4617,10 +4637,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6373,6 +6389,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_he.ts

@@ -4193,10 +4193,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation>משתמשים מעל ערוצים</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;אם מוגדר, תצטרכו לאשר שוב יציאה מהתוכנה.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>הצג את מספר משתמשים בכל ערוץ</translation>
@@ -4262,14 +4258,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation>גרירת ערוצים</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>&lt;p dir=&quot;RTL&quot;&gt;שאל האם לסגור או למזער את Mumble ביציאה.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>&lt;p dir=&quot;RTL&quot;&gt;שאל האם לצאת כאשר מחובר לשרת.&lt;/p&gt;</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>תמיד למעלה</translation>
@@ -4574,6 +4562,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4665,10 +4685,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>סגור</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>&lt;p dir=&quot;RTL&quot;&gt;‫Mumble מחוברת כרגע לשרת, לסגור או למזער אותה?&lt;/p&gt;</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6423,6 +6439,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_hu.ts

@@ -4191,10 +4191,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation>Felhasználók a csatornák felett</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Ha be van állítva, akkor leellenőrzi, hogy ha kapcsolódva van, akkor ki akar-e lépni.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Felhasználók számát mutatja minden csatornában</translation>
@@ -4260,14 +4256,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation>Csatorna mozgatása</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Amikor kilép a Mumble-ból megkérdezi, hogy bezárja vagy minimalizálj a programot.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Kilépés megerősítése</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Mindig előtérben</translation>
@@ -4572,6 +4560,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4663,10 +4683,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>Bezárás</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>A Mumble jelenleg kiszolgálóhoz csatlakozik. Szeretne kilépni vagy csak kis méretre szeretne váltani?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6423,6 +6439,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_it.ts

@@ -4205,10 +4205,6 @@ Questa impostazione si applica solo ai nuovi messaggi, quelli già mostrati mant
         <source>Users above Channels</source>
         <translation>Visualizza utenti sopra i canali</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Se selezionato chiederà conferma alla chiusura di Mumble, se connesso ad un server&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Visualizza il numero degli utenti in ogni canale</translation>
@@ -4274,14 +4270,6 @@ Questa impostazione si applica solo ai nuovi messaggi, quelli già mostrati mant
         <source>Channel Dragging</source>
         <translation>Trascinamento Canale</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Chiede se chiudere o minimizzare la finestra all&apos;uscita da Mumble.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Quando connesso, chiedi conferma all&apos;uscita</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Sempre in primo piano</translation>
@@ -4586,6 +4574,38 @@ Questa impostazione si applica solo ai nuovi messaggi, quelli già mostrati mant
         <source>Action (Channel):</source>
         <translation>Azione (Canale):</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4677,10 +4697,6 @@ Questa impostazione si applica solo ai nuovi messaggi, quelli già mostrati mant
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble è attualmente connesso ad un server. Vuoi Chiuderlo o Minimizzarlo?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6465,6 +6481,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_ja.ts

@@ -4192,10 +4192,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation>チャンネルの上にユーザを表示する</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;これがセットされている場合、接続中に終了するかを確認します。&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>それぞれのチャンネルのユーザ数を表示</translation>
@@ -4261,14 +4257,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation>チャンネルのドラッグ操作</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>終了時に最小化するか閉じるかを確認します。</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>接続中の終了は確認する</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>常に手前に表示</translation>
@@ -4573,6 +4561,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4664,10 +4684,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble は現在、サーバに接続しています。接続を閉じるか最小化しますか?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6421,6 +6437,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_ko.ts

@@ -4204,10 +4204,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation>채널 위의 유저</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;설정된 경우 연결되면 종료할지 확인합니다.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>각 채널의 유저 수 표시</translation>
@@ -4273,14 +4269,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation>채널 드래그</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Mumble을 종료할 때 닫을 것인지 아니면 최소화할지 묻습니다.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>연결된 상태에서 종료 시 묻기</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>항상 위에</translation>
@@ -4585,6 +4573,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation>작업 (채널):</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4676,10 +4696,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>닫기</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble이 현재 서버에 연결되어 있습니다. 닫거나 최소화하시겠습니까?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6464,6 +6480,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_lt.ts

@@ -4175,10 +4175,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Jei nustatyta, jums išeinant ir vis dar tebesant prisijungus, bus klausiama patvirtinimo.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Rodyti kiekviename kanale naudotojų skaičių</translation>
@@ -4244,14 +4240,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation>Kanalų tempimas</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Išeinant iš Mumble, klausti ar programą užverti ar suskleisti.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Klausti išeinant, kai tebeesama prisijungta</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Visada viršuje</translation>
@@ -4556,6 +4544,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4647,10 +4667,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>Užverti</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Programa Mumble šiuo metu yra prisijungusi prie serverio. Norite programą užverti ar suskleisti?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6405,6 +6421,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_nl.ts

@@ -4205,10 +4205,6 @@ Deze instelling geldt voor nieuwe berichten, vermits getoonden conformeren aan h
         <source>Users above Channels</source>
         <translation>Gebruikers boven kanalen</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Ingesteld, wordt om bevestiging gevraagd of je wilt afsluiten terwijl nog verbonden.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Kanaalgebruikersaantal tonen</translation>
@@ -4274,14 +4270,6 @@ Deze instelling geldt voor nieuwe berichten, vermits getoonden conformeren aan h
         <source>Channel Dragging</source>
         <translation>Kanalen Slepen</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Vraag af te sluiten/minimaliseren indien Mumble afsluit.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Vraag bij afsluiten terwijl verbonden</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Altijd vooraan</translation>
@@ -4586,6 +4574,38 @@ Deze instelling geldt voor nieuwe berichten, vermits getoonden conformeren aan h
         <source>Action (Channel):</source>
         <translation>Actie (Kanaal):</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4677,10 +4697,6 @@ Deze instelling geldt voor nieuwe berichten, vermits getoonden conformeren aan h
         <source>Close</source>
         <translation>Sluit</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble is momenteel verbonden met een server. Wil je afsluiten of minimaliseren?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6465,6 +6481,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_no.ts

@@ -4220,10 +4220,6 @@ Har kun innvirkning for nye meldinger. Gamle meldinger vises i foregående tidsf
         <source>Users above Channels</source>
         <translation>Brukere over kanaler</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Hvis satt, vil spørre deg om bekreftelse ved avslutting hvis tilkoblet.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Vis antalle brukere i hver kanal</translation>
@@ -4289,14 +4285,6 @@ Har kun innvirkning for nye meldinger. Gamle meldinger vises i foregående tidsf
         <source>Channel Dragging</source>
         <translation>Kanaldraging</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Spør hvorvidt det skal lukkes eller minimeres når Mumble avsluttes.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Spør ved avslutning når tilkoblet</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Alltid øverst</translation>
@@ -4601,6 +4589,38 @@ Har kun innvirkning for nye meldinger. Gamle meldinger vises i foregående tidsf
         <source>Action (Channel):</source>
         <translation type="unfinished">Handling (kanal):</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4692,10 +4712,6 @@ Har kun innvirkning for nye meldinger. Gamle meldinger vises i foregående tidsf
         <source>Close</source>
         <translation>Lukk</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble er ikke koblet til en tjener. Ønsker du å lukke eller minimere det?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6480,6 +6496,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_oc.ts

@@ -4144,10 +4144,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4213,14 +4209,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Totjorn en dessús</translation>
@@ -4525,6 +4513,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4616,10 +4636,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>Tampar</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6372,6 +6388,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_pl.ts

@@ -4206,10 +4206,6 @@ Ustawienie dotyczy tylko nowych wiadomości, te już pokazane zachowają poprzed
         <source>Users above Channels</source>
         <translation>Wyświetlaj nazwy użytkowników ponad kanałami</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Jeżeli ustawione, program będzie sprawdzać; czy chcesz go zamknąć, gdy jesteś na serwerze.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Wyświetlaj liczbę użytkowników na każdym kanale</translation>
@@ -4275,14 +4271,6 @@ Ustawienie dotyczy tylko nowych wiadomości, te już pokazane zachowają poprzed
         <source>Channel Dragging</source>
         <translation>Przeciąganie kanałów</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Zapytaj, czy zamknąć, czy zminimalizować, podczas kończenia pracy z Mumble.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Ostrzegaj przed zamknięciem programu</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Zawsze na wierzchu</translation>
@@ -4587,6 +4575,38 @@ Ustawienie dotyczy tylko nowych wiadomości, te już pokazane zachowają poprzed
         <source>Action (Channel):</source>
         <translation>Akcja (kanał):</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4678,10 +4698,6 @@ Ustawienie dotyczy tylko nowych wiadomości, te już pokazane zachowają poprzed
         <source>Close</source>
         <translation>Zakończ</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>&lt;b&gt;UWAGA!&lt;/b&gt; Mumble jest obecnie połączony z serwerem. Chcesz zamknąć czy zminimalizować program?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6526,6 +6542,14 @@ Prawidłowe opcje to:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_pt_BR.ts

@@ -4205,10 +4205,6 @@ Essa configuração só se aplica para novas mensagens. As mensagens já exibida
         <source>Users above Channels</source>
         <translation>Usuários acima dos canais</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Se marcado, verificará se você quer sair se conectado&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Mostrar número de usuários em cada canal</translation>
@@ -4274,14 +4270,6 @@ Essa configuração só se aplica para novas mensagens. As mensagens já exibida
         <source>Channel Dragging</source>
         <translation>Moção de canais</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Perguntar quando fechar ou minimizar ao fechar o Mumble.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Perguntar ao sair enquanto conectado</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Sempre visível</translation>
@@ -4586,6 +4574,38 @@ Essa configuração só se aplica para novas mensagens. As mensagens já exibida
         <source>Action (Channel):</source>
         <translation>Ação (Canal):</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4677,10 +4697,6 @@ Essa configuração só se aplica para novas mensagens. As mensagens já exibida
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>O Mumble está conectado a um servidor atualmente. Você gostaria de fechá-lo ou minimizá-lo?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6465,6 +6481,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_pt_PT.ts

@@ -4205,10 +4205,6 @@ Essa configuração só se aplica para novas mensagens. As mensagens já exibida
         <source>Users above Channels</source>
         <translation>Utilizadores acima dos canais</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Se marcado, verificará se quer sair se ligado&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Mostrar número de utilizadores em cada canal</translation>
@@ -4274,14 +4270,6 @@ Essa configuração só se aplica para novas mensagens. As mensagens já exibida
         <source>Channel Dragging</source>
         <translation>Movimento de Canais</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Perguntar fechar ou minimizar ao encerrar o Mumble.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Perguntar ao sair enquanto ligado</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Sempre no topo</translation>
@@ -4586,6 +4574,38 @@ Essa configuração só se aplica para novas mensagens. As mensagens já exibida
         <source>Action (Channel):</source>
         <translation>Ação (Canal):</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4677,10 +4697,6 @@ Essa configuração só se aplica para novas mensagens. As mensagens já exibida
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>O Mumble está ligado a um servidor atualmente. Gostaria de fechá-lo ou minimizá-lo?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6443,6 +6459,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_ro.ts

@@ -4148,10 +4148,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4217,14 +4213,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4529,6 +4517,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4620,10 +4640,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6376,6 +6392,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_ru.ts

@@ -4206,10 +4206,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation>Пользователи над каналами</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Если отмечено, нужно будет подтвердить попытку закрыть Mumble, если Вы подключены к серверу.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Показывать количество пользователей на каждом канале</translation>
@@ -4275,14 +4271,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation>Перетаскивание канала</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Спрашивать Закрыть или Свернуть Mumble при закрытии.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Спрашивать о выходе, когда подключен к серверу</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Отображать на переднем плане</translation>
@@ -4587,6 +4575,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation>Действие (Канал):</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4678,10 +4698,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>В настоящий момент Mumble подключен к серверу.&lt;br /&gt;Вы хотите Закрыть его или Свернуть в трей?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6466,6 +6482,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_si.ts

@@ -4286,18 +4286,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Show context menu in menu bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&lt;b&gt;Enable Developer menu&lt;/b&gt;&lt;br /&gt;This enables the &quot;Developer&quot;-menu in Mumble. This menu is used for developer-specific features, such as the Developer Console.</source>
         <translation type="unfinished"></translation>
@@ -4495,6 +4483,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -5477,10 +5497,6 @@ Valid actions are:
         <source>Push-to-Talk</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
@@ -6334,6 +6350,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_sk.ts

@@ -4234,18 +4234,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Show context menu in menu bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&lt;b&gt;Enable Developer menu&lt;/b&gt;&lt;br /&gt;This enables the &quot;Developer&quot;-menu in Mumble. This menu is used for developer-specific features, such as the Developer Console.</source>
         <translation type="unfinished"></translation>
@@ -4499,6 +4487,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>User Interface</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -5593,10 +5613,6 @@ Valid actions are:
         <source>Mumble - Minimal View</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
@@ -6338,6 +6354,14 @@ Otherwise abort and check your certificate and username.</source>
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_sq.ts

@@ -4288,18 +4288,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Show context menu in menu bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&lt;b&gt;Enable Developer menu&lt;/b&gt;&lt;br /&gt;This enables the &quot;Developer&quot;-menu in Mumble. This menu is used for developer-specific features, such as the Developer Console.</source>
         <translation type="unfinished"></translation>
@@ -4497,6 +4485,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -5494,10 +5514,6 @@ Valid actions are:
         <source>Push-to-Talk</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
@@ -6336,6 +6352,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_sv.ts

@@ -4205,10 +4205,6 @@ Inställningen gäller endast för nya meddelanden, de redan visade meddelandena
         <source>Users above Channels</source>
         <translation>Visa användare ovan kanaler</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Vid markering, kommer vi att verifiera om du vill avsluta vid anslutning.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Visa antalet användare i varje kanal</translation>
@@ -4274,14 +4270,6 @@ Inställningen gäller endast för nya meddelanden, de redan visade meddelandena
         <source>Channel Dragging</source>
         <translation>Kanaldragning</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Fråga om att stänga eller minimera vid avslut av Mumble.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Fråga vid avslut om stängning</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Alltid överst</translation>
@@ -4586,6 +4574,38 @@ Inställningen gäller endast för nya meddelanden, de redan visade meddelandena
         <source>Action (Channel):</source>
         <translation>Åtgärd (kanal):</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4677,10 +4697,6 @@ Inställningen gäller endast för nya meddelanden, de redan visade meddelandena
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble är för närvarande anslutet till en server. Vill du stänga eller minimera?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6465,6 +6481,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_te.ts

@@ -4155,10 +4155,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4224,14 +4220,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4536,6 +4524,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4627,10 +4647,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6383,6 +6399,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_th.ts

@@ -4142,10 +4142,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4211,14 +4207,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4523,6 +4511,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4614,10 +4634,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6370,6 +6386,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_tr.ts

@@ -4204,10 +4204,6 @@ Bu ayar sadece yeni mesajlara uygulanır, zaten görüntülenmiş olanlar öncek
         <source>Users above Channels</source>
         <translation>Kullanıcılar kanalların üstünde</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Bağlantıdayken programdan çıkmak istediğinizde, emin olup olmadığınızı sorar.&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>Her kanaldaki kullanıcı sayısını göster</translation>
@@ -4273,14 +4269,6 @@ Bu ayar sadece yeni mesajlara uygulanır, zaten görüntülenmiş olanlar öncek
         <source>Channel Dragging</source>
         <translation>Kanal Kaydırma</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>Mumble&apos;dan çıkış seçildiğinde uygulamanın kapatılması ve küçültülmesi seçimi sun.</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>Bağlantıdayken çıkışta sor</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>Her Zaman Üstte</translation>
@@ -4585,6 +4573,38 @@ Bu ayar sadece yeni mesajlara uygulanır, zaten görüntülenmiş olanlar öncek
         <source>Action (Channel):</source>
         <translation>Eylem (Kanal):</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4676,10 +4696,6 @@ Bu ayar sadece yeni mesajlara uygulanır, zaten görüntülenmiş olanlar öncek
         <source>Close</source>
         <translation>Kapat</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble hâlihazırda bir sunucuya bağlıdır. Kapatmak mı istiyorsunuz, küçültmek mi?</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6524,6 +6540,14 @@ Geçerli seçenekler şunlardır:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_uk.ts

@@ -4145,10 +4145,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4214,14 +4210,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4526,6 +4514,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4617,10 +4637,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6373,6 +6389,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_zh_CN.ts

@@ -4204,10 +4204,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation>用户显示在频道上方</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;如果选中，在您已连接服务器时退出需要确认。&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>显示每个频道的用户数</translation>
@@ -4273,14 +4269,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation>频道拖动</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>在退出 Mumble 时，询问您要关闭还是最小化。</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>在已连接服务器时确认退出</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>始终置顶</translation>
@@ -4585,6 +4573,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation>操作（频道）：</translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4676,10 +4696,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>关闭</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble 已连接到服务器。您要关闭或者最小化吗？</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6524,6 +6540,14 @@ mumble://[&lt;用户名&gt;[:&lt;密码&gt;]@]&lt;主机名&gt;[:&lt;端口&gt;]
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_zh_HK.ts

@@ -4142,10 +4142,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation type="unfinished"></translation>
@@ -4211,14 +4207,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
@@ -4523,6 +4511,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4614,10 +4634,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>關閉</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble 正與伺服器連線中。您希望關閉還是最小化？</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6375,6 +6391,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/mumble/mumble_zh_TW.ts

@@ -4170,10 +4170,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Users above Channels</source>
         <translation>顯示頻道內使用者清單</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;If set, will verify you want to quit if connected.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;退出程式時如果與伺服器持續連線則進行重複確認。&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Show number of users in each channel</source>
         <translation>顯示每一個頻道的使用人數</translation>
@@ -4239,14 +4235,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Channel Dragging</source>
         <translation>頻道拖曳</translation>
     </message>
-    <message>
-        <source>Ask whether to close or minimize when quitting Mumble.</source>
-        <translation>詢問退出 Mumble 時是關閉還是最小化。</translation>
-    </message>
-    <message>
-        <source>Ask on quit while connected</source>
-        <translation>與伺服器連線期間離開前確認</translation>
-    </message>
     <message>
         <source>Always On Top</source>
         <translation>最上層顯示</translation>
@@ -4551,6 +4539,38 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Action (Channel):</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quit Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior of clicking on the X in the top right corner.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Ask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ask when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize when connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -4642,10 +4662,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>Close</source>
         <translation>關閉</translation>
     </message>
-    <message>
-        <source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
-        <translation>Mumble 正與伺服器連線中。你希望關閉還是最小化？</translation>
-    </message>
     <message>
         <source>Mute Self</source>
         <comment>Global Shortcut</comment>
@@ -6398,6 +6414,14 @@ Valid options are:
         <source>Server instructed us to use an audio codec different from Opus, which is no longer supported. Disconnecting...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Are you sure you want to close Mumble? Perhaps you prefer to minimize it instead?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this setting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

src/tests/TestSettingsJSONSerialization/generate_test_case.py

@@ -136,6 +136,8 @@ def getDefaultValueForType(dataType):
         return "Settings::NoiseCancelBoth"
     elif dataType in ["EchoCancelOptionID"]:
         return "EchoCancelOptionID::SPEEX_MULTICHANNEL"
+    elif dataType in ["QuitBehavior"]:
+        return "QuitBehavior::ALWAYS_QUIT"
     elif dataType in ["OverlayShow"]:
         return "OverlaySettings::HomeChannel"
     elif dataType in ["OverlayShow"]: