diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h index eda3c2418..f7143ff54 100644 --- a/src/include/86box/resource.h +++ b/src/include/86box/resource.h @@ -24,93 +24,134 @@ /* Dialog IDs. */ -#define DLG_ABOUT 101 /* top-level dialog */ -#define DLG_STATUS 102 /* top-level dialog */ -#define DLG_SND_GAIN 103 /* top-level dialog */ -#define DLG_NEW_FLOPPY 104 /* top-level dialog */ -#define DLG_SPECIFY_DIM 105 /* top-level dialog */ -#define DLG_PREFERENCES 106 /* top-level dialog */ -#define DLG_CONFIG 110 /* top-level dialog */ -#define DLG_CFG_MACHINE 111 /* sub-dialog of config */ -#define DLG_CFG_VIDEO 112 /* sub-dialog of config */ -#define DLG_CFG_INPUT 113 /* sub-dialog of config */ -#define DLG_CFG_SOUND 114 /* sub-dialog of config */ -#define DLG_CFG_NETWORK 115 /* sub-dialog of config */ -#define DLG_CFG_PORTS 116 /* sub-dialog of config */ -#define DLG_CFG_STORAGE 117 /* sub-dialog of config */ -#define DLG_CFG_HARD_DISKS 118 /* sub-dialog of config */ -#define DLG_CFG_HARD_DISKS_ADD 119 /* sub-dialog of config */ -#define DLG_CFG_FLOPPY_AND_CDROM_DRIVES 120 /* sub-dialog of config */ -#define DLG_CFG_OTHER_REMOVABLE_DEVICES 121 /* sub-dialog of config */ -#define DLG_CFG_PERIPHERALS 122 /* sub-dialog of config */ +#define DLG_ABOUT 101 /* top-level dialog */ +#define DLG_STATUS 102 /* top-level dialog */ +#define DLG_SND_GAIN 103 /* top-level dialog */ +#define DLG_NEW_FLOPPY 104 /* top-level dialog */ +#define DLG_SPECIFY_DIM 105 /* top-level dialog */ +#define DLG_PREFERENCES 106 /* top-level dialog */ +#define DLG_CONFIG 110 /* top-level dialog */ +#define DLG_CFG_MACHINE 111 /* sub-dialog of config */ +#define DLG_CFG_VIDEO 112 /* sub-dialog of config */ +#define DLG_CFG_INPUT 113 /* sub-dialog of config */ +#define DLG_CFG_SOUND 114 /* sub-dialog of config */ +#define DLG_CFG_NETWORK 115 /* sub-dialog of config */ +#define DLG_CFG_PORTS 116 /* sub-dialog of config */ +#define DLG_CFG_STORAGE 117 /* sub-dialog of config */ +#define DLG_CFG_HARD_DISKS 118 /* sub-dialog of config */ +#define DLG_CFG_HARD_DISKS_ADD 119 /* sub-dialog of config */ +#define DLG_CFG_FLOPPY_AND_CDROM_DRIVES 120 /* sub-dialog of config */ +#define DLG_CFG_OTHER_REMOVABLE_DEVICES 121 /* sub-dialog of config */ +#define DLG_CFG_PERIPHERALS 122 /* sub-dialog of config */ /* Static text label IDs. */ -#define IDT_1700 1700 /* Language: */ -#define IDT_1701 1701 /* Machine: */ -#define IDT_1702 1702 /* CPU type: */ -#define IDT_1703 1703 /* Wait states: */ -#define IDT_1704 1704 /* CPU: */ -#define IDT_1705 1705 /* MB == IDC_TEXT_MB */ -#define IDT_1706 1706 /* Memory: */ -#define IDT_1707 1707 /* Video: */ -#define IDT_1708 1708 /* Machine type: */ -#define IDT_1709 1709 /* Mouse: */ -#define IDT_1710 1710 /* Joystick: */ -#define IDT_1711 1711 /* Sound card: */ -#define IDT_1712 1712 /* MIDI Out Device: */ -#define IDT_1713 1713 /* MIDI In Device: */ -#define IDT_1714 1714 /* Network type: */ -#define IDT_1715 1715 /* PCap device: */ -#define IDT_1716 1716 /* Network adapter: */ -#define IDT_1717 1717 /* SCSI Controller: */ -#define IDT_1718 1718 /* HD Controller: */ -#define IDT_1719 1719 -#define IDT_1720 1720 /* Hard disks: */ -#define IDT_1721 1721 /* Bus: */ -#define IDT_1722 1722 /* Channel: */ -#define IDT_1723 1723 /* ID: */ -#define IDT_1724 1724 /* LUN: */ -#define IDT_1726 1726 /* Sectors: */ -#define IDT_1727 1727 /* Heads: */ -#define IDT_1728 1728 /* Cylinders: */ -#define IDT_1729 1729 /* Size (MB): */ -#define IDT_1730 1730 /* Type: */ -#define IDT_1731 1731 /* File name: */ -#define IDT_1737 1737 /* Floppy drives: */ -#define IDT_1738 1738 /* Type: */ -#define IDT_1739 1739 /* CD-ROM drives: */ -#define IDT_1740 1740 /* Bus: */ -#define IDT_1741 1741 /* ID: */ -#define IDT_1742 1742 /* LUN: */ -#define IDT_1743 1743 /* Channel: */ -#define IDT_STEXT 1744 /* text in status window */ -#define IDT_SDEVICE 1745 /* text in status window */ -#define IDT_1746 1746 /* Gain */ -#define IDT_1749 1749 /* File name: */ -#define IDT_1750 1750 /* Disk size: */ -#define IDT_1751 1751 /* RPM mode: */ -#define IDT_1752 1752 /* Progress: */ -#define IDT_1753 1753 /* Bus: */ -#define IDT_1754 1754 /* ID: */ -#define IDT_1755 1755 /* LUN: */ -#define IDT_1756 1756 /* Channel: */ -#define IDT_1757 1757 /* Progress: */ -#define IDT_1758 1758 /* Speed: */ -#define IDT_1759 1759 /* ZIP drives: */ -#define IDT_1763 1763 /* Board #1: */ -#define IDT_1764 1764 /* Board #2: */ -#define IDT_1765 1765 /* Board #3: */ -#define IDT_1766 1766 /* Board #4: */ -#define IDT_1767 1767 /* ISA RTC: */ -#define IDT_1768 1768 /* Ext FD Controller: */ -#define IDT_1769 1769 /* MO drives: */ -#define IDT_1770 1770 /* Bus: */ -#define IDT_1771 1771 /* ID: */ -#define IDT_1772 1772 /* Channel */ -#define IDT_1773 1773 /* Type: */ -#define IDT_1774 1774 /* Image Format: */ -#define IDT_1775 1775 /* Block Size: */ +/* DLG_SND_GAIN */ +#define IDT_GAIN 1700 /* Gain */ + +/* DLG_NEW_FLOPPY */ +#define IDT_FLP_FILE_NAME 1701 /* File name: */ +#define IDT_FLP_DISK_SIZE 1702 /* Disk size: */ +#define IDT_FLP_RPM_MODE 1703 /* RPM mode: */ +#define IDT_FLP_PROGRESS 1704 /* Progress: */ + +/* DLG_SPECIFY_DIM */ +#define IDT_WIDTH 1705 /* ??? */ +#define IDT_HEIGHT 1706 /* ??? */ + +/* DLG_CFG_MACHINE */ +#define IDT_MACHINE_TYPE 1707 /* Machine type: */ +#define IDT_MACHINE 1708 /* Machine: */ +#define IDT_CPU_TYPE 1709 /* CPU type: */ +#define IDT_CPU_SPEED 1710 /* CPU speed: */ +#define IDT_FPU 1711 /* FPU: */ +#define IDT_WAIT_STATES 1712 /* Wait states: */ +#define IDT_MB 1713 /* MB == IDC_TEXT_MB */ +#define IDT_MEMORY 1714 /* Memory: */ + +/* DLG_CFG_VIDEO */ +#define IDT_VIDEO 1715 /* Video: */ + +/* DLG_CFG_INPUT */ +#define IDT_MOUSE 1716 /* Mouse: */ +#define IDT_JOYSTICK 1717 /* Joystick: */ + +/* DLG_CFG_SOUND */ +#define IDT_SOUND 1718 /* Sound card: */ +#define IDT_MIDI_OUT 1719 /* MIDI Out Device: */ +#define IDT_MIDI_IN 1720 /* MIDI In Device: */ + +/* DLG_CFG_NETWORK */ +#define IDT_NET_TYPE 1721 /* Network type: */ +#define IDT_PCAP 1722 /* PCap device: */ +#define IDT_NET 1723 /* Network adapter: */ + +/* DLG_CFG_PORTS */ +#define IDT_COM1 1724 /* COM1 Device: */ +#define IDT_COM2 1725 /* COM1 Device: */ +#define IDT_COM3 1726 /* COM1 Device: */ +#define IDT_COM4 1727 /* COM1 Device: */ + +#define IDT_LPT1 1728 /* LPT1 Device: */ +#define IDT_LPT2 1729 /* LPT2 Device: */ +#define IDT_LPT3 1730 /* LPT3 Device: */ +#define IDT_LPT4 1731 /* LPT4 Device: */ + +/* DLG_CFG_STORAGE */ +#define IDT_HDC 1732 /* HD Controller: */ +#define IDT_FDC 1733 /* Ext FD Controller: */ +#define IDT_SCSI_1 1734 /* SCSI Board #1: */ +#define IDT_SCSI_2 1735 /* SCSI Board #2: */ +#define IDT_SCSI_3 1736 /* SCSI Board #3: */ +#define IDT_SCSI_4 1737 /* SCSI Board #4: */ + +/* DLG_CFG_HARD_DISKS */ +#define IDT_HDD 1738 /* Hard disks: */ +#define IDT_BUS 1739 /* Bus: */ +#define IDT_CHANNEL 1740 /* Channel: */ +#define IDT_ID 1741 /* ID: */ +#define IDT_LUN 1742 /* LUN: */ + +/* DLG_CFG_HARD_DISKS_ADD */ +#define IDT_SECTORS 1743 /* Sectors: */ +#define IDT_HEADS 1744 /* Heads: */ +#define IDT_CYLS 1745 /* Cylinders: */ +#define IDT_SIZE_MB 1746 /* Size (MB): */ +#define IDT_TYPE 1747 /* Type: */ +#define IDT_FILE_NAME 1748 /* File name: */ +#define IDT_IMG_FORMAT 1749 /* Image Format: */ +#define IDT_BLOCK_SIZE 1750 /* Block Size: */ +#define IDT_PROGRESS 1751 /* Progress: */ + +/* DLG_CFG_FLOPPY_AND_CDROM_DRIVES */ +#define IDT_FLOPPY_DRIVES 1752 /* Floppy drives: */ +#define IDT_FDD_TYPE 1753 /* Type: */ +#define IDT_CD_DRIVES 1754 /* CD-ROM drives: */ +#define IDT_CD_BUS 1755 /* Bus: */ +#define IDT_CD_ID 1756 /* ID: */ +#define IDT_CD_LUN 1757 /* LUN: */ +#define IDT_CD_CHANNEL 1758 /* Channel: */ +#define IDT_CD_SPEED 1759 /* Speed: */ + +/* DLG_CFG_OTHER_REMOVABLE_DEVICES */ +#define IDT_MO_DRIVES 1760 /* MO drives: */ +#define IDT_MO_BUS 1761 /* Bus: */ +#define IDT_MO_ID 1762 /* ID: */ +#define IDT_MO_CHANNEL 1763 /* Channel */ +#define IDT_MO_TYPE 1764 /* Type: */ + +#define IDT_ZIP_DRIVES 1765 /* ZIP drives: */ +#define IDT_ZIP_BUS 1766 /* Bus: */ +#define IDT_ZIP_ID 1767 /* ID: */ +#define IDT_ZIP_LUN 1768 /* LUN: */ +#define IDT_ZIP_CHANNEL 1769 /* Channel: */ + +/* DLG_CFG_PERIPHERALS */ +#define IDT_ISARTC 1770 /* ISA RTC: */ +#define IDT_ISAMEM_1 1771 /* ISAMEM Board #1: */ +#define IDT_ISAMEM_2 1772 /* ISAMEM Board #2: */ +#define IDT_ISAMEM_3 1773 /* ISAMEM Board #3: */ +#define IDT_ISAMEM_4 1774 /* ISAMEM Board #4: */ /* * To try to keep these organized, we now group the @@ -136,7 +177,7 @@ #endif #define IDC_MEMTEXT 1018 #define IDC_MEMSPIN 1019 -#define IDC_TEXT_MB IDT_1705 +#define IDC_TEXT_MB IDT_MB #define IDC_VIDEO 1020 /* video config */ #define IDC_COMBO_VIDEO 1021 diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index 75921230a..ababda8f2 100644 --- a/src/win/languages/cs-CZ.rc +++ b/src/win/languages/cs-CZ.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Počítač:" #define STR_CONFIGURE "Nastavit" #define STR_CPU_TYPE "Procesor:" -#define STR_SPEED "Rychlost:" +#define STR_CPU_SPEED "Rychlost:" #define STR_FPU "Koprocesor:" #define STR_WAIT_STATES "Čekací stavy:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Zvuková karta:" -#define STR_MIDI "MIDI výstup:" +#define STR_MIDI_OUT "MIDI výstup:" #define STR_MIDI_IN "MIDI vstup:" #define STR_MPU401 "Samostatný MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo časování" #define STR_CHECKBPB "Kontrola BPB" #define STR_CDROM_DRIVES "Mechaniky CD-ROM:" +#define STR_CD_SPEED "Rychlost:" #define STR_MO_DRIVES "Magnetooptické mechaniky:" #define STR_ZIP_DRIVES "Mechaniky ZIP:" diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index 9fb84a20c..08f152795 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Maschine:" #define STR_CONFIGURE "Einstellen" #define STR_CPU_TYPE "CPU-Typ:" -#define STR_SPEED "Geschwindigkeit:" +#define STR_CPU_SPEED "Geschwindigkeit:" #define STR_FPU "FPU-Einheit:" #define STR_WAIT_STATES "Wartezustände:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Soundkarte:" -#define STR_MIDI "MIDI Out-Gerät:" +#define STR_MIDI_OUT "MIDI Out-Gerät:" #define STR_MIDI_IN "MIDI In-Gerät:" #define STR_MPU401 "Standalone-MPU-401-Gerät" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo-Timings" #define STR_CHECKBPB "BPB überprüfen" #define STR_CDROM_DRIVES "CD-ROM-Laufwerke:" +#define STR_CD_SPEED "Geschwindigkeit:" #define STR_MO_DRIVES "MO-Laufwerke:" #define STR_ZIP_DRIVES "ZIP-Laufwerke:" diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index c6934b398..111c6e292 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -23,7 +23,7 @@ BEGIN PUSHBUTTON STR_CANCEL,IDCANCEL,57,24,50,14 CONTROL STR_GAIN,IDC_SLIDER_GAIN,"msctls_trackbar32",TBS_VERT | TBS_BOTH | TBS_AUTOTICKS | WS_TABSTOP,15,20,20,109 - CTEXT STR_GAIN,IDT_1746,10,7,32,9,SS_CENTERIMAGE + CTEXT STR_GAIN,IDT_GAIN,10,7,32,9,SS_CENTERIMAGE END DLG_NEW_FLOPPY DIALOG DISCARDABLE 0, 0, 226, 86 @@ -33,16 +33,16 @@ FONT FONT_SIZE, FONT_NAME BEGIN DEFPUSHBUTTON STR_OK,IDOK,104,65,50,14 PUSHBUTTON STR_CANCEL,IDCANCEL,162,65,50,14 - LTEXT STR_FILE_NAME,IDT_1749,7,6,44,12,SS_CENTERIMAGE - LTEXT STR_DISK_SIZE,IDT_1750,7,25,44,12,SS_CENTERIMAGE - LTEXT STR_RPM_MODE,IDT_1751,7,45,44,12,SS_CENTERIMAGE + LTEXT STR_FILE_NAME,IDT_FLP_FILE_NAME,7,6,44,12,SS_CENTERIMAGE + LTEXT STR_DISK_SIZE,IDT_FLP_DISK_SIZE,7,25,44,12,SS_CENTERIMAGE + LTEXT STR_RPM_MODE,IDT_FLP_RPM_MODE,7,45,44,12,SS_CENTERIMAGE EDITTEXT IDC_EDIT_FILE_NAME,53,5,150,14,ES_AUTOHSCROLL | ES_READONLY COMBOBOX IDC_COMBO_DISK_SIZE,53,25,166,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_COMBO_RPM_MODE,53,45,166,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_CFILE,206,5,13,14 - LTEXT STR_PROGRESS,IDT_1757,7,45,44,12,SS_CENTERIMAGE + LTEXT STR_PROGRESS,IDT_FLP_PROGRESS,7,45,44,12,SS_CENTERIMAGE CONTROL "IMGCreateProgress",IDC_PBAR_IMG_CREATE,"msctls_progress32",PBS_SMOOTH | WS_BORDER,53,45,166,14 END @@ -52,12 +52,12 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION STR_SPECIFY_DIM FONT FONT_SIZE, FONT_NAME BEGIN - LTEXT STR_WIDTH,IDT_1709,7,9,24,12 + LTEXT STR_WIDTH,IDT_WIDTH,7,9,24,12 EDITTEXT IDC_EDIT_WIDTH,33,7,45,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_WIDTHSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,76,6, 12,12 - LTEXT STR_HEIGHT,IDT_1710,97,9,24,12 + LTEXT STR_HEIGHT,IDT_HEIGHT,97,9,24,12 EDITTEXT IDC_EDIT_HEIGHT,123,7,45,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_HEIGHTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,166,6, @@ -86,35 +86,35 @@ FONT FONT_SIZE, FONT_NAME BEGIN COMBOBOX IDC_COMBO_MACHINE_TYPE,71,7,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_MACHINE_TYPE,IDT_1708,7,9,60,10 + LTEXT STR_MACHINE_TYPE,IDT_MACHINE_TYPE,7,9,60,10 COMBOBOX IDC_COMBO_MACHINE,71,26,138,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_MACHINE,IDT_1701,7,28,60,10 + LTEXT STR_MACHINE,IDT_MACHINE,7,28,60,10 PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MACHINE,214,26,46,12 COMBOBOX IDC_COMBO_CPU_TYPE,71,45,110,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_CPU_TYPE,IDT_1702,7,47,59,10 + LTEXT STR_CPU_TYPE,IDT_CPU_TYPE,7,47,59,10 COMBOBOX IDC_COMBO_CPU_SPEED,215,45,45,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_SPEED,IDT_1704,189,47,24,10 + LTEXT STR_CPU_SPEED,IDT_CPU_SPEED,189,47,24,10 COMBOBOX IDC_COMBO_FPU,71,64,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_FPU,IDT_1707,7,66,59,10 + LTEXT STR_FPU,IDT_FPU,7,66,59,10 COMBOBOX IDC_COMBO_WS,71,83,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_WAIT_STATES,IDT_1703,7,85,60,10 + LTEXT STR_WAIT_STATES,IDT_WAIT_STATES,7,85,60,10 EDITTEXT IDC_MEMTEXT,70,102,45,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_MEMSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,113,101, 12,12 - LTEXT STR_MB,IDT_1705,123,104,10,10 - LTEXT STR_MEMORY,IDT_1706,7,104,30,10 + LTEXT STR_MB,IDT_MB,123,104,10,10 + LTEXT STR_MEMORY,IDT_MEMORY,7,104,30,10 #ifdef USE_DYNAREC CONTROL STR_DYNAREC,IDC_CHECK_DYNAREC,"Button", @@ -134,7 +134,7 @@ DLG_CFG_VIDEO DIALOG DISCARDABLE 107, 0, 267, 45 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN - LTEXT STR_VIDEO,IDT_1707,7,9,48,10 + LTEXT STR_VIDEO,IDT_VIDEO,7,9,48,10 COMBOBOX IDC_COMBO_VIDEO,64,7,155,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_VID,222,7,38,12 @@ -147,11 +147,11 @@ DLG_CFG_INPUT DIALOG DISCARDABLE 107, 0, 267, 65 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN - LTEXT STR_MOUSE,IDT_1709,7,9,57,10 + LTEXT STR_MOUSE,IDT_MOUSE,7,9,57,10 COMBOBOX IDC_COMBO_MOUSE,71,7,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MOUSE,214,7,46,12 - LTEXT STR_JOYSTICK,IDT_1710,7,27,58,10 + LTEXT STR_JOYSTICK,IDT_JOYSTICK,7,27,58,10 COMBOBOX IDC_COMBO_JOYSTICK,71,25,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_JOY1,IDC_JOY1,7,44,50,14 @@ -166,17 +166,17 @@ FONT FONT_SIZE, FONT_NAME BEGIN COMBOBOX IDC_COMBO_SOUND,71,7,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_SOUND,IDT_1711,7,9,59,10 + LTEXT STR_SOUND,IDT_SOUND,7,9,59,10 PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SND,214,7,46,12 COMBOBOX IDC_COMBO_MIDI_OUT,71,26,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_MIDI,IDT_1712,7,28,59,10 + LTEXT STR_MIDI,IDT_MIDI_OUT,7,28,59,10 PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI_OUT,214,26,46,12 COMBOBOX IDC_COMBO_MIDI_IN,71,45,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_MIDI_IN,IDT_1713,7,47,59,10 + LTEXT STR_MIDI_IN,IDT_MIDI_IN,7,47,59,10 PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI_IN,214,45,46,12 CONTROL STR_MPU401,IDC_CHECK_MPU401,"Button", @@ -203,15 +203,15 @@ DLG_CFG_NETWORK DIALOG DISCARDABLE 107, 0, 267, 65 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN - LTEXT STR_NET_TYPE,IDT_1714,7,9,59,10 + LTEXT STR_NET_TYPE,IDT_NET_TYPE,7,9,59,10 COMBOBOX IDC_COMBO_NET_TYPE,71,7,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_PCAP,IDT_1715,7,28,59,10 + LTEXT STR_PCAP,IDT_PCAP,7,28,59,10 COMBOBOX IDC_COMBO_PCAP,71,26,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_NET,IDT_1716,7,47,59,10 + LTEXT STR_NET,IDT_NET,7,47,59,10 COMBOBOX IDC_COMBO_NET,71,45,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_NET,214,44,46,12 @@ -222,36 +222,36 @@ STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN /* - LTEXT STR_COM1,IDT_1717,7,9,61,10 + LTEXT STR_COM1,IDT_COM1,7,9,61,10 COMBOBOX IDC_COMBO_COM1,71,7,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_COM2,IDT_1718,7,28,61,10 + LTEXT STR_COM2,IDT_COM2,7,28,61,10 COMBOBOX IDC_COMBO_COM2,71,26,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_COM3,IDT_1719,7,47,61,10 + LTEXT STR_COM3,IDT_COM3,7,47,61,10 COMBOBOX IDC_COMBO_COM3,71,45,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_COM4,IDT_1720,7,66,61,10 + LTEXT STR_COM4,IDT_COM4,7,66,61,10 COMBOBOX IDC_COMBO_COM4,71,45,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP */ - LTEXT STR_LPT1,IDT_1717,7,9,61,10 + LTEXT STR_LPT1,IDT_LPT1,7,9,61,10 COMBOBOX IDC_COMBO_LPT1,71,7,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_LPT2,IDT_1718,7,28,61,10 + LTEXT STR_LPT2,IDT_LPT2,7,28,61,10 COMBOBOX IDC_COMBO_LPT2,71,26,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_LPT3,IDT_1719,7,47,61,10 + LTEXT STR_LPT3,IDT_LPT3,7,47,61,10 COMBOBOX IDC_COMBO_LPT3,71,45,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_LPT4,IDT_1720,7,66,61,10 + LTEXT STR_LPT4,IDT_LPT4,7,66,61,10 COMBOBOX IDC_COMBO_LPT4,71,64,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -278,12 +278,12 @@ DLG_CFG_STORAGE DIALOG DISCARDABLE 107, 0, 267, 203 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN - LTEXT STR_HDC,IDT_1718,7,9,64,10 + LTEXT STR_HDC,IDT_HDC,7,9,64,10 COMBOBOX IDC_COMBO_HDC,64,7,155,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_HDC,222,7,38,12 - LTEXT STR_FDC,IDT_1768,7,28,64,10 + LTEXT STR_FDC,IDT_FDC,7,28,64,10 COMBOBOX IDC_COMBO_FDC,64,26,155,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_FDC,222,26,38,12 @@ -297,19 +297,19 @@ BEGIN PUSHBUTTON STR_CONFIGURE,IDC_BUTTON_IDE_QUA,222,64,38,12 GROUPBOX STR_SCSI,IDC_GROUP_SCSI,7,85,253,93 - LTEXT STR_SCSI_1,IDT_1763,16,102,48,10 + LTEXT STR_SCSI_1,IDT_SCSI_1,16,102,48,10 COMBOBOX IDC_COMBO_SCSI_1,73,100,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_1,213,100,38,12 - LTEXT STR_SCSI_2,IDT_1764,16,121,48,10 + LTEXT STR_SCSI_2,IDT_SCSI_2,16,121,48,10 COMBOBOX IDC_COMBO_SCSI_2,73,119,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_2,213,119,38,12 - LTEXT STR_SCSI_3,IDT_1765,16,140,48,10 + LTEXT STR_SCSI_3,IDT_SCSI_3,16,140,48,10 COMBOBOX IDC_COMBO_SCSI_3,73,138,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_3,213,138,38,12 - LTEXT STR_SCSI_4,IDT_1766,16,159,48,10 + LTEXT STR_SCSI_4,IDT_SCSI_4,16,159,48,10 COMBOBOX IDC_COMBO_SCSI_4,73,157,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_4,213,157,38,12 @@ -325,19 +325,19 @@ BEGIN CONTROL "List1",IDC_LIST_HARD_DISKS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,18,253,92 - LTEXT STR_HDD,IDT_1720,7,7,253,8 + LTEXT STR_HDD,IDT_HDD,7,7,253,8 PUSHBUTTON STR_NEW,IDC_BUTTON_HDD_ADD_NEW,60,137,62,10 PUSHBUTTON STR_EXISTING,IDC_BUTTON_HDD_ADD,129,137,62,10 PUSHBUTTON STR_REMOVE,IDC_BUTTON_HDD_REMOVE,198,137,62,10 COMBOBOX IDC_COMBO_HD_BUS,33,117,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_BUS,IDT_1721,7,119,24,8 + LTEXT STR_BUS,IDT_BUS,7,119,24,8 COMBOBOX IDC_COMBO_HD_CHANNEL,170,117,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_CHANNEL,IDT_1722,131,119,38,8 + LTEXT STR_CHANNEL,IDT_CHANNEL,131,119,38,8 COMBOBOX IDC_COMBO_HD_ID,170,117,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_ID,IDT_1723,131,119,38,8 + LTEXT STR_ID,IDT_ID,131,119,38,8 COMBOBOX IDC_COMBO_HD_CHANNEL_IDE,170,117,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -357,30 +357,30 @@ BEGIN EDITTEXT IDC_EDIT_HD_SIZE,42,52,28,12 COMBOBOX IDC_COMBO_HD_TYPE,113,52,98,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_SECTORS,IDT_1726,154,35,27,10 - LTEXT STR_HEADS,IDT_1727,81,35,29,8 - LTEXT STR_CYLS,IDT_1728,7,35,32,12 - LTEXT STR_SIZE_MB,IDT_1729,7,54,33,8 - LTEXT STR_TYPE,IDT_1730,86,54,24,8 - LTEXT STR_FILE_NAME,IDT_1731,7,7,204,9 + LTEXT STR_SECTORS,IDT_SECTORS,154,35,27,10 + LTEXT STR_HEADS,IDT_HEADS,81,35,29,8 + LTEXT STR_CYLS,IDT_CYLS,7,35,32,12 + LTEXT STR_SIZE_MB,IDT_SIZE_MB,7,54,33,8 + LTEXT STR_TYPE,IDT_TYPE,86,54,24,8 + LTEXT STR_FILE_NAME,IDT_FILE_NAME,7,7,204,9 COMBOBOX IDC_COMBO_HD_BUS,33,71,58,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_BUS,IDT_1721,7,73,24,8 + LTEXT STR_BUS,IDT_BUS,7,73,24,8 COMBOBOX IDC_COMBO_HD_CHANNEL,134,71,77,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_CHANNEL,IDT_1722,99,73,34,8 + LTEXT STR_CHANNEL,IDT_CHANNEL,99,73,34,8 COMBOBOX IDC_COMBO_HD_ID,134,71,77,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_ID,IDT_1723,99,73,34,8 + LTEXT STR_ID,IDT_ID,99,73,34,8 COMBOBOX IDC_COMBO_HD_CHANNEL_IDE,134,71,77,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_IMG_FORMAT,IDT_1774,7,92,50,12 + LTEXT STR_IMG_FORMAT,IDT_IMG_FORMAT,7,92,50,12 COMBOBOX IDC_COMBO_HD_IMG_FORMAT,58,90,153,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_BLOCK_SIZE,IDT_1775,7,111,50,12 + LTEXT STR_BLOCK_SIZE,IDT_BLOCK_SIZE,7,111,50,12 COMBOBOX IDC_COMBO_HD_BLOCK_SIZE,58,109,153,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_PROGRESS,IDT_1752,7,7,204,9 + LTEXT STR_PROGRESS,IDT_PROGRESS,7,7,204,9 CONTROL "IMGCreateProgress",IDC_PBAR_IMG_CREATE,"msctls_progress32",PBS_SMOOTH | WS_BORDER,7,16,204,12 END @@ -392,10 +392,10 @@ BEGIN CONTROL "List1",IDC_LIST_FLOPPY_DRIVES,"SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,18,253,60 - LTEXT STR_FLOPPY_DRIVES,IDT_1737,7,7,253,8 + LTEXT STR_FLOPPY_DRIVES,IDT_FLOPPY_DRIVES,7,7,253,8 COMBOBOX IDC_COMBO_FD_TYPE,33,85,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_TYPE,IDT_1738,7,87,24,8 + LTEXT STR_TYPE,IDT_FDD_TYPE,7,87,24,8 CONTROL STR_TURBO,IDC_CHECKTURBO,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,131,86,64,10 CONTROL STR_CHECKBPB,IDC_CHECKBPB,"Button", @@ -404,19 +404,19 @@ BEGIN CONTROL "List1",IDC_LIST_CDROM_DRIVES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,117,253,60 - LTEXT STR_CDROM_DRIVES,IDT_1739,7,107,253,8 + LTEXT STR_CDROM_DRIVES,IDT_CD_DRIVES,7,107,253,8 COMBOBOX IDC_COMBO_CD_BUS,33,185,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_BUS,IDT_1740,7,187,24,8 + LTEXT STR_BUS,IDT_CD_BUS,7,187,24,8 COMBOBOX IDC_COMBO_CD_ID,170,185,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_ID,IDT_1741,131,187,38,8 + LTEXT STR_ID,IDT_CD_ID,131,187,38,8 COMBOBOX IDC_COMBO_CD_CHANNEL_IDE,170,185,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_CHANNEL,IDT_1742,131,187,38,8 + LTEXT STR_CHANNEL,IDT_CD_CHANNEL,131,187,38,8 COMBOBOX IDC_COMBO_CD_SPEED,33,205,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_SPEED,IDT_1758,7,207,24,8 + LTEXT STR_CD_SPEED,IDT_CD_SPEED,7,207,24,8 END DLG_CFG_OTHER_REMOVABLE_DEVICES DIALOG DISCARDABLE 107, 0, 267, 222 @@ -427,33 +427,33 @@ BEGIN CONTROL "List1",IDC_LIST_MO_DRIVES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,17,253,60 - LTEXT STR_MO_DRIVES,IDT_1769,7,7,253,8 + LTEXT STR_MO_DRIVES,IDT_MO_DRIVES,7,7,253,8 COMBOBOX IDC_COMBO_MO_BUS,33,85,80,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_BUS,IDT_1770,7,87,24,8 + LTEXT STR_BUS,IDT_MO_BUS,7,87,24,8 COMBOBOX IDC_COMBO_MO_ID,170,85,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_ID,IDT_1771,131,87,38,8 + LTEXT STR_ID,IDT_MO_ID,131,87,38,8 COMBOBOX IDC_COMBO_MO_CHANNEL_IDE,170,85,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_CHANNEL,IDT_1772,131,87,38,8 + LTEXT STR_CHANNEL,IDT_MO_CHANNEL,131,87,38,8 COMBOBOX IDC_COMBO_MO_TYPE,33,105,120,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_TYPE,IDT_1773,7,107,24,8 + LTEXT STR_TYPE,IDT_MO_TYPE,7,107,24,8 CONTROL "List1",IDC_LIST_ZIP_DRIVES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,137,253,60 - LTEXT STR_ZIP_DRIVES,IDT_1759,7,127,253,8 + LTEXT STR_ZIP_DRIVES,IDT_ZIP_DRIVES,7,127,253,8 COMBOBOX IDC_COMBO_ZIP_BUS,33,205,80,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_BUS,IDT_1753,7,207,24,8 + LTEXT STR_BUS,IDT_ZIP_BUS,7,207,24,8 COMBOBOX IDC_COMBO_ZIP_ID,149,205,61,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_ID,IDT_1754,120,207,28,8 + LTEXT STR_ID,IDT_ZIP_ID,120,207,28,8 COMBOBOX IDC_COMBO_ZIP_CHANNEL_IDE,149,205,61,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_CHANNEL,IDT_1755,120,207,28,8 + LTEXT STR_CHANNEL,IDT_ZIP_CHANNEL,120,207,28,8 CONTROL STR_250,IDC_CHECK250,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,218,205,44,10 END @@ -462,25 +462,25 @@ DLG_CFG_PERIPHERALS DIALOG DISCARDABLE 107, 0, 267, 154 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN - LTEXT STR_ISARTC,IDT_1767,7,9,48,10 + LTEXT STR_ISARTC,IDT_ISARTC,7,9,48,10 COMBOBOX IDC_COMBO_ISARTC,64,7,155,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISARTC,222,7,38,12 GROUPBOX STR_ISAMEM,IDC_GROUP_ISAMEM,7,28,253,93 - LTEXT STR_ISAMEM_1,IDT_1763,16,45,48,10 + LTEXT STR_ISAMEM_1,IDT_ISAMEM_1,16,45,48,10 COMBOBOX IDC_COMBO_ISAMEM_1,73,43,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_1,213,43,38,12 - LTEXT STR_ISAMEM_2,IDT_1764,16,64,48,10 + LTEXT STR_ISAMEM_2,IDT_ISAMEM_2,16,64,48,10 COMBOBOX IDC_COMBO_ISAMEM_2,73,62,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_2,213,62,38,12 - LTEXT STR_ISAMEM_3,IDT_1765,16,83,48,10 + LTEXT STR_ISAMEM_3,IDT_ISAMEM_3,16,83,48,10 COMBOBOX IDC_COMBO_ISAMEM_3,73,81,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_3,213,81,38,12 - LTEXT STR_ISAMEM_4,IDT_1766,16,102,48,10 + LTEXT STR_ISAMEM_4,IDT_ISAMEM_4,16,102,48,10 COMBOBOX IDC_COMBO_ISAMEM_4,73,100,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_4,213,100,38,12 @@ -520,7 +520,7 @@ END #undef STR_MACHINE #undef STR_CONFIGURE #undef STR_CPU_TYPE -#undef STR_SPEED +#undef STR_CPU_SPEED #undef STR_FPU #undef STR_WAIT_STATES #undef STR_MB @@ -542,7 +542,7 @@ END #undef STR_JOY4 #undef STR_SOUND -#undef STR_MIDI +#undef STR_MIDI_OUT #undef STR_MIDI_IN #undef STR_MPU401 #undef STR_SSI @@ -603,6 +603,7 @@ END #undef STR_TURBO #undef STR_CHECKBPB #undef STR_CDROM_DRIVES +#undef STR_CD_SPEED #undef STR_MO_DRIVES #undef STR_ZIP_DRIVES diff --git a/src/win/languages/en-GB.rc b/src/win/languages/en-GB.rc index 498939216..381091ca5 100644 --- a/src/win/languages/en-GB.rc +++ b/src/win/languages/en-GB.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Machine:" #define STR_CONFIGURE "Configure" #define STR_CPU_TYPE "CPU type:" -#define STR_SPEED "Speed:" +#define STR_CPU_SPEED "Speed:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Wait states:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Sound card:" -#define STR_MIDI "MIDI Out Device:" +#define STR_MIDI_OUT "MIDI Out Device:" #define STR_MIDI_IN "MIDI In Device:" #define STR_MPU401 "Standalone MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo timings" #define STR_CHECKBPB "Check BPB" #define STR_CDROM_DRIVES "CD-ROM drives:" +#define STR_CD_SPEED "Speed:" #define STR_MO_DRIVES "MO drives:" #define STR_ZIP_DRIVES "ZIP drives:" diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc index ef1b4131d..6013cea7b 100644 --- a/src/win/languages/en-US.rc +++ b/src/win/languages/en-US.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Machine:" #define STR_CONFIGURE "Configure" #define STR_CPU_TYPE "CPU type:" -#define STR_SPEED "Speed:" +#define STR_CPU_SPEED "Speed:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Wait states:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Sound card:" -#define STR_MIDI "MIDI Out Device:" +#define STR_MIDI_OUT "MIDI Out Device:" #define STR_MIDI_IN "MIDI In Device:" #define STR_MPU401 "Standalone MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo timings" #define STR_CHECKBPB "Check BPB" #define STR_CDROM_DRIVES "CD-ROM drives:" +#define STR_CD_SPEED "Speed:" #define STR_MO_DRIVES "MO drives:" #define STR_ZIP_DRIVES "ZIP drives:" diff --git a/src/win/languages/es-ES.rc b/src/win/languages/es-ES.rc index 2056978cb..ff774c894 100644 --- a/src/win/languages/es-ES.rc +++ b/src/win/languages/es-ES.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Máquina:" #define STR_CONFIGURE "Configurar" #define STR_CPU_TYPE "Tipo de CPU:" -#define STR_SPEED "Velocidad:" +#define STR_CPU_SPEED "Velocidad:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Estados en espera:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Mando 4..." #define STR_SOUND "Tarjeta de sonido:" -#define STR_MIDI "Dispositivo MIDI de salida:" +#define STR_MIDI_OUT "Dispositivo MIDI de salida:" #define STR_MIDI_IN "Dispositivo MIDI de entrada:" #define STR_MPU401 "MPU-401 independiente" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "Temporizaciones Turbo" #define STR_CHECKBPB "Chequear BPB" #define STR_CDROM_DRIVES "Unidades de CD-ROM:" +#define STR_CD_SPEED "Velocidad:" #define STR_MO_DRIVES "Unidades MO:" #define STR_ZIP_DRIVES "Unidades ZIP:" diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc index e5a2643f2..b24e297d8 100644 --- a/src/win/languages/fi-FI.rc +++ b/src/win/languages/fi-FI.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Tietokone:" #define STR_CONFIGURE "Määritys" #define STR_CPU_TYPE "Suorittimen tyyppi:" -#define STR_SPEED "Nopeus:" +#define STR_CPU_SPEED "Nopeus:" #define STR_FPU "Apusuoritin:" #define STR_WAIT_STATES "Odotustilat:" #define STR_MB "Mt" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Peliohjain 4..." #define STR_SOUND "Äänikortti:" -#define STR_MIDI "MIDI-ulostulo:" +#define STR_MIDI_OUT "MIDI-ulostulo:" #define STR_MIDI_IN "MIDI-sisääntulo:" #define STR_MPU401 "Erillinen MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo-ajoitukset" #define STR_CHECKBPB "Tarkista BPB" #define STR_CDROM_DRIVES "CD-ROM-asemat:" +#define STR_CD_SPEED "Nopeus:" #define STR_MO_DRIVES "Magneettisoptiset asemat (MO):" #define STR_ZIP_DRIVES "ZIP-asemat:" diff --git a/src/win/languages/fr-FR.rc b/src/win/languages/fr-FR.rc index ca1355f03..e048c5065 100644 --- a/src/win/languages/fr-FR.rc +++ b/src/win/languages/fr-FR.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Machine:" #define STR_CONFIGURE "Configurer" #define STR_CPU_TYPE "Type du processeur:" -#define STR_SPEED "Vitesse:" +#define STR_CPU_SPEED "Vitesse:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "États d'attente:" #define STR_MB "Mo" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Manette 4..." #define STR_SOUND "Carte son:" -#define STR_MIDI "Sortie MIDI:" +#define STR_MIDI_OUT "Sortie MIDI:" #define STR_MIDI_IN "Entrée MIDI:" #define STR_MPU401 "MPU-401 autonome" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo" #define STR_CHECKBPB "Vérifier BPB" #define STR_CDROM_DRIVES "Lecterus CD-ROM:" +#define STR_CD_SPEED "Vitesse:" #define STR_MO_DRIVES "Lecteurs magnéto-optiques:" #define STR_ZIP_DRIVES "Lecteurs ZIP:" diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc index 06b7db4a5..5a212cc91 100644 --- a/src/win/languages/hr-HR.rc +++ b/src/win/languages/hr-HR.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Sistem:" #define STR_CONFIGURE "Namjesti" #define STR_CPU_TYPE "Tip procesora:" -#define STR_SPEED "Brzina:" +#define STR_CPU_SPEED "Brzina:" #define STR_FPU "FPU uređaj:" #define STR_WAIT_STATES "Stanja čekanja:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Palica za igru 4..." #define STR_SOUND "Zvučna kartica:" -#define STR_MIDI "Izlazni uređaj MIDI:" +#define STR_MIDI_OUT "Izlazni uređaj MIDI:" #define STR_MIDI_IN "Ulazni uređaj MIDI:" #define STR_MPU401 "Samostalni MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo vrijemena" #define STR_CHECKBPB "Provjeraj BPB" #define STR_CDROM_DRIVES "CD-ROM pogoni:" +#define STR_CD_SPEED "Brzina:" #define STR_MO_DRIVES "MO pogoni:" #define STR_ZIP_DRIVES "ZIP pogoni:" diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index 5d2561655..6d5907bcc 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -300,7 +300,7 @@ END #define STR_MACHINE "Számítógép:" #define STR_CONFIGURE "Beállítások..." #define STR_CPU_TYPE "Processzor:" -#define STR_SPEED "Seb.:" +#define STR_CPU_SPEED "Seb.:" #define STR_FPU "FPU-egység:" #define STR_WAIT_STATES "Várak. ciklusok:" #define STR_MB "MB" @@ -322,7 +322,7 @@ END #define STR_JOY4 "Játékvez. 4..." #define STR_SOUND "Hangkártya:" -#define STR_MIDI "MIDI-kimenet:" +#define STR_MIDI_OUT "MIDI-kimenet:" #define STR_MIDI_IN "MIDI-bemenet:" #define STR_MPU401 "Különálló MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -383,6 +383,7 @@ END #define STR_TURBO "Turbó időzítés" #define STR_CHECKBPB "BPB ellenőrzés" #define STR_CDROM_DRIVES "CD-ROM meghajtók:" +#define STR_CD_SPEED "Seb.:" #define STR_MO_DRIVES "MO-meghajtók:" #define STR_ZIP_DRIVES "ZIP-meghajtók:" diff --git a/src/win/languages/it-IT.rc b/src/win/languages/it-IT.rc index ce21d6cc1..c941bc585 100644 --- a/src/win/languages/it-IT.rc +++ b/src/win/languages/it-IT.rc @@ -296,7 +296,7 @@ END #define STR_MACHINE "Piastra madre:" #define STR_CONFIGURE "Configura" #define STR_CPU_TYPE "Tipo del CPU:" -#define STR_SPEED "Veloc.:" +#define STR_CPU_SPEED "Veloc.:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Stati di attesa:" #define STR_MB "MB" @@ -318,7 +318,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Scheda audio:" -#define STR_MIDI "Uscita MIDI:" +#define STR_MIDI_OUT "Uscita MIDI:" #define STR_MIDI_IN "Entrata MIDI:" #define STR_MPU401 "MPU-401 autonomo" #define STR_SSI "Innovation SSI-2001" @@ -379,6 +379,7 @@ END #define STR_TURBO "Turbo" #define STR_CHECKBPB "Verifica BPB" #define STR_CDROM_DRIVES "Unità CD-ROM:" +#define STR_CD_SPEED "Veloc.:" #define STR_MO_DRIVES "Unità magneto-ottiche:" #define STR_ZIP_DRIVES "Unità ZIP:" diff --git a/src/win/languages/ja-JP.rc b/src/win/languages/ja-JP.rc index 7c11f5f18..c3e9b2acd 100644 --- a/src/win/languages/ja-JP.rc +++ b/src/win/languages/ja-JP.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "マシン:" #define STR_CONFIGURE "設定" #define STR_CPU_TYPE "CPUタイプ:" -#define STR_SPEED "速度:" +#define STR_CPU_SPEED "速度:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "待機状態:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "ジョイスティック4..." #define STR_SOUND "サウンドカード:" -#define STR_MIDI "MIDI出力デバイス:" +#define STR_MIDI_OUT "MIDI出力デバイス:" #define STR_MIDI_IN "MIDI入力デバイス:" #define STR_MPU401 "独立型MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "高速タイミング" #define STR_CHECKBPB "BPBをチェック" #define STR_CDROM_DRIVES "CD-ROMドライブ:" +#define STR_CD_SPEED "速度:" #define STR_MO_DRIVES "光磁気ドライブ:" #define STR_ZIP_DRIVES "ZIPドライブ:" diff --git a/src/win/languages/ko-KR.rc b/src/win/languages/ko-KR.rc index ddbdf111a..8d494c718 100644 --- a/src/win/languages/ko-KR.rc +++ b/src/win/languages/ko-KR.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "기종:" #define STR_CONFIGURE "설정" #define STR_CPU_TYPE "CPU 종류:" -#define STR_SPEED "속도:" +#define STR_CPU_SPEED "속도:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "대기 상태:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "조이스틱 4..." #define STR_SOUND "사운드 카드:" -#define STR_MIDI "MIDI 출력 장치:" +#define STR_MIDI_OUT "MIDI 출력 장치:" #define STR_MIDI_IN "MIDI 입력 장치:" #define STR_MPU401 "MPU-401 단독 사용" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "고속 동작" #define STR_CHECKBPB "BPB 확인" #define STR_CDROM_DRIVES "CD-ROM 드라이브:" +#define STR_CD_SPEED "속도:" #define STR_MO_DRIVES "광자기 드라이브:" #define STR_ZIP_DRIVES "ZIP 드라이브:" diff --git a/src/win/languages/pl-PL.rc b/src/win/languages/pl-PL.rc index 2c4a74e7c..52d730882 100644 --- a/src/win/languages/pl-PL.rc +++ b/src/win/languages/pl-PL.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Maszyna:" #define STR_CONFIGURE "Konfiguruj" #define STR_CPU_TYPE "Rodzaj procesora:" -#define STR_SPEED "Szybkość:" +#define STR_CPU_SPEED "Szybkość:" #define STR_FPU "Jednostka FPU:" #define STR_WAIT_STATES "Stany oczekiwania:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Karta dźwiękowa:" -#define STR_MIDI "Urządzenie wyjściowe MIDI:" +#define STR_MIDI_OUT "Urządzenie wyjściowe MIDI:" #define STR_MIDI_IN "Urządzenie wejściowe MIDI:" #define STR_MPU401 "Samodzielne urządzenie MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -372,6 +372,7 @@ END #define STR_TURBO "Rozrządy Turbo" #define STR_CHECKBPB "Sprawdzaj BPB" #define STR_CDROM_DRIVES "Napędy CD-ROM:" +#define STR_CD_SPEED "Szybkość:" #define STR_MO_DRIVES "Napędy MO:" #define STR_ZIP_DRIVES "Napędy ZIP:" diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index 695c27d6a..72cab4239 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -298,7 +298,7 @@ END #define STR_MACHINE "Máquina:" #define STR_CONFIGURE "Configurar" #define STR_CPU_TYPE "Tipo de CPU:" -#define STR_SPEED "Veloc.:" +#define STR_CPU_SPEED "Veloc.:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Estados de espera:" #define STR_MB "MB" @@ -320,7 +320,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Placa de som:" -#define STR_MIDI "Disp. saída MIDI:" +#define STR_MIDI_OUT "Disp. saída MIDI:" #define STR_MIDI_IN "Disp. entrada MIDI:" #define STR_MPU401 "MPU-401 autônomo" #define STR_SSI "Innovation SSI-2001" @@ -381,6 +381,7 @@ END #define STR_TURBO "Turbo" #define STR_CHECKBPB "Verificar BPB" #define STR_CDROM_DRIVES "Unidades de CD-ROM:" +#define STR_CD_SPEED "Veloc.:" #define STR_MO_DRIVES "Unidades magneto-ópticas:" #define STR_ZIP_DRIVES "Unidades ZIP:" diff --git a/src/win/languages/pt-PT.rc b/src/win/languages/pt-PT.rc index 09aa38389..2d8103147 100644 --- a/src/win/languages/pt-PT.rc +++ b/src/win/languages/pt-PT.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Máquina:" #define STR_CONFIGURE "Configurar" #define STR_CPU_TYPE "Tipo do CPU:" -#define STR_SPEED "Velocidade:" +#define STR_CPU_SPEED "Velocidade:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Estados de espera:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Placa de som:" -#define STR_MIDI "Disp. saída MIDI:" +#define STR_MIDI_OUT "Disp. saída MIDI:" #define STR_MIDI_IN "Disp. entrada MIDI:" #define STR_MPU401 "MPU-401 autónomo" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "Velocidade turbo" #define STR_CHECKBPB "Verificar BPB" #define STR_CDROM_DRIVES "Unidades CD-ROM:" +#define STR_CD_SPEED "Velocidade:" #define STR_MO_DRIVES "Unidades magneto-ópticas:" #define STR_ZIP_DRIVES "Unidades ZIP:" diff --git a/src/win/languages/ru-RU.rc b/src/win/languages/ru-RU.rc index 86eb4c812..0fd617d74 100644 --- a/src/win/languages/ru-RU.rc +++ b/src/win/languages/ru-RU.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Системная плата:" #define STR_CONFIGURE "Настройка" #define STR_CPU_TYPE "Тип ЦП:" -#define STR_SPEED "Скорость:" +#define STR_CPU_SPEED "Скорость:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Циклы ожидания:" #define STR_MB "МБ" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Джойстик 4..." #define STR_SOUND "Звуковая карта:" -#define STR_MIDI "MIDI Out устр-во:" +#define STR_MIDI_OUT "MIDI Out устр-во:" #define STR_MIDI_IN "MIDI In устр-во:" #define STR_MPU401 "Отдельный MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "Турбо тайминги" #define STR_CHECKBPB "Проверять BPB" #define STR_CDROM_DRIVES "Дисководы CD-ROM:" +#define STR_CD_SPEED "Скорость:" #define STR_MO_DRIVES "Магнитооптические дисководы:" #define STR_ZIP_DRIVES "ZIP дисководы:" diff --git a/src/win/languages/sl-SI.rc b/src/win/languages/sl-SI.rc index 8bf14c5b4..1b4f1c3fa 100644 --- a/src/win/languages/sl-SI.rc +++ b/src/win/languages/sl-SI.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Sistem:" #define STR_CONFIGURE "Nastavi" #define STR_CPU_TYPE "Vrsta procesorja:" -#define STR_SPEED "Hitrost:" +#define STR_CPU_SPEED "Hitrost:" #define STR_FPU "Procesor plavajoče vejice:" #define STR_WAIT_STATES "Čakalna stanja:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Igralna palica 4..." #define STR_SOUND "Zvočna kartica:" -#define STR_MIDI "Izhodna naprava MIDI:" +#define STR_MIDI_OUT "Izhodna naprava MIDI:" #define STR_MIDI_IN "Vhodna naprava MIDI:" #define STR_MPU401 "Samostojen MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo časovniki" #define STR_CHECKBPB "Preverjaj BPB" #define STR_CDROM_DRIVES "Pogoni CD-ROM:" +#define STR_CD_SPEED "Hitrost:" #define STR_MO_DRIVES "Magnetno-optični pogoni:" #define STR_ZIP_DRIVES "Pogoni ZIP:" diff --git a/src/win/languages/tr-TR.rc b/src/win/languages/tr-TR.rc index 9a4b2894b..617f0a45a 100644 --- a/src/win/languages/tr-TR.rc +++ b/src/win/languages/tr-TR.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Makine:" #define STR_CONFIGURE "Ayarla" #define STR_CPU_TYPE "CPU türü:" -#define STR_SPEED "Hız:" +#define STR_CPU_SPEED "Hız:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Bekleme süreleri:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Oyun kolu 4..." #define STR_SOUND "Ses kartı:" -#define STR_MIDI "MIDI Çıkış Cihazı:" +#define STR_MIDI_OUT "MIDI Çıkış Cihazı:" #define STR_MIDI_IN "MIDI Giriş Cihazı:" #define STR_MPU401 "Bağımsız MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo zamanlamaları" #define STR_CHECKBPB "BPB'yi denetle" #define STR_CDROM_DRIVES "CD-ROM sürücüleri:" +#define STR_CD_SPEED "Hız:" #define STR_MO_DRIVES "MO sürücüleri:" #define STR_ZIP_DRIVES "ZIP sürücüleri:" diff --git a/src/win/languages/zh-CN.rc b/src/win/languages/zh-CN.rc index 2c54dfdf9..668b1a061 100644 --- a/src/win/languages/zh-CN.rc +++ b/src/win/languages/zh-CN.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "机型:" #define STR_CONFIGURE "配置" #define STR_CPU_TYPE "CPU 类型:" -#define STR_SPEED "速度:" +#define STR_CPU_SPEED "速度:" #define STR_FPU "浮点处理器 (FPU):" #define STR_WAIT_STATES "等待状态 (WS):" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "操纵杆 4..." #define STR_SOUND "声卡:" -#define STR_MIDI "MIDI 输出设备:" +#define STR_MIDI_OUT "MIDI 输出设备:" #define STR_MIDI_IN "MIDI 输入设备:" #define STR_MPU401 "独立 MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "加速时序" #define STR_CHECKBPB "检查 BPB" #define STR_CDROM_DRIVES "光盘驱动器:" +#define STR_CD_SPEED "速度:" #define STR_MO_DRIVES "磁光盘驱动器:" #define STR_ZIP_DRIVES "ZIP 驱动器:" diff --git a/src/win/win_settings.c b/src/win/win_settings.c index 9f72b4f9d..c377f3069 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -2011,7 +2011,7 @@ recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id) { int i = 0, bus = 0; - for (i = IDT_1722; i <= IDT_1723; i++) + for (i = IDT_CHANNEL; i <= IDT_ID; i++) settings_show_window(hdlg, i, FALSE); settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL, FALSE); settings_show_window(hdlg, IDC_COMBO_HD_ID, FALSE); @@ -2022,7 +2022,7 @@ recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id) switch(bus) { case HDD_BUS_MFM: /* MFM */ - settings_show_window(hdlg, IDT_1722, TRUE); + settings_show_window(hdlg, IDT_CHANNEL, TRUE); settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL, TRUE); if (assign_id) @@ -2030,7 +2030,7 @@ recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id) settings_set_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL, is_add_dlg ? new_hdd.mfm_channel : temp_hdd[lv1_current_sel].mfm_channel); break; case HDD_BUS_XTA: /* XTA */ - settings_show_window(hdlg, IDT_1722, TRUE); + settings_show_window(hdlg, IDT_CHANNEL, TRUE); settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL, TRUE); if (assign_id) @@ -2038,7 +2038,7 @@ recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id) settings_set_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL, is_add_dlg ? new_hdd.xta_channel : temp_hdd[lv1_current_sel].xta_channel); break; case HDD_BUS_ESDI: /* ESDI */ - settings_show_window(hdlg, IDT_1722, TRUE); + settings_show_window(hdlg, IDT_CHANNEL, TRUE); settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL, TRUE); if (assign_id) @@ -2047,7 +2047,7 @@ recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id) break; case HDD_BUS_IDE: /* IDE */ case HDD_BUS_ATAPI: /* ATAPI */ - settings_show_window(hdlg, IDT_1722, TRUE); + settings_show_window(hdlg, IDT_CHANNEL, TRUE); settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL_IDE, TRUE); if (assign_id) @@ -2055,8 +2055,8 @@ recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id) settings_set_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL_IDE, is_add_dlg ? new_hdd.ide_channel : temp_hdd[lv1_current_sel].ide_channel); break; case HDD_BUS_SCSI: /* SCSI */ - settings_show_window(hdlg, IDT_1723, TRUE); - settings_show_window(hdlg, IDT_1724, TRUE); + settings_show_window(hdlg, IDT_ID, TRUE); + settings_show_window(hdlg, IDT_LUN, TRUE); settings_show_window(hdlg, IDC_COMBO_HD_ID, TRUE); if (assign_id) @@ -2065,7 +2065,7 @@ recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id) } } - settings_show_window(hdlg, IDT_1721, (hd_listview_items != 0) || is_add_dlg); + settings_show_window(hdlg, IDT_BUS, (hd_listview_items != 0) || is_add_dlg); settings_show_window(hdlg, IDC_COMBO_HD_BUS, (hd_listview_items != 0) || is_add_dlg); } @@ -2528,11 +2528,11 @@ static MVHDGeom create_drive_vhd_fixed(char* filename, int cyl, int heads, int s adjust_86box_geometry_for_vhd(&_86box_geometry, &vhd_geometry); HWND h = GetDlgItem(vhd_progress_hdlg, IDC_PBAR_IMG_CREATE); - settings_show_window(vhd_progress_hdlg, IDT_1731, FALSE); + settings_show_window(vhd_progress_hdlg, IDT_FILE_NAME, FALSE); settings_show_window(vhd_progress_hdlg, IDC_EDIT_HD_FILE_NAME, FALSE); settings_show_window(vhd_progress_hdlg, IDC_CFILE, FALSE); settings_show_window(vhd_progress_hdlg, IDC_PBAR_IMG_CREATE, TRUE); - settings_enable_window(vhd_progress_hdlg, IDT_1752, TRUE); + settings_enable_window(vhd_progress_hdlg, IDT_PROGRESS, TRUE); SendMessage(h, PBM_SETRANGE32, (WPARAM) 0, (LPARAM) vhd_geometry.cyl * vhd_geometry.heads * vhd_geometry.spt); SendMessage(h, PBM_SETPOS, (WPARAM) 0, (LPARAM) 0); @@ -2663,7 +2663,7 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM settings_set_cur_sel(hdlg, IDC_COMBO_HD_BLOCK_SIZE, 0); settings_show_window(hdlg, IDC_COMBO_HD_BLOCK_SIZE, FALSE); - settings_show_window(hdlg, IDT_1775, FALSE); + settings_show_window(hdlg, IDT_BLOCK_SIZE, FALSE); if (existing & 1) { settings_enable_window(hdlg, IDC_EDIT_HD_SPT, FALSE); @@ -2672,7 +2672,7 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM settings_enable_window(hdlg, IDC_EDIT_HD_SIZE, FALSE); settings_enable_window(hdlg, IDC_COMBO_HD_TYPE, FALSE); settings_show_window(hdlg, IDC_COMBO_HD_IMG_FORMAT, FALSE); - settings_show_window(hdlg, IDT_1774, FALSE); + settings_show_window(hdlg, IDT_IMG_FORMAT, FALSE); /* adjust window size */ GetWindowRect(hdlg, &rect); @@ -2717,7 +2717,7 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM new_hdd.scsi_id = id; settings_enable_window(hdlg, IDC_EDIT_HD_FILE_NAME, FALSE); - settings_show_window(hdlg, IDT_1752, FALSE); + settings_show_window(hdlg, IDT_PROGRESS, FALSE); settings_show_window(hdlg, IDC_PBAR_IMG_CREATE, FALSE); no_update = 0; @@ -2845,11 +2845,11 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM size &= 0xfffff; if (size || r) { - settings_show_window(hdlg, IDT_1731, FALSE); + settings_show_window(hdlg, IDT_FILE_NAME, FALSE); settings_show_window(hdlg, IDC_EDIT_HD_FILE_NAME, FALSE); settings_show_window(hdlg, IDC_CFILE, FALSE); settings_show_window(hdlg, IDC_PBAR_IMG_CREATE, TRUE); - settings_enable_window(hdlg, IDT_1752, TRUE); + settings_enable_window(hdlg, IDT_PROGRESS, TRUE); h = GetDlgItem(hdlg, IDC_PBAR_IMG_CREATE); SendMessage(h, PBM_SETRANGE32, (WPARAM) 0, (LPARAM) r); @@ -3309,10 +3309,10 @@ hdd_add_file_open_error: if (img_format == 4 || img_format == 5) { /* For dynamic and diff VHDs, show the block size dropdown. */ settings_show_window(hdlg, IDC_COMBO_HD_BLOCK_SIZE, TRUE); - settings_show_window(hdlg, IDT_1775, TRUE); + settings_show_window(hdlg, IDT_BLOCK_SIZE, TRUE); } else { /* Hide it otherwise. */ settings_show_window(hdlg, IDC_COMBO_HD_BLOCK_SIZE, FALSE); - settings_show_window(hdlg, IDT_1775, FALSE); + settings_show_window(hdlg, IDT_BLOCK_SIZE, FALSE); } break; } @@ -4226,19 +4226,19 @@ cdrom_recalc_location_controls(HWND hdlg, int assign_id) int i = 0; int bus = temp_cdrom[lv2_current_sel].bus_type; - for (i = IDT_1741; i < (IDT_1742 + 1); i++) + for (i = IDT_CD_ID; i <= (IDT_CD_LUN); i++) settings_show_window(hdlg, i, FALSE); settings_show_window(hdlg, IDC_COMBO_CD_ID, FALSE); settings_show_window(hdlg, IDC_COMBO_CD_CHANNEL_IDE, FALSE); settings_show_window(hdlg, IDC_COMBO_CD_SPEED, bus != CDROM_BUS_DISABLED); - settings_show_window(hdlg, IDT_1758, bus != CDROM_BUS_DISABLED); + settings_show_window(hdlg, IDT_CD_SPEED, bus != CDROM_BUS_DISABLED); if (bus != CDROM_BUS_DISABLED) settings_set_cur_sel(hdlg, IDC_COMBO_CD_SPEED, temp_cdrom[lv2_current_sel].speed - 1); switch(bus) { case CDROM_BUS_ATAPI: /* ATAPI */ - settings_show_window(hdlg, IDT_1742, TRUE); + settings_show_window(hdlg, IDT_CD_LUN, TRUE); settings_show_window(hdlg, IDC_COMBO_CD_CHANNEL_IDE, TRUE); if (assign_id) @@ -4247,7 +4247,7 @@ cdrom_recalc_location_controls(HWND hdlg, int assign_id) settings_set_cur_sel(hdlg, IDC_COMBO_CD_CHANNEL_IDE, temp_cdrom[lv2_current_sel].ide_channel); break; case CDROM_BUS_SCSI: /* SCSI */ - settings_show_window(hdlg, IDT_1741, TRUE); + settings_show_window(hdlg, IDT_CD_ID, TRUE); settings_show_window(hdlg, IDC_COMBO_CD_ID, TRUE); if (assign_id) @@ -4307,19 +4307,19 @@ mo_recalc_location_controls(HWND hdlg, int assign_id) int i = 0; int bus = temp_mo_drives[lv1_current_sel].bus_type; - for (i = IDT_1771; i < (IDT_1772 + 1); i++) + for (i = IDT_MO_ID; i <= (IDT_MO_CHANNEL); i++) settings_show_window(hdlg, i, FALSE); settings_show_window(hdlg, IDC_COMBO_MO_ID, FALSE); settings_show_window(hdlg, IDC_COMBO_MO_CHANNEL_IDE, FALSE); settings_show_window(hdlg, IDC_COMBO_MO_TYPE, bus != MO_BUS_DISABLED); - settings_show_window(hdlg, IDT_1773, bus != MO_BUS_DISABLED); + settings_show_window(hdlg, IDT_MO_TYPE, bus != MO_BUS_DISABLED); if (bus != MO_BUS_DISABLED) settings_set_cur_sel(hdlg, IDC_COMBO_MO_TYPE, temp_mo_drives[lv1_current_sel].type); switch(bus) { case MO_BUS_ATAPI: /* ATAPI */ - settings_show_window(hdlg, IDT_1772, TRUE); + settings_show_window(hdlg, IDT_MO_CHANNEL, TRUE); settings_show_window(hdlg, IDC_COMBO_MO_CHANNEL_IDE, TRUE); if (assign_id) @@ -4328,7 +4328,7 @@ mo_recalc_location_controls(HWND hdlg, int assign_id) settings_set_cur_sel(hdlg, IDC_COMBO_MO_CHANNEL_IDE, temp_mo_drives[lv1_current_sel].ide_channel); break; case MO_BUS_SCSI: /* SCSI */ - settings_show_window(hdlg, IDT_1771, TRUE); + settings_show_window(hdlg, IDT_MO_ID, TRUE); settings_show_window(hdlg, IDC_COMBO_MO_ID, TRUE); if (assign_id) @@ -4374,7 +4374,7 @@ zip_recalc_location_controls(HWND hdlg, int assign_id) int bus = temp_zip_drives[lv2_current_sel].bus_type; - for (i = IDT_1754; i < (IDT_1755 + 1); i++) + for (i = IDT_ZIP_ID; i <= (IDT_ZIP_LUN); i++) settings_show_window(hdlg, i, FALSE); settings_show_window(hdlg, IDC_COMBO_ZIP_ID, FALSE); settings_show_window(hdlg, IDC_COMBO_ZIP_CHANNEL_IDE, FALSE); @@ -4385,7 +4385,7 @@ zip_recalc_location_controls(HWND hdlg, int assign_id) switch(bus) { case ZIP_BUS_ATAPI: /* ATAPI */ - settings_show_window(hdlg, IDT_1755, TRUE); + settings_show_window(hdlg, IDT_ZIP_LUN, TRUE); settings_show_window(hdlg, IDC_COMBO_ZIP_CHANNEL_IDE, TRUE); if (assign_id) @@ -4394,7 +4394,7 @@ zip_recalc_location_controls(HWND hdlg, int assign_id) settings_set_cur_sel(hdlg, IDC_COMBO_ZIP_CHANNEL_IDE, temp_zip_drives[lv2_current_sel].ide_channel); break; case ZIP_BUS_SCSI: /* SCSI */ - settings_show_window(hdlg, IDT_1754, TRUE); + settings_show_window(hdlg, IDT_ZIP_ID, TRUE); settings_show_window(hdlg, IDC_COMBO_ZIP_ID, TRUE); if (assign_id)