diff --git a/src/config.c b/src/config.c index 0d3b13a29..1267cd91c 100644 --- a/src/config.c +++ b/src/config.c @@ -709,9 +709,9 @@ load_network(void) if (p != NULL) { if ((network_dev_to_id(p) == -1) || (network_ndev == 1)) { if ((network_ndev == 1) && strcmp(network_host, "none")) { - ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2103); + ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2094); } else if (network_dev_to_id(p) == -1) { - ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2104); + ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2095); } strcpy(network_host, "none"); diff --git a/src/include/86box/language.h b/src/include/86box/language.h index 16e5e3080..582aa0b70 100644 --- a/src/include/86box/language.h +++ b/src/include/86box/language.h @@ -53,44 +53,44 @@ #define IDS_2077 2077 // "Click to capture mouse" #define IDS_2078 2078 // "Press F12-F8 to release mouse" #define IDS_2079 2079 // "Press F12-F8 or middle button.." -#define IDS_2081 2081 // "Unable to initialize Flui.." -#define IDS_2082 2082 // "Bus" -#define IDS_2083 2083 // "File" -#define IDS_2084 2084 // "C" -#define IDS_2085 2085 // "H" -#define IDS_2086 2086 // "S" -#define IDS_2087 2087 // "MB" -#define IDS_2088 2088 // "Check BPB" -#define IDS_2094 2094 // "KB" -#define IDS_2095 2095 // "Neither DirectDraw nor Dire.." -#define IDS_2099 2099 // "Default" -#define IDS_2100 2100 // "%i Wait state(s)" -#define IDS_2101 2101 // "Type" -#define IDS_2102 2102 // "PCap failed to set up.." -#define IDS_2103 2103 // "No PCap devices found" -#define IDS_2104 2104 // "Invalid PCap device" -#define IDS_2105 2105 // "Standard 2-button joystick(s)" -#define IDS_2106 2106 // "Standard 4-button joystick" -#define IDS_2107 2107 // "Standard 6-button joystick" -#define IDS_2108 2108 // "Standard 8-button joystick" -#define IDS_2109 2109 // "CH Flightstick Pro" -#define IDS_2110 2110 // "Microsoft SideWinder Pad" -#define IDS_2111 2111 // "Thrustmaster Flight Cont.." -#define IDS_2112 2112 // "None" -#define IDS_2113 2113 // "Unable to load Accelerators" -#define IDS_2114 2114 // "Unable to register Raw Input" -#define IDS_2115 2115 // "%u" -#define IDS_2116 2116 // "%u MB (CHS: %i, %i, %i)" -#define IDS_2117 2117 // "Floppy %i (%s): %ls" -#define IDS_2118 2118 // "All floppy images (*.0??;*.." -#define IDS_2119 2119 // "Unable to initialize Free.." -#define IDS_2120 2120 // "Unable to initialize SDL..." -#define IDS_2121 2121 // "Are you sure you want to..." -#define IDS_2122 2122 // "Are you sure you want to..." -#define IDS_2123 2123 // "Unable to initialize Ghostscript..." -#define IDS_2124 2124 // "MO %i (%03i): %ls" -#define IDS_2125 2125 // "MO images (*.IM?)\0*.IM..." -#define IDS_2126 2126 // "Welcome to 86Box!" +#define IDS_2080 2080 // "Unable to initialize Flui.." +#define IDS_2081 2081 // "Bus" +#define IDS_2082 2082 // "File" +#define IDS_2083 2083 // "C" +#define IDS_2084 2084 // "H" +#define IDS_2085 2085 // "S" +#define IDS_2086 2086 // "MB" +#define IDS_2087 2087 // "Check BPB" +#define IDS_2088 2088 // "KB" +#define IDS_2089 2089 // "Neither DirectDraw nor Dire.." +#define IDS_2090 2090 // "Default" +#define IDS_2091 2091 // "%i Wait state(s)" +#define IDS_2092 2092 // "Type" +#define IDS_2093 2093 // "PCap failed to set up.." +#define IDS_2094 2094 // "No PCap devices found" +#define IDS_2095 2095 // "Invalid PCap device" +#define IDS_2096 2096 // "Standard 2-button joystick(s)" +#define IDS_2097 2097 // "Standard 4-button joystick" +#define IDS_2098 2098 // "Standard 6-button joystick" +#define IDS_2099 2099 // "Standard 8-button joystick" +#define IDS_2100 2100 // "CH Flightstick Pro" +#define IDS_2101 2101 // "Microsoft SideWinder Pad" +#define IDS_2102 2102 // "Thrustmaster Flight Cont.." +#define IDS_2103 2103 // "None" +#define IDS_2104 2104 // "Unable to load Accelerators" +#define IDS_2105 2105 // "Unable to register Raw Input" +#define IDS_2106 2106 // "%u" +#define IDS_2107 2107 // "%u MB (CHS: %i, %i, %i)" +#define IDS_2108 2108 // "Floppy %i (%s): %ls" +#define IDS_2109 2109 // "All floppy images (*.0??;*.." +#define IDS_2110 2110 // "Unable to initialize Free.." +#define IDS_2111 2111 // "Unable to initialize SDL..." +#define IDS_2112 2112 // "Are you sure you want to..." +#define IDS_2113 2113 // "Are you sure you want to..." +#define IDS_2114 2114 // "Unable to initialize Ghostscript..." +#define IDS_2115 2115 // "MO %i (%03i): %ls" +#define IDS_2116 2116 // "MO images (*.IM?)\0*.IM..." +#define IDS_2117 2117 // "Welcome to 86Box!" #define IDS_4096 4096 // "Hard disk (%s)" #define IDS_4097 4097 // "%01i:%01i" diff --git a/src/network/network.c b/src/network/network.c index 4273cf6fb..eaf317f89 100644 --- a/src/network/network.c +++ b/src/network/network.c @@ -328,7 +328,7 @@ network_reset(void) if (i < 0) { /* Tell user we can't do this (at the moment.) */ - ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2102); + ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2093); // FIXME: we should ask in the dialog if they want to // reconfigure or quit, and throw them into the diff --git a/src/printer/prt_escp.c b/src/printer/prt_escp.c index 93a628f5b..9cfc2a762 100644 --- a/src/printer/prt_escp.c +++ b/src/printer/prt_escp.c @@ -2036,7 +2036,7 @@ escp_init(void *lpt) if (ft_handle == NULL) { ft_handle = dynld_module(fn, ft_imports); if (ft_handle == NULL) { - ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2119); + ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2110); return(NULL); } } @@ -2044,7 +2044,7 @@ escp_init(void *lpt) /* Initialize FreeType. */ if (ft_lib == NULL) { if (ft_Init_FreeType(&ft_lib)) { - ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2119); + ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2110); dynld_close(ft_lib); ft_lib = NULL; return(NULL); diff --git a/src/printer/prt_ps.c b/src/printer/prt_ps.c index 8057213eb..b822ff17a 100644 --- a/src/printer/prt_ps.c +++ b/src/printer/prt_ps.c @@ -352,7 +352,7 @@ ps_init(void *lpt) /* Try loading the DLL. */ ghostscript_handle = dynld_module(PATH_GHOSTSCRIPT_DLL, ghostscript_imports); if (ghostscript_handle == NULL) { - ui_msgbox(MBX_ERROR, (wchar_t *) IDS_2123); + ui_msgbox(MBX_ERROR, (wchar_t *) IDS_2114); } else { if (gsapi_revision(&rev, sizeof(rev)) == 0) { pclog("Loaded %s, rev %ld (%ld)\n", rev.product, rev.revision, rev.revisiondate); diff --git a/src/sound/midi_fluidsynth.c b/src/sound/midi_fluidsynth.c index bc18027e6..11c4a8b57 100644 --- a/src/sound/midi_fluidsynth.c +++ b/src/sound/midi_fluidsynth.c @@ -230,7 +230,7 @@ void* fluidsynth_init(const device_t *info) #endif if (fluidsynth_handle == NULL) { - ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2081); + ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2080); return NULL; } diff --git a/src/win/86Box.rc b/src/win/86Box.rc index fdff75044..068f8d6ed 100644 --- a/src/win/86Box.rc +++ b/src/win/86Box.rc @@ -926,44 +926,44 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_2081 "Unable to initialize FluidSynth, libfluidsynth.dll is required" - IDS_2082 "Bus" - IDS_2083 "File" - IDS_2084 "C" - IDS_2085 "H" - IDS_2086 "S" - IDS_2087 "MB" - IDS_2088 "Check BPB" - IDS_2094 "KB" - IDS_2095 "86Box could not initialize the video renderer." - IDS_2099 "Default" - IDS_2100 "%i Wait state(s)" - IDS_2101 "Type" - IDS_2102 "PCap failed to set up because it may not be initialized" - IDS_2103 "No PCap devices found" - IDS_2104 "Invalid PCap device" - IDS_2105 "Standard 2-button joystick(s)" - IDS_2106 "Standard 4-button joystick" - IDS_2107 "Standard 6-button joystick" - IDS_2108 "Standard 8-button joystick" - IDS_2109 "CH Flightstick Pro" - IDS_2110 "Microsoft SideWinder Pad" - IDS_2111 "Thrustmaster Flight Control System" - IDS_2112 "None" - IDS_2113 "Unable to load Keyboard Accelerators!" - IDS_2114 "Unable to register Raw Input!" - IDS_2115 "%u" - IDS_2116 "%u MB (CHS: %i, %i, %i)" - IDS_2117 "Floppy %i (%s): %ls" - IDS_2118 "All images (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Advanced sector images (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Basic sector images (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Flux images (*.FDI)\0*.FDI\0Surface images (*.86F;*.MFM)\0*.86F;*.MFM\0All files (*.*)\0*.*\0" - IDS_2119 "Unable to initialize FreeType, freetype.dll is required" - IDS_2120 "Unable to initialize SDL, SDL2.dll is required" - IDS_2121 "Are you sure you want to hard reset the emulated machine?" - IDS_2122 "Are you sure you want to quit 86Box?" - IDS_2123 "Unable to initialize Ghostscript, gsdll32.dll is required for automatic convertion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript files (.ps)." - IDS_2124 "MO %i (%03i): %ls" - IDS_2125 "MO images (*.IM?)\0*.IM?\0All files (*.*)\0*.*\0" - IDS_2126 "Welcome to 86Box!" + IDS_2080 "Unable to initialize FluidSynth, libfluidsynth.dll is required" + IDS_2081 "Bus" + IDS_2082 "File" + IDS_2083 "C" + IDS_2084 "H" + IDS_2085 "S" + IDS_2086 "MB" + IDS_2087 "Check BPB" + IDS_2088 "KB" + IDS_2089 "86Box could not initialize the video renderer." + IDS_2090 "Default" + IDS_2091 "%i Wait state(s)" + IDS_2092 "Type" + IDS_2093 "PCap failed to set up because it may not be initialized" + IDS_2094 "No PCap devices found" + IDS_2095 "Invalid PCap device" + IDS_2096 "Standard 2-button joystick(s)" + IDS_2097 "Standard 4-button joystick" + IDS_2098 "Standard 6-button joystick" + IDS_2099 "Standard 8-button joystick" + IDS_2100 "CH Flightstick Pro" + IDS_2101 "Microsoft SideWinder Pad" + IDS_2102 "Thrustmaster Flight Control System" + IDS_2103 "None" + IDS_2104 "Unable to load Keyboard Accelerators!" + IDS_2105 "Unable to register Raw Input!" + IDS_2106 "%u" + IDS_2107 "%u MB (CHS: %i, %i, %i)" + IDS_2108 "Floppy %i (%s): %ls" + IDS_2109 "All images (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Advanced sector images (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Basic sector images (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Flux images (*.FDI)\0*.FDI\0Surface images (*.86F;*.MFM)\0*.86F;*.MFM\0All files (*.*)\0*.*\0" + IDS_2110 "Unable to initialize FreeType, freetype.dll is required" + IDS_2111 "Unable to initialize SDL, SDL2.dll is required" + IDS_2112 "Are you sure you want to hard reset the emulated machine?" + IDS_2113 "Are you sure you want to quit 86Box?" + IDS_2114 "Unable to initialize Ghostscript, gsdll32.dll is required for automatic convertion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript files (.ps)." + IDS_2115 "MO %i (%03i): %ls" + IDS_2116 "MO images (*.IM?)\0*.IM?\0All files (*.*)\0*.*\0" + IDS_2117 "Welcome to 86Box!" END STRINGTABLE DISCARDABLE diff --git a/src/win/win_media_menu.c b/src/win/win_media_menu.c index 415ff22f3..cdd4b90ac 100644 --- a/src/win/win_media_menu.c +++ b/src/win/win_media_menu.c @@ -75,10 +75,10 @@ media_menu_set_name_floppy(int drive) mbstowcs(temp, fdd_getname(fdd_get_type(drive)), strlen(fdd_getname(fdd_get_type(drive))) + 1); if (wcslen(floppyfns[drive]) == 0) { - _swprintf(name, plat_get_string(IDS_2117), + _swprintf(name, plat_get_string(IDS_2108), drive + 1, temp, plat_get_string(IDS_2057)); } else { - _swprintf(name, plat_get_string(IDS_2117), + _swprintf(name, plat_get_string(IDS_2108), drive + 1, temp, floppyfns[drive]); } @@ -155,10 +155,10 @@ media_menu_set_name_mo(int drive) temp = plat_get_string(id); if (wcslen(mo_drives[drive].image_path) == 0) { - _swprintf(name, plat_get_string(IDS_2124), + _swprintf(name, plat_get_string(IDS_2115), drive+1, temp, plat_get_string(IDS_2057)); } else { - _swprintf(name, plat_get_string(IDS_2124), + _swprintf(name, plat_get_string(IDS_2115), drive+1, temp, mo_drives[drive].image_path); } @@ -419,7 +419,7 @@ media_menu_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) if (menus == NULL) break; - ret = file_dlg_w_st(hwnd, IDS_2118, floppyfns[id], 0); + ret = file_dlg_w_st(hwnd, IDS_2109, floppyfns[id], 0); if (! ret) { floppy_mount(id, wopenfilestring, wp); } @@ -514,7 +514,7 @@ media_menu_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) if (menus == NULL) break; - ret = file_dlg_w_st(hwnd, IDS_2125, mo_drives[id].image_path, 0); + ret = file_dlg_w_st(hwnd, IDS_2116, mo_drives[id].image_path, 0); if (! ret) mo_mount(id, wopenfilestring, wp); break; diff --git a/src/win/win_settings.c b/src/win/win_settings.c index b34afd943..27b415695 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -625,11 +625,11 @@ win_settings_machine_recalc_machine(HWND hdlg) if (!(machines[temp_machine].flags & MACHINE_AT) || (machines[temp_machine].ram_granularity >= 128)) { SendMessage(h, UDM_SETPOS, 0, temp_mem_size); h = GetDlgItem(hdlg, IDC_TEXT_MB); - SendMessage(h, WM_SETTEXT, 0, win_get_string(IDS_2094)); + SendMessage(h, WM_SETTEXT, 0, win_get_string(IDS_2088)); } else { SendMessage(h, UDM_SETPOS, 0, temp_mem_size / 1024); h = GetDlgItem(hdlg, IDC_TEXT_MB); - SendMessage(h, WM_SETTEXT, 0, win_get_string(IDS_2087)); + SendMessage(h, WM_SETTEXT, 0, win_get_string(IDS_2086)); } free(lptsTemp); @@ -668,7 +668,7 @@ win_settings_machine_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) SendMessage(h, CB_SETCURSEL, machinetolist[temp_machine], 0); h = GetDlgItem(hdlg, IDC_COMBO_WS); - SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_2099)); + SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_2090)); for (c = 0; c < 8; c++) { wsprintf(lptsTemp, plat_get_string(2100), c); @@ -1155,7 +1155,7 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) if (device_is_valid(sound_dev, machines[temp_machine].flags)) { if (c == 0) - SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_2112)); + SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_2103)); else { mbstowcs(lptsTemp, s, strlen(s) + 1); SendMessage(h, CB_ADDSTRING, 0, (LPARAM) lptsTemp); @@ -1186,7 +1186,7 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) if (midi_device_available(c)) { if (c == 0) - SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_2112)); + SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_2103)); else { mbstowcs(lptsTemp, s, strlen(s) + 1); SendMessage(h, CB_ADDSTRING, 0, (LPARAM) lptsTemp); @@ -1217,7 +1217,7 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) if (midi_in_device_available(c)) { if (c == 0) - SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_2112)); + SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_2103)); else { mbstowcs(lptsTemp, s, strlen(s) + 1); SendMessage(h, CB_ADDSTRING, 0, (LPARAM) lptsTemp); @@ -1426,7 +1426,7 @@ win_settings_ports_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) break; if (c == 0) - SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_2112)); + SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_2103)); else { mbstowcs(lptsTemp, s, strlen(s) + 1); SendMessage(h, CB_ADDSTRING, 0, (LPARAM) lptsTemp); @@ -1582,7 +1582,7 @@ win_settings_peripherals_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lPa if (device_is_valid(scsi_dev, machines[temp_machine].flags)) { if (c == 0) - SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_2112)); + SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_2103)); else { mbstowcs(lptsTemp, s, strlen(s) + 1); SendMessage(h, CB_ADDSTRING, 0, (LPARAM) lptsTemp); @@ -1637,7 +1637,7 @@ win_settings_peripherals_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lPa if (d == 0) { /* Translate "None". */ - SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_2112)); + SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_2103)); } else { mbstowcs(lptsTemp, s, strlen(s) + 1); SendMessage(h, CB_ADDSTRING, 0, (LPARAM) lptsTemp); @@ -1664,7 +1664,7 @@ win_settings_peripherals_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lPa if (d == 0) { /* Translate "None". */ SendMessage(h, CB_ADDSTRING, 0, - (LPARAM)win_get_string(IDS_2112)); + (LPARAM)win_get_string(IDS_2103)); } else { s = (char *) isamem_get_name(d); mbstowcs(lptsTemp, s, strlen(s) + 1); @@ -2491,7 +2491,7 @@ win_settings_hard_disks_init_columns(HWND hwndList) for (iCol = 0; iCol < C_COLUMNS_HARD_DISKS; iCol++) { lvc.iSubItem = iCol; - lvc.pszText = plat_get_string(IDS_2082 + iCol); + lvc.pszText = plat_get_string(IDS_2081 + iCol); switch(iCol) { case 0: /* Bus */ @@ -2556,7 +2556,7 @@ set_edit_box_contents(HWND hdlg, int id, uint32_t val) WCHAR szText[256]; h = GetDlgItem(hdlg, id); - wsprintf(szText, plat_get_string(IDS_2115), val); + wsprintf(szText, plat_get_string(IDS_2106), val); SendMessage(h, WM_SETTEXT, (WPARAM) wcslen(szText), (LPARAM) szText); } @@ -2575,7 +2575,7 @@ static int hdconf_initialize_hdt_combo(HWND hdlg) for (i = 0; i < 127; i++) { temp_size = ((uint64_t) hdd_table[i][0]) * hdd_table[i][1] * hdd_table[i][2]; size_mb = (uint32_t) (temp_size >> 11LL); - wsprintf(szText, plat_get_string(IDS_2116), size_mb, hdd_table[i][0], hdd_table[i][1], hdd_table[i][2]); + wsprintf(szText, plat_get_string(IDS_2107), size_mb, hdd_table[i][0], hdd_table[i][1], hdd_table[i][2]); SendMessage(h, CB_ADDSTRING, 0, (LPARAM) szText); if ((tracks == (int) hdd_table[i][0]) && (hpc == (int) hdd_table[i][1]) && (spt == (int) hdd_table[i][2])) @@ -3593,7 +3593,7 @@ win_settings_cdrom_drives_recalc_list(HWND hwndList) lvI.iSubItem = 1; if (temp_cdrom[i].bus_type == CDROM_BUS_DISABLED) - lvI.pszText = plat_get_string(IDS_2112); + lvI.pszText = plat_get_string(IDS_2103); else { wsprintf(szText, L"%ix", temp_cdrom[i].speed); lvI.pszText = szText; @@ -3667,7 +3667,7 @@ win_settings_floppy_drives_init_columns(HWND hwndList) lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; lvc.iSubItem = 0; - lvc.pszText = plat_get_string(IDS_2101); + lvc.pszText = plat_get_string(IDS_2092); lvc.cx = 292; lvc.fmt = LVCFMT_LEFT; @@ -3685,7 +3685,7 @@ win_settings_floppy_drives_init_columns(HWND hwndList) return FALSE; lvc.iSubItem = 2; - lvc.pszText = plat_get_string(IDS_2088); + lvc.pszText = plat_get_string(IDS_2087); lvc.cx = 75; lvc.fmt = LVCFMT_LEFT; @@ -3705,7 +3705,7 @@ win_settings_cdrom_drives_init_columns(HWND hwndList) lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; lvc.iSubItem = 0; - lvc.pszText = plat_get_string(IDS_2082); + lvc.pszText = plat_get_string(IDS_2081); lvc.cx = 342; lvc.fmt = LVCFMT_LEFT; @@ -3734,7 +3734,7 @@ win_settings_zip_drives_init_columns(HWND hwndList) lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; lvc.iSubItem = 0; - lvc.pszText = plat_get_string(IDS_2082); + lvc.pszText = plat_get_string(IDS_2081); lvc.cx = 342; lvc.fmt = LVCFMT_LEFT; @@ -3743,7 +3743,7 @@ win_settings_zip_drives_init_columns(HWND hwndList) return FALSE; lvc.iSubItem = 1; - lvc.pszText = plat_get_string(IDS_2101); + lvc.pszText = plat_get_string(IDS_2092); lvc.cx = 50; lvc.fmt = LVCFMT_LEFT; @@ -3857,7 +3857,7 @@ win_settings_cdrom_drives_update_item(HWND hwndList, int i) lvI.iSubItem = 1; if (temp_cdrom[i].bus_type == CDROM_BUS_DISABLED) - lvI.pszText = plat_get_string(IDS_2112); + lvI.pszText = plat_get_string(IDS_2103); else { wsprintf(szText, L"%ix", temp_cdrom[i].speed); lvI.pszText = szText; diff --git a/src/win/win_stbar.c b/src/win/win_stbar.c index 4dbdb6f9b..f509b45a5 100644 --- a/src/win/win_stbar.c +++ b/src/win/win_stbar.c @@ -183,10 +183,10 @@ StatusBarCreateFloppyTip(int part) mbstowcs(wtext, fdd_getname(fdd_get_type(drive)), strlen(fdd_getname(fdd_get_type(drive))) + 1); if (wcslen(floppyfns[drive]) == 0) { - _swprintf(tempTip, plat_get_string(IDS_2117), + _swprintf(tempTip, plat_get_string(IDS_2108), drive+1, wtext, plat_get_string(IDS_2057)); } else { - _swprintf(tempTip, plat_get_string(IDS_2117), + _swprintf(tempTip, plat_get_string(IDS_2108), drive+1, wtext, floppyfns[drive]); } @@ -271,10 +271,10 @@ StatusBarCreateMOTip(int part) szText = plat_get_string(id); if (wcslen(mo_drives[drive].image_path) == 0) { - _swprintf(tempTip, plat_get_string(IDS_2124), + _swprintf(tempTip, plat_get_string(IDS_2115), drive+1, szText, plat_get_string(IDS_2057)); } else { - _swprintf(tempTip, plat_get_string(IDS_2124), + _swprintf(tempTip, plat_get_string(IDS_2115), drive+1, szText, mo_drives[drive].image_path); } @@ -856,7 +856,7 @@ StatusBarCreate(HWND hwndParent, uintptr_t idStatus, HINSTANCE hInst) sb_parts++; SendMessage(hwndSBAR, SB_SETPARTS, (WPARAM)sb_parts, (LPARAM)iStatusWidths); SendMessage(hwndSBAR, SB_SETTEXT, 0 | SBT_NOBORDERS, - (LPARAM)plat_get_string(IDS_2126)); + (LPARAM)plat_get_string(IDS_2117)); sb_ready = 1; } diff --git a/src/win/win_ui.c b/src/win/win_ui.c index 5fa549e8b..4c2e46f3a 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -312,7 +312,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) case IDM_ACTION_HRESET: win_notify_dlg_open(); - i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2121); + i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2112); if (i == 0) pc_reset(1); win_notify_dlg_closed(); @@ -327,7 +327,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) if (no_quit_confirm) i = 0; else - i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2122); + i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2113); if (i == 0) { UnhookWindowsHookEx(hKeyboardHook); KillTimer(hwnd, TIMER_1SEC); @@ -695,7 +695,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) if (no_quit_confirm) i = 0; else - i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2122); + i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2113); if (i == 0) { UnhookWindowsHookEx(hKeyboardHook); KillTimer(hwnd, TIMER_1SEC); @@ -731,7 +731,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) if (manager_wm) break; win_notify_dlg_open(); - i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2121); + i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2112); if (i == 0) pc_reset(1); win_notify_dlg_closed(); @@ -744,7 +744,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) if (no_quit_confirm) i = 0; else - i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2122); + i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2113); if (i == 0) { UnhookWindowsHookEx(hKeyboardHook); KillTimer(hwnd, TIMER_1SEC); @@ -926,7 +926,7 @@ ui_init(int nCmdShow) ridev.hwndTarget = NULL; /* current focus window */ if (! RegisterRawInputDevices(&ridev, 1, sizeof(ridev))) { MessageBox(hwndMain, - plat_get_string(IDS_2114), + plat_get_string(IDS_2105), plat_get_string(IDS_2050), MB_OK | MB_ICONERROR); return(4); @@ -940,7 +940,7 @@ ui_init(int nCmdShow) haccel = LoadAccelerators(hinstance, ACCEL_NAME); if (haccel == NULL) { MessageBox(hwndMain, - plat_get_string(IDS_2113), + plat_get_string(IDS_2104), plat_get_string(IDS_2050), MB_OK | MB_ICONERROR); return(3); @@ -982,7 +982,7 @@ ui_init(int nCmdShow) /* Initialize the configured Video API. */ if (! plat_setvid(vid_api)) { MessageBox(hwnd, - plat_get_string(IDS_2095), + plat_get_string(IDS_2089), plat_get_string(IDS_2050), MB_OK | MB_ICONERROR); return(5);