X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.rc;h=770f58d514d8f6dc346ba313feb78da3b66fe37a;hb=a9793b43a5e0ed4e4fe88497b1f9cc413cd08266;hp=428e1c4b1a8983f56bf5062c1006bf96806a3330;hpb=b51ca75e943536b633299e3d03a511df3ec58821;p=xboard.git

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index 428e1c4..770f58d 100644
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -44,7 +44,7 @@ BEGIN
     LTEXT           "Chessboard for Windows",400,25,15,121,8
     LTEXT           "Copyright 1991 Digital Equipment Corporation",201,6,34,
                     149,8
-    LTEXT           "Enhancements Copyright 1992-2009   Free Software Foundation",
+    LTEXT           "Enhancements Copyright 1992-2010  Free Software Foundation",
                     OPT_TCtext1,6,45,121,17
     CONTROL         "",OPT_TCTime,"Static",SS_BLACKRECT,4,28,159,1
     LTEXT           "WinBoard 0.0.0",ABOUTBOX_Version,25,5,160,8
@@ -60,7 +60,7 @@ CAPTION "Time Control"
 FONT 8, "MS Sans Serif"
 BEGIN
     LTEXT           "Use arrow keys to specify which clock setting type, then press tab to alter values.",
-                    IDC_STATIC,9,9,231,20
+                    IDC_Babble,9,9,231,20
     CONTROL         "Conventional chess clock",OPT_TCUseMoves,"Button",
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,36,113,10
     CONTROL         "Incremental clock",OPT_TCUseInc,"Button",
@@ -72,21 +72,21 @@ BEGIN
     LTEXT           "Within number of minutes:",OPT_TCtext2,113,54,81,8,NOT 
                     WS_GROUP
     EDITTEXT        OPT_TCTime,197,52,32,12,ES_AUTOHSCROLL
-    LTEXT           "Initial number of minutes:",405,15,89,106,8,NOT 
+    LTEXT           "Initial number of minutes:",OPT_TCitext1,15,89,106,8,NOT 
                     WS_GROUP
     EDITTEXT        OPT_TCTime2,127,87,32,12,ES_AUTOHSCROLL | WS_GROUP
-    LTEXT           "Plus number of seconds per move:",406,15,105,109,8,NOT 
+    LTEXT           "Plus number of seconds per move:",OPT_TCitext2,15,105,109,8,NOT 
                     WS_GROUP
     EDITTEXT        OPT_TCInc,127,103,32,12,ES_AUTOHSCROLL
     LTEXT           "Maximum seconds per move:",OPT_TCftext,15,142,109,8,NOT 
                     WS_GROUP
     EDITTEXT        OPT_TCFixed,127,140,32,12,ES_AUTOHSCROLL
-    LTEXT           "",408,185,148,67,8,NOT WS_GROUP
-    LTEXT           "Time-Odds Factors:",IDC_STATIC,6,158,150,8,NOT WS_GROUP
+    LTEXT           "",OPT_TCitext3,185,148,67,8,NOT WS_GROUP
+    LTEXT           "Time-Odds Factors:",GPB_Factors,6,158,150,8,NOT WS_GROUP
     EDITTEXT        OPT_TCOdds1,47,171,32,12,ES_AUTOHSCROLL | WS_GROUP
-    LTEXT           "Engine #1:",IDC_STATIC,6,173,40,8,NOT WS_GROUP
+    LTEXT           "Engine #1:",IDC_Factor1,6,173,40,8,NOT WS_GROUP
     EDITTEXT        OPT_TCOdds2,127,171,32,12,ES_AUTOHSCROLL
-    LTEXT           "Engine #2:",IDC_STATIC,86,173,40,8,NOT WS_GROUP
+    LTEXT           "Engine #2:",IDC_Factor2,86,173,40,8,NOT WS_GROUP
     PUSHBUTTON      "OK",IDOK,29,190,40,14,WS_GROUP
     PUSHBUTTON      "Cancel",IDCANCEL,85,190,40,14
 END
@@ -137,7 +137,7 @@ BEGIN
     LISTBOX         1120,6,32,90,68,LBS_SORT | LBS_OWNERDRAWFIXED | 
                     LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL | 
                     WS_TABSTOP
-    LTEXT           "&Directories:",-1,110,6,92,9
+    LTEXT           "&Directories:",IDC_Directories,110,6,92,9
     LTEXT           "",1088,110,18,92,9,SS_NOPREFIX | NOT WS_GROUP
     LISTBOX         1121,110,32,92,68,LBS_SORT | LBS_OWNERDRAWFIXED | 
                     LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL | 
@@ -152,7 +152,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,208,6,50,14,WS_GROUP
     PUSHBUTTON      "Cancel",IDCANCEL,208,24,50,14,WS_GROUP
     PUSHBUTTON      "&Help",1038,208,46,50,14,NOT WS_VISIBLE | WS_GROUP
-    LTEXT           "&Index number:",-1,208,74,48,8
+    LTEXT           "&Index number:",IDC_IndexNr,208,74,48,8
     EDITTEXT        OPT_IndexNumberOld,208,84,50,12,ES_AUTOHSCROLL
     PUSHBUTTON      "Net&work...",1037,208,113,50,14,WS_GROUP
 END
@@ -164,22 +164,22 @@ FONT 8, "Helv"
 BEGIN
     PUSHBUTTON      "OK",IDOK,106,60,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,164,60,50,14
-    RTEXT           "&Port:",-1,4,6,40,10
+    RTEXT           "&Port:",IDC_Port,4,6,40,10
     COMBOBOX        OPT_Port,49,4,55,60,CBS_DROPDOWN | WS_VSCROLL | 
                     WS_TABSTOP
-    RTEXT           "Data &Rate:",-1,114,6,40,10,NOT WS_GROUP
+    RTEXT           "Data &Rate:",IDC_Rate,114,6,40,10,NOT WS_GROUP
     COMBOBOX        OPT_DataRate,159,4,55,100,CBS_DROPDOWN | WS_VSCROLL | 
                     WS_TABSTOP
-    RTEXT           "Data &Bits:",-1,4,25,40,10,NOT WS_GROUP
+    RTEXT           "Data &Bits:",IDC_Bits,4,25,40,10,NOT WS_GROUP
     COMBOBOX        OPT_Bits,49,22,55,60,CBS_DROPDOWNLIST | CBS_HASSTRINGS | 
                     WS_VSCROLL | WS_TABSTOP
-    RTEXT           "P&arity:",-1,114,24,40,10,NOT WS_GROUP
+    RTEXT           "P&arity:",IDC_Parity,114,24,40,10,NOT WS_GROUP
     COMBOBOX        OPT_Parity,159,22,55,60,CBS_DROPDOWNLIST | 
                     CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "&Stop Bits:",-1,4,42,40,10,NOT WS_GROUP
+    RTEXT           "&Stop Bits:",IDC_Stop,4,42,40,10,NOT WS_GROUP
     COMBOBOX        OPT_StopBits,49,40,55,60,CBS_DROPDOWNLIST | 
                     CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "F&low:",-1,114,42,40,10,NOT WS_GROUP
+    RTEXT           "F&low:",IDC_Flow,114,42,40,10,NOT WS_GROUP
     COMBOBOX        OPT_Flow,159,40,55,60,CBS_DROPDOWNLIST | CBS_HASSTRINGS | 
                     WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Help",OPT_SerialHelp,4,60,50,14,NOT WS_VISIBLE
@@ -212,8 +212,6 @@ BEGIN
     PUSHBUTTON      "K&night",PB_Knight,139,23,40,14,NOT WS_TABSTOP
     PUSHBUTTON      "&King",PB_King,4,4,40,14,NOT WS_TABSTOP
     PUSHBUTTON      "&Cancel",IDCANCEL,139,4,40,14,WS_GROUP
-    LTEXT           "      YES",IDC_Yes,6,25,36,10
-    LTEXT           "       NO",IDC_No,141,25,36,10
     LTEXT           "C&entaur",IDC_Centaur,12,6,25,10
 END
 
@@ -222,7 +220,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About WinBoard"
 FONT 8, "MS Sans Serif"
 BEGIN
-    RTEXT           "Chessboard for Windows",DLG_TimeControl,196,154,80,8
+    RTEXT           "Chessboard for Windows",IDC_ChessBoard,196,154,80,8
     LTEXT           "Copyright 1991 Digital Equipment Corporation",201,4,168,
                     151,8
     LTEXT           "Enhancements Copyright 1992-2003   Free Software Foundation",
@@ -339,7 +337,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "WinBoard Startup"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "What would you like to do?",IDC_STATIC,4,4,211,56
+    GROUPBOX        "What would you like to do?",IDC_Welcome,4,4,211,56
     CONTROL         "&Play against a chess engine or match two engines",
                     OPT_ChessEngine,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
                     WS_TABSTOP,8,17,193,10
@@ -369,7 +367,7 @@ DLG_IndexNumber DIALOG DISCARDABLE  0, 0, 236, 18
 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
 FONT 8, "MS Sans Serif"
 BEGIN
-    LTEXT           "Inde&x number:",IDC_STATIC,5,2,46,8
+    LTEXT           "Inde&x number:",IDC_Index,5,2,46,8
     EDITTEXT        OPT_IndexNumber,54,0,155,13,ES_AUTOHSCROLL
 END
 
@@ -398,7 +396,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Sounds"
 FONT 8, "MS Sans Serif"
 BEGIN
-    LTEXT           "&Event:",IDC_STATIC,4,7,26,9
+    LTEXT           "&Event:",IDC_Event,4,7,26,9
     COMBOBOX        CBO_Sounds,30,4,208,110,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
 //    GROUPBOX        "sound type",IDC_STATIC,8,18,66,62
@@ -420,13 +418,13 @@ BEGIN
     PUSHBUTTON      "&Play",OPT_PlaySound,188,47,50,14
 END
 
-DLG_GeneralOptions DIALOG DISCARDABLE  0, 0, 250, 183
+DLG_GeneralOptions DIALOG DISCARDABLE  0, 0, 250, 197
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "General Options"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,110,164,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,166,164,50,14
+    DEFPUSHBUTTON   "OK",IDOK,110,178,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,166,178,50,14
     CONTROL         "Always on &Top",OPT_AlwaysOnTop,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,4,6,126,10
     CONTROL         "Highlight Last &Move",OPT_HighlightLastMove,"Button",
@@ -471,17 +469,21 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,146,126,10
     CONTROL         "Highlight with Arro&w",OPT_HighlightMoveArrow,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,131,145,126,10
+    CONTROL         "Displa&y Logos",OPT_AutoLogo,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,160,126,10
 END
 
-DLG_IcsOptions DIALOGEX 0, 0, 302, 255
+DLG_IcsOptions DIALOGEX 0, 0, 302, 268
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "ICS Options"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,194,237,50,15
-    PUSHBUTTON      "Cancel",IDCANCEL,248,237,50,15
+    DEFPUSHBUTTON   "OK",IDOK,194,250,50,15
+    PUSHBUTTON      "Cancel",IDCANCEL,248,250,50,15
     CONTROL         "&Auto Comment",OPT_AutoComment,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,10,12,63,8
+    CONTROL         "&Auto Kibitz",OPT_AutoKibitz,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,84,12,63,8
     CONTROL         "Auto &Observe",OPT_AutoObserve,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,10,25,63,8
     CONTROL         "&Get Move List",OPT_GetMoveList,"Button",
@@ -490,6 +492,14 @@ BEGIN
                     BS_AUTOCHECKBOX | WS_TABSTOP,10,51,84,8
     CONTROL         "&Quiet Play",OPT_QuietPlay,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,10,64,63,8
+    CONTROL         "See&k Graph",OPT_SeekGraph,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,10,77,63,8
+    CONTROL         "auto-&Refresh",OPT_AutoRefresh,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,84,77,63,8
+    CONTROL         "Bckgnd Obser&ve",OPT_BgObserve,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,10,90,68,8
+    CONTROL         "&Dual Board",OPT_DualBoard,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,84,90,63,8
     CONTROL         "&Premove",OPT_Premove,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,160,12,46,10
     CONTROL         "&White first move",OPT_PremoveWhite,"Button",
@@ -498,57 +508,61 @@ BEGIN
     CONTROL         "&Black first move",OPT_PremoveBlack,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,160,40,66,10
     EDITTEXT        OPT_PremoveBlackText,236,38,25,14,ES_AUTOHSCROLL
+    CONTROL         "One-Click &Move",OPT_SmartMove,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,160,54,100,10
     CONTROL         "&Sound alarm at",OPT_IcsAlarm,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,160,72,63,10
-    EDITTEXT        OPT_IcsAlarmTime,236,68,26,14,ES_AUTOHSCROLL
-    LTEXT           "seconds",IDC_STATIC,264,72,28,8
-    PUSHBUTTON      "Choose...",OPT_ChooseShoutColor,97,101,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseSShoutColor,97,121,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseChannel1Color,97,141,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseChannelColor,97,161,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseKibitzColor,97,181,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseTellColor,246,101,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseChallengeColor,246,121,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseRequestColor,246,141,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseSeekColor,246,161,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseNormalColor,246,181,45,15
-    PUSHBUTTON      "Background...",OPT_ChooseBackgroundColor,10,208,50,16
-    PUSHBUTTON      "&Defaults...",OPT_DefaultColors,68,208,50,16
+                    WS_TABSTOP,160,85,63,10
+    EDITTEXT        OPT_IcsAlarmTime,236,81,26,14,ES_AUTOHSCROLL
+    LTEXT           "seconds",IDC_Sec,264,85,28,8
+    PUSHBUTTON      "Choose...",OPT_ChooseShoutColor,97,114,45,15
+    PUSHBUTTON      "Choose...",OPT_ChooseSShoutColor,97,134,45,15
+    PUSHBUTTON      "Choose...",OPT_ChooseChannel1Color,97,154,45,15
+    PUSHBUTTON      "Choose...",OPT_ChooseChannelColor,97,174,45,15
+    PUSHBUTTON      "Choose...",OPT_ChooseKibitzColor,97,194,45,15
+    PUSHBUTTON      "Choose...",OPT_ChooseTellColor,246,114,45,15
+    PUSHBUTTON      "Choose...",OPT_ChooseChallengeColor,246,134,45,15
+    PUSHBUTTON      "Choose...",OPT_ChooseRequestColor,246,154,45,15
+    PUSHBUTTON      "Choose...",OPT_ChooseSeekColor,246,174,45,15
+    PUSHBUTTON      "Choose...",OPT_ChooseNormalColor,246,194,45,15
+    PUSHBUTTON      "Background...",OPT_ChooseBackgroundColor,10,221,50,16
+    PUSHBUTTON      "&Defaults...",OPT_DefaultColors,68,221,50,16
     CONTROL         "Do &not colorize messages",OPT_DontColorize,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,192,212,97,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,192,225,97,10
     CONTROL         "",OPT_SampleShout,"RICHEDIT",ES_CENTER | ES_MULTILINE | 
-                    ES_READONLY | WS_DISABLED | WS_GROUP,10,101,75,15,
+                    ES_READONLY | WS_DISABLED | WS_GROUP,10,114,75,15,
                     WS_EX_CLIENTEDGE
     CONTROL         "",OPT_SampleSShout,"RICHEDIT",ES_CENTER | ES_MULTILINE | 
-                    ES_READONLY | WS_DISABLED | WS_GROUP,10,121,75,15,
+                    ES_READONLY | WS_DISABLED | WS_GROUP,10,134,75,15,
                     WS_EX_CLIENTEDGE
     CONTROL         "",OPT_SampleChannel1,"RICHEDIT",ES_CENTER | 
                     ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_GROUP,10,
-                    141,75,15,WS_EX_CLIENTEDGE
+                    154,75,15,WS_EX_CLIENTEDGE
     CONTROL         "",OPT_SampleChannel,"RICHEDIT",ES_CENTER | ES_MULTILINE | 
-                    ES_READONLY | WS_DISABLED | WS_GROUP,10,161,75,15,
+                    ES_READONLY | WS_DISABLED | WS_GROUP,10,174,75,15,
                     WS_EX_CLIENTEDGE
     CONTROL         "",OPT_SampleKibitz,"RICHEDIT",ES_CENTER | ES_MULTILINE | 
-                    ES_READONLY | WS_GROUP,10,181,75,15,WS_EX_CLIENTEDGE
+                    ES_READONLY | WS_GROUP,10,194,75,15,WS_EX_CLIENTEDGE
     CONTROL         "",OPT_SampleTell,"RICHEDIT",ES_CENTER | ES_MULTILINE | 
-                    ES_READONLY | WS_DISABLED | WS_GROUP,159,101,75,15,
+                    ES_READONLY | WS_DISABLED | WS_GROUP,159,114,75,15,
                     WS_EX_CLIENTEDGE
     CONTROL         "",OPT_SampleChallenge,"RICHEDIT",ES_CENTER | 
                     ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_GROUP,159,
-                    121,75,15,WS_EX_CLIENTEDGE
+                    134,75,15,WS_EX_CLIENTEDGE
     CONTROL         "",OPT_SampleRequest,"RICHEDIT",ES_CENTER | ES_MULTILINE | 
-                    ES_READONLY | WS_DISABLED | WS_GROUP,159,141,75,15,
+                    ES_READONLY | WS_DISABLED | WS_GROUP,159,154,75,15,
                     WS_EX_CLIENTEDGE
     CONTROL         "",OPT_SampleSeek,"RICHEDIT",ES_CENTER | ES_MULTILINE | 
-                    ES_READONLY | WS_DISABLED | WS_GROUP,159,161,75,15,
+                    ES_READONLY | WS_DISABLED | WS_GROUP,159,174,75,15,
                     WS_EX_CLIENTEDGE
     CONTROL         "",OPT_SampleNormal,"RICHEDIT",ES_CENTER | ES_MULTILINE | 
-                    ES_READONLY | WS_DISABLED | WS_GROUP,159,181,75,15,
+                    ES_READONLY | WS_DISABLED | WS_GROUP,159,194,75,15,
                     WS_EX_CLIENTEDGE
-    GROUPBOX        "Interaction Colors",IDC_STATIC,4,90,294,140
-    GROUPBOX        "Premove",IDC_STATIC,154,0,144,56
-    GROUPBOX        "General",IDC_STATIC,4,0,146,88
-    GROUPBOX        "Alarm",IDC_STATIC,154,58,144,30
+    LTEXT           "Startup &Chat Boxes:",IDC_Boxes,4,251,65,8
+    EDITTEXT        OPT_StartupChatBoxes,72,249,90,14,ES_AUTOHSCROLL
+    GROUPBOX        "Interaction Colors",GPB_Colors,4,103,294,140
+    GROUPBOX        "Premove",GPB_Premove,154,0,144,69
+    GROUPBOX        "General",GPB_General,4,0,146,101
+    GROUPBOX        "Alarm",GPB_Alarm,154,71,144,30
 END
 
 DLG_BoardOptions DIALOG DISCARDABLE  0, 0, 194, 250
@@ -620,13 +634,13 @@ BEGIN
     GROUPBOX        "Colors",IDC_STATIC,4,84,185,142
     EDITTEXT        OPT_PremoveHighlightColor,80,184,25,15,ES_READONLY | 
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT           "Light Squares",IDC_STATIC,10,98,60,10
-    LTEXT           "Dark Squares",IDC_STATIC,10,116,60,10
-    LTEXT           "White Pieces",IDC_STATIC,10,134,60,10
-    LTEXT           "Black Pieces",IDC_STATIC,10,152,60,10
-    LTEXT           "Square Highlights",IDC_STATIC,10,170,60,10
-    LTEXT           "Premove Highlights",IDC_STATIC,10,188,70,10
-    GROUPBOX        "Size",IDC_STATIC,4,4,185,75
+    LTEXT           "Light Squares",IDC_Light,10,98,60,10
+    LTEXT           "Dark Squares",IDC_Dark,10,116,60,10
+    LTEXT           "White Pieces",IDC_White,10,134,60,10
+    LTEXT           "Black Pieces",IDC_Black,10,152,60,10
+    LTEXT           "Square Highlights",IDC_High,10,170,60,10
+    LTEXT           "Premove Highlights",IDC_PreHigh,10,188,70,10
+    GROUPBOX        "Size",GPB_Size,4,4,185,75
     EDITTEXT        OPT_SampleLightSquare,144,96,39,36,ES_READONLY | 
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP
     EDITTEXT        OPT_SampleDarkSquare,144,138,39,36,ES_READONLY | 
@@ -696,18 +710,20 @@ BEGIN
                     50,10
     CONTROL         "&Shatranj",OPT_VariantShatranj,"Button",BS_AUTORADIOBUTTON,134,
                     84,50,10
-    CONTROL         "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,134,94,50,
+    CONTROL         "Seira&wan",OPT_VariantSChess,"Button",BS_AUTORADIOBUTTON,134,94,50,
                     10
-    GROUPBOX        "Variant",IDC_STATIC,4,4,185,115
-    LTEXT           "Board size:",IDC_STATIC,10,135,40,8
+    CONTROL         "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,134,104,50,
+                    10
+    GROUPBOX        "Variant",GPB_Variant,4,4,185,115
+    LTEXT           "Board size:",GPB_Board,10,135,40,8
     EDITTEXT        IDC_Ranks,60,131,14,14,ES_AUTOHSCROLL
-    LTEXT           "ranks",IDC_STATIC,77,135,22,8
+    LTEXT           "ranks",IDC_Height,77,135,22,8
     EDITTEXT        IDC_Files,116,131,14,14,ES_AUTOHSCROLL
-    LTEXT           "files",IDC_STATIC,133,135,37,8
-    LTEXT           "Holdings with room for:",IDC_STATIC,10,153,90,8
+    LTEXT           "files",IDC_Width,133,135,37,8
+    LTEXT           "Holdings with room for:",IDC_Hand,10,153,90,8
     EDITTEXT        IDC_Holdings,93,149,14,14,ES_AUTOHSCROLL
-    LTEXT           "pieces",IDC_STATIC,110,153,22,8
-    LTEXT           "('-1' means defaults for selected variant)",IDC_STATIC,10,171,150,8
+    LTEXT           "pieces",IDC_Pieces,110,153,22,8
+    LTEXT           "('-1' means defaults for selected variant)",IDC_Def,10,171,150,8
 END
 
 DLG_Fonts DIALOG DISCARDABLE  0, 0, 266, 226
@@ -744,8 +760,8 @@ BEGIN
                     WS_DISABLED | WS_BORDER,67,11,140,20
     CONTROL         "",OPT_SampleMessageFont,"RICHEDIT",ES_READONLY | 
                     WS_DISABLED | WS_BORDER,67,35,140,20
-    GROUPBOX        "Current Board Size",IDC_STATIC,3,1,259,83
-    GROUPBOX        "All Board Sizes",IDC_STATIC,3,87,259,109
+    GROUPBOX        "Current Board Size",GPB_Current,3,1,259,83
+    GROUPBOX        "All Board Sizes",GPB_All,3,87,259,109
     CONTROL         "",OPT_SampleMoveHistoryFont,"RICHEDIT",ES_READONLY | 
                     WS_DISABLED | WS_BORDER,67,170,140,20
     LTEXT           "Move History, Engine Output",OPT_MessageFont6,13,171,50,20,NOT 
@@ -823,22 +839,25 @@ BEGIN
     ICON            IDI_TRANS_14,IDC_StateIcon2,164,84,20,20
 END
 
-DLG_Chat DIALOGEX 0, 0, 256, 106
+DLG_Chat DIALOGEX 0, 0, 290, 106
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 EXSTYLE WS_EX_TOOLWINDOW
 CAPTION "Chat Window"
 FONT 8, "MS Sans Serif"
 BEGIN
-    LTEXT           "Chat partner:",IDC_STATIC,5,5,45,10
-    EDITTEXT        IDC_ChatPartner,50,3,100,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "Change",IDC_Change,155,3,35,13
-    PUSHBUTTON      "Clear",IDC_Clear,198,3,25,13
-    DEFPUSHBUTTON   "Send",IDC_Send,228,3,25,13
+    LTEXT           "Chat partner:",IDC_Partner,5,5,45,10
+    EDITTEXT        IDC_ChatPartner,50,3,45,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "",IDC_Focus1,100,3,30,13
+    PUSHBUTTON      "",IDC_Focus2,133,3,30,13
+    PUSHBUTTON      "",IDC_Focus3,166,3,30,13
+    PUSHBUTTON      "",IDC_Focus4,199,3,30,13
+    PUSHBUTTON      "Clear",IDC_Clear,232,3,25,13
+    DEFPUSHBUTTON   "Send",IDC_Send,262,3,25,13
     CONTROL         "",IDC_ChatMemo,"RICHEDIT",ES_MULTILINE | ES_READONLY |
-                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | 
-                    WS_HSCROLL | WS_TABSTOP,3,17,250,70
+                    ES_AUTOVSCROLL | WS_BORDER | WS_VSCROLL | 
+                    WS_HSCROLL | WS_TABSTOP,3,17,284,70
     CONTROL         "",OPT_ChatInput,"RICHEDIT",ES_AUTOHSCROLL | ES_NOHIDESEL | 
-                    WS_BORDER | WS_TABSTOP,3,90,250,13
+                    WS_BORDER | WS_TABSTOP,3,90,284,13
 END
 
 DLG_EnginePlayOptions DIALOG DISCARDABLE  0, 0, 208, 202
@@ -857,14 +876,14 @@ BEGIN
     CONTROL         "Periodic Updates (for Analysis Mode)",
                     IDC_EpPeriodicUpdates,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,4,40,131,10
-    GROUPBOX        "Engine-engine matches",IDC_STATIC,4,56,200,98
-    LTEXT           "Adjudicate draw after:",IDC_STATIC,10,72,70,8
+    GROUPBOX        "Adjudications in non-ICS games",GPB_Adjudications,4,56,200,98
+    LTEXT           "Adjudicate draw after:",IDC_Draw,10,72,70,8
     EDITTEXT        IDC_EpDrawMoveCount,116,68,40,14,ES_AUTOHSCROLL
-    LTEXT           "moves",IDC_STATIC,158,72,22,8
-    LTEXT           "Win/loss adjudication threshold:",IDC_STATIC,10,90,102,
+    LTEXT           "moves",IDC_Moves,158,72,22,8
+    LTEXT           "Win/loss adjudication threshold:",IDC_Threshold,10,90,102,
                     8
     EDITTEXT        IDC_EpAdjudicationThreshold,116,86,40,14,ES_AUTOHSCROLL
-    LTEXT           "centipawns",IDC_STATIC,158,90,37,8
+    LTEXT           "centipawns",IDC_Centi,158,90,37,8
     CONTROL         "&Verify Engine Claims",IDC_TestClaims,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,10,108,100,10
     CONTROL         "Detect &Mates",
@@ -876,11 +895,11 @@ BEGIN
     CONTROL         "Adjudicate &Trivial Draws",
                     IDC_TrivialDraws,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,10,138,100,10
-    GROUPBOX        "Apply",IDC_STATIC,115,102,81,47
+    GROUPBOX        "Apply",GPB_Apply,115,102,81,47
     EDITTEXT        IDC_RuleMoves,120,113,20,14,ES_AUTOHSCROLL
-    LTEXT           "-move rule",IDC_STATIC,142,117,35,8
+    LTEXT           "-move rule",IDC_Rule,142,117,35,8
     EDITTEXT        IDC_DrawRepeats,120,130,20,14,ES_AUTOHSCROLL
-    LTEXT           "-fold repeats",IDC_STATIC,142,134,50,8
+    LTEXT           "-fold repeats",IDC_Repeats,142,134,50,8
     CONTROL         "Engine #1 Score is Absolute",
                     IDC_ScoreAbs1,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,10,156,120,10
@@ -891,33 +910,39 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,154,185,50,14
 END
 
-DLG_OptionsUCI DIALOG DISCARDABLE  0, 0, 228, 124
+DLG_OptionsUCI DIALOG DISCARDABLE  0, 0, 228, 160
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Engine Settings"
+CAPTION "Common Engine Settings"
 FONT 8, "MS Sans Serif"
 BEGIN
-    LTEXT           "Polyglot Directory:",IDC_STATIC,2,8,58,8
+    LTEXT           "Polyglot Directory:",IDC_PolyDir,2,8,58,8
     EDITTEXT        IDC_PolyglotDir,62,4,140,14,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_BrowseForPolyglotDir,206,4,17,14
-    LTEXT           "Hash Size (MB):",IDC_STATIC,2,26,52,8
+    LTEXT           "Hash Size (MB):",IDC_Hash,2,26,52,8
     EDITTEXT        IDC_HashSize,62,22,40,14,ES_AUTOHSCROLL
-    LTEXT           "EGTB Path:",IDC_STATIC,2,44,39,8
+    LTEXT           "EGTB Path:",IDC_Path,2,44,39,8
     EDITTEXT        IDC_PathToEGTB,62,40,140,14,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_BrowseForEGTB,206,40,17,14
-    LTEXT           "EGTB Size (MB):",IDC_STATIC,2,62,54,8
+    LTEXT           "EGTB Size (MB):",IDC_Cache,2,62,54,8
     EDITTEXT        IDC_SizeOfEGTB,62,58,40,14,ES_AUTOHSCROLL
     CONTROL         "Use Book:",IDC_UseBook,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,2,80,49,10
     EDITTEXT        IDC_BookFile,62,76,140,14,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_BrowseForBook,206,76,17,14
-    LTEXT           "Max nr of CPUs:",IDC_STATIC,106,26,52,8
+    LTEXT           "Max nr of CPUs:",IDC_CPU,106,26,52,8
     EDITTEXT        IDC_Cores,162,22,40,14,ES_AUTOHSCROLL
     CONTROL         "First has Own Book",IDC_OwnBook1,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,2,94,100,10
     CONTROL         "Second has Own Book",IDC_OwnBook2,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,2,107,100,10
-    DEFPUSHBUTTON   "OK",IDOK,118,106,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,174,106,50,14
+    LTEXT           "Book Depth:",IDC_Depth,106,98,52,8
+    EDITTEXT        IDC_BookDep,162,94,40,14,ES_AUTOHSCROLL
+    LTEXT           "Book Variation:",IDC_Variation,106,116,52,8
+    EDITTEXT        IDC_BookStr,162,112,40,14,ES_AUTOHSCROLL
+    LTEXT           "Default Match Games:",IDC_DefGames,2,135,72,8
+    EDITTEXT        IDC_Games,76,131,28,14,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,118,142,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,174,142,50,14
 END
 
 DLG_Null DIALOG DISCARDABLE  0, 0, 186, 50
@@ -1074,58 +1099,87 @@ WINBOARD MENU DISCARDABLE
 BEGIN
     POPUP "&File"
     BEGIN
-        MENUITEM "New &Game\tCtrl-N",           IDM_NewGame
-        MENUITEM "New Shuffle Game...",         IDM_NewGameFRC
-        MENUITEM "New Variant...\tAlt+Shift+V",  IDM_NewVariant
+        MENUITEM "&New Game\tCtrl-N",           IDM_NewGame
+        MENUITEM "New Sh&uffle Game...",        IDM_NewGameFRC
+        MENUITEM "New &Variant...\tAlt+Shift+V",IDM_NewVariant
         MENUITEM SEPARATOR
         MENUITEM "&Load Game...\tCtrl-O",       IDM_LoadGame
-        MENUITEM "Load &Next Game\tAlt+PgDn",   IDM_LoadNextGame
-        MENUITEM "Load &Previous Game\tAlt+PgUp", IDM_LoadPrevGame
-        MENUITEM "&Reload Same Game",           IDM_ReloadGame
+        MENUITEM "L&oad Position...\tCtrl+Shift+O", IDM_LoadPosition
+//        MENUITEM "Load &Next Game\tAlt+PgDn",   IDM_LoadNextGame
+//        MENUITEM "Load &Previous Game\tAlt+PgUp", IDM_LoadPrevGame
+//        MENUITEM "&Reload Same Game",           IDM_ReloadGame
+//        MENUITEM "Load N&ext Position\tAlt+Shift+PgDn", IDM_LoadNextPosition
+//        MENUITEM "Load Pre&vious Position\tAlt+Shift+PgUp", 
+//                                                IDM_LoadPrevPosition
+//        MENUITEM "Reload Sa&me Position",       IDM_ReloadPosition
+        MENUITEM SEPARATOR
         MENUITEM "&Save Game...\tCtrl-S",       IDM_SaveGame
+        MENUITEM "S&ave Position...\tCtrl+Shift+S",IDM_SavePosition
         MENUITEM SEPARATOR
-        MENUITEM "&Copy Game To Clipboard\tCtrl+C", IDM_CopyGame
-        MENUITEM "Paste Game &From Clipboard\tCtrl+V", IDM_PasteGame
+        MENUITEM "Save as &Diagram...",         IDM_SaveDiagram
         MENUITEM SEPARATOR
+        MENUITEM "&Quit",                       IDM_Exit
+    END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy Game To Clipboard\tCtrl+C", IDM_CopyGame
+        MENUITEM "C&opy Position To Clipboard\tCtrl+Shift+C", 
+                                                IDM_CopyPosition
         MENUITEM "Copy Game List to Clipboard", IDM_CopyGameListToClipboard
         MENUITEM SEPARATOR
-        MENUITEM "L&oad Position...\tCtrl+Shift+O", IDM_LoadPosition
-        MENUITEM "Load N&ext Position\tAlt+Shift+PgDn", IDM_LoadNextPosition
-        MENUITEM "Load Pre&vious Position\tAlt+Shift+PgUp", 
-                                                IDM_LoadPrevPosition
-        MENUITEM "Reload Sa&me Position",       IDM_ReloadPosition
-        MENUITEM "S&ave Position...\tCtrl+Shift+S",IDM_SavePosition
-        MENUITEM "Save &Diagram...",            IDM_SaveDiagram
-        MENUITEM SEPARATOR
-        MENUITEM "Cop&y Position To Clipboard\tCtrl+Shift+C", 
-                                                IDM_CopyPosition
-        MENUITEM "Pas&te Position From Clipboard\tCtrl+Shift+V", 
+        MENUITEM "&Paste Game From Clipboard\tCtrl+V", IDM_PasteGame
+        MENUITEM "P&aste Position From Clipboard\tCtrl+Shift+V", 
                                                 IDM_PasteAny
         MENUITEM SEPARATOR
-        MENUITEM "E&xit",                       IDM_Exit
+        MENUITEM "&Edit Game\tCtrl+E",          IDM_EditGame
+        MENUITEM "E&dit Position\tCtrl+Shift+E",IDM_EditPosition
+        MENUITEM SEPARATOR
+        MENUITEM "Edit Ta&gs...",               IDM_EditTags
+        MENUITEM "Edit &Comment...",            IDM_EditComment
+        MENUITEM "Enter &Username...",          IDM_TypeInName
+        MENUITEM SEPARATOR
+        MENUITEM "&Revert\tHome",               IDM_Revert
+        MENUITEM "&Annotate",                   IDM_Annotate
+        MENUITEM "&Truncate Game\tEnd",         IDM_TruncateGame
+        MENUITEM SEPARATOR
+        MENUITEM "&Backward\tAlt+Left",         IDM_Backward
+        MENUITEM "&Forward\tAlt+Right",         IDM_Forward
+        MENUITEM "Back to &Start\tAlt+Home",    IDM_ToStart
+        MENUITEM "For&ward to End\tAlt+End",    IDM_ToEnd
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Flip &View\tF2",              IDM_FlipView
+        MENUITEM "&Swap Clocks",                IDM_FlipClock
+        MENUITEM SEPARATOR
+        MENUITEM "Engine &Output\tAlt+Shift+O", IDM_ShowEngineOutput
+        MENUITEM "Move &History\tAlt+Shift+H",  IDM_ShowMoveHistory
+        MENUITEM "Evaluation &Graph\tAlt+Shift+E",IDM_ShowEvalGraph
+        MENUITEM "Game &List\tAlt+Shift+G",     IDM_ShowGameList
+        MENUITEM "Open &New Chat Window",       IDM_NewChat
+        MENUITEM "Type In &Move...\tAlt+I",     IDM_TypeInMove
+        MENUITEM SEPARATOR
+        MENUITEM "&Tags",                       IDM_EditTags
+        MENUITEM "&Comments",                   IDM_EditComment
+        MENUITEM SEPARATOR
+        MENUITEM "&Game List Tags...",          IDM_GameListOptions
+        MENUITEM "&Board...",                   IDM_BoardOptions
+        MENUITEM "&Fonts...",                   IDM_Fonts
     END
     POPUP "&Mode"
     BEGIN
         MENUITEM "Machine &White\tCtrl+W",      IDM_MachineWhite
         MENUITEM "Machine &Black\tCtrl+B",      IDM_MachineBlack
-        MENUITEM "Two &Machines\tCtrl+T",       IDM_TwoMachines
-        MENUITEM "Machine Bot&h",               IDM_MachineBoth
+        MENUITEM "&Two Machines\tCtrl+T",       IDM_TwoMachines
+//        MENUITEM "Machine Both",                IDM_MachineBoth
         MENUITEM "&Analysis Mode\tCtrl+A",      IDM_AnalysisMode
         MENUITEM "Analyze &File\tCtrl+F",       IDM_AnalyzeFile
-        MENUITEM "&ICS Client",                 IDM_IcsClient
-        MENUITEM "Edit &Game\tCtrl+E",          IDM_EditGame
-        MENUITEM "&Edit Position\tShift+Ctrl+E",IDM_EditPosition
+        MENUITEM "&Edit Game\tCtrl+E",          IDM_EditGame
+        MENUITEM "E&dit Position\tCtrl+Shift+E",IDM_EditPosition
         MENUITEM "Trai&ning",                   IDM_Training, GRAYED
+        MENUITEM "&ICS Client",                 IDM_IcsClient
         MENUITEM SEPARATOR
-        MENUITEM "Show Engine &Output\tAlt+Shift+O",  IDM_ShowEngineOutput
-        MENUITEM "Show Evaluation Graph\tAlt+Shift+E",IDM_ShowEvalGraph
-        MENUITEM "Show Game &List\tAlt+Shift+G",      IDM_ShowGameList
-        MENUITEM "Show Move History\tAlt+Shift+H",    IDM_ShowMoveHistory
-        MENUITEM "Open Chat Window",            IDM_NewChat
-        MENUITEM SEPARATOR
-        MENUITEM "Edit &Tags...",               IDM_EditTags
-        MENUITEM "Edit &Comment...",            IDM_EditComment
-        MENUITEM "Enter &Username...",          IDM_TypeInName
+        MENUITEM "&Machine Match",              IDM_Match
         MENUITEM "&Pause\tPause",               IDM_Pause
     END
     POPUP "&Action"
@@ -1142,46 +1196,40 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Stop &Observing\tF10",        IDM_StopObserving
         MENUITEM "Stop E&xamining\tF11",        IDM_StopExamining
+        MENUITEM "&Upload to Examine",          IDM_Upload
         MENUITEM SEPARATOR
         MENUITEM "Adjudicate to &White",        IDM_UserAdjudication_White
         MENUITEM "Adjudicate to &Black",        IDM_UserAdjudication_Black
         MENUITEM "Adjudicate &Draw",            IDM_UserAdjudication_Draw
     END
-    POPUP "&Step"
+    POPUP "E&ngine"
     BEGIN
-        MENUITEM "T&ype In Move...\tAlt+I",     IDM_TypeInMove
         MENUITEM SEPARATOR
-        MENUITEM "&Backward\tAlt+Left",         IDM_Backward
-        MENUITEM "&Forward\tAlt+Right",         IDM_Forward
-        MENUITEM "Back to &Start\tAlt+Home",    IDM_ToStart
-        MENUITEM "Forward to &End\tAlt+End",    IDM_ToEnd
-        MENUITEM "Re&vert",                     IDM_Revert
-        MENUITEM "&Truncate Game",              IDM_TruncateGame
+        MENUITEM "Engine #&1 Settings...",       IDM_Engine1Options
+        MENUITEM "Engine #&2 Settings...",       IDM_Engine2Options
+        MENUITEM SEPARATOR
+        MENUITEM "&Hint...",                    IDM_Hint
+        MENUITEM "&Book...",                    IDM_Book
         MENUITEM SEPARATOR
         MENUITEM "&Move Now\tCtrl+M",           IDM_MoveNow
         MENUITEM "&Retract Move\tCtrl+X",       IDM_RetractMove
     END
     POPUP "&Options"
     BEGIN
-        MENUITEM "Flip &View\tF2",              IDM_FlipView
-        MENUITEM "Swap &Clocks",                IDM_FlipClock
         MENUITEM "&Mute all Sounds",            IDM_MuteSounds
         MENUITEM SEPARATOR
         MENUITEM "&General...",                 IDM_GeneralOptions
-        MENUITEM "&Board...",                   IDM_BoardOptions
-        MENUITEM "Adjudications...\tAlt+Shift+J",IDM_EnginePlayOptions
-        MENUITEM "Global Settings...\tAlt+Shift+U",IDM_OptionsUCI
-        MENUITEM "Engine #1 Settings...",       IDM_Engine1Options
-        MENUITEM "Engine #2 Settings...",       IDM_Engine2Options
-        MENUITEM "&ICS...",                     IDM_IcsOptions, GRAYED
-        MENUITEM "&Fonts...",                   IDM_Fonts
-        MENUITEM "Soun&ds...",                  IDM_Sounds
-        MENUITEM "Game List...",                IDM_GameListOptions
+        MENUITEM "&Time Control...\tAlt+Shift+T",IDM_TimeControl
+        MENUITEM "Common &Engine...\tAlt+Shift+U",IDM_OptionsUCI
+        MENUITEM "Ad&judications...\tAlt+Shift+J",IDM_EnginePlayOptions
         MENUITEM SEPARATOR
-        MENUITEM "Comm&unications...",          IDM_CommPort
         MENUITEM "&Load Game...\tAlt+Shift+L",  IDM_LoadOptions
         MENUITEM "&Save Game...\tAlt+Shift+S",  IDM_SaveOptions
-        MENUITEM "&Time Control...\tAlt+Shift+T",IDM_TimeControl
+        MENUITEM "G&ame List...",               IDM_GameListOptions
+        MENUITEM SEPARATOR
+        MENUITEM "Soun&ds...",                  IDM_Sounds
+        MENUITEM "&ICS...",                     IDM_IcsOptions, GRAYED
+        MENUITEM "Comm&unications...",          IDM_CommPort
         MENUITEM SEPARATOR
         MENUITEM "Save Settings &Now",          IDM_SaveSettings
         MENUITEM "Save Settings on E&xit",      IDM_SaveSettingsOnExit
@@ -1192,9 +1240,6 @@ BEGIN
         MENUITEM "Help &Index",                 IDM_HELPSEARCH
         MENUITEM "How to &Use Help",            IDM_HELPHELP
         MENUITEM SEPARATOR
-        MENUITEM "&Hint...",                    IDM_Hint
-        MENUITEM "&Book...",                    IDM_Book
-        MENUITEM SEPARATOR
         MENUITEM "&About WinBoard",             IDM_ABOUT
     END
 END
@@ -1905,6 +1950,10 @@ W33O                    BITMAP  MOVEABLE PURE   "bitmaps/w33o.bmp"
 M33O                    BITMAP  MOVEABLE PURE   "bitmaps/m33o.bmp"
 O33O                    BITMAP  MOVEABLE PURE   "bitmaps/o33o.bmp"
 DK33O                   BITMAP  MOVEABLE PURE   "bitmaps/dk33o.bmp"
+WP33O                   BITMAP  MOVEABLE PURE   "bitmaps/wp33o.bmp"
+WN33O                   BITMAP  MOVEABLE PURE   "bitmaps/wn33o.bmp"
+WL33O                   BITMAP  MOVEABLE PURE   "bitmaps/wl33o.bmp"
+WS33O                   BITMAP  MOVEABLE PURE   "bitmaps/ws33o.bmp"
 A33W                    BITMAP  MOVEABLE PURE   "bitmaps/a33w.bmp"
 AA33W                   BITMAP  MOVEABLE PURE   "bitmaps/as33w.bmp"
 C33W                    BITMAP  MOVEABLE PURE   "bitmaps/c33w.bmp"
@@ -1933,6 +1982,10 @@ W33S                    BITMAP  MOVEABLE PURE   "bitmaps/w33s.bmp"
 M33S                    BITMAP  MOVEABLE PURE   "bitmaps/m33s.bmp"
 O33S                    BITMAP  MOVEABLE PURE   "bitmaps/o33s.bmp"
 DK33S                   BITMAP  MOVEABLE PURE   "bitmaps/dk33s.bmp"
+WP33S                   BITMAP  MOVEABLE PURE   "bitmaps/wp33s.bmp"
+WN33S                   BITMAP  MOVEABLE PURE   "bitmaps/wn33s.bmp"
+WL33S                   BITMAP  MOVEABLE PURE   "bitmaps/wl33s.bmp"
+WS33S                   BITMAP  MOVEABLE PURE   "bitmaps/ws33s.bmp"
 
 A37O                    BITMAP  MOVEABLE PURE   "bitmaps/a37o.bmp"
 L37O                    BITMAP  MOVEABLE PURE   "bitmaps/l37o.bmp"