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

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source 
# Conflicts:
#	src/qt/qt_mediamenu.cpp
#	src/qt/qt_mediamenu.hpp
This commit is contained in:
RichardG867
2022-06-07 15:36:12 -03:00
parent 0582c11e90 92c3768a48
commit 50b75c457d
104 changed files with 7259 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/win/languages/ru-RU.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Видеокарта:"
#define STR_VOODOO "Ускоритель Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Мышь:"
#define STR_JOYSTICK "Джойстик:"