From 7ffbd62ceb8e7847347b5d6f551d094d5d2e4174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laci=20b=C3=A1?= Date: Fri, 19 Nov 2021 21:33:21 +0100 Subject: [PATCH 01/13] Fix encoding issues in win_progsett.c and win_icon.c --- src/win/win_icon.c | 2 +- src/win/win_progsett.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/win/win_icon.c b/src/win/win_icon.c index e5e4cdc67..9b0d5ef23 100644 --- a/src/win/win_icon.c +++ b/src/win/win_icon.c @@ -135,7 +135,7 @@ void win_load_icon_set() for (i = 0; i < count; i++) { plat_append_filename(temp, path_root, icon_files[i].filename); - mbstowcs(wtemp, temp, strlen(temp) + 1); + mbstoc16s(wtemp, temp, strlen(temp) + 1); HICON ictemp; ictemp = LoadImageW(NULL, (LPWSTR)wtemp, IMAGE_ICON, x, y, LR_LOADFROMFILE | LR_DEFAULTCOLOR); diff --git a/src/win/win_progsett.c b/src/win/win_progsett.c index 46ede599b..2617cdd44 100644 --- a/src/win/win_progsett.c +++ b/src/win/win_progsett.c @@ -102,7 +102,7 @@ progsett_fill_iconsets(HWND hdlg) win_get_icons_path(icon_path_root); wchar_t search[512]; - mbstowcs(search, icon_path_root, strlen(icon_path_root) + 1); + mbstoc16s(search, icon_path_root, strlen(icon_path_root) + 1); wcscat(search, L"*.*"); hFind = FindFirstFile((LPCWSTR)search, &data); @@ -113,7 +113,7 @@ progsett_fill_iconsets(HWND hdlg) (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { wchar_t temp[512] = {0}, dispname[512] = {0}; - mbstowcs(temp, icon_path_root, strlen(icon_path_root) + 1); + mbstoc16s(temp, icon_path_root, strlen(icon_path_root) + 1); wcscat(temp, data.cFileName); wcscat(temp, L"\\iconinfo.txt"); @@ -124,14 +124,14 @@ progsett_fill_iconsets(HWND hdlg) char line[512] = {0}; if (fgets(line, 511, fp)) { - mbstowcs(dispname, line, strlen(line) + 1); + mbstoc16s(dispname, line, strlen(line) + 1); } fclose(fp); } char filename[512]; - wcstombs(filename, data.cFileName, 511); + c16stombs(filename, data.cFileName, 511); int index = SendMessage(icon_combo, CB_ADDSTRING, 0, (LPARAM)dispname); SendMessage(icon_combo, CB_SETITEMDATA, index, (LPARAM)(strdup(filename))); From 3bd2e199dd5bd516bb3907393fd87ceb8efaea58 Mon Sep 17 00:00:00 2001 From: OBattler Date: Fri, 19 Nov 2021 23:13:46 +0100 Subject: [PATCH 02/13] Added a missing call to flushmmucache_nopc(). --- src/machine/m_ps2_mca.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/machine/m_ps2_mca.c b/src/machine/m_ps2_mca.c index db53f8047..b9f96973f 100644 --- a/src/machine/m_ps2_mca.c +++ b/src/machine/m_ps2_mca.c @@ -1019,6 +1019,8 @@ static void mem_encoding_update() ps2.split_size = 0; ps2_mca_log("PS/2 Model 80-111: Split memory block disabled\n"); } + + flushmmucache_nopc(); } static uint8_t mem_encoding_read(uint16_t addr, void *p) From 01567e976f45c089f747f505f4c5ea286309c868 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sat, 20 Nov 2021 10:32:02 +0100 Subject: [PATCH 03/13] Some IBM PS/2 Model 55SX memory fixes. --- src/machine/m_ps2_mca.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/machine/m_ps2_mca.c b/src/machine/m_ps2_mca.c index b9f96973f..ed44b35a7 100644 --- a/src/machine/m_ps2_mca.c +++ b/src/machine/m_ps2_mca.c @@ -483,11 +483,13 @@ static void model_55sx_write(uint16_t port, uint8_t val) if (shadowbios) { mem_set_mem_state(0xe0000, 0x20000, MEM_READ_INTERNAL | MEM_WRITE_DISABLED); + mem_set_mem_state((mem_size+256) * 1024, 128 * 1024, MEM_READ_EXTANY | MEM_WRITE_EXTANY); mem_mapping_disable(&ps2.shadow_mapping); } else { mem_set_mem_state(0xe0000, 0x20000, MEM_READ_EXTANY | MEM_WRITE_INTERNAL); + mem_set_mem_state((mem_size+256) * 1024, 128 * 1024, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL); mem_mapping_enable(&ps2.shadow_mapping); } @@ -495,6 +497,8 @@ static void model_55sx_write(uint16_t port, uint8_t val) mem_set_mem_state(mem_size * 1024, 256 * 1024, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL); else mem_set_mem_state(mem_size * 1024, 256 * 1024, MEM_READ_EXTANY | MEM_WRITE_EXTANY); + + flushmmucache_nopc(); break; case 0x106: ps2.subaddr_lo = val; From 6351c8f12d13587d06eee7f20cdb093260325a44 Mon Sep 17 00:00:00 2001 From: ts-korhonen Date: Sat, 20 Nov 2021 21:07:49 +0200 Subject: [PATCH 04/13] Improve some of fi-FI translation --- src/win/languages/fi-FI.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc index 990396e47..790139fc8 100644 --- a/src/win/languages/fi-FI.rc +++ b/src/win/languages/fi-FI.rc @@ -98,10 +98,10 @@ BEGIN MENUITEM "&Media", IDM_MEDIA POPUP "&Työkalut" BEGIN - MENUITEM "&Asetukset...", IDM_CONFIG + MENUITEM "&Tietokoneen asetukset...", IDM_CONFIG MENUITEM "&Päivitä tilapalkin kuvakkeita", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Change program &settings...", IDM_VID_PROG_SETT + MENUITEM "&Ohjelman asetukset...", IDM_VID_PROG_SETT # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Käytä &Discord integraatiota", IDM_DISCORD @@ -273,10 +273,10 @@ END // Dialog // -#define STR_PROG_SETT "Program Settings" +#define STR_PROG_SETT "Ohjelman asetukset" #define STR_SND_GAIN "Äänen tulotaso" #define STR_NEW_FLOPPY "Uusi levykuva" -#define STR_CONFIG "86Box Asetukset" +#define STR_CONFIG "Tietokoneen asetukset" #define STR_SPECIFY_DIM "Määritä pääikkunan koko" #define STR_OK "OK" @@ -307,7 +307,7 @@ END #define STR_MB "Mt" #define STR_MEMORY "Muisti:" #define STR_TIME_SYNC "Kellon synkronointi" -#define STR_DISABLED "Poistettu käytöstä" +#define STR_DISABLED "Ei käytössä" #define STR_ENABLED_LOCAL "Käytössä (paikallinen)" #define STR_ENABLED_UTC "Käytössä (UTC)" #define STR_DYNAREC "Dynaaminen uudelleenkääntäjä" @@ -383,7 +383,7 @@ END #define STR_ZIP_DRIVES "ZIP-asemat:" #define STR_250 "ZIP 250" -#define STR_ISARTC "ISA-reaaliaikakello:" +#define STR_ISARTC "ISA-RTC (kello):" #define STR_ISAMEM "ISA-muistilaajennus" #define STR_ISAMEM_1 "Kortti 1:" #define STR_ISAMEM_2 "Kortti 2:" @@ -598,11 +598,11 @@ BEGIN IDS_5120 "CD-ROM %i (%s): %s" - IDS_5376 "Poistettu käytöstä" + IDS_5376 "Ei käytössä" IDS_5381 "ATAPI" IDS_5382 "SCSI" - IDS_5632 "Poistettu käytöstä" + IDS_5632 "Ei käytössä" IDS_5637 "ATAPI (%01i:%01i)" IDS_5638 "SCSI (%01i:%02i)" From a1df1c23edeb9479a8636f13d2fcc732630e8288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sat, 20 Nov 2021 23:24:11 +0100 Subject: [PATCH 05/13] Rename Program Settings to Preferences --- src/include/86box/resource.h | 4 +-- src/include/86box/win.h | 4 +-- src/win/CMakeLists.txt | 2 +- src/win/Makefile.mingw | 2 +- src/win/languages/cs-CZ.rc | 4 +-- src/win/languages/de-DE.rc | 4 +-- src/win/languages/dialogs.rc | 6 ++-- src/win/languages/en-US.rc | 6 ++-- src/win/languages/fi-FI.rc | 4 +-- src/win/languages/fr-FR.rc | 4 +-- src/win/languages/hr-HR.rc | 4 +-- src/win/languages/hu-HU.rc | 4 +-- src/win/languages/it-IT.rc | 4 +-- src/win/languages/ja-JP.rc | 4 +-- src/win/languages/pt-BR.rc | 4 +-- src/win/languages/pt-PT.rc | 4 +-- src/win/languages/sl-SI.rc | 4 +-- src/win/languages/zh-CN.rc | 4 +-- src/win/{win_progsett.c => win_preferences.c} | 30 +++++++++---------- src/win/win_ui.c | 4 +-- 20 files changed, 53 insertions(+), 53 deletions(-) rename src/win/{win_progsett.c => win_preferences.c} (91%) diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h index d05409e0d..1d84cd60b 100644 --- a/src/include/86box/resource.h +++ b/src/include/86box/resource.h @@ -29,7 +29,7 @@ #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_PROG_SETT 106 /* 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 */ @@ -357,7 +357,7 @@ #define IDM_DISCORD 40090 #endif -#define IDM_VID_PROG_SETT 40091 +#define IDM_PREFERENCES 40091 #if defined(DEV_BRANCH) && defined(USE_OPENGL) #define IDM_VID_GL_FPS_BLITTER 40100 diff --git a/src/include/86box/win.h b/src/include/86box/win.h index 333b6fbee..a71174314 100644 --- a/src/include/86box/win.h +++ b/src/include/86box/win.h @@ -188,8 +188,8 @@ extern void NewFloppyDialogCreate(HWND hwnd, int id, int part); /* Functions in win_specify_dim.c: */ extern void SpecifyDimensionsDialogCreate(HWND hwnd); -/* Functions in win_lang.c: */ -extern void ProgSettDlgCreate(HWND hwnd); +/* Functions in win_preferences.c: */ +extern void PreferencesDlgCreate(HWND hwnd); /* Functions in win_settings.c: */ diff --git a/src/win/CMakeLists.txt b/src/win/CMakeLists.txt index 5b44eeb45..00eda35a1 100644 --- a/src/win/CMakeLists.txt +++ b/src/win/CMakeLists.txt @@ -20,7 +20,7 @@ add_library(plat OBJECT win.c win_dynld.c win_cdrom.c win_thread.c add_library(ui OBJECT win_ui.c win_icon.c win_stbar.c win_sdl.c win_dialog.c win_about.c win_settings.c win_devconf.c win_snd_gain.c win_specify_dim.c win_new_floppy.c - win_jsconf.c win_media_menu.c win_progsett.c 86Box.rc) + win_jsconf.c win_media_menu.c win_preferences.c 86Box.rc) if(MSVC) # MSVC complains when we include the manifest from 86Box.rc... diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index 2d2ad272f..6607ca904 100644 --- a/src/win/Makefile.mingw +++ b/src/win/Makefile.mingw @@ -408,7 +408,7 @@ else UIOBJ := win_ui.o win_icon.o win_stbar.o \ win_sdl.o \ win_dialog.o win_about.o \ - win_settings.o win_devconf.o win_snd_gain.o win_specify_dim.o win_progsett.o \ + win_settings.o win_devconf.o win_snd_gain.o win_specify_dim.o win_preferences.o \ win_new_floppy.o win_jsconf.o win_media_menu.o endif diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index 1c5e74876..6c0f25ebf 100644 --- a/src/win/languages/cs-CZ.rc +++ b/src/win/languages/cs-CZ.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "&Nastavení...", IDM_CONFIG MENUITEM "&Aktualizovat ikony stavového řádku", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Change program &settings...", IDM_VID_PROG_SETT + MENUITEM "Change program &settings...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Povolit integraci s &Discordem", IDM_DISCORD @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PROG_SETT "Program Settings" +#define STR_PREFERENCES "Program Settings" #define STR_SND_GAIN "Zesílení zvuku" #define STR_NEW_FLOPPY "Nový obraz" #define STR_CONFIG "Nastavení emulátoru 86Box" diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index 19df8d020..3520d2986 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "&Einstellungen...", IDM_CONFIG MENUITEM "&Statusleistenicons aktualisieren", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Programmeinstellungen ändern...", IDM_VID_PROG_SETT + MENUITEM "Programmeinstellungen ändern...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "&Discord-Integration aktivieren", IDM_DISCORD @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PROG_SETT "Programmeinstellungen" +#define STR_PREFERENCES "Programmeinstellungen" #define STR_SND_GAIN "Klangverstärkung" #define STR_NEW_FLOPPY "Neues Image" #define STR_CONFIG "86Box-Einstellungen" diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index b2813faa0..9f4211aa0 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -1,6 +1,6 @@ -DLG_PROG_SETT DIALOG DISCARDABLE 0, 0, 240, 118 +DLG_PREFERENCES DIALOG DISCARDABLE 0, 0, 240, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION STR_PROG_SETT +CAPTION STR_PREFERENCES FONT FONT_SIZE, FONT_NAME BEGIN DEFPUSHBUTTON STR_OK, IDOK, 123, 97, 50, 14 @@ -460,7 +460,7 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,147,128,94,10 END -#undef STR_PROG_SETT +#undef STR_PREFERENCES #undef STR_SND_GAIN #undef STR_NEW_FLOPPY #undef STR_CONFIG diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc index cc86e387a..802297836 100644 --- a/src/win/languages/en-US.rc +++ b/src/win/languages/en-US.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "&Settings...", IDM_CONFIG MENUITEM "&Update status bar icons", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Change program &settings...", IDM_VID_PROG_SETT + MENUITEM "&Preferences...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Enable &Discord integration", IDM_DISCORD @@ -273,10 +273,10 @@ END // Dialog // -#define STR_PROG_SETT "Program Settings" +#define STR_PREFERENCES "86Box Preferences" #define STR_SND_GAIN "Sound Gain" #define STR_NEW_FLOPPY "New Image" -#define STR_CONFIG "86Box Settings" +#define STR_CONFIG "Machine Settings" #define STR_SPECIFY_DIM "Specify Main Window Dimensions" #define STR_OK "OK" diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc index 790139fc8..d79ffeced 100644 --- a/src/win/languages/fi-FI.rc +++ b/src/win/languages/fi-FI.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "&Tietokoneen asetukset...", IDM_CONFIG MENUITEM "&Päivitä tilapalkin kuvakkeita", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "&Ohjelman asetukset...", IDM_VID_PROG_SETT + MENUITEM "&Ohjelman asetukset...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Käytä &Discord integraatiota", IDM_DISCORD @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PROG_SETT "Ohjelman asetukset" +#define STR_PREFERENCES "Ohjelman asetukset" #define STR_SND_GAIN "Äänen tulotaso" #define STR_NEW_FLOPPY "Uusi levykuva" #define STR_CONFIG "Tietokoneen asetukset" diff --git a/src/win/languages/fr-FR.rc b/src/win/languages/fr-FR.rc index e107cf109..48c94df85 100644 --- a/src/win/languages/fr-FR.rc +++ b/src/win/languages/fr-FR.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "&Réglages...", IDM_CONFIG MENUITEM "Mettre à jour la barre de stat&us", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Changer la &langue...", IDM_VID_PROG_SETT + MENUITEM "Changer la &langue...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Activer intégration &Discord", IDM_DISCORD @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PROG_SETT "Changer langue" +#define STR_PREFERENCES "Changer langue" #define STR_SND_GAIN "Gain son" #define STR_NEW_FLOPPY "Nouvelle image" #define STR_CONFIG "Réglages 86Box" diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc index 20648ecdb..bba399a80 100644 --- a/src/win/languages/hr-HR.rc +++ b/src/win/languages/hr-HR.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "&Postavke...", IDM_CONFIG MENUITEM "&Ažuriranje ikone statusne trake", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "&Promjeni postavke programa...", IDM_VID_PROG_SETT + MENUITEM "&Promjeni postavke programa...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Omogući integraciju &Discord-a", IDM_DISCORD @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PROG_SETT "Postavke programa" +#define STR_PREFERENCES "Postavke programa" #define STR_SND_GAIN "Pojačavanje zvuka" #define STR_NEW_FLOPPY "Nova slika" #define STR_CONFIG "86Box postavke" diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index 569cf5570..4cf1db8e0 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -104,7 +104,7 @@ BEGIN MENUITEM "&Beállítások...", IDM_CONFIG MENUITEM "Állapotsori ikonok &frissítése", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Program&beállítások...", IDM_VID_PROG_SETT + MENUITEM "Program&beállítások...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "&Discord integráció engedélyezése", IDM_DISCORD @@ -276,7 +276,7 @@ END // Dialog // -#define STR_PROG_SETT "Programbeállítások" +#define STR_PREFERENCES "Programbeállítások" #define STR_SND_GAIN "Hangerőszabályzó" #define STR_NEW_FLOPPY "Új képfájl létrehozása" #define STR_CONFIG "86Box beállítások" diff --git a/src/win/languages/it-IT.rc b/src/win/languages/it-IT.rc index 28eb1ba95..b037135bb 100644 --- a/src/win/languages/it-IT.rc +++ b/src/win/languages/it-IT.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "&Impostazioni...", IDM_CONFIG MENUITEM "&Aggiorna icone della barra di stato", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Change program &settings...", IDM_VID_PROG_SETT + MENUITEM "Change program &settings...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Abilita &integrazione Discord", IDM_DISCORD @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PROG_SETT "Program Settings" +#define STR_PREFERENCES "Program Settings" #define STR_SND_GAIN "Guadagno del suono" #define STR_NEW_FLOPPY "Nuova immagine" #define STR_CONFIG "Impostazioni di 86Box" diff --git a/src/win/languages/ja-JP.rc b/src/win/languages/ja-JP.rc index bb5c84298..aa8120ac0 100644 --- a/src/win/languages/ja-JP.rc +++ b/src/win/languages/ja-JP.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "設定(&S)...", IDM_CONFIG MENUITEM "ステータスバーアイコンの更新(&U)", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "表示言語の変更(&P)...", IDM_VID_PROG_SETT + MENUITEM "表示言語の変更(&P)...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Discordとの連携を可能にする(&D)", IDM_DISCORD @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PROG_SETT "表示言語の変更" +#define STR_PREFERENCES "表示言語の変更" #define STR_SND_GAIN "サウンドゲイン" #define STR_NEW_FLOPPY "新規のイメージ" #define STR_CONFIG "86Boxの設定" diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index 4bddc26ca..2e6acc0b9 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -102,7 +102,7 @@ BEGIN MENUITEM "&Configurações...", IDM_CONFIG MENUITEM "&Atualizar ícones da barra de status", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Alterar &configurações do programa...", IDM_VID_PROG_SETT + MENUITEM "Alterar &configurações do programa...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Ativar integração com o &Discord", IDM_DISCORD @@ -274,7 +274,7 @@ END // Dialog // -#define STR_PROG_SETT "Configurações do programa" +#define STR_PREFERENCES "Configurações do programa" #define STR_SND_GAIN "Ganho de som" #define STR_NEW_FLOPPY "Nova imagem de disquete" #define STR_CONFIG "Configurações do 86Box" diff --git a/src/win/languages/pt-PT.rc b/src/win/languages/pt-PT.rc index 171e37d76..3d2482b9d 100644 --- a/src/win/languages/pt-PT.rc +++ b/src/win/languages/pt-PT.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "&Definições...", IDM_CONFIG MENUITEM "&Atualizar ícones da barra de estado", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Change program &settings...", IDM_VID_PROG_SETT + MENUITEM "Change program &settings...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Ativar integração com &Discord", IDM_DISCORD @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PROG_SETT "Program Settings" +#define STR_PREFERENCES "Program Settings" #define STR_SND_GAIN "Ganho de som" #define STR_NEW_FLOPPY "Nova imagem" #define STR_CONFIG "Definições do 86Box" diff --git a/src/win/languages/sl-SI.rc b/src/win/languages/sl-SI.rc index 68aeaf46c..743258924 100644 --- a/src/win/languages/sl-SI.rc +++ b/src/win/languages/sl-SI.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "&Nastavitve...", IDM_CONFIG MENUITEM "&Posodabljaj ikone statusne vrstice", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "&Spremeni jezik...", IDM_VID_PROG_SETT + MENUITEM "&Spremeni jezik...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Omogoči integracijo s programom &Discord", IDM_DISCORD @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PROG_SETT "Spremeni jezik" +#define STR_PREFERENCES "Spremeni jezik" #define STR_SND_GAIN "Ojačanje zvoka" #define STR_NEW_FLOPPY "Nova slika" #define STR_CONFIG "Nastavitve programa 86Box" diff --git a/src/win/languages/zh-CN.rc b/src/win/languages/zh-CN.rc index 1a8444569..06f53344a 100644 --- a/src/win/languages/zh-CN.rc +++ b/src/win/languages/zh-CN.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "设置(&S)...", IDM_CONFIG MENUITEM "更新状态栏图标(&U)", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Change program &settings...", IDM_VID_PROG_SETT + MENUITEM "Change program &settings...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "启用 Discord 集成(&D)", IDM_DISCORD @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PROG_SETT "Program Settings" +#define STR_PREFERENCES "Program Settings" #define STR_SND_GAIN "音量增益" #define STR_NEW_FLOPPY "新建镜像" #define STR_CONFIG "86Box 设置" diff --git a/src/win/win_progsett.c b/src/win/win_preferences.c similarity index 91% rename from src/win/win_progsett.c rename to src/win/win_preferences.c index 2617cdd44..6bec48282 100644 --- a/src/win/win_progsett.c +++ b/src/win/win_preferences.c @@ -39,7 +39,7 @@ static char temp_icon_set[256] = {0}; int enum_helper, c; -HWND hwndProgSett; +HWND hwndPreferences; BOOL CALLBACK EnumResLangProc(HMODULE hModule, LPCTSTR lpszType, LPCTSTR lpszName, WORD wIDLanguage, LONG_PTR lParam) @@ -60,7 +60,7 @@ EnumResLangProc(HMODULE hModule, LPCTSTR lpszType, LPCTSTR lpszName, WORD wIDLan /* Load available languages */ static void -progsett_fill_languages(HWND hdlg) +preferences_fill_languages(HWND hdlg) { temp_language = GetThreadUILanguage(); HWND lang_combo = GetDlgItem(hdlg, IDC_COMBO_LANG); @@ -79,7 +79,7 @@ progsett_fill_languages(HWND hdlg) /* Load available iconsets */ static void -progsett_fill_iconsets(HWND hdlg) +preferences_fill_iconsets(HWND hdlg) { HWND icon_combo = GetDlgItem(hdlg, IDC_COMBO_ICON); @@ -154,7 +154,7 @@ progsett_fill_iconsets(HWND hdlg) /* This returns 1 if any variable has changed, 0 if not. */ static int -progsett_settings_changed(void) +preferences_settings_changed(void) { int i = 0; @@ -167,7 +167,7 @@ progsett_settings_changed(void) /* IndexOf by ItemData */ static int -progsett_indexof(HWND combo, LPARAM itemdata) +preferences_indexof(HWND combo, LPARAM itemdata) { int i; for (i = 0; i < SendMessage(combo, CB_GETCOUNT, 0, 0); i++) @@ -179,7 +179,7 @@ progsett_indexof(HWND combo, LPARAM itemdata) /* This saves the settings back to the global variables. */ static void -progsett_settings_save(void) +preferences_settings_save(void) { /* Language */ set_language(temp_language); @@ -205,23 +205,23 @@ static LRESULT CALLBACK #else static BOOL CALLBACK #endif -ProgSettDlgProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) +PreferencesDlgProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { case WM_INITDIALOG: - hwndProgSett = hdlg; + hwndPreferences = hdlg; /* Language */ temp_language = lang_id; strcpy(temp_icon_set, icon_set); - progsett_fill_languages(hdlg); - progsett_fill_iconsets(hdlg); + preferences_fill_languages(hdlg); + preferences_fill_iconsets(hdlg); break; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: - if (progsett_settings_changed()) - progsett_settings_save(); + if (preferences_settings_changed()) + preferences_settings_save(); EndDialog(hdlg, 0); return TRUE; @@ -247,7 +247,7 @@ ProgSettDlgProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) case IDC_BUTTON_DEFAULT: { HWND combo = GetDlgItem(hdlg, IDC_COMBO_LANG); - int index = progsett_indexof(combo, DEFAULT_LANGUAGE); + int index = preferences_indexof(combo, DEFAULT_LANGUAGE); SendMessage(combo, CB_SETCURSEL, index, 0); temp_language = DEFAULT_LANGUAGE; break; @@ -286,7 +286,7 @@ ProgSettDlgProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) void -ProgSettDlgCreate(HWND hwnd) +PreferencesDlgCreate(HWND hwnd) { - DialogBox(hinstance, (LPCTSTR)DLG_PROG_SETT, hwnd, ProgSettDlgProcedure); + DialogBox(hinstance, (LPCTSTR)DLG_PREFERENCES, hwnd, PreferencesDlgProcedure); } diff --git a/src/win/win_ui.c b/src/win/win_ui.c index 60d63b99e..fc41f0b8a 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -804,8 +804,8 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) config_save(); break; - case IDM_VID_PROG_SETT: - ProgSettDlgCreate(hwnd); + case IDM_PREFERENCES: + PreferencesDlgCreate(hwnd); break; case IDM_VID_SPECIFY_DIM: From c1f0a7b14198e8dae0981231e28becabb52d9c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laci=20b=C3=A1?= <84271678+laciba96@users.noreply.github.com> Date: Sat, 20 Nov 2021 23:57:44 +0100 Subject: [PATCH 06/13] Improve some of hu-HU translation (#1856) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Improve some of hu-HU translation In the same manner, as fi-FI was updated. * Update hu-HU.rc Co-authored-by: David Hrdlička --- src/win/languages/hu-HU.rc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index 4cf1db8e0..ac47c249b 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -101,10 +101,10 @@ BEGIN MENUITEM "&Média", IDM_MEDIA POPUP "&Eszközök" BEGIN - MENUITEM "&Beállítások...", IDM_CONFIG + MENUITEM "&Konfigurálás...", IDM_CONFIG MENUITEM "Állapotsori ikonok &frissítése", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Program&beállítások...", IDM_PREFERENCES + MENUITEM "&Beállítások...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "&Discord integráció engedélyezése", IDM_DISCORD @@ -276,10 +276,10 @@ END // Dialog // -#define STR_PREFERENCES "Programbeállítások" +#define STR_PREFERENCES "86Box beállítások" #define STR_SND_GAIN "Hangerőszabályzó" #define STR_NEW_FLOPPY "Új képfájl létrehozása" -#define STR_CONFIG "86Box beállítások" +#define STR_CONFIG "Számítógép konfiguráció" #define STR_SPECIFY_DIM "Főablak méreteinek megadása" #define STR_OK "OK" @@ -386,7 +386,7 @@ END #define STR_ZIP_DRIVES "ZIP-meghajtók:" #define STR_250 "ZIP 250" -#define STR_ISARTC "ISA RTC:" +#define STR_ISARTC "ISA RTC (óra):" #define STR_ISAMEM "ISA memóriabővítők" #define STR_ISAMEM_1 "Kártya 1:" #define STR_ISAMEM_2 "Kártya 2:" @@ -617,8 +617,8 @@ BEGIN IDS_5894 "1.2 MB" IDS_5895 "1.25 MB" IDS_5896 "1.44 MB" - IDS_5897 "DMF (klaszter 1024)" - IDS_5898 "DMF (klaszter 2048)" + IDS_5897 "DMF (1024 klaszter)" + IDS_5898 "DMF (2048 klaszter)" IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" From 090934ab10038d958639a0c1048ce11bf1c85e80 Mon Sep 17 00:00:00 2001 From: Teemu Korhonen <80648513+ts-korhonen@users.noreply.github.com> Date: Sun, 21 Nov 2021 00:57:59 +0200 Subject: [PATCH 07/13] Better settings-configuration translation for fi-FI (#1857) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: David Hrdlička --- src/win/languages/fi-FI.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc index d79ffeced..47ff193eb 100644 --- a/src/win/languages/fi-FI.rc +++ b/src/win/languages/fi-FI.rc @@ -98,10 +98,10 @@ BEGIN MENUITEM "&Media", IDM_MEDIA POPUP "&Työkalut" BEGIN - MENUITEM "&Tietokoneen asetukset...", IDM_CONFIG + MENUITEM "&Kokoonpano...", IDM_CONFIG MENUITEM "&Päivitä tilapalkin kuvakkeita", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "&Ohjelman asetukset...", IDM_PREFERENCES + MENUITEM "&Sovellusasetukset...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Käytä &Discord integraatiota", IDM_DISCORD @@ -273,10 +273,10 @@ END // Dialog // -#define STR_PREFERENCES "Ohjelman asetukset" +#define STR_PREFERENCES "Sovellusasetukset" #define STR_SND_GAIN "Äänen tulotaso" #define STR_NEW_FLOPPY "Uusi levykuva" -#define STR_CONFIG "Tietokoneen asetukset" +#define STR_CONFIG "Tietokoneen kokoonpano" #define STR_SPECIFY_DIM "Määritä pääikkunan koko" #define STR_OK "OK" From 4482769817b51820f4dd2c0a77f1ff2b8d592906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sat, 20 Nov 2021 23:58:52 +0100 Subject: [PATCH 08/13] Update CZ, DE, HR, JP and SI translations --- src/win/languages/cs-CZ.rc | 10 +++++----- src/win/languages/de-DE.rc | 8 ++++---- src/win/languages/hr-HR.rc | 8 ++++---- src/win/languages/ja-JP.rc | 6 +++--- src/win/languages/sl-SI.rc | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index 6c0f25ebf..f123b546b 100644 --- a/src/win/languages/cs-CZ.rc +++ b/src/win/languages/cs-CZ.rc @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// Czech (Czech Republic) resources #ifdef _WIN32 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -101,13 +101,13 @@ BEGIN MENUITEM "&Nastavení...", IDM_CONFIG MENUITEM "&Aktualizovat ikony stavového řádku", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Change program &settings...", IDM_PREFERENCES + MENUITEM "&Předvolby...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Povolit integraci s &Discordem", IDM_DISCORD # endif MENUITEM SEPARATOR - MENUITEM "Pořídit s&creenshot\tCtrl+F11", IDM_ACTION_SCREENSHOT + MENUITEM "Pořídit &screenshot\tCtrl+F11", IDM_ACTION_SCREENSHOT MENUITEM SEPARATOR MENUITEM "&Zesílení zvuku", IDM_SND_GAIN #ifdef MTR_ENABLED @@ -273,10 +273,10 @@ END // Dialog // -#define STR_PREFERENCES "Program Settings" +#define STR_PREFERENCES "Předvolby emulátoru 86Box" #define STR_SND_GAIN "Zesílení zvuku" #define STR_NEW_FLOPPY "Nový obraz" -#define STR_CONFIG "Nastavení emulátoru 86Box" +#define STR_CONFIG "Nastavení počítače" #define STR_SPECIFY_DIM "Zadat rozměry hlavního okna" #define STR_OK "OK" diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index 3520d2986..452b03074 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -98,10 +98,10 @@ BEGIN MENUITEM "&Medien", IDM_MEDIA POPUP "&Werkzeuge" BEGIN - MENUITEM "&Einstellungen...", IDM_CONFIG + MENUITEM "&Optionen...", IDM_CONFIG MENUITEM "&Statusleistenicons aktualisieren", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Programmeinstellungen ändern...", IDM_PREFERENCES + MENUITEM "&Einstellungen...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "&Discord-Integration aktivieren", IDM_DISCORD @@ -273,10 +273,10 @@ END // Dialog // -#define STR_PREFERENCES "Programmeinstellungen" +#define STR_PREFERENCES "86Box-Einstellungen" #define STR_SND_GAIN "Klangverstärkung" #define STR_NEW_FLOPPY "Neues Image" -#define STR_CONFIG "86Box-Einstellungen" +#define STR_CONFIG "Maschinenoptionen" #define STR_SPECIFY_DIM "Abmessungen des Hauptfensters einstellen" #define STR_OK "OK" diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc index bba399a80..31ec58835 100644 --- a/src/win/languages/hr-HR.rc +++ b/src/win/languages/hr-HR.rc @@ -98,10 +98,10 @@ BEGIN MENUITEM "&Mediji", IDM_MEDIA POPUP "&Alati" BEGIN - MENUITEM "&Postavke...", IDM_CONFIG + MENUITEM "&Opcije...", IDM_CONFIG MENUITEM "&Ažuriranje ikone statusne trake", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "&Promjeni postavke programa...", IDM_PREFERENCES + MENUITEM "&Postavke...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Omogući integraciju &Discord-a", IDM_DISCORD @@ -273,10 +273,10 @@ END // Dialog // -#define STR_PREFERENCES "Postavke programa" +#define STR_PREFERENCES "86Box postavke" #define STR_SND_GAIN "Pojačavanje zvuka" #define STR_NEW_FLOPPY "Nova slika" -#define STR_CONFIG "86Box postavke" +#define STR_CONFIG "Opcije sistema" #define STR_SPECIFY_DIM "Odredite glavne dimenzije prozora" #define STR_OK "OK" diff --git a/src/win/languages/ja-JP.rc b/src/win/languages/ja-JP.rc index aa8120ac0..d2ca7e4e1 100644 --- a/src/win/languages/ja-JP.rc +++ b/src/win/languages/ja-JP.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "設定(&S)...", IDM_CONFIG MENUITEM "ステータスバーアイコンの更新(&U)", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "表示言語の変更(&P)...", IDM_PREFERENCES + MENUITEM "環境設定(&P)...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Discordとの連携を可能にする(&D)", IDM_DISCORD @@ -273,10 +273,10 @@ END // Dialog // -#define STR_PREFERENCES "表示言語の変更" +#define STR_PREFERENCES "86Boxの環境設定" #define STR_SND_GAIN "サウンドゲイン" #define STR_NEW_FLOPPY "新規のイメージ" -#define STR_CONFIG "86Boxの設定" +#define STR_CONFIG "マシンの設定" #define STR_SPECIFY_DIM "メインウィンドウの寸法指定" #define STR_OK "OK" diff --git a/src/win/languages/sl-SI.rc b/src/win/languages/sl-SI.rc index 743258924..d0104217e 100644 --- a/src/win/languages/sl-SI.rc +++ b/src/win/languages/sl-SI.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "&Nastavitve...", IDM_CONFIG MENUITEM "&Posodabljaj ikone statusne vrstice", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "&Spremeni jezik...", IDM_PREFERENCES + MENUITEM "&Možnosti...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Omogoči integracijo s programom &Discord", IDM_DISCORD @@ -273,10 +273,10 @@ END // Dialog // -#define STR_PREFERENCES "Spremeni jezik" +#define STR_PREFERENCES "Možnosti programa 86Box" #define STR_SND_GAIN "Ojačanje zvoka" #define STR_NEW_FLOPPY "Nova slika" -#define STR_CONFIG "Nastavitve programa 86Box" +#define STR_CONFIG "Nastavitve sistema" #define STR_SPECIFY_DIM "Določi velikost glavnega okna" #define STR_OK "V redu" From d2ae09836a6cb19de3ef66e1b006825bb632019b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sun, 21 Nov 2021 00:40:00 +0100 Subject: [PATCH 09/13] Update Czech translation --- src/win/languages/cs-CZ.rc | 66 +++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index f123b546b..4eea439d4 100644 --- a/src/win/languages/cs-CZ.rc +++ b/src/win/languages/cs-CZ.rc @@ -58,7 +58,7 @@ BEGIN MENUITEM "1.&5x", IDM_VID_SCALE_3X MENUITEM "&2x", IDM_VID_SCALE_4X END - POPUP "Metoda filtrování" + POPUP "Metoda &filtrování" BEGIN MENUITEM "&Nejbližší", IDM_VID_FILTER_NEAREST MENUITEM "&Lineární", IDM_VID_FILTER_LINEAR @@ -66,12 +66,12 @@ BEGIN MENUITEM "Š&kálování HiDPI", IDM_VID_HIDPI MENUITEM SEPARATOR MENUITEM "&Celá obrazovka\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN - POPUP "Fullscreen &stretch mode" + POPUP "Režím roztá&hnutí při celé obrazovce" BEGIN MENUITEM "&Roztáhnout", IDM_VID_FS_FULL MENUITEM "&4:3", IDM_VID_FS_43 MENUITEM "&Zachovat poměr stran", IDM_VID_FS_KEEPRATIO - MENUITEM "&Integer scale", IDM_VID_FS_INT + MENUITEM "&Celočíselné škálování", IDM_VID_FS_INT END POPUP "Nastavení pro E&GA a (S)VGA" BEGIN @@ -79,7 +79,7 @@ BEGIN POPUP "&Typ VGA monitoru" BEGIN MENUITEM "RGB &barevný", IDM_VID_GRAY_RGB - MENUITEM "&RGB odstíny šedi", IDM_VID_GRAY_MONO + MENUITEM "&Odstíny šedi", IDM_VID_GRAY_MONO MENUITEM "&Jantarová obrazovka", IDM_VID_GRAY_AMBER MENUITEM "&Zelená obrazovka", IDM_VID_GRAY_GREEN MENUITEM "&Bílá obrazovka", IDM_VID_GRAY_WHITE @@ -92,8 +92,8 @@ BEGIN END END MENUITEM SEPARATOR - MENUITEM "CGA/PCjr/Tandy/E&GA/(S)VGA overscan", IDM_VID_OVERSCAN - MENUITEM "&Upravit kontrast černobílých obrazovek", IDM_VID_CGACON + MENUITEM "Přesah obrazu CGA/PCjr/Tandy/E&GA/(S)VGA", IDM_VID_OVERSCAN + MENUITEM "&Upravit kontrast černobílé obrazovky", IDM_VID_CGACON END MENUITEM "&Média", IDM_MEDIA POPUP "&Nástroje" @@ -117,38 +117,38 @@ BEGIN #endif END #if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS) - POPUP "&Logging" + POPUP "&Záznamy" BEGIN # ifdef ENABLE_BUSLOGIC_LOG - MENUITEM "Enable BusLogic logs\tCtrl+F4", IDM_LOG_BUSLOGIC + MENUITEM "Povolit záznamy BusLogic\tCtrl+F4", IDM_LOG_BUSLOGIC # endif # ifdef ENABLE_CDROM_LOG - MENUITEM "Enable CD-ROM logs\tCtrl+F5", IDM_LOG_CDROM + MENUITEM "Povolit záznamy CD-ROM\tCtrl+F5", IDM_LOG_CDROM # endif # ifdef ENABLE_D86F_LOG - MENUITEM "Enable floppy (86F) logs\tCtrl+F6", IDM_LOG_D86F + MENUITEM "Povolit záznamy diskety (86F)\tCtrl+F6", IDM_LOG_D86F # endif # ifdef ENABLE_FDC_LOG - MENUITEM "Enable floppy controller logs\tCtrl+F7", IDM_LOG_FDC + MENUITEM "Povolit záznamy disketového řadiče\tCtrl+F7", IDM_LOG_FDC # endif # ifdef ENABLE_IDE_LOG - MENUITEM "Enable IDE logs\tCtrl+F8", IDM_LOG_IDE + MENUITEM "Povolit záznamy IDE\tCtrl+F8", IDM_LOG_IDE # endif # ifdef ENABLE_SERIAL_LOG - MENUITEM "Enable Serial Port logs\tCtrl+F3", IDM_LOG_SERIAL + MENUITEM "Povolit záznamy sériového portu\tCtrl+F3", IDM_LOG_SERIAL # endif # ifdef ENABLE_NIC_LOG - MENUITEM "Enable Network logs\tCtrl+F9", IDM_LOG_NIC + MENUITEM "Povolit záznamy sítě\tCtrl+F9", IDM_LOG_NIC # endif # ifdef ENABLE_LOG_COMMANDS # ifdef ENABLE_LOG_TOGGLES MENUITEM SEPARATOR # endif # ifdef ENABLE_LOG_BREAKPOINT - MENUITEM "&Log breakpoint\tCtrl+F10", IDM_LOG_BREAKPOINT + MENUITEM "Zaznamenat do &logu zarážku\tCtrl+F10", IDM_LOG_BREAKPOINT # endif # ifdef ENABLE_VRAM_DUMP - MENUITEM "Dump &video RAM\tCtrl+F1", IDM_DUMP_VRAM + MENUITEM "Zaznamenat obsah &video RAM\tCtrl+F1", IDM_DUMP_VRAM # endif # endif END @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PREFERENCES "Předvolby emulátoru 86Box" +#define STR_PREFERENCES "Předvolby programu 86Box" #define STR_SND_GAIN "Zesílení zvuku" #define STR_NEW_FLOPPY "Nový obraz" #define STR_CONFIG "Nastavení počítače" @@ -299,7 +299,7 @@ END #define STR_MACHINE_TYPE "Typ počítače:" #define STR_MACHINE "Počítač:" -#define STR_CONFIGURE "Konfigurovat" +#define STR_CONFIGURE "Nastavit" #define STR_CPU_TYPE "Procesor:" #define STR_SPEED "Rychlost:" #define STR_FPU "Koprocesor:" @@ -406,7 +406,7 @@ STRINGTABLE DISCARDABLE BEGIN 2048 "86Box" IDS_2049 "Chyba" - IDS_2050 "Závažná chyba" + IDS_2050 "Kritická chyba" IDS_2051 "" IDS_2052 "Stiskněte Ctrl+Alt+Page Down pro návrat z režimu celé obrazovky." IDS_2053 "Rychlost" @@ -418,7 +418,7 @@ BEGIN IDS_2059 "Turbo" IDS_2060 "Zap." IDS_2061 "Vyp." - IDS_2062 "Všechny obrazy disků (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Základní sektorové obrazy (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Povrchové obrazy (*.86F)\0*.86F\0" + IDS_2062 "Všechny obrazy disků (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Základní sektorové obrazy (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Obrazy povrchu (*.86F)\0*.86F\0" IDS_2063 "Počítač ""%hs"" není dostupný, jelikož chybí obraz jeho paměti ROM ve složce ""roms/machines"". Konfigurace se přepne na jiný dostupný počítač." END @@ -436,7 +436,7 @@ BEGIN IDS_2073 "Disketové a CD-ROM mechaniky" IDS_2074 "Další vyměnitelná zařízení" IDS_2075 "Jiné příslušenství" - IDS_2076 "Image povrchu (*.86F)\0*.86F\0" + IDS_2076 "Obrazy povrchu (*.86F)\0*.86F\0" IDS_2077 "Klikněte pro zabraní myši" IDS_2078 "Stiskněte F8+F12 pro uvolnění myši" IDS_2079 "Stiskněte F8+F12 nebo prostřední tlačítko pro uvolnění myši" @@ -444,7 +444,7 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_2080 "Nebylo možné spustit FluidSynth." + IDS_2080 "Nastala chyba při inicializaci knihovny FluidSynth." IDS_2081 "Sběrnice" IDS_2082 "Soubor" IDS_2083 "C" @@ -453,11 +453,11 @@ BEGIN IDS_2086 "MB" IDS_2087 "Kontrola BPB" IDS_2088 "KB" - IDS_2089 "Nebylo možné spustit video renderer." + IDS_2089 "Nastala chyba při inicializaci video rendereru." IDS_2090 "Výchozí" IDS_2091 "%i čekací stav(y)" IDS_2092 "Typ" - IDS_2093 "Nebylo možné spustit PCap" + IDS_2093 "Nastala chyba při inicializaci knihovny PCap" IDS_2094 "Nebyla nalezena žádná PCap zařízení" IDS_2095 "Neplatné PCap zařízení" IDS_2096 "Standardní 2tlačítkový joystick" @@ -467,21 +467,21 @@ BEGIN IDS_2100 "CH Flightstick Pro" IDS_2101 "Microsoft SideWinder Pad" IDS_2102 "Thrustmaster Flight Control System" - IDS_2103 "Žadný" + IDS_2103 "Žadné" IDS_2104 "Nebylo možné nahrát klávesnicové zkratky." IDS_2105 "Nebylo možné zaregistrovat raw input." IDS_2106 "%u" IDS_2107 "%u MB (CHS: %i, %i, %i)" IDS_2108 "Disketová mechanika %i (%s): %ls" IDS_2109 "Všechny obrazy (*.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\0Rozšířené sektorové obrazy (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Základní sektorové obrazy (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Obrazy magnetického toku (*.FDI)\0*.FDI\0Obrazy povrchu (*.86F;*.MFM)\0*.86F;*.MFM\0Všechny soubory (*.*)\0*.*\0" - IDS_2110 "Nebylo možné spustit FreeType" - IDS_2111 "Nebylo možné spustit SDL, je potřeba SDL2.dll" + IDS_2110 "Nastala chyba při inicializaci knihovny FreeType" + IDS_2111 "Nastala chyba při inicializaci knihovny SDL, je potřeba SDL2.dll" IDS_2112 "Opravdu chcete resetovat emulovaný počítač?" IDS_2113 "Opravdu chcete ukončit 86Box?" - IDS_2114 "Nebylo možné spustit Ghostscript" + IDS_2114 "Nastala chyba při inicializaci knihovny Ghostscript" IDS_2115 "MO %i (%ls): %ls" IDS_2116 "Obrazy MO (*.IM?;*.MDI)\0*.IM?;*.MDI\0Všechny soubory (*.*)\0*.*\0" - IDS_2117 "Vítejte v emulátoru 86Box!" + IDS_2117 "Vítejte v programu 86Box!" IDS_2118 "Vestavěný řadič" IDS_2119 "Ukončit" IDS_2120 "Nebyly nalezeny žádné obrazy ROM" @@ -506,7 +506,7 @@ BEGIN #else #define LIB_NAME_FREETYPE "libfreetype" #endif - IDS_2131 LIB_NAME_FREETYPE " je potřeba pro emulaci ESC/P tiskárny." + IDS_2131 LIB_NAME_FREETYPE " je potřeba pro emulaci ESC/P tiskáren." #ifdef _WIN32 #define LIB_NAME_GS "gsdll32.dll" #else @@ -577,7 +577,7 @@ BEGIN IDS_4129 "Malé bloky (512 KB)" IDS_4130 "Soubory VHD (*.VHD)\0*.VHD\0Všechny soubory (*.*)\0*.*\0" IDS_4131 "Vyberte nadřazený virtuální disk" - IDS_4132 "To může znamenat, že se obsahy nadřazeného disku změnily po vytvoření rozdílového disku.\n\nTato chyba také může nastat, pokud byl soubor s image disku kopírován nebo přesunut, nebo kvůli chybě v programu, který tento disk vytvořil.\n\nChcete časová razítka opravit?" + IDS_4132 "To může znamenat, že se obsahy nadřazeného disku změnily po vytvoření rozdílového disku.\n\nTato chyba také může nastat, pokud byl obraz disku kopírován nebo přesunut, nebo kvůli chybě v programu, který jej vytvořil.\n\nChcete časová razítka opravit?" IDS_4133 "Časová razítka nadřazeného a podřazeného disku nesouhlasí" IDS_4134 "Nebylo možné opravit časové razítko VHD." IDS_4135 "%01i:%02i" @@ -631,12 +631,12 @@ BEGIN IDS_5910 "5.25"" 1Gb M.O." IDS_5911 "5.25"" 1.3Gb M.O." - IDS_6144 "Dokonalé ot./m" + IDS_6144 "Dokonalé otáčky za minutu" IDS_6145 "1%% pod dokonalými ot./m" IDS_6146 "1.5%% pod dokonalými ot./m" IDS_6147 "2%% pod dokonalými ot./m" - IDS_7168 "(výchozí nastavení systému)" + IDS_7168 "(Výchozí nastavení systému)" END #define IDS_LANG_ENUS IDS_7168 From 808971482b69bcb32602a6d5348315ea7bf4bbda Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 20 Nov 2021 18:37:07 -0500 Subject: [PATCH 10/13] British --- src/win/languages/en-GB.rc | 644 +++++++++++++++++++++++++++++++++++++ 1 file changed, 644 insertions(+) create mode 100644 src/win/languages/en-GB.rc diff --git a/src/win/languages/en-GB.rc b/src/win/languages/en-GB.rc new file mode 100644 index 000000000..847e97d90 --- /dev/null +++ b/src/win/languages/en-GB.rc @@ -0,0 +1,644 @@ +//////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_GB +#pragma code_page(65001) +#endif //_WIN32 + +#define AUTHORS + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +MainMenu MENU DISCARDABLE +BEGIN + POPUP "&Action" + BEGIN + MENUITEM "&Keyboard requires capture", IDM_ACTION_KBD_REQ_CAPTURE + MENUITEM "&Right CTRL is left ALT", IDM_ACTION_RCTRL_IS_LALT + MENUITEM SEPARATOR + MENUITEM "&Hard Reset...", IDM_ACTION_HRESET + MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD + MENUITEM SEPARATOR + MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC + MENUITEM SEPARATOR + MENUITEM "&Pause", IDM_ACTION_PAUSE + MENUITEM SEPARATOR + MENUITEM "E&xit...", IDM_ACTION_EXIT + END + POPUP "&View" + BEGIN + MENUITEM "&Hide status bar", IDM_VID_HIDE_STATUS_BAR + MENUITEM SEPARATOR + MENUITEM "&Resizeable window", IDM_VID_RESIZE + MENUITEM "R&emember size && position", IDM_VID_REMEMBER + MENUITEM SEPARATOR + POPUP "Re&nderer" + BEGIN + MENUITEM "&SDL (Software)", IDM_VID_SDL_SW + MENUITEM "SDL (&Hardware)", IDM_VID_SDL_HW + MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL +#if defined(DEV_BRANCH) && defined(USE_OPENGL) + MENUITEM "Open&GL (3.3 Core)", IDM_VID_OPENGL_CORE +#endif +#ifdef USE_VNC + MENUITEM "&VNC", IDM_VID_VNC +#endif + END + MENUITEM SEPARATOR + MENUITEM "Specify dimensions...", IDM_VID_SPECIFY_DIM + MENUITEM "F&orce 4:3 display ratio", IDM_VID_FORCE43 + POPUP "&Window scale factor" + BEGIN + MENUITEM "&0.5x", IDM_VID_SCALE_1X + MENUITEM "&1x", IDM_VID_SCALE_2X + MENUITEM "1.&5x", IDM_VID_SCALE_3X + MENUITEM "&2x", IDM_VID_SCALE_4X + END + POPUP "Filter method" + BEGIN + MENUITEM "&Nearest", IDM_VID_FILTER_NEAREST + MENUITEM "&Linear", IDM_VID_FILTER_LINEAR + END + MENUITEM "Hi&DPI scaling", IDM_VID_HIDPI + MENUITEM SEPARATOR + MENUITEM "&Fullscreen\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + POPUP "Fullscreen &stretch mode" + BEGIN + MENUITEM "&Full screen stretch", IDM_VID_FS_FULL + MENUITEM "&4:3", IDM_VID_FS_43 + MENUITEM "&Square pixels (Keep ratio)", IDM_VID_FS_KEEPRATIO + MENUITEM "&Integer scale", IDM_VID_FS_INT + END + POPUP "E&GA/(S)VGA settings" + BEGIN + MENUITEM "&Inverted VGA monitor", IDM_VID_INVERT + POPUP "VGA screen &type" + BEGIN + MENUITEM "RGB &Colour", IDM_VID_GRAY_RGB + MENUITEM "&RGB Greyscale", IDM_VID_GRAY_MONO + MENUITEM "&Amber monitor", IDM_VID_GRAY_AMBER + MENUITEM "&Green monitor", IDM_VID_GRAY_GREEN + MENUITEM "&White monitor", IDM_VID_GRAY_WHITE + END + POPUP "Grayscale &conversion type" + BEGIN + MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601 + MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709 + MENUITEM "&Average", IDM_VID_GRAYCT_AVE + END + END + MENUITEM SEPARATOR + MENUITEM "CGA/PCjr/Tandy/E&GA/(S)VGA overscan", IDM_VID_OVERSCAN + MENUITEM "Change contrast for &monochrome display", IDM_VID_CGACON + END + MENUITEM "&Media", IDM_MEDIA + POPUP "&Tools" + BEGIN + MENUITEM "&Settings...", IDM_CONFIG + MENUITEM "&Update status bar icons", IDM_UPDATE_ICONS + MENUITEM SEPARATOR + MENUITEM "Change program &settings...", IDM_VID_PROG_SETT +# ifdef USE_DISCORD + MENUITEM SEPARATOR + MENUITEM "Enable &Discord integration", IDM_DISCORD +# endif + MENUITEM SEPARATOR + MENUITEM "Take s&creenshot\tCtrl+F11", IDM_ACTION_SCREENSHOT + MENUITEM SEPARATOR + MENUITEM "Sound &gain...", IDM_SND_GAIN +#ifdef MTR_ENABLED + MENUITEM SEPARATOR + MENUITEM "Begin trace\tCtrl+T", IDM_ACTION_BEGIN_TRACE + MENUITEM "End trace\tCtrl+T", IDM_ACTION_END_TRACE +#endif + END +#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS) + POPUP "&Logging" + BEGIN +# ifdef ENABLE_BUSLOGIC_LOG + MENUITEM "Enable BusLogic logs\tCtrl+F4", IDM_LOG_BUSLOGIC +# endif +# ifdef ENABLE_CDROM_LOG + MENUITEM "Enable CD-ROM logs\tCtrl+F5", IDM_LOG_CDROM +# endif +# ifdef ENABLE_D86F_LOG + MENUITEM "Enable floppy (86F) logs\tCtrl+F6", IDM_LOG_D86F +# endif +# ifdef ENABLE_FDC_LOG + MENUITEM "Enable floppy controller logs\tCtrl+F7", IDM_LOG_FDC +# endif +# ifdef ENABLE_IDE_LOG + MENUITEM "Enable IDE logs\tCtrl+F8", IDM_LOG_IDE +# endif +# ifdef ENABLE_SERIAL_LOG + MENUITEM "Enable Serial Port logs\tCtrl+F3", IDM_LOG_SERIAL +# endif +# ifdef ENABLE_NIC_LOG + MENUITEM "Enable Network logs\tCtrl+F9", IDM_LOG_NIC +# endif +# ifdef ENABLE_LOG_COMMANDS +# ifdef ENABLE_LOG_TOGGLES + MENUITEM SEPARATOR +# endif +# ifdef ENABLE_LOG_BREAKPOINT + MENUITEM "&Log breakpoint\tCtrl+F10", IDM_LOG_BREAKPOINT +# endif +# ifdef ENABLE_VRAM_DUMP + MENUITEM "Dump &video RAM\tCtrl+F1", IDM_DUMP_VRAM +# endif +# endif + END +#endif + POPUP "&Help" + BEGIN + MENUITEM "&Documentation...", IDM_DOCS + MENUITEM "&About 86Box...", IDM_ABOUT + END +END + +StatusBarMenu MENU DISCARDABLE +BEGIN + MENUITEM SEPARATOR +END + +CassetteSubmenu MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&New image...", IDM_CASSETTE_IMAGE_NEW + MENUITEM SEPARATOR + MENUITEM "&Existing image...", IDM_CASSETTE_IMAGE_EXISTING + MENUITEM "Existing image (&Write-protected)...", IDM_CASSETTE_IMAGE_EXISTING_WP + MENUITEM SEPARATOR + MENUITEM "&Record", IDM_CASSETTE_RECORD + MENUITEM "&Play", IDM_CASSETTE_PLAY + MENUITEM "&Rewind to the beginning", IDM_CASSETTE_REWIND + MENUITEM "&Fast forward to the end", IDM_CASSETTE_FAST_FORWARD + MENUITEM SEPARATOR + MENUITEM "E&ject", IDM_CASSETTE_EJECT + END +END + +CartridgeSubmenu MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Image...", IDM_CARTRIDGE_IMAGE + MENUITEM SEPARATOR + MENUITEM "E&ject", IDM_CARTRIDGE_EJECT + END +END + +FloppySubmenu MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&New image...", IDM_FLOPPY_IMAGE_NEW + MENUITEM SEPARATOR + MENUITEM "&Existing image...", IDM_FLOPPY_IMAGE_EXISTING + MENUITEM "Existing image (&Write-protected)...", IDM_FLOPPY_IMAGE_EXISTING_WP + MENUITEM SEPARATOR + MENUITEM "E&xport to 86F...", IDM_FLOPPY_EXPORT_TO_86F + MENUITEM SEPARATOR + MENUITEM "E&ject", IDM_FLOPPY_EJECT + END +END + +CdromSubmenu MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Mute", IDM_CDROM_MUTE + MENUITEM SEPARATOR + MENUITEM "E&mpty", IDM_CDROM_EMPTY + MENUITEM "&Reload previous image", IDM_CDROM_RELOAD + MENUITEM SEPARATOR + MENUITEM "&Image", IDM_CDROM_IMAGE + END +END + +ZIPSubmenu MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&New image...", IDM_ZIP_IMAGE_NEW + MENUITEM SEPARATOR + MENUITEM "&Existing image...", IDM_ZIP_IMAGE_EXISTING + MENUITEM "Existing image (&Write-protected)...", IDM_ZIP_IMAGE_EXISTING_WP + MENUITEM SEPARATOR + MENUITEM "E&ject", IDM_ZIP_EJECT + MENUITEM "&Reload previous image", IDM_ZIP_RELOAD + END +END + +MOSubmenu MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&New image...", IDM_MO_IMAGE_NEW + MENUITEM SEPARATOR + MENUITEM "&Existing image...", IDM_MO_IMAGE_EXISTING + MENUITEM "Existing image (&Write-protected)...", IDM_MO_IMAGE_EXISTING_WP + MENUITEM SEPARATOR + MENUITEM "E&ject", IDM_MO_EJECT + MENUITEM "&Reload previous image", IDM_MO_RELOAD + END +END + +#if defined(DEV_BRANCH) && defined(USE_OPENGL) +VidGLSubMenu MENU DISCARDABLE +BEGIN + POPUP "Target &framerate" + BEGIN + MENUITEM "&Sync with video", IDM_VID_GL_FPS_BLITTER + MENUITEM "&25 fps", IDM_VID_GL_FPS_25 + MENUITEM "&30 fps", IDM_VID_GL_FPS_30 + MENUITEM "&50 fps", IDM_VID_GL_FPS_50 + MENUITEM "&60 fps", IDM_VID_GL_FPS_60 + MENUITEM "&75 fps", IDM_VID_GL_FPS_75 + END + MENUITEM "&VSync", IDM_VID_GL_VSYNC + MENUITEM "&Select shader...", IDM_VID_GL_SHADER + MENUITEM "&Remove shader", IDM_VID_GL_NOSHADER +END +#endif + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +#define STR_PROG_SETT "Program Settings" +#define STR_SND_GAIN "Sound Gain" +#define STR_NEW_FLOPPY "New Image" +#define STR_CONFIG "86Box Settings" +#define STR_SPECIFY_DIM "Specify Main Window Dimensions" + +#define STR_OK "OK" +#define STR_CANCEL "Cancel" +#define STR_GLOBAL "Save these settings as &global defaults" +#define STR_DEFAULT "&Default" +#define STR_LANGUAGE "Language:" +#define STR_ICONSET "Icon set:" + +#define STR_GAIN "Gain" + +#define STR_FILE_NAME "File name:" +#define STR_DISK_SIZE "Disk size:" +#define STR_RPM_MODE "RPM mode:" +#define STR_PROGRESS "Progress:" + +#define STR_WIDTH "Width:" +#define STR_HEIGHT "Height:" +#define STR_LOCK_TO_SIZE "Lock to this size" + +#define STR_MACHINE_TYPE "Machine type:" +#define STR_MACHINE "Machine:" +#define STR_CONFIGURE "Configure" +#define STR_CPU_TYPE "CPU type:" +#define STR_SPEED "Speed:" +#define STR_FPU "FPU:" +#define STR_WAIT_STATES "Wait states:" +#define STR_MB "MB" +#define STR_MEMORY "Memory:" +#define STR_TIME_SYNC "Time synchronization" +#define STR_DISABLED "Disabled" +#define STR_ENABLED_LOCAL "Enabled (local time)" +#define STR_ENABLED_UTC "Enabled (UTC)" +#define STR_DYNAREC "Dynamic Recompiler" + +#define STR_VIDEO "Video:" +#define STR_VOODOO "Voodoo Graphics" + +#define STR_MOUSE "Mouse:" +#define STR_JOYSTICK "Joystick:" +#define STR_JOY1 "Joystick 1..." +#define STR_JOY2 "Joystick 2..." +#define STR_JOY3 "Joystick 3..." +#define STR_JOY4 "Joystick 4..." + +#define STR_SOUND "Sound card:" +#define STR_MIDI "MIDI Out Device:" +#define STR_MIDI_IN "MIDI In Device:" +#define STR_MPU401 "Standalone MPU-401" +#define STR_SSI "Innovation SSI-2001" +#define STR_CMS "CMS / Game Blaster" +#define STR_GUS "Gravis Ultrasound" +#define STR_FLOAT "Use FLOAT32 sound" + +#define STR_NET_TYPE "Network type:" +#define STR_PCAP "PCap device:" +#define STR_NET "Network adapter:" + +#define STR_LPT1 "LPT1 Device:" +#define STR_LPT2 "LPT2 Device:" +#define STR_LPT3 "LPT3 Device:" +#define STR_SERIAL1 "Serial port 1" +#define STR_SERIAL2 "Serial port 2" +#define STR_SERIAL3 "Serial port 3" +#define STR_SERIAL4 "Serial port 4" +#define STR_PARALLEL1 "Parallel port 1" +#define STR_PARALLEL2 "Parallel port 2" +#define STR_PARALLEL3 "Parallel port 3" + +#define STR_HDC "HD Controller:" +#define STR_FDC "FD Controller:" +#define STR_IDE_TER "Tertiary IDE Controller" +#define STR_IDE_QUA "Quaternary IDE Controller" +#define STR_SCSI "SCSI" +#define STR_SCSI_1 "Controller 1:" +#define STR_SCSI_2 "Controller 2:" +#define STR_SCSI_3 "Controller 3:" +#define STR_SCSI_4 "Controller 4:" +#define STR_CASSETTE "Cassette" + +#define STR_HDD "Hard disks:" +#define STR_NEW "&New..." +#define STR_EXISTING "&Existing..." +#define STR_REMOVE "&Remove" +#define STR_BUS "Bus:" +#define STR_CHANNEL "Channel:" +#define STR_ID "ID:" + +#define STR_SPECIFY "&Specify..." +#define STR_SECTORS "Sectors:" +#define STR_HEADS "Heads:" +#define STR_CYLS "Cylinders:" +#define STR_SIZE_MB "Size (MB):" +#define STR_TYPE "Type:" +#define STR_IMG_FORMAT "Image Format:" +#define STR_BLOCK_SIZE "Block Size:" + +#define STR_FLOPPY_DRIVES "Floppy drives:" +#define STR_TURBO "Turbo timings" +#define STR_CHECKBPB "Check BPB" +#define STR_CDROM_DRIVES "CD-ROM drives:" + +#define STR_MO_DRIVES "MO drives:" +#define STR_ZIP_DRIVES "ZIP drives:" +#define STR_250 "ZIP 250" + +#define STR_ISARTC "ISA RTC:" +#define STR_ISAMEM "ISA Memory Expansion" +#define STR_ISAMEM_1 "Card 1:" +#define STR_ISAMEM_2 "Card 2:" +#define STR_ISAMEM_3 "Card 3:" +#define STR_ISAMEM_4 "Card 4:" +#define STR_BUGGER "ISABugger device" +#define STR_POSTCARD "POST card" + +#define FONT_SIZE 9 +#define FONT_NAME "Segoe UI" + +#include "dialogs.rc" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + 2048 "86Box" + IDS_2049 "Error" + IDS_2050 "Fatal error" + IDS_2051 "" + IDS_2052 "Press CTRL+ALT+PAGE DOWN to return to windowed mode." + IDS_2053 "Speed" + IDS_2054 "ZIP %03i %i (%s): %ls" + IDS_2055 "ZIP images (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" + IDS_2056 "86Box could not find any usable ROM images.\n\nPlease download a ROM set and extract it into the ""roms"" directory." + IDS_2057 "(empty)" + IDS_2058 "ZIP images (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0All files (*.*)\0*.*\0" + IDS_2059 "Turbo" + IDS_2060 "On" + IDS_2061 "Off" + IDS_2062 "All images (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Basic sector images (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Surface images (*.86F)\0*.86F\0" + IDS_2063 "Machine ""%hs"" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_2064 "Video card ""%hs"" is not available due to missing ROMs in the roms/video directory. Switching to an available video card." + IDS_2065 "Machine" + IDS_2066 "Display" + IDS_2067 "Input devices" + IDS_2068 "Sound" + IDS_2069 "Network" + IDS_2070 "Ports (COM & LPT)" + IDS_2071 "Storage controllers" + IDS_2072 "Hard disks" + IDS_2073 "Floppy & CD-ROM drives" + IDS_2074 "Other removable devices" + IDS_2075 "Other peripherals" + IDS_2076 "Surface images (*.86F)\0*.86F\0" + IDS_2077 "Click to capture mouse" + IDS_2078 "Press F8+F12 to release mouse" + IDS_2079 "Press F8+F12 or middle button to release mouse" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_2080 "Unable to initialize FluidSynth" + 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 "Could not initialize the video renderer." + IDS_2090 "Default" + IDS_2091 "%i Wait state(s)" + IDS_2092 "Type" + IDS_2093 "Failed to set up PCap" + 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" + 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 exit 86Box?" + IDS_2114 "Unable to initialize Ghostscript" + IDS_2115 "MO %i (%ls): %ls" + IDS_2116 "MO images (*.IM?;*.MDI)\0*.IM?;*.MDI\0All files (*.*)\0*.*\0" + IDS_2117 "Welcome to 86Box!" + IDS_2118 "Internal controller" + IDS_2119 "Exit" + IDS_2120 "No ROMs found" + IDS_2121 "Do you want to save the settings?" + IDS_2122 "This will hard reset the emulated machine." + IDS_2123 "Save" + IDS_2124 "About 86Box" + 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, Tiseno100, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information." + IDS_2127 "OK" + IDS_2128 "Hardware not available" +#ifdef _WIN32 +#define LIB_NAME_PCAP "WinPcap" +#else +#define LIB_NAME_PCAP "libpcap" +#endif + IDS_2129 "Make sure " LIB_NAME_PCAP " is installed and that you are on a " LIB_NAME_PCAP "-compatible network connection." + IDS_2130 "Invalid configuration" +#ifdef _WIN32 +#define LIB_NAME_FREETYPE "freetype.dll" +#else +#define LIB_NAME_FREETYPE "libfreetype" +#endif + IDS_2131 LIB_NAME_FREETYPE " is required for ESC/P printer emulation." +#ifdef _WIN32 +#define LIB_NAME_GS "gsdll32.dll" +#else +#define LIB_NAME_GS "libgs" +#endif + IDS_2132 LIB_NAME_GS " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files." +#ifdef _WIN32 +#define LIB_NAME_FLUIDSYNTH "libfluidsynth.dll" +#else +#define LIB_NAME_FLUIDSYNTH "libfluidsynth" +#endif + IDS_2133 LIB_NAME_FLUIDSYNTH " is required for FluidSynth MIDI output." + IDS_2134 "Entering fullscreen mode" + IDS_2135 "Don't show this message again" + IDS_2136 "Don't exit" + IDS_2137 "Reset" + IDS_2138 "Don't reset" + 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_2141 "%hs Device Configuration" + IDS_2142 "Monitor in sleep mode" + IDS_2143 "OpenGL Shaders (*.GLSL)\0*.GLSL\0All files (*.*)\0*.*\0" + IDS_2144 "OpenGL options" + IDS_2145 "You are loading an unsupported configuration" + IDS_2146 "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid." + IDS_2147 "Continue" + IDS_2148 "Cassette: %s" + IDS_2149 "Cassette images (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0All files (*.*)\0*.*\0" + IDS_2150 "Cartridge %i: %ls" + IDS_2151 "Cartridge images (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0All files (*.*)\0*.*\0" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_4096 "Hard disk (%s)" + IDS_4097 "%01i:%01i" + IDS_4098 "%01i" + IDS_4099 "MFM/RLL or ESDI CD-ROM drives never existed" + IDS_4100 "Custom..." + IDS_4101 "Custom (large)..." + IDS_4102 "Add New Hard Disk" + IDS_4103 "Add Existing Hard Disk" + IDS_4104 "HDI disk images cannot be larger than 4 GB." + IDS_4105 "Disk images cannot be larger than 127 GB." + IDS_4106 "Hard disk images (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0All files (*.*)\0*.*\0" + IDS_4107 "Unable to read file" + IDS_4108 "Unable to write file" + IDS_4109 "HDI or HDX images with a sector size other than 512 are not supported." + IDS_4110 "USB is not yet supported" + IDS_4111 "Disk image file already exists" + IDS_4112 "Please specify a valid file name." + IDS_4113 "Disk image created" + IDS_4114 "Make sure the file exists and is readable." + IDS_4115 "Make sure the file is being saved to a writable directory." + IDS_4116 "Disk image too large" + IDS_4117 "Remember to partition and format the newly-created drive." + IDS_4118 "The selected file will be overwritten. Are you sure you want to use it?" + IDS_4119 "Unsupported disk image" + IDS_4120 "Overwrite" + IDS_4121 "Don't overwrite" + IDS_4122 "Raw image (.img)" + IDS_4123 "HDI image (.hdi)" + IDS_4124 "HDX image (.hdx)" + IDS_4125 "Fixed-size VHD (.vhd)" + IDS_4126 "Dynamic-size VHD (.vhd)" + IDS_4127 "Differencing VHD (.vhd)" + IDS_4128 "Large blocks (2 MB)" + IDS_4129 "Small blocks (512 KB)" + IDS_4130 "VHD files (*.VHD)\0*.VHD\0All files (*.*)\0*.*\0" + IDS_4131 "Select the parent VHD" + IDS_4132 "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?" + IDS_4133 "Parent and child disk timestamps do not match" + IDS_4134 "Could not fix VHD timestamp." + IDS_4135 "%01i:%02i" + + IDS_4352 "MFM/RLL" + IDS_4353 "XTA" + IDS_4354 "ESDI" + IDS_4355 "IDE" + IDS_4356 "ATAPI" + IDS_4357 "SCSI" + + IDS_4608 "MFM/RLL (%01i:%01i)" + IDS_4609 "XTA (%01i:%01i)" + IDS_4610 "ESDI (%01i:%01i)" + IDS_4611 "IDE (%01i:%01i)" + IDS_4612 "ATAPI (%01i:%01i)" + IDS_4613 "SCSI (%01i:%02i)" + + IDS_5120 "CD-ROM %i (%s): %s" + + IDS_5376 "Disabled" + IDS_5381 "ATAPI" + IDS_5382 "SCSI" + + IDS_5632 "Disabled" + IDS_5637 "ATAPI (%01i:%01i)" + IDS_5638 "SCSI (%01i:%02i)" + + IDS_5888 "160 kB" + IDS_5889 "180 kB" + IDS_5890 "320 kB" + IDS_5891 "360 kB" + IDS_5892 "640 kB" + IDS_5893 "720 kB" + IDS_5894 "1.2 MB" + IDS_5895 "1.25 MB" + IDS_5896 "1.44 MB" + IDS_5897 "DMF (cluster 1024)" + IDS_5898 "DMF (cluster 2048)" + IDS_5899 "2.88 MB" + IDS_5900 "ZIP 100" + IDS_5901 "ZIP 250" + IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" + IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" + IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" + IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" + IDS_5906 "3.5"" 1.3Gb M.O. (GigaMO)" + IDS_5907 "3.5"" 2.3Gb M.O. (GigaMO 2)" + IDS_5908 "5.25"" 600Mb M.O." + IDS_5909 "5.25"" 650Mb M.O." + IDS_5910 "5.25"" 1Gb M.O." + IDS_5911 "5.25"" 1.3Gb M.O." + + IDS_6144 "Perfect RPM" + IDS_6145 "1%% below perfect RPM" + IDS_6146 "1.5%% below perfect RPM" + IDS_6147 "2%% below perfect RPM" + + IDS_7168 "(System Default)" +END +#define IDS_LANG_ENUS IDS_7168 + +// English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// From 02f5c8350369583a913f4e12790635cb7f83013b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sun, 21 Nov 2021 00:47:03 +0100 Subject: [PATCH 11/13] Fix en-GB translation --- src/win/86Box.rc | 3 ++- src/win/languages/en-GB.rc | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/win/86Box.rc b/src/win/86Box.rc index 441d63ba0..f9b50c1e9 100644 --- a/src/win/86Box.rc +++ b/src/win/86Box.rc @@ -360,10 +360,10 @@ END #endif // not APSTUDIO_INVOKED -#include "languages/zh-CN.rc" #include "languages/cs-CZ.rc" #include "languages/de-DE.rc" #include "languages/en-US.rc" +#include "languages/en-GB.rc" #include "languages/fr-FR.rc" #include "languages/hr-HR.rc" #include "languages/fi-FI.rc" @@ -373,3 +373,4 @@ END #include "languages/pt-BR.rc" #include "languages/pt-PT.rc" #include "languages/sl-SI.rc" +#include "languages/zh-CN.rc" diff --git a/src/win/languages/en-GB.rc b/src/win/languages/en-GB.rc index 847e97d90..67fc074a5 100644 --- a/src/win/languages/en-GB.rc +++ b/src/win/languages/en-GB.rc @@ -1,8 +1,8 @@ //////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// English (U.K.) resources #ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_GB +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK #pragma code_page(65001) #endif //_WIN32 @@ -101,7 +101,7 @@ BEGIN MENUITEM "&Settings...", IDM_CONFIG MENUITEM "&Update status bar icons", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Change program &settings...", IDM_VID_PROG_SETT + MENUITEM "&Preferences...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Enable &Discord integration", IDM_DISCORD @@ -273,10 +273,10 @@ END // Dialog // -#define STR_PROG_SETT "Program Settings" +#define STR_PREFERENCES "86Box Preferences" #define STR_SND_GAIN "Sound Gain" #define STR_NEW_FLOPPY "New Image" -#define STR_CONFIG "86Box Settings" +#define STR_CONFIG "Machine Settings" #define STR_SPECIFY_DIM "Specify Main Window Dimensions" #define STR_OK "OK" @@ -640,5 +640,5 @@ BEGIN END #define IDS_LANG_ENUS IDS_7168 -// English (U.S.) resources +// English (U.K.) resources ///////////////////////////////////////////////////////////////////////////// From db8b7dc896334c0f9f45209ecbc10bfa77fa77cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sun, 21 Nov 2021 03:25:16 +0100 Subject: [PATCH 12/13] Replaced outdated translations with English --- src/win/languages/fr-FR.rc | 4 ++-- src/win/languages/pt-PT.rc | 4 ++-- src/win/languages/zh-CN.rc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/win/languages/fr-FR.rc b/src/win/languages/fr-FR.rc index 48c94df85..cb840ca00 100644 --- a/src/win/languages/fr-FR.rc +++ b/src/win/languages/fr-FR.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "&Réglages...", IDM_CONFIG MENUITEM "Mettre à jour la barre de stat&us", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Changer la &langue...", IDM_PREFERENCES + MENUITEM "&Preferences...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Activer intégration &Discord", IDM_DISCORD @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PREFERENCES "Changer langue" +#define STR_PREFERENCES "86Box Preferences" #define STR_SND_GAIN "Gain son" #define STR_NEW_FLOPPY "Nouvelle image" #define STR_CONFIG "Réglages 86Box" diff --git a/src/win/languages/pt-PT.rc b/src/win/languages/pt-PT.rc index 3d2482b9d..d9927cf3d 100644 --- a/src/win/languages/pt-PT.rc +++ b/src/win/languages/pt-PT.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "&Definições...", IDM_CONFIG MENUITEM "&Atualizar ícones da barra de estado", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Change program &settings...", IDM_PREFERENCES + MENUITEM "&Preferences...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Ativar integração com &Discord", IDM_DISCORD @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PREFERENCES "Program Settings" +#define STR_PREFERENCES "Preferences" #define STR_SND_GAIN "Ganho de som" #define STR_NEW_FLOPPY "Nova imagem" #define STR_CONFIG "Definições do 86Box" diff --git a/src/win/languages/zh-CN.rc b/src/win/languages/zh-CN.rc index 06f53344a..226d40465 100644 --- a/src/win/languages/zh-CN.rc +++ b/src/win/languages/zh-CN.rc @@ -101,7 +101,7 @@ BEGIN MENUITEM "设置(&S)...", IDM_CONFIG MENUITEM "更新状态栏图标(&U)", IDM_UPDATE_ICONS MENUITEM SEPARATOR - MENUITEM "Change program &settings...", IDM_PREFERENCES + MENUITEM "&Preferences...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "启用 Discord 集成(&D)", IDM_DISCORD @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PREFERENCES "Program Settings" +#define STR_PREFERENCES "86Box Preferences" #define STR_SND_GAIN "音量增益" #define STR_NEW_FLOPPY "新建镜像" #define STR_CONFIG "86Box 设置" From 0c307c2058422a5b234eb85d42770e0b0767018b Mon Sep 17 00:00:00 2001 From: OBattler Date: Sun, 21 Nov 2021 18:17:45 +0100 Subject: [PATCH 13/13] Ported the AT keyboard reset fixes from feature/machine_and_kb. --- src/device/keyboard_at.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/device/keyboard_at.c b/src/device/keyboard_at.c index b7cd3951e..4e6e24a1a 100644 --- a/src/device/keyboard_at.c +++ b/src/device/keyboard_at.c @@ -1052,38 +1052,48 @@ static void write_output(atkbd_t *dev, uint8_t val) { uint8_t kbc_ven = dev->flags & KBC_VEN_MASK; + uint8_t old = dev->output_port; kbd_log("ATkbc: write output port: %02X (old: %02X)\n", val, dev->output_port); if ((kbc_ven == KBC_VEN_AMI) || ((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_NOREF)) val |= ((dev->mem[0] << 4) & 0x10); - if ((dev->output_port ^ val) & 0x20) { /*IRQ 12*/ + /*IRQ 12*/ + if ((dev->output_port ^ val) & 0x20) { if (val & 0x20) picint(1 << 12); else picintc(1 << 12); } - if ((dev->output_port ^ val) & 0x10) { /*IRQ 1*/ + + /*IRQ 1*/ + if ((dev->output_port ^ val) & 0x10) { if (val & 0x10) picint(1 << 1); else picintc(1 << 1); } + if ((dev->output_port ^ val) & 0x02) { /*A20 enable change*/ mem_a20_key = val & 0x02; mem_a20_recalc(); flushmmucache(); } - if ((dev->output_port ^ val) & 0x01) { /*Reset*/ - if (! (val & 0x01)) { + + /* Do this here to avoid an infinite reset loop. */ + dev->output_port = val; + + /* 0 holds the CPU in the RESET state, 1 releases it. To simplify this, + we just do everything on release. */ + if ((val & 0x01) && !(old & 0x01)) { + if (val & 0x01) { /* Pin 0 selected. */ - softresetx86(); /*Pulse reset!*/ + pclog("write_output(): Pulse reset!\n"); + softresetx86(); /*Pulse reset!*/ cpu_set_edx(); - smbase = is_am486dxl ? 0x00060000 : 0x00030000; + flushmmucache(); } } - /* Mask off the A20 stuff because we use mem_a20_key directly for that. */ - dev->output_port = val; } @@ -1372,7 +1382,7 @@ write64_ami(void *priv, uint8_t val) case 0xa1: /* get controller version */ kbd_log("ATkbc: AMI - get controller version\n"); - add_data(dev, 'H'); + add_data(dev, 'Z'); return 0; case 0xa2: /* clear keyboard controller lines P22/P23 */