Commit Graph

249 Commits

Author SHA1 Message Date
OBattler
6bb5942ad1 Finish merge. 2023-05-16 00:53:59 +02:00
Jasmine Iwanek
1c3e1b4602 Correct win32 ui for cdrom model headings 2023-05-04 03:04:38 -04:00
Jasmine Iwanek
5c0292ae41 Disable old early CDROM support 2023-05-04 02:54:25 -04:00
Jasmine Iwanek
070d5c4190 Allow configuration of additional network adaptors in win32 ui 2023-05-03 04:08:26 -04:00
Jasmine Iwanek
948a78f6a9 Config support for Softfloat FPU in win32 ui 2023-05-02 01:56:53 -04:00
SuperMaxusa
46cd82e54f small fix in uk-UA.rc 2023-04-23 15:27:10 +03:00
SuperMaxusa
b6fbc74837 Update uk-UA.rc 2023-04-23 01:05:20 +03:00
OBattler
6850cb3ab1 Missing #undef's in dialog.rc. 2023-03-30 00:36:16 +02:00
Miran Grča
f2d02399b4 Merge pull request #3196 from snowruna/patch-1
Update ko-KR.rc
2023-03-21 00:19:42 +01:00
上條 當麻
7bfd8b39f5 Update zh-TW.rc 2023-03-13 03:35:44 +08:00
runa
a9df761d83 Update ko-KR.rc
Fix some missing parts
2023-03-12 04:06:38 +09:00
Jasmine Iwanek
93a1f2d2f9 Whitespace in win32 lang files (2/2) 2023-03-09 22:43:17 -05:00
上條 當麻
62568961d3 Update zh-TW.rc 2023-03-03 21:56:35 +08:00
Jasmine Iwanek
de32c40204 Whitespace in lang files 2023-03-01 02:40:33 -05:00
Jasmine Iwanek
ffaa8f885d Capitalize Dynarec strings 2023-03-01 00:19:13 -05:00
Jasmine Iwanek
8c1906bc98 Add missing translation 2023-03-01 00:15:56 -05:00
Jasmine Iwanek
f643391975 Serial Passthrough 2023-02-14 20:53:59 -05:00
Jasmine Iwanek
13b954a336 Port PR#2786 (Higher scaling factors) to win32 UI 2023-02-06 03:22:28 -05:00
Miran Grča
15138347c2 Merge pull request #3080 from jriwanek-forks/win32
Underlying plumbing for multi-net in win32 ui
2023-02-04 10:02:24 +01:00
Jasmine Iwanek
5d752db6a7 Underlying plumbing for multi-net in win32 ui 2023-02-04 03:35:16 -05:00
Jasmine Iwanek
f88a1e1728 Fix a warning due to extranious text 2023-02-04 02:23:32 -05:00
Miran Grča
a6ca6e3001 Merge pull request #3071 from jriwanek-forks/multi-sound
Support up to 4 sound cards
2023-02-02 12:39:54 +01:00
Jasmine Iwanek
5f04b29e8f Support up to 4 sound cards 2023-02-02 03:29:38 -05:00
David Hrdlička
7490bb12c9 Move Discord Rich Presence behind a compile-time option 2023-02-01 17:17:56 +01:00
Alexander Babikov
74f3393fe6 Display dynarec information in the About box 2023-01-18 21:09:36 +05:00
OBattler
542d9f1117 Dialogs.rc now correctly undefines STR_SPEED. 2022-12-11 19:48:58 +01:00
altiereslima
8f4897ad70 Update Portuguese Brazilian 2022-11-18 19:56:07 -03:00
Камидзе
f9e33d81bc Update zh-TW.rc 2022-11-14 16:19:40 +08:00
Камидзе
7df72ef848 Update zh-TW.rc 2022-11-11 08:57:38 +08:00
Jasmine Iwanek
19a64344ef Updates 2022-11-08 22:09:59 -05:00
Jasmine Iwanek
7b1a2b2f42 Merge remote-tracking branch 'upstream/master' into hdd-speed 2022-11-08 15:55:13 -05:00
Jasmine Iwanek
a157d6faca Update languages 2022-11-08 15:21:35 -05:00
Jasmine Iwanek
96802345b2 Merge pull request #2830 from kzmidze/patch-4
Update zh-TW.rc
2022-11-08 14:14:09 -05:00
Jasmine Iwanek
9291b184fe Merge remote-tracking branch 'upstream/master' into hdd-speed 2022-11-08 13:58:05 -05:00
Jasmine Iwanek
e5fecb289c Update de-DE.rc 2022-11-08 13:51:20 -05:00
Jasmine Iwanek
2f17689b64 Initial Dual Video on Win32 (UI Settings Part) 2022-11-08 13:04:08 -05:00
Jasmine Iwanek
40d39f1baa HDD Speed setting in win32 2022-11-08 11:43:36 -05:00
Камидзе
06e4c9a5f2 Update zh-TW.rc 2022-11-08 19:04:15 +08:00
Камидзе
0da1d7fb83 Update zh-TW.rc 2022-11-08 12:34:52 +08:00
Jasmine Iwanek
3a26985e1e Correct Image and Folder to windows design guidelines 2022-11-07 21:48:38 -05:00
Jasmine Iwanek
4000127c2b Revert "Fix odd german translation"
This reverts commit 37159b2fb7.
2022-11-07 21:34:06 -05:00
Jasmine Iwanek
37159b2fb7 Fix odd german translation
noun

stroke    Hub, Schlaganfall, Takt, Strich, Schlag, Streich
tact    Takt, Feingefühl
bar    Bar, Leiste, Balken, Latte, Stange, Takt
measure    Maßnahme, Maß, Maßstab, Takt, Maßeinheit, Menge
beat    Schlag, Takt, Runde, Revier, Beatmusik, Treibjagd
phase    Phase, Stufe, Stadium, Abschnitt, Takt, Schub
tactfulness    Feingefühl, Takt
grace    Gnade, Anmut, Grazie, Huld, Tischgebet, Takt

None of these seem correct.
2022-11-07 21:09:22 -05:00
Jasmine Iwanek
6b49dd609e Add zh-TW.rc to win32 & QT 2022-11-07 21:09:21 -05:00
OBattler
4d19b8a1e4 Added the ability to select earlier CD-ROM drive (emulates Chinon CDS-431 for SCSI and NEC CDR-260 for ATAPI) - needs to be ported to QT. 2022-10-29 06:44:30 +02:00
RichardG867
10e9285f61 Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30
# Conflicts:
#	src/cdrom/cdrom_image.c
#	src/cdrom/cdrom_image_backend.c
#	src/include/86box/cdrom.h
#	src/include/86box/cdrom_image_backend.h
#	src/include/86box/resource.h
#	src/qt/qt_mediamenu.cpp
#	src/qt/qt_mediamenu.hpp
#	src/unix/unix.c
#	src/win/win.c
#	src/win/win_devconf.c
#	src/win/win_dialog.c
#	src/win/win_joystick_rawinput.c
#	src/win/win_media_menu.c
#	src/win/win_mouse.c
#	src/win/win_settings.c
#	src/win/win_ui.c
2022-10-15 14:00:00 -03:00
Alexander Babikov
f51c4cbaab Adjust the layout and label text of the FM synth driver option 2022-07-26 17:03:26 +05:00
Alexander Babikov
9f77a00d32 win: Add the FM synth driver select option to the UI 2022-07-26 10:23:02 +05:00
altiereslima
61cb47a2d6 Update pt-BR.rc 2022-07-24 10:26:09 -03:00
RichardG867
537e43a1f9 Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30 2022-07-12 20:07:19 -03:00
Jasmine Iwanek
45a84cbbfe Fix incorrect position of CD speed 2022-07-09 19:35:53 -04:00