claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up resource IDs

Browse Source
This commit is contained in:
David Hrdlička
2020-11-20 18:42:22 +01:00
parent 3506ad90e0
commit 8aab3da769
4 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/include/86box/language.h
View File

@@ -24,7 +24,7 @@
#define IDS_STRINGS 2048 // "86Box" #define IDS_STRINGS 2048 // "86Box"
#define IDS_2049 2049 // "Error" #define IDS_2049 2049 // "Error"
#define IDS_2050 2050 // "Fatal error" #define IDS_2050 2050 // "Fatal error"
#define IDS_2051 2051 // "Are you sure you want to save..." #define IDS_2051 2051 // "<reserved>"
#define IDS_2052 2052 // "Press CTRL+ALT+PAGE DOWN..." #define IDS_2052 2052 // "Press CTRL+ALT+PAGE DOWN..."
#define IDS_2053 2053 // "Speed" #define IDS_2053 2053 // "Speed"
#define IDS_2054 2054 // "ZIP %i (%03i): %ls" #define IDS_2054 2054 // "ZIP %i (%03i): %ls"
@@ -94,9 +94,9 @@
#define IDS_2118 2118 // "Internal controller" #define IDS_2118 2118 // "Internal controller"
#define IDS_2119 2119 // "Exit" #define IDS_2119 2119 // "Exit"
#define IDS_2120 2120 // "No ROMs found" #define IDS_2120 2120 // "No ROMs found"
#define IDS_2121 2121 // "Save changes\nThis will hard..." #define IDS_2121 2121 // "Do you want to save the settings?"
#define IDS_2122 2122 // "Discard changes\nAll changes..." #define IDS_2122 2122 // "This will hard reset the virtual..."
#define IDS_2123 2123 // "Do you want to save the settings?" #define IDS_2123 2123 // "Save"
#define IDS_2124 2124 // "About 86Box" #define IDS_2124 2124 // "About 86Box"
#define IDS_2125 2125 // "86Box v" EMU_VERSION #define IDS_2125 2125 // "86Box v" EMU_VERSION
#define IDS_2126 2126 // "An emulator of old computers..." #define IDS_2126 2126 // "An emulator of old computers..."
@@ -109,15 +109,12 @@
#define IDS_2133 2133 // LIB_NAME_FLUIDSYNTH " is required..." #define IDS_2133 2133 // LIB_NAME_FLUIDSYNTH " is required..."
#define IDS_2134 2134 // "Entering fullscreen mode" #define IDS_2134 2134 // "Entering fullscreen mode"
#define IDS_2135 2135 // "Don't show this message again" #define IDS_2135 2135 // "Don't show this message again"
#define IDS_2136 2136 // "Don't Exit" #define IDS_2136 2136 // "Don't exit"
#define IDS_2137 2137 // "Reset" #define IDS_2137 2137 // "Reset"
#define IDS_2138 2138 // "Don't Reset" #define IDS_2138 2138 // "Don't reset"
#define IDS_2139 2139 // "MO images (*.IM?)\0*.IM?..." #define IDS_2139 2139 // "MO images (*.IM?)\0*.IM?..."
#define IDS_2140 2140 // "CD-ROM images (*.ISO;*.CU.." #define IDS_2140 2140 // "CD-ROM images (*.ISO;*.CU.."
#define IDS_2141 2141 // "Save" #define IDS_2141 2141 // "%hs Device Configuration"
#define IDS_2142 2142 // "Don't save"
#define IDS_2143 2143 // "This will hard reset the virtual..."
#define IDS_2144 2144 // "%hs Device Configuration"
#define IDS_4096 4096 // "Hard disk (%s)" #define IDS_4096 4096 // "Hard disk (%s)"
#define IDS_4097 4097 // "%01i:%01i" #define IDS_4097 4097 // "%01i:%01i"
@@ -144,7 +141,7 @@
#define IDS_4118 4118 // "The selected file will be..." #define IDS_4118 4118 // "The selected file will be..."
#define IDS_4119 4119 // "Unsupported disk image" #define IDS_4119 4119 // "Unsupported disk image"
#define IDS_4120 4120 // "Overwrite" #define IDS_4120 4120 // "Overwrite"
#define IDS_4121 4121 // "Don't Overwrite" #define IDS_4121 4121 // "Don't overwrite"
#define IDS_4122 4122 // "Raw image (.img)" #define IDS_4122 4122 // "Raw image (.img)"
#define IDS_4123 4123 // "HDI image (.hdi)" #define IDS_4123 4123 // "HDI image (.hdi)"
#define IDS_4124 4124 // "HDX image (.hdx)" #define IDS_4124 4124 // "HDX image (.hdx)"
@@ -153,10 +150,10 @@
#define IDS_4127 4127 // "Differencing VHD (.vhd)" #define IDS_4127 4127 // "Differencing VHD (.vhd)"
#define IDS_4128 4128 // "Large blocks (2 MB)" #define IDS_4128 4128 // "Large blocks (2 MB)"
#define IDS_4129 4129 // "Small blocks (512 KB)" #define IDS_4129 4129 // "Small blocks (512 KB)"
#define IDS_4130 4130 // "VHD files (*.VHD)\0*.VHD\0All files (*.*)\0*.*\0" #define IDS_4130 4130 // "VHD files (*.VHD)\0*.VHD\0All..."
#define IDS_4131 4131 // "Select the parent VHD" #define IDS_4131 4131 // "Select the parent VHD"
#define IDS_4132 4132 // "WARNING: VHD PARENT/CHILD TIMESTAMPS DO NOT MATCH..." #define IDS_4132 4132 // "This could mean that the parent..."
#define IDS_4133 4133 // "VHD Timestamp Mismatch" #define IDS_4133 4133 // "Parent and child disk timestamps..."
#define IDS_4134 4134 // "Could not fix VHD timestamp." #define IDS_4134 4134 // "Could not fix VHD timestamp."
#define IDS_4352 4352 // "MFM/RLL" #define IDS_4352 4352 // "MFM/RLL"
@@ -225,7 +222,7 @@
#define IDS_LANG_ENUS IDS_7168 #define IDS_LANG_ENUS IDS_7168
#define STR_NUM_2048 97 #define STR_NUM_2048 94
#define STR_NUM_3072 11 #define STR_NUM_3072 11
#define STR_NUM_4096 39 #define STR_NUM_4096 39
#define STR_NUM_4352 6 #define STR_NUM_4352 6

13
src/win/86Box.rc
View File

@@ -920,7 +920,7 @@ BEGIN
2048 "86Box" 2048 "86Box"
IDS_2049 "Error" IDS_2049 "Error"
IDS_2050 "Fatal error" IDS_2050 "Fatal error"
IDS_2051 "Are you sure you want to save the settings?" IDS_2051 "<reserved>"
IDS_2052 "Press CTRL+ALT+PAGE DOWN to return to windowed mode." IDS_2052 "Press CTRL+ALT+PAGE DOWN to return to windowed mode."
IDS_2053 "Speed" IDS_2053 "Speed"
IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2054 "ZIP %03i %i (%s): %ls"
@@ -998,9 +998,9 @@ BEGIN
IDS_2118 "Internal controller" IDS_2118 "Internal controller"
IDS_2119 "Exit" IDS_2119 "Exit"
IDS_2120 "No ROMs found" IDS_2120 "No ROMs found"
IDS_2121 "Save changes\nThis will hard reset the emulated machine." IDS_2121 "Do you want to save the settings?"
IDS_2122 "Discard changes\nAll changes made to the settings will be lost." IDS_2122 "This will hard reset the virtual machine."
IDS_2123 "Do you want to save the settings?" IDS_2123 "Save"
IDS_2124 "About 86Box" IDS_2124 "About 86Box"
IDS_2125 "86Box v" EMU_VERSION IDS_2125 "86Box v" EMU_VERSION
IDS_2126 "An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information." IDS_2126 "An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information."
@@ -1038,10 +1038,7 @@ BEGIN
IDS_2138 "Don't reset" IDS_2138 "Don't reset"
IDS_2139 "MO images (*.IM?;*.MDI)\0*.IM?;*.MDI\0All files (*.*)\0*.*\0" IDS_2139 "MO images (*.IM?;*.MDI)\0*.IM?;*.MDI\0All files (*.*)\0*.*\0"
IDS_2140 "CD-ROM images (*.ISO;*.CUE)\0*.ISO;*.CUE\0All files (*.*)\0*.*\0" IDS_2140 "CD-ROM images (*.ISO;*.CUE)\0*.ISO;*.CUE\0All files (*.*)\0*.*\0"
IDS_2141 "Save" IDS_2141 "%hs Device Configuration"
IDS_2142 "Don't save"
IDS_2143 "This will hard reset the virtual machine."
IDS_2144 "%hs Device Configuration"
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

2
src/win/win_devconf.c
View File

@@ -455,7 +455,7 @@ deviceconfig_inst_open(HWND hwnd, const device_t *device, int inst)
*data++ = 0; /*no menu*/ *data++ = 0; /*no menu*/
*data++ = 0; /*predefined dialog box class*/ *data++ = 0; /*predefined dialog box class*/
data += wsprintf(data, plat_get_string(IDS_2144), device->name) + 1; data += wsprintf(data, plat_get_string(IDS_2141), device->name) + 1;
*data++ = 9; /*Point*/ *data++ = 9; /*Point*/
data += MultiByteToWideChar(CP_ACP, 0, "Segoe UI", -1, data, 120); data += MultiByteToWideChar(CP_ACP, 0, "Segoe UI", -1, data, 120);

2
src/win/win_settings.c
View File

@@ -531,7 +531,7 @@ settings_msgbox_reset()
h = hwndMain; h = hwndMain;
hwndMain = hwndParentDialog; hwndMain = hwndParentDialog;
i = ui_msgbox_ex(MBX_QUESTION_OK | MBX_WARNING, (wchar_t *) IDS_2051, (wchar_t *) IDS_2143, (wchar_t *) IDS_2141, NULL, NULL); i = ui_msgbox_ex(MBX_QUESTION_OK | MBX_WARNING, (wchar_t *) IDS_2121, (wchar_t *) IDS_2122, (wchar_t *) IDS_2123, NULL, NULL);
hwndMain = h; hwndMain = h;