Index: fred.rc
===================================================================
--- fred.rc	(revision 10474)
+++ fred.rc	(working copy)
@@ -18,13 +18,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
-#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -116,7 +114,7 @@
 // Toolbar
 //
 
-IDR_MAINFRAME TOOLBAR  23, 23
+IDR_MAINFRAME TOOLBAR 23, 23
 BEGIN
     BUTTON      ID_SELECT
     BUTTON      ID_SELECT_AND_MOVE
@@ -152,7 +150,7 @@
 // Menu
 //
 
-IDR_MAINMENU MENU 
+IDR_MAINMENU MENU
 BEGIN
     POPUP "&File"
     BEGIN
@@ -335,7 +333,7 @@
     END
 END
 
-IDR_MENU_SHIP_POPUP MENU 
+IDR_MENU_SHIP_POPUP MENU
 BEGIN
     POPUP "Properties"
     BEGIN
@@ -345,7 +343,7 @@
     END
 END
 
-IDR_MENU_EDIT_POPUP MENU 
+IDR_MENU_EDIT_POPUP MENU
 BEGIN
     POPUP "EDIT"
     BEGIN
@@ -370,7 +368,7 @@
     END
 END
 
-IDR_MENU_CAMPAIGN MENU 
+IDR_MENU_CAMPAIGN MENU
 BEGIN
     POPUP "&File"
     BEGIN
@@ -392,7 +390,7 @@
     END
 END
 
-IDR_MENU_EDIT_SEXP_TREE MENU 
+IDR_MENU_EDIT_SEXP_TREE MENU
 BEGIN
     POPUP "Edit sexp tree"
     BEGIN
@@ -442,7 +440,7 @@
     END
 END
 
-IDR_WING_EDIT_MENU MENU 
+IDR_WING_EDIT_MENU MENU
 BEGIN
     POPUP "&Select Wing"
     BEGIN
@@ -450,7 +448,7 @@
     END
 END
 
-IDR_SHIP_EDIT_MENU MENU 
+IDR_SHIP_EDIT_MENU MENU
 BEGIN
     POPUP "&Select Ship"
     BEGIN
@@ -458,7 +456,7 @@
     END
 END
 
-IDR_PLAYER_EDIT_MENU MENU 
+IDR_PLAYER_EDIT_MENU MENU
 BEGIN
     POPUP "Select Team"
     BEGIN
@@ -471,7 +469,7 @@
     END
 END
 
-IDR_WAYPOINT_PATH_EDIT_MENU MENU 
+IDR_WAYPOINT_PATH_EDIT_MENU MENU
 BEGIN
     POPUP "&Select Waypoint Path"
     BEGIN
@@ -479,7 +477,7 @@
     END
 END
 
-IDR_ASTEROID_FIELD_MENU MENU 
+IDR_ASTEROID_FIELD_MENU MENU
 BEGIN
     POPUP "Select Field"
     BEGIN
@@ -487,7 +485,7 @@
     END
 END
 
-IDR_CPGN_VIEW_OFF MENU 
+IDR_CPGN_VIEW_OFF MENU
 BEGIN
     POPUP "Blah"
     BEGIN
@@ -496,7 +494,7 @@
     END
 END
 
-IDR_CPGN_VIEW_ON MENU 
+IDR_CPGN_VIEW_ON MENU
 BEGIN
     POPUP "Blah"
     BEGIN
@@ -512,7 +510,7 @@
 // Accelerator
 //
 
-IDR_MAINFRAME ACCELERATORS 
+IDR_MAINFRAME ACCELERATORS
 BEGIN
     "1",            ID_SPEED1,              VIRTKEY, NOINVERT
     "1",            ID_GROUP1,              VIRTKEY, CONTROL, NOINVERT
@@ -603,7 +601,7 @@
     "Z",            ID_ZOOM_EXTENTS,        VIRTKEY, SHIFT, NOINVERT
 END
 
-IDR_ACC_CAMPAIGN ACCELERATORS 
+IDR_ACC_CAMPAIGN ACCELERATORS
 BEGIN
     "H",            ID_ERROR_CHECKER,       VIRTKEY, ALT, NOINVERT
     "N",            ID_CPGN_FILE_NEW,       VIRTKEY, CONTROL, NOINVERT
@@ -618,7 +616,7 @@
 // Dialog
 //
 
-IDD_ABOUTBOX DIALOG  0, 0, 284, 89
+IDD_ABOUTBOX DIALOG 0, 0, 284, 89
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About FRED2"
 FONT 8, "MS Sans Serif"
@@ -699,7 +697,7 @@
     GROUPBOX        "Message Properties",IDC_STATIC,7,184,184,60
 END
 
-IDD_SHIP_GOALS_EDITOR DIALOG  0, 0, 412, 221
+IDD_SHIP_GOALS_EDITOR DIALOG 0, 0, 412, 221
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Initial Orders"
 FONT 8, "MS Sans Serif"
@@ -882,7 +880,7 @@
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,326,180,142,10
 END
 
-IDD_PREFERENCES DIALOG  0, 0, 333, 81
+IDD_PREFERENCES DIALOG 0, 0, 333, 81
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Preferences"
 FONT 8, "MS Sans Serif"
@@ -1017,7 +1015,7 @@
     LTEXT           "Missile bank 4",IDC_STATIC,232,64,46,8
 END
 
-IDD_SHIP_MARKINGS DIALOG  0, 0, 252, 140
+IDD_SHIP_MARKINGS DIALOG 0, 0, 252, 140
 STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION
 CAPTION "Ship Markings"
 FONT 8, "MS Sans Serif"
@@ -1150,7 +1148,7 @@
     PUSHBUTTON      "Restrict Departure Paths",IDC_RESTRICT_DEPARTURE,160,223,121,14,0,WS_EX_STATICEDGE
 END
 
-IDD_OPERATOR_ARGUMENT_TYPES DIALOG  0, 0, 235, 50
+IDD_OPERATOR_ARGUMENT_TYPES DIALOG 0, 0, 235, 50
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Select Argument Types"
 FONT 8, "MS Sans Serif"
@@ -1199,7 +1197,7 @@
     LTEXT           "Set Amount From Variable",IDC_STATIC,179,234,93,10
 END
 
-IDD_ORIENT_EDITOR DIALOG  0, 0, 229, 119
+IDD_ORIENT_EDITOR DIALOG 0, 0, 229, 119
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Object Orientation Editor"
 FONT 8, "MS Sans Serif"
@@ -1421,7 +1419,7 @@
     LTEXT           "Delay After Arrival",IDC_STATIC,7,99,57,8
 END
 
-IDD_REINFORCEMENT_SELECT DIALOG  0, 0, 156, 132
+IDD_REINFORCEMENT_SELECT DIALOG 0, 0, 156, 132
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Select Reinforcement Unit"
 FONT 8, "MS Sans Serif"
@@ -1431,7 +1429,7 @@
     PUSHBUTTON      "Cancel",IDCANCEL,99,111,50,14
 END
 
-IDD_WAYPOINT_PATH_EDITOR DIALOG  0, 0, 145, 29
+IDD_WAYPOINT_PATH_EDITOR DIALOG 0, 0, 145, 29
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Waypoint Path/Jump Node Editor"
 MENU IDR_WAYPOINT_PATH_EDIT_MENU
@@ -1441,7 +1439,7 @@
     EDITTEXT        IDC_NAME,32,7,106,14,ES_AUTOHSCROLL
 END
 
-IDD_WING_CREATE DIALOG  0, 0, 119, 68
+IDD_WING_CREATE DIALOG 0, 0, 119, 68
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Create Wing"
 FONT 8, "MS Sans Serif"
@@ -1492,7 +1490,7 @@
     LTEXT           "Team Color Setting:",IDC_STATIC,16,308,66,8
 END
 
-IDD_ASTEROID_EDITOR DIALOG  0, 0, 376, 210
+IDD_ASTEROID_EDITOR DIALOG 0, 0, 376, 210
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Debris Field Editor"
 FONT 8, "MS Sans Serif"
@@ -1547,50 +1545,50 @@
     GROUPBOX        "",IDC_STATIC,16,61,159,94
 END
 
-IDD_CAMPAIGN DIALOGEX 0, 0, 237, 441
+IDD_CAMPAIGN DIALOGEX 0, 0, 270, 441
 STYLE DS_SETFONT | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    LISTBOX         IDC_FILELIST,7,17,221,77,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_NAME,63,98,69,12,ES_AUTOHSCROLL
-    COMBOBOX        IDC_CAMPAIGN_TYPE,160,98,68,116,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_DESC2,7,123,221,24,ES_MULTILINE | ES_AUTOVSCROLL
+    LISTBOX         IDC_FILELIST,7,17,254,77,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAME,63,98,100,12,ES_AUTOHSCROLL
+    COMBOBOX        IDC_CAMPAIGN_TYPE,193,98,68,116,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_DESC2,7,123,254,38,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL
     CONTROL         "Reset tech db at start of campaign",IDC_CUSTOM_TECH_DB,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,151,122,9
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,136,112,122,9
     EDITTEXT        IDC_BRIEFING_CUTSCENE,73,175,66,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_MAIN_HALL,64,192,49,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_DEBRIEFING_PERSONA,200,190,21,12,ES_NUMBER,WS_EX_RIGHT
-    CONTROL         "Tree1",IDC_SEXP_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,224,157,111,WS_EX_CLIENTEDGE
-    PUSHBUTTON      "Move Up",IDC_MOVE_UP,171,225,53,14,BS_CENTER,WS_EX_STATICEDGE
-    PUSHBUTTON      "Move Down",IDC_MOVE_DOWN,171,242,53,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "Toggle Loop",IDC_TOGGLE_LOOP,171,259,53,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "Realign Tree",IDC_ALIGN,175,286,53,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "Load Mission",ID_LOAD,175,303,53,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "Close",ID_CPGN_CLOSE,175,320,53,14,0,WS_EX_STATICEDGE
-    EDITTEXT        IDC_HELP_BOX,7,339,221,24,ES_MULTILINE | ES_READONLY | NOT WS_TABSTOP,WS_EX_TRANSPARENT
-    EDITTEXT        IDC_MISSISON_LOOP_DESC,7,377,221,24,ES_MULTILINE | ES_AUTOVSCROLL
+    EDITTEXT        IDC_MAIN_HALL,73,190,49,12,ES_AUTOHSCROLL
+    EDITTEXT        IDC_DEBRIEFING_PERSONA,231,175,21,12,ES_NUMBER,WS_EX_RIGHT
+    CONTROL         "Tree1",IDC_SEXP_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,224,188,111,WS_EX_CLIENTEDGE
+    PUSHBUTTON      "Move Up",IDC_MOVE_UP,206,225,53,14,BS_CENTER,WS_EX_STATICEDGE
+    PUSHBUTTON      "Move Down",IDC_MOVE_DOWN,206,242,53,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Toggle Loop",IDC_TOGGLE_LOOP,206,259,53,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Realign Tree",IDC_ALIGN,210,286,53,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Load Mission",ID_LOAD,210,303,53,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Close",ID_CPGN_CLOSE,210,320,53,14,0,WS_EX_STATICEDGE
+    EDITTEXT        IDC_HELP_BOX,7,339,255,24,ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP,WS_EX_TRANSPARENT
+    EDITTEXT        IDC_MISSISON_LOOP_DESC,7,377,253,24,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL
     EDITTEXT        IDC_LOOP_BRIEF_ANIM,69,406,100,12,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse",IDC_LOOP_BRIEF_BROWSE,175,406,53,13,0,WS_EX_STATICEDGE
     EDITTEXT        IDC_LOOP_BRIEF_SOUND,69,422,100,12,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse",IDC_LOOP_BRIEF_SOUND_BROWSE,175,422,53,13,0,WS_EX_STATICEDGE
     LTEXT           "Available missions",IDC_STATIC,7,7,58,8
     LTEXT           "Campaign name",IDC_STATIC,7,99,52,8
-    LTEXT           "Type",IDC_STATIC,138,99,17,8
+    LTEXT           "Type",IDC_STATIC,171,99,17,8
     LTEXT           "Branches",IDC_STATIC,7,214,31,8
     LTEXT           "Briefing cutscene",IDC_STATIC,13,176,56,8
-    LTEXT           "Number of Players:",IDC_PLAYERS_LABEL,7,151,60,8
-    LTEXT           "Static",IDC_NUM_PLAYERS,70,151,19,8,0,WS_EX_TRANSPARENT
+    LTEXT           "Number of Players:",IDC_PLAYERS_LABEL,176,7,60,8
+    LTEXT           "Static",IDC_NUM_PLAYERS,239,7,19,8,0,WS_EX_TRANSPARENT
     LTEXT           "Campaign description",IDC_STATIC,7,113,68,8
-    GROUPBOX        "Branch Options",IDC_STATIC,167,214,61,64
+    GROUPBOX        "Branch Options",IDC_STATIC,202,214,61,64
     LTEXT           "Mission loop description",IDC_STATIC,7,367,76,8
     LTEXT           "Loop brief anim",IDC_STATIC,13,408,49,8
     LTEXT           "Loop brief voice",IDC_STATIC,13,423,52,8
-    LTEXT           "Main hall name",IDC_MAINHALL_LABEL,14,194,48,8
-    GROUPBOX        "Mission options",IDC_MISSION_OPTIONS,7,165,221,43
-    LTEXT           "Debriefing persona index",IDC_STATIC,118,193,79,8
+    LTEXT           "Main hall name",IDC_MAINHALL_LABEL,14,192,48,8
+    GROUPBOX        "Mission options",IDC_MISSION_OPTIONS,7,165,254,43
+    LTEXT           "Debriefing persona index",IDC_STATIC,148,176,79,8
 END
 
-IDD_TEXT_VIEW DIALOG  0, 0, 324, 285
+IDD_TEXT_VIEW DIALOG 0, 0, 324, 285
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ship TBL Data"
 FONT 8, "MS Sans Serif"
@@ -1598,63 +1596,63 @@
     EDITTEXT        IDC_EDIT1,7,7,310,271,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
 END
 
-IDD_BRIEFING_EDITOR DIALOGEX 0, 0, 258, 417
+IDD_BRIEFING_EDITOR DIALOGEX 0, 0, 413, 399
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Briefing Editor"
 MENU IDR_PLAYER_EDIT_MENU
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON      "Prev",IDC_PREV,147,7,23,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "Next",IDC_NEXT,173,7,23,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "Add Stage",IDC_ADD_STAGE,147,22,50,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "Insert Stage",IDC_INSERT_STAGE,147,38,50,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "Delete Stage",IDC_DELETE_STAGE,147,54,50,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "Save View",IDC_SAVE_VIEW,201,7,50,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "Goto View",IDC_GOTO_VIEW,201,23,50,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "Copy View",IDC_COPY_VIEW,201,39,50,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "Paste View",IDC_PASTE_VIEW,201,55,50,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Prev",IDC_PREV,299,7,23,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Next",IDC_NEXT,325,7,23,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Add Stage",IDC_ADD_STAGE,299,22,50,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Insert Stage",IDC_INSERT_STAGE,299,38,50,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Delete Stage",IDC_DELETE_STAGE,299,54,50,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Save View",IDC_SAVE_VIEW,353,7,50,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Goto View",IDC_GOTO_VIEW,353,23,50,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Copy View",IDC_COPY_VIEW,353,39,50,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Paste View",IDC_PASTE_VIEW,353,55,50,14,0,WS_EX_STATICEDGE
     EDITTEXT        IDC_TIME,103,23,31,12,ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "Cut to next stage",IDC_CUT_NEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,38,69,10
     CONTROL         "Cut to previous stage",IDC_CUT_PREV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,83,10
-    EDITTEXT        IDC_TEXT,7,72,244,40,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN
-    EDITTEXT        IDC_VOICE,63,115,83,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse",IDC_BROWSE,150,115,42,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "IDB_PLAY",IDC_PLAY,194,115,13,14,BS_BITMAP,WS_EX_TRANSPARENT | WS_EX_STATICEDGE
-    COMBOBOX        IDC_BRIEFING_MUSIC,70,142,83,135,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_SUBSTITUTE_BRIEFING_MUSIC,70,159,83,135,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Tree1",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP,7,190,244,71,WS_EX_CLIENTEDGE
-    CONTROL         "Draw lines between marked icons",IDC_LINES,"Button",BS_3STATE | WS_TABSTOP,129,264,122,10
-    EDITTEXT        IDC_ICON_LABEL,51,288,75,14,ES_AUTOHSCROLL
-    COMBOBOX        IDC_ICON_IMAGE,52,304,75,135,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_SHIP_TYPE,52,320,75,145,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_TEAM,52,336,75,84,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_ID,151,284,30,12,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "Highlight",IDC_HILIGHT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,135,302,43,10
-    CONTROL         "Change locally",IDC_LOCAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,135,317,62,10
-    CONTROL         "Flip Icon",IDC_FLIP_ICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,136,332,43,10
-    PUSHBUTTON      "Make Icon",IDC_MAKE_ICON,197,283,50,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "Delete Icon",IDC_DELETE_ICON,197,300,50,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "Propagate",IDC_PROPAGATE_ICONS,197,317,50,14,0,WS_EX_STATICEDGE
-    EDITTEXT        IDC_ICON_TEXT,14,363,230,40,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN
+    EDITTEXT        IDC_TEXT,7,72,396,85,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
+    EDITTEXT        IDC_VOICE,63,164,83,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse",IDC_BROWSE,150,164,42,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "IDB_PLAY",IDC_PLAY,194,164,13,14,BS_BITMAP,WS_EX_TRANSPARENT | WS_EX_STATICEDGE
+    COMBOBOX        IDC_BRIEFING_MUSIC,205,18,83,135,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_SUBSTITUTE_BRIEFING_MUSIC,205,34,83,135,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Tree1",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,190,200,205,WS_EX_CLIENTEDGE
+    CONTROL         "Draw lines between marked icons",IDC_LINES,"Button",BS_3STATE | WS_TABSTOP,233,353,122,10
+    EDITTEXT        IDC_ICON_LABEL,269,216,108,14,ES_AUTOHSCROLL
+    COMBOBOX        IDC_ICON_IMAGE,269,234,108,135,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_SHIP_TYPE,269,250,107,145,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_TEAM,269,266,107,84,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_ID,269,200,30,12,ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "Highlight",IDC_HILIGHT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,298,367,43,10
+    CONTROL         "Change locally",IDC_LOCAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,233,367,62,10
+    CONTROL         "Flip Icon",IDC_FLIP_ICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,233,380,43,10
+    PUSHBUTTON      "Make Icon",IDC_MAKE_ICON,225,182,50,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Delete Icon",IDC_DELETE_ICON,282,182,50,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "Propagate",IDC_PROPAGATE_ICONS,339,182,50,14,0,WS_EX_STATICEDGE
+    EDITTEXT        IDC_ICON_TEXT,230,293,146,53,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN
     LTEXT           "Stage 1 of 9",IDC_STAGE_TITLE,7,7,53,8
-    GROUPBOX        "Current Icon Info",IDC_STATIC,7,274,244,136
-    LTEXT           "Label",IDC_STATIC,13,291,18,8
-    LTEXT           "Icon image",IDC_STATIC,13,307,36,8
+    GROUPBOX        "Current Icon Info",IDC_STATIC,222,167,170,228
+    LTEXT           "Label",IDC_STATIC,230,219,18,8
+    LTEXT           "Icon image",IDC_STATIC,229,237,36,8
     LTEXT           "Text",IDC_STATIC,7,62,15,8
     LTEXT           "Camera Transition Time (ms)",IDC_STATIC,7,25,90,8
-    LTEXT           "Voice Wave File",IDC_STATIC,7,117,53,8
-    LTEXT           "Text",IDC_STATIC,14,352,15,8
-    LTEXT           "Team",IDC_STATIC,13,339,19,8
-    LTEXT           "Ship Type",IDC_STATIC,13,323,33,8
-    LTEXT           "ID",IDC_STATIC,137,286,8,8
-    LTEXT           "Default",IDC_STATIC,14,144,24,8
+    LTEXT           "Voice Wave File",IDC_STATIC,7,166,53,8
+    LTEXT           "Text",IDC_STATIC,230,282,15,8
+    LTEXT           "Team",IDC_STATIC,229,269,19,8
+    LTEXT           "Ship Type",IDC_STATIC,229,253,33,8
+    LTEXT           "ID",IDC_STATIC,230,201,8,8
+    LTEXT           "Default",IDC_STATIC,149,18,24,8
     LTEXT           "Usage Formula",IDC_STATIC,7,180,48,8
-    LTEXT           "If music pack is present",IDC_STATIC,14,157,44,17
-    GROUPBOX        "Briefing Music",IDC_STATIC,7,132,150,44
-    CONTROL         "Use Wing Icon",IDC_USE_WING_ICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,136,347,63,10
+    LTEXT           "If music pack is present",IDC_STATIC,149,31,44,17
+    GROUPBOX        "Briefing Music",IDC_STATIC,141,7,150,44
+    CONTROL         "Use Wing Icon",IDC_USE_WING_ICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,298,380,63,10
 END
 
-IDD_IGNORE_ORDERS DIALOG  0, 0, 120, 217
+IDD_IGNORE_ORDERS DIALOG 0, 0, 120, 217
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ignore Orders"
 FONT 8, "MS Sans Serif"
@@ -1673,7 +1671,7 @@
     CONTROL         "order 10",IDC_CHECK10,"Button",BS_3STATE | WS_TABSTOP,7,183,105,10
 END
 
-IDD_DEBRIEFING_EDITOR DIALOGEX 0, 0, 322, 225
+IDD_DEBRIEFING_EDITOR DIALOGEX 0, 0, 471, 282
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Debriefing Editor"
 MENU IDR_PLAYER_EDIT_MENU
@@ -1684,27 +1682,27 @@
     PUSHBUTTON      "Add",IDC_ADD_STAGE,7,24,38,14,0,WS_EX_STATICEDGE
     PUSHBUTTON      "Insert",IDC_INSERT_STAGE,48,24,38,14,0,WS_EX_STATICEDGE
     PUSHBUTTON      "Delete",IDC_DELETE_STAGE,89,24,38,14,0,WS_EX_STATICEDGE
-    CONTROL         "Tree1",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP,7,55,122,110,WS_EX_CLIENTEDGE
+    CONTROL         "Tree1",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,55,122,212,WS_EX_CLIENTEDGE
     EDITTEXT        IDC_VOICE,193,7,68,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse",IDC_BROWSE,265,7,34,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "IDB_PLAY",IDC_PLAY,302,7,13,14,BS_BITMAP,WS_EX_TRANSPARENT | WS_EX_STATICEDGE
-    EDITTEXT        IDC_TEXT,135,34,179,57,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
-    EDITTEXT        IDC_REC_TEXT,136,108,179,57,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN
+    PUSHBUTTON      "IDB_PLAY",IDC_PLAY,311,7,13,14,BS_BITMAP,WS_EX_TRANSPARENT | WS_EX_STATICEDGE
+    EDITTEXT        IDC_TEXT,135,34,329,103,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
+    EDITTEXT        IDC_REC_TEXT,135,157,329,57,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
     LTEXT           "Text",IDC_STATIC,135,24,15,8
     LTEXT           "Voice Wave File",IDC_STATIC,135,10,53,8
     LTEXT           "Stage 1 of 9",IDC_STAGE_TITLE,7,10,53,8
     LTEXT           "Usage Formula",IDC_STATIC,7,43,48,8
-    LTEXT           "Recommendation Text",IDC_STATIC,135,96,72,8
-    GROUPBOX        "Debriefing Music",IDC_STATIC,7,175,260,45
-    LTEXT           "Success Music",IDC_STATIC,15,187,53,8
-    COMBOBOX        IDC_SUCCESSFUL_MISSION_TRACK,12,195,80,180,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Average Music",IDC_STATIC,100,187,53,8
-    COMBOBOX        IDC_DEBRIEFING_TRACK,97,195,80,180,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Failure Music",IDC_STATIC,185,187,53,8
-    COMBOBOX        IDC_FAILED_MISSION_TRACK,182,195,80,180,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Recommendation Text",IDC_STATIC,135,143,72,8
+    GROUPBOX        "Debriefing Music",IDC_STATIC,136,222,260,45
+    LTEXT           "Success Music",IDC_STATIC,144,234,53,8
+    COMBOBOX        IDC_SUCCESSFUL_MISSION_TRACK,142,242,80,180,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Average Music",IDC_STATIC,229,234,53,8
+    COMBOBOX        IDC_DEBRIEFING_TRACK,226,242,80,180,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Failure Music",IDC_STATIC,314,234,53,8
+    COMBOBOX        IDC_FAILED_MISSION_TRACK,312,242,80,180,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_ADJUST_GRID DIALOG  0, 0, 153, 94
+IDD_ADJUST_GRID DIALOG 0, 0, 153, 94
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Adjust Grid"
 FONT 8, "MS Sans Serif"
@@ -1726,7 +1724,7 @@
     LTEXT           "X Level",IDC_STATIC,69,50,25,8
 END
 
-IDD_SHIELD_SYS DIALOG  0, 0, 192, 106
+IDD_SHIELD_SYS DIALOG 0, 0, 192, 106
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Shield System Editor"
 FONT 8, "MS Sans Serif"
@@ -1743,7 +1741,7 @@
     PUSHBUTTON      "Cancel",IDCANCEL,134,86,50,14
 END
 
-IDD_INITIAL_SHIPS DIALOG  0, 0, 127, 210
+IDD_INITIAL_SHIPS DIALOG 0, 0, 127, 210
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Initial Ships Allowed"
 FONT 8, "MS Sans Serif"
@@ -1753,7 +1751,7 @@
     PUSHBUTTON      "Cancel",IDCANCEL,70,189,50,14
 END
 
-IDD_CMD_BRIEF DIALOGEX 0, 0, 189, 158
+IDD_CMD_BRIEF DIALOGEX 0, 0, 391, 223
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Command Briefing Editor"
 MENU IDR_PLAYER_EDIT_MENU
@@ -1764,18 +1762,18 @@
     PUSHBUTTON      "Add",IDC_ADD_STAGE,7,24,38,14,0,WS_EX_STATICEDGE
     PUSHBUTTON      "Insert",IDC_INSERT_STAGE,48,24,38,14,0,WS_EX_STATICEDGE
     PUSHBUTTON      "Delete",IDC_DELETE_STAGE,89,24,38,14,0,WS_EX_STATICEDGE
-    EDITTEXT        IDC_TEXT,7,55,175,59,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
-    EDITTEXT        IDC_ANI_FILENAME,61,118,68,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse",IDC_BROWSE_ANI,132,118,50,14,0,WS_EX_STATICEDGE
-    EDITTEXT        IDC_WAVE_FILENAME,61,136,68,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse",IDC_BROWSE_WAVE,132,136,34,14,0,WS_EX_STATICEDGE
-    PUSHBUTTON      "IDB_PLAY",IDC_PLAY,169,136,13,14,BS_BITMAP,WS_EX_TRANSPARENT | WS_EX_STATICEDGE
-    DEFPUSHBUTTON   "OK",IDOK,132,14,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,132,31,50,14
+    EDITTEXT        IDC_TEXT,7,55,377,122,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
+    EDITTEXT        IDC_ANI_FILENAME,263,184,68,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse",IDC_BROWSE_ANI,334,184,50,14,0,WS_EX_STATICEDGE
+    EDITTEXT        IDC_WAVE_FILENAME,263,202,68,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse",IDC_BROWSE_WAVE,334,202,34,14,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "IDB_PLAY",IDC_PLAY,371,202,13,14,BS_BITMAP,WS_EX_TRANSPARENT | WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK,334,14,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,334,31,50,14
     LTEXT           "Briefing Text",IDC_STATIC,7,44,40,8
-    LTEXT           "Ani Filename",IDC_STATIC,7,121,41,8
+    LTEXT           "Ani Filename",IDC_STATIC,209,187,41,8
     LTEXT           "Stage 1 of 9",IDC_STAGE_TITLE,7,10,53,8
-    LTEXT           "Wave Filename",IDC_STATIC,7,139,50,8
+    LTEXT           "Wave Filename",IDC_STATIC,209,205,50,8
 END
 
 IDD_SHIP_FLAGS DIALOGEX 0, 0, 286, 295
@@ -1838,7 +1836,7 @@
     CONTROL         "Scramble Messages",IDC_SCRAMBLE_MESSAGES,"Button",BS_3STATE | WS_TABSTOP,165,177,79,10
 END
 
-IDD_ADD_VARIABLE DIALOG  0, 0, 422, 102
+IDD_ADD_VARIABLE DIALOG 0, 0, 422, 102
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Add Variable"
 FONT 8, "MS Sans Serif"
@@ -1858,7 +1856,7 @@
     CONTROL         "Network-Variable",IDC_TYPE_NETWORK_VARIABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,137,71,84,11
 END
 
-IDD_MODIFY_VARIABLE DIALOG  0, 0, 422, 102
+IDD_MODIFY_VARIABLE DIALOG 0, 0, 422, 102
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Modify Variable"
 FONT 8, "MS Sans Serif"
@@ -1880,7 +1878,7 @@
     CONTROL         "Network-Variable",IDC_TYPE_NETWORK_VARIABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,72,84,11
 END
 
-IDD_SPECIAL_DAMAGE DIALOG  0, 0, 234, 129
+IDD_SPECIAL_DAMAGE DIALOG 0, 0, 234, 129
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Special Explosion"
 FONT 8, "MS Sans Serif"
@@ -1906,7 +1904,7 @@
     LTEXT           "Duration (msecs):",IDC_STATIC,30,111,56,8
 END
 
-IDD_DUMP_STATS DIALOG  0, 0, 577, 375
+IDD_DUMP_STATS DIALOG 0, 0, 577, 375
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Mission Stats"
 FONT 8, "MS Sans Serif"
@@ -1916,7 +1914,7 @@
     EDITTEXT        IDC_STATS_TEXT,7,7,563,333,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | ES_NUMBER | WS_VSCROLL
 END
 
-IDD_SHIP_TEXTURES DIALOG  0, 0, 296, 56
+IDD_SHIP_TEXTURES DIALOG 0, 0, 296, 56
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ship Texture Replace"
 FONT 8, "MS Sans Serif"
@@ -1929,7 +1927,7 @@
     COMBOBOX        IDC_OLD_TEXTURE_LIST,7,16,137,85,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_SPECIAL_HITPOINTS DIALOG  0, 0, 234, 85
+IDD_SPECIAL_HITPOINTS DIALOG 0, 0, 234, 85
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Special Hitpoints"
 FONT 8, "MS Sans Serif"
@@ -1946,7 +1944,7 @@
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,106,10
 END
 
-IDD_SET_GLOBAL_SHIP_FLAGS DIALOG  0, 0, 114, 79
+IDD_SET_GLOBAL_SHIP_FLAGS DIALOG 0, 0, 114, 79
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Set Global Ship Flags"
 FONT 8, "MS Sans Serif"
@@ -1957,7 +1955,7 @@
     PUSHBUTTON      "Global Affected-By-Gravity",IDC_AFFECTED_BY_GRAVITY,7,58,100,14
 END
 
-IDD_VOICE_MANAGER DIALOG  0, 0, 407, 218
+IDD_VOICE_MANAGER DIALOG 0, 0, 407, 218
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Voice Acting Manager"
 FONT 8, "MS Sans Serif"
@@ -2002,7 +2000,7 @@
                     "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,166,159,100,19
 END
 
-IDD_BRIEFING_PERSONAS DIALOG  0, 0, 320, 201
+IDD_BRIEFING_PERSONAS DIALOG 0, 0, 320, 201
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Dialog"
 FONT 8, "MS Sans Serif"
@@ -2011,7 +2009,7 @@
     PUSHBUTTON      "Cancel",IDCANCEL,263,24,50,14
 END
 
-IDD_CUSTOM_WING_NAMES DIALOG  0, 0, 390, 54
+IDD_CUSTOM_WING_NAMES DIALOG 0, 0, 390, 54
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Custom Wing Names"
 FONT 8, "MS Sans Serif"
@@ -2033,7 +2031,7 @@
     PUSHBUTTON      "Cancel",IDCANCEL,333,24,50,14
 END
 
-IDD_RESTRICT_PATHS DIALOG  0, 0, 141, 87
+IDD_RESTRICT_PATHS DIALOG 0, 0, 141, 87
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Restrict Paths"
 FONT 8, "MS Sans Serif"
@@ -2044,7 +2042,7 @@
     LTEXT           "Restrict departure paths to the following:",IDC_RESTRICT_PATHS_LABEL,7,7,127,11
 END
 
-IDD_BACKGROUND_CHOOSER DIALOG  0, 0, 152, 45
+IDD_BACKGROUND_CHOOSER DIALOG 0, 0, 152, 45
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Choose a background"
 FONT 8, "MS Sans Serif"
@@ -2054,7 +2052,7 @@
     COMBOBOX        IDC_BACKGROUND,7,16,83,265,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_FICTION_VIEWER DIALOG  0, 0, 205, 66
+IDD_FICTION_VIEWER DIALOG 0, 0, 205, 66
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Fiction Viewer Editor"
 FONT 8, "MS Sans Serif"
@@ -2138,7 +2136,7 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_ABOUTBOX, DIALOG
     BEGIN
@@ -2329,7 +2327,7 @@
     IDD_CAMPAIGN, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 228
+        RIGHTMARGIN, 261
         TOPMARGIN, 7
         BOTTOMMARGIN, 435
     END
@@ -2345,10 +2343,11 @@
     IDD_BRIEFING_EDITOR, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 251
-        VERTGUIDE, 136
+        RIGHTMARGIN, 403
+        VERTGUIDE, 173
+        VERTGUIDE, 222
         TOPMARGIN, 7
-        BOTTOMMARGIN, 410
+        BOTTOMMARGIN, 393
     END
 
     IDD_IGNORE_ORDERS, DIALOG
@@ -2362,9 +2361,9 @@
     IDD_DEBRIEFING_EDITOR, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 315
+        RIGHTMARGIN, 464
         TOPMARGIN, 7
-        BOTTOMMARGIN, 165
+        BOTTOMMARGIN, 267
     END
 
     IDD_ADJUST_GRID, DIALOG
@@ -2394,9 +2393,9 @@
     IDD_CMD_BRIEF, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 182
+        RIGHTMARGIN, 384
         TOPMARGIN, 7
-        BOTTOMMARGIN, 151
+        BOTTOMMARGIN, 216
     END
 
     IDD_SHIP_FLAGS, DIALOG
@@ -2691,19 +2690,19 @@
 // String Table
 //
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDR_MAINFRAME           "FRED2_OPEN 3.7.1 - FreeSpace2 Mission Editor\nUntitled\nFRED2\nFreeSpace2 Missions (*.fs2)\n.fs2\nFreeSpace2Mission\nFreeSpace2 Mission"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     AFX_IDS_APP_TITLE       "FRED2"
     AFX_IDS_IDLEMESSAGE     "For Help, press F1"
     AFX_IDS_HELPMODEMESSAGE "Select an object on which to get Help"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Create a new campaign\nNew"
     ID_FILE_OPEN            "Open an existing campaign\nOpen"
@@ -2716,7 +2715,7 @@
     ID_FILE_PRINT_PREVIEW   "Display full pages\nPrint Preview"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_APP_ABOUT            "Display program information, version number and copyright\nAbout"
     ID_APP_EXIT             "Exit the campaign editor\nExit"
@@ -2727,7 +2726,7 @@
     ID_HELP                 "Display help for current task or command\nHelp"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Open this document"
     ID_FILE_MRU_FILE2       "Open this document"
@@ -2747,18 +2746,18 @@
     ID_FILE_MRU_FILE16      "Open this document"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"
     ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_WINDOW_SPLIT         "Split the active window into panes\nSplit"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Erase the selection\nErase"
     ID_EDIT_CLEAR_ALL       "Erase everything\nErase All"
@@ -2773,13 +2772,13 @@
     ID_EDIT_REDO            "Redo the previously undone action\nRedo"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Show or hide the toolbar\nToggle ToolBar"
     ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle StatusBar"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Change the window size"
     AFX_IDS_SCMOVE          "Change the window position"
@@ -2790,24 +2789,24 @@
     AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     AFX_IDS_SCRESTORE       "Restore the window to normal size"
     AFX_IDS_SCTASKLIST      "Activate Task List"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Close print preview mode\nCancel Preview"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_FILE_MISSIONNOTES    "Displays designer notes and mission properties\nMission Specs"
     ID_SELECT               "Select objects mode\nSelect (S)"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_VIEW_FIGHTERS        "Show/Hide Fighter objects"
     ID_VIEW_CAPITALSHIPS    "Show/Hide Capital Ship objects"
@@ -2825,7 +2824,7 @@
     ID_EDITORS_SHIPS        "Open ship editor dialog window to edit ship"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_EDITORS_GOALS        "Activates Mission Goal Editor\nMission Goal Editor"
     ID_EDITORS_WAYPOINTS    "Activates Waypoint Editor\nWaypoint Editor"
@@ -2836,7 +2835,7 @@
     ID_PROPERTIES_ONE       "This is Mike's prompt!"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
     ID_INDICATOR_CAPS       "CAP"
@@ -2850,7 +2849,7 @@
     ID_INDICATOR_MODIFIED   "MODIFIED"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_MISCSTUFF_SHOWSHIPSASICONS "This is the (help?) prompt!"
     ID_EDIT_POPUP_SHOW_SHIP_MODELS 
@@ -2859,7 +2858,7 @@
                             "Display ship names and ship types for visible ships"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_ADD_MISSION_TIME     "Evaluates to elapsed time into mission in seconds"
     ID_ADD_EQUALS           "Evaluates to true if numbers or objects are the same"
@@ -2874,7 +2873,7 @@
     ID_ADD_FALSE            "Evaluates to a boolean value of false"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_EDIT_POPUP_SHOW_COMPASS 
                             "Display a 3 dimentional compass in the upper right corner of window"
@@ -2888,7 +2887,7 @@
     ID_ADD_MINUS            "Evaluates to difference between first subexpression and remaining subexpressions"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_SHOW_GRID_POSITIONS  "Show position on grid for all visible objects"
     ID_SHOW_COORDINATES     "Display the coordinates of objects/waypoints."
@@ -2903,7 +2902,7 @@
     ID_DISSOLVE_WING        "Remove selected ships from Wing(s)\nRemove from Wing"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_SELECT_AND_MOVE      "Select and Move objects\nSelect and Move (M)"
     ID_SELECT_AND_ROTATE    "Select and Rotate objects\nSelect and Rotate (R)"
@@ -2918,7 +2917,7 @@
     ID_FIND_DISTANCE        "Find Distance between two objects\nFind Distance"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_BUTTON32944          "Constrain to YZ axis\nYZ Constraint"
     ID_BUTTON32945          "Constrain to XY axis\nXY Constraint"
@@ -2933,27 +2932,27 @@
     ID_SHOW_HORIZON         "Show the horizon line"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_EDITORS_PLAYER       "Edit loadout information for all teams"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_REVERT               "Revert changes by reloading mission from last save\nRevert"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_ERROR_CHECKER        "Checks campaign for errors"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_LOOKAT_OBJ           "Rotate camera around selected object\nRotate around object (Ctrl+V)"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_EDITORS_ADJUST_GRID  "Adjust the orientation and level of the grid."
     ID_EDITORS_SHIELD_SYS   "Editor for availability of shield system for ships."
@@ -2961,7 +2960,7 @@
     ID_MARK_WING            "Mark entire wing selected object is a member of."
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_CONTROL_OBJ          "Movement keys control marked objects instead of camera."
     ID_CHECKOUT             "Checks out the mission from Source Safe"
@@ -2969,37 +2968,35 @@
     ID_AA_GRIDLINES         "Toggle Gridlines being drawn anti-aliased or not."
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_FORMAT_FS2_OPEN      "Save missions with SCP features"
     ID_FORMAT_FS2_RETAIL    "Save missions compatible with FS2 retail"
     ID_FORMAT_FS1           "Save missions compatible with FS1 retail"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_FORMAT_FS1_RETAIL    "Save missions compatible with FS1 retail"
 END
 
-#endif    // English (U.S.) resources
+#endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.K.) resources
+// English (United Kingdom) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 #pragma code_page(1252)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
 
-IDD_ALT_SHIP_CLASS DIALOG  0, 0, 312, 212
+IDD_ALT_SHIP_CLASS DIALOG 0, 0, 312, 212
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alternate Ship Class Editor"
 FONT 8, "MS Sans Serif"
@@ -3026,7 +3023,7 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_ALT_SHIP_CLASS, DIALOG
     BEGIN
@@ -3038,7 +3035,7 @@
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // English (U.K.) resources
+#endif    // English (United Kingdom) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
