Merge branch 'master' into master

2021-11-18 22:08:22 +01:00
parent d99a9a1983 dce2e40f18
commit 6e1b6f7c81
3 changed files with 648 additions and 4 deletions
--- a/src/win/86Box.rc
+++ b/src/win/86Box.rc
@@ -364,6 +364,7 @@ END
 #include "languages/cs-CZ.rc"
 #include "languages/de-DE.rc"
 #include "languages/en-US.rc"
+//#include "languages/fr-FR.rc"
 #include "languages/hr-HR.rc"
 #include "languages/fi-FI.rc"
 #include "languages/hu-HU.rc"
@@ -371,5 +372,4 @@ END
 #include "languages/ja-JP.rc"
 #include "languages/pt-BR.rc"
 #include "languages/pt-PT.rc"
-#include "languages/zh-CN.rc"
-//#include "languages/fr-FR.rc"
+#include "languages/sl-SI.rc"