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

# Conflicts:
#	src/qt/qt_mediamenu.cpp
#	src/qt/qt_mediamenu.hpp

src/win/languages/cs-CZ.rc

@@ -272,6 +272,7 @@ END
 
 #define STR_VIDEO		"Grafika:"
 #define STR_VOODOO		"Použít grafický akcelerátor Voodoo"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"Myš:"
 #define STR_JOYSTICK		"Joystick:"

src/win/languages/de-DE.rc

@@ -272,6 +272,7 @@ END
 
 #define STR_VIDEO		"Videokarte:"
 #define STR_VOODOO		"Voodoo-Grafik"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"Maus:"
 #define STR_JOYSTICK		"Joystick:"

src/win/languages/dialogs.rc

@@ -265,6 +265,10 @@ BEGIN
                     7, 27, 199, CFG_CHECKBOX_HEIGHT
     PUSHBUTTON      STR_CONFIGURE, IDC_BUTTON_VOODOO,
                     CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
+
+    CONTROL         STR_IBM8514, IDC_CHECK_IBM8514,
+                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+                    7, 46, 199, CFG_CHECKBOX_HEIGHT
 END
 
 DLG_CFG_INPUT DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT

src/win/languages/en-GB.rc

@@ -272,6 +272,7 @@ END
 
 #define STR_VIDEO		"Video:"
 #define STR_VOODOO		"Voodoo Graphics"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"Mouse:"
 #define STR_JOYSTICK		"Joystick:"

src/win/languages/en-US.rc

@@ -272,6 +272,7 @@ END
 
 #define STR_VIDEO		"Video:"
 #define STR_VOODOO		"Voodoo Graphics"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"Mouse:"
 #define STR_JOYSTICK		"Joystick:"

src/win/languages/es-ES.rc

@@ -272,6 +272,7 @@ END
 
 #define STR_VIDEO		"Vídeo:"
 #define STR_VOODOO		"Voodoo Graphics"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"Ratón:"
 #define STR_JOYSTICK		"Mando:"

src/win/languages/fi-FI.rc

@@ -272,6 +272,7 @@ END
 
 #define STR_VIDEO           "Näytönohjain:"
 #define STR_VOODOO          "Voodoo-grafiikkasuoritin"
+#define STR_IBM8514	        "IBM 8514/a Graphics"
 
 #define STR_MOUSE           "Hiiri:"
 #define STR_JOYSTICK        "Peliohjain:"

src/win/languages/fr-FR.rc

@@ -272,6 +272,7 @@ END
 
 #define STR_VIDEO		"Vidéo:"
 #define STR_VOODOO		"Graphique Voodoo"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"Souris:"
 #define STR_JOYSTICK		"Manette de commande:"

src/win/languages/hr-HR.rc

@@ -272,6 +272,7 @@ END
 
 #define STR_VIDEO		"Video:"
 #define STR_VOODOO		"Voodoo grafika"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"Miš:"
 #define STR_JOYSTICK		"Palica za igru:"

src/win/languages/hu-HU.rc

@@ -277,6 +277,7 @@ END
 
 #define STR_VIDEO		"Videokártya:"
 #define STR_VOODOO		"Voodoo-gyorsítókártya"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"Egér:"
 #define STR_JOYSTICK		"Játékvezérlő:"

src/win/languages/it-IT.rc

@@ -273,6 +273,7 @@ END
 
 #define STR_VIDEO		"Video:"
 #define STR_VOODOO		"Grafica Voodoo"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"Mouse:"
 #define STR_JOYSTICK		"Joystick:"

src/win/languages/ja-JP.rc

@@ -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		"ジョイスティック:"

src/win/languages/ko-KR.rc

@@ -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		"조이스틱:"

src/win/languages/pl-PL.rc

@@ -272,6 +272,7 @@ END
 
 #define STR_VIDEO		"Wideo:"
 #define STR_VOODOO		"Grafika Voodoo"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"Mysz:"
 #define STR_JOYSTICK		"Joystick:"

src/win/languages/pt-BR.rc

@@ -275,6 +275,7 @@ END
 
 #define STR_VIDEO		"Vídeo:"
 #define STR_VOODOO		"3DFX Voodoo"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"Mouse:"
 #define STR_JOYSTICK		"Joystick:"

src/win/languages/pt-PT.rc

@@ -272,6 +272,7 @@ END
 
 #define STR_VIDEO		"Vídeo:"
 #define STR_VOODOO		"Gráficos Voodoo"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"Rato:"
 #define STR_JOYSTICK		"Joystick:"

src/win/languages/ru-RU.rc

@@ -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		"Джойстик:"

src/win/languages/sl-SI.rc

@@ -272,6 +272,7 @@ END
 
 #define STR_VIDEO		"Video:"
 #define STR_VOODOO		"Voodoo grafika"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"Miška:"
 #define STR_JOYSTICK		"Igralna palica:"

src/win/languages/tr-TR.rc

@@ -272,6 +272,7 @@ END
 
 #define STR_VIDEO		"Ekran kartı:"
 #define STR_VOODOO		"Voodoo Grafikleri"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"Fare:"
 #define STR_JOYSTICK		"Oyun kolu:"

src/win/languages/uk-UA.rc

@@ -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		"Джойстик:"

src/win/languages/zh-CN.rc

@@ -272,6 +272,7 @@ END
 
 #define STR_VIDEO		"显卡:"
 #define STR_VOODOO		"Voodoo Graphics"
+#define STR_IBM8514		"IBM 8514/a Graphics"
 
 #define STR_MOUSE		"鼠标:"
 #define STR_JOYSTICK		"操纵杆:"