3 files changed, 80 insertions, 75 deletions
diff --git a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
index 630c0b940..85f9386ad 100644
--- a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
+++ b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
@@ -98,7 +98,8 @@ BEGIN
     EDITTEXT        IDC_XDMCP_HOST,78,12,64,12
     AUTOCHECKBOX    STR_XDMCP_INDIRECT,IDC_XDMCP_INDIRECT,19,28,280,10
     AUTORADIOBUTTON STR_XDMCP_BROADCAST, IDC_XDMCP_BROADCAST,7,42,300,10
-    LTEXT           STR_XDMCP_QUERY_DESC,IDC_XDMCP_QUERY_DESC,7,56,300,42
+    LTEXT           STR_XDMCP_QUERY_DESC,IDC_XDMCP_QUERY_DESC,7,66,300,42
+    AUTOCHECKBOX    STR_XDMCP_TERMINATE,IDC_XDMCP_TERMINATE,7,94,300,10
 END
 
 IDD_EXTRA DIALOGEX 0, 0, 317, 143
diff --git a/xorg-server/hw/xwin/xlaunch/resources/resources.h b/xorg-server/hw/xwin/xlaunch/resources/resources.h
index 3df186d3b..03f3dac1f 100644
--- a/xorg-server/hw/xwin/xlaunch/resources/resources.h
+++ b/xorg-server/hw/xwin/xlaunch/resources/resources.h
@@ -24,86 +24,88 @@
  * use or other dealings in this Software without prior written authorization.
  */
 
-#define IDC_STATIC -1
+#define IDC_STATIC                     -1
 
-#define IDD_WELCOME             100
-#define IDD_FINISH              101
-#define IDD_DISPLAY             102
-#define IDD_CLIENTS             103
-#define IDD_PROGRAM             104
-#define IDD_XDMCP               105
-#define IDD_FONTPATH            106
-#define IDD_EXTRA               107
+#define IDD_WELCOME                   100
+#define IDD_FINISH                    101
+#define IDD_DISPLAY                   102
+#define IDD_CLIENTS                   103
+#define IDD_PROGRAM                   104
+#define IDD_XDMCP                     105
+#define IDD_FONTPATH                  106
+#define IDD_EXTRA                     107
 
-#define IDI_XLAUNCH             108
+#define IDI_XLAUNCH                   108
 
-#define IDS_DISPLAY_TITLE       300
-#define IDS_DISPLAY_SUBTITLE    301
-#define IDS_CLIENTS_TITLE       302
-#define IDS_CLIENTS_SUBTITLE    303
-#define IDS_PROGRAM_TITLE       304
-#define IDS_PROGRAM_SUBTITLE    305
-#define IDS_XDMCP_TITLE         306
-#define IDS_XDMCP_SUBTITLE      307
-#define IDS_FONTPATH_TITLE      308
-#define IDS_FONTPATH_SUBTITLE   309
-#define IDS_FINISH_TITLE        310
-#define IDS_FINISH_SUBTITLE     311
-#define IDS_EXTRA_TITLE         312
-#define IDS_EXTRA_SUBTITLE      313
-#define IDS_SAVE_TITLE          320
-#define IDS_SAVE_FILETITLE      321
-#define IDS_SAVE_FILTER         322
-                
-#define IDC_MULTIWINDOW         200
-#define IDC_WINDOWED            201
-#define IDC_FULLSCREEN          202
-#define IDC_NODECORATION        203
-#define IDC_MULTIWINDOW_IMG     204
-#define IDC_WINDOWED_IMG        205
-#define IDC_FULLSCREEN_IMG      206
-#define IDC_NODECORATION_IMG    207
-#define IDC_DISPLAY             208
-#define IDC_DISPLAY_DESC        209
+#define IDC_MULTIWINDOW               200
+#define IDC_WINDOWED                  201
+#define IDC_FULLSCREEN                202
+#define IDC_NODECORATION              203
+#define IDC_MULTIWINDOW_IMG           204
+#define IDC_WINDOWED_IMG              205
+#define IDC_FULLSCREEN_IMG            206
+#define IDC_NODECORATION_IMG          207
+#define IDC_DISPLAY                   208
+#define IDC_DISPLAY_DESC              209
 
-#define IDC_CLIENT_NONE         210
-#define IDC_XDMCP               211
-#define IDC_CLIENT              212
-#define IDC_CLIENT_LOCAL        213
-#define IDC_CLIENT_REMOTE       214
-#define IDC_CLIENT_HOST         215
-#define IDC_CLIENT_USER         216
-#define IDC_CLIENT_PASSWORD     217
-#define IDC_CLIENT_CONFIGURE    218
-#define IDC_CLIENT_PROGRAM      219
-#define IDC_XDMCP_QUERY         220
-#define IDC_XDMCP_BROADCAST     221
-#define IDC_XDMCP_INDIRECT      222
-#define IDC_XDMCP_HOST          223
-#define IDC_CLIENT_NONE_DESC    224
-#define IDC_XDMCP_DESC          225
-#define IDC_CLIENT_DESC         226
-#define IDC_XDMCP_QUERY_DESC    227
-#define IDC_CLIENT_PROGRAM_DESC 228
-#define IDC_CLIENT_HOST_DESC    229
-#define IDC_CLIENT_USER_DESC    230
-#define IDC_CLIENT_PASSWORD_DESC 231
+#define IDC_CLIENT_NONE               210
+#define IDC_XDMCP                     211
+#define IDC_CLIENT                    212
+#define IDC_CLIENT_LOCAL              213
+#define IDC_CLIENT_REMOTE             214
+#define IDC_CLIENT_HOST               215
+#define IDC_CLIENT_USER               216
+#define IDC_CLIENT_PASSWORD           217
+#define IDC_CLIENT_CONFIGURE          218
+#define IDC_CLIENT_PROGRAM            219
+#define IDC_XDMCP_QUERY               220
+#define IDC_XDMCP_BROADCAST           221
+#define IDC_XDMCP_INDIRECT            222
+#define IDC_XDMCP_HOST                223
+#define IDC_CLIENT_NONE_DESC          224
+#define IDC_XDMCP_DESC                225
+#define IDC_CLIENT_DESC               226
+#define IDC_XDMCP_QUERY_DESC          227
+#define IDC_CLIENT_PROGRAM_DESC       228
+#define IDC_CLIENT_HOST_DESC          229
+#define IDC_CLIENT_USER_DESC          230
+#define IDC_CLIENT_PASSWORD_DESC      231
 #define IDC_CLIENT_REMOTEPROGRAM      232
 #define IDC_CLIENT_REMOTEPROGRAM_DESC 233
 
-#define IDC_FONTPATH_DESC        240
+#define IDC_FONTPATH_DESC             240
+
+#define IDC_FINISH_DESC               250
+#define IDC_FINISH_SAVE               251
+#define IDC_FINISH_SAVE_DESC          252
 
-#define IDC_FINISH_DESC		 250
-#define IDC_FINISH_SAVE		 251
-#define IDC_FINISH_SAVE_DESC     252
+#define IDC_CLIPBOARD                 260
+#define IDC_CLIPBOARD_DESC            261
+#define IDC_EXTRA_PARAMS              262
+#define IDC_EXTRA_PARAMS_DESC         263
+#define IDC_WGL                       264
+#define IDC_WGL_DESC                  265
+#define IDC_CLIPBOARDPRIMARY          266
+#define IDC_CLIPBOARDPRIMARY_DESC     267
+#define IDC_DISABLEAC                 268
+#define IDC_DISABLEAC_DESC            269
+#define IDC_XDMCP_TERMINATE           270
 
-#define IDC_CLIPBOARD            260
-#define IDC_CLIPBOARD_DESC       261
-#define IDC_EXTRA_PARAMS         262
-#define IDC_EXTRA_PARAMS_DESC    263
-#define IDC_WGL                  264
-#define IDC_WGL_DESC             265
-#define IDC_CLIPBOARDPRIMARY      266
-#define IDC_CLIPBOARDPRIMARY_DESC 267
-#define IDC_DISABLEAC             268
-#define IDC_DISABLEAC_DESC        269
+#define IDS_DISPLAY_TITLE             300
+#define IDS_DISPLAY_SUBTITLE          301
+#define IDS_CLIENTS_TITLE             302
+#define IDS_CLIENTS_SUBTITLE          303
+#define IDS_PROGRAM_TITLE             304
+#define IDS_PROGRAM_SUBTITLE          305
+#define IDS_XDMCP_TITLE               306
+#define IDS_XDMCP_SUBTITLE            307
+#define IDS_FONTPATH_TITLE            308
+#define IDS_FONTPATH_SUBTITLE         309
+#define IDS_FINISH_TITLE              310
+#define IDS_FINISH_SUBTITLE           311
+#define IDS_EXTRA_TITLE               312
+#define IDS_EXTRA_SUBTITLE            313
+#define IDS_SAVE_TITLE                320
+#define IDS_SAVE_FILETITLE            321
+#define IDS_SAVE_FILTER               322
+                
diff --git a/xorg-server/hw/xwin/xlaunch/resources/strings.rc b/xorg-server/hw/xwin/xlaunch/resources/strings.rc
index 1d7fd3b0a..dab2b30af 100644
--- a/xorg-server/hw/xwin/xlaunch/resources/strings.rc
+++ b/xorg-server/hw/xwin/xlaunch/resources/strings.rc
@@ -71,6 +71,8 @@
 #define STR_DISABLEAC               "Disable access control"
 #define STR_DISABLEAC_DESC          "Use this when you want vcxsrv to accept connections from all clients."
 
+#define STR_XDMCP_TERMINATE          "Terminate on server reset."
+
 #define STR_CAPTION_FINISH          "Finish configuration"
 #define STR_FINISH_DESC	            "Configuration is complete. Click Finish to start VcXsrv."
 #define STR_FINISH_SAVE_DESC        "You may also save the configuration for later use."