diff --git a/src/device/keyboard_at.c b/src/device/keyboard_at.c index 4e6e24a1a..ff166ea89 100644 --- a/src/device/keyboard_at.c +++ b/src/device/keyboard_at.c @@ -1051,11 +1051,11 @@ add_data_kbd(uint16_t val) 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)) + uint8_t kbc_ven = dev->flags & KBC_VEN_MASK; + if ((kbc_ven != KBC_VEN_OLIVETTI) && ((kbc_ven == KBC_VEN_AMI) || ((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_NOREF))) val |= ((dev->mem[0] << 4) & 0x10); /*IRQ 12*/ @@ -2104,7 +2104,7 @@ kbd_write(uint16_t port, uint8_t val, void *priv) case 0xd0: /* read output port */ kbd_log("ATkbc: read output port\n"); mask = 0xff; - if (((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_NOREF) && (dev->mem[0] & 0x10)) + if ((kbc_ven != KBC_VEN_OLIVETTI) && ((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_NOREF) && (dev->mem[0] & 0x10)) mask &= 0xbf; add_to_kbc_queue_front(dev, dev->output_port & mask, 0, 0x00); break; diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index 2e6acc0b9..d97928cc2 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_PREFERENCES + MENUITEM "&Preferências...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "Ativar integração com o &Discord", IDM_DISCORD @@ -274,7 +274,7 @@ END // Dialog // -#define STR_PREFERENCES "Configurações do programa" +#define STR_PREFERENCES "Preferências do 86Box" #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/zh-CN.rc b/src/win/languages/zh-CN.rc index 226d40465..f31180057 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 "&Preferences...", IDM_PREFERENCES + MENUITEM "&偏好选项(语言等)...", IDM_PREFERENCES # ifdef USE_DISCORD MENUITEM SEPARATOR MENUITEM "启用 Discord 集成(&D)", IDM_DISCORD @@ -273,7 +273,7 @@ END // Dialog // -#define STR_PREFERENCES "86Box Preferences" +#define STR_PREFERENCES "86Box 偏好选项" #define STR_SND_GAIN "音量增益" #define STR_NEW_FLOPPY "新建镜像" #define STR_CONFIG "86Box 设置"