From 7cbf58886096937dfba04dcfe9291359b74d54a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sun, 14 Nov 2021 18:34:34 +0100 Subject: [PATCH] Fix the Visual Studio build - resource files must end with trailing newspace, otherwise the builds fails with RC1040 - rc.exe did not like the multi-line string declaration for the about dialog text, might have to think about a more definitive solution there --- src/win/86Box.rc | 2 +- src/win/languages/en-US.rc | 18 ++++-------------- src/win/languages/hu-HU.rc | 15 ++------------- src/win/languages/pt-BR.rc | 15 ++------------- 4 files changed, 9 insertions(+), 41 deletions(-) diff --git a/src/win/86Box.rc b/src/win/86Box.rc index 549ec4c8b..8755f1639 100644 --- a/src/win/86Box.rc +++ b/src/win/86Box.rc @@ -362,4 +362,4 @@ END #include "languages/en-US.rc" #include "languages/hu-HU.rc" -#include "languages/pt-BR.rc" \ No newline at end of file +#include "languages/pt-BR.rc" diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc index f21f91de5..7c00d4be8 100644 --- a/src/win/languages/en-US.rc +++ b/src/win/languages/en-US.rc @@ -6,6 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(65001) #endif //_WIN32 +#define AUTHORS + ///////////////////////////////////////////////////////////////////////////// // // Menu @@ -833,19 +835,7 @@ BEGIN IDS_2124 "About 86Box" IDS_2125 "86Box v" EMU_VERSION - IDS_2126 "An emulator of old computers\n\n" - - "Authors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\n" - - /* - Here uncomment following line and add your name like "Translated by: \n\n". - If such a line exists with name of previous translators, don't erase their name, just add yours to the end of line. - */ - - //"Translated by: \n\n" - - "Released under the GNU General Public License version 2 or later. See LICENSE for more information." - + IDS_2126 "An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information." IDS_2127 "OK" IDS_2128 "Hardware not available" #ifdef _WIN32 @@ -995,4 +985,4 @@ END #define IDS_LANG_ENUS IDS_7168 // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// \ No newline at end of file +///////////////////////////////////////////////////////////////////////////// diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index 4abbdb43d..0e60cbdbf 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -834,18 +834,7 @@ BEGIN IDS_2123 "Mentés" IDS_2124 "A 86Box névjegye" IDS_2125 "86Box v" EMU_VERSION - IDS_2126 "Régi számítógépek emulátora\n\n" - - "Fejlesztők: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\n" - - /* - Translate the following line as "Translated by: \n\n". - If there were previous translators, don't erase their name, just add yours to the end of line. - */ - - "Fordította: Laci bá'\n\n" - - "Megjelent a GNU General Public License v2 vagy újabb alatt. További információért lásd a LICENSE fájlt." + IDS_2126 "Régi számítógépek emulátora\n\nFejlesztők: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nFordította: Laci bá'\n\nMegjelent a GNU General Public License v2 vagy újabb alatt. További információért lásd a LICENSE fájlt." IDS_2127 "OK" IDS_2128 "Hardver nem elérhető" #ifdef _WIN32 @@ -995,4 +984,4 @@ END #define IDS_LANG_ENUS IDS_7168 // Hungarian resources -///////////////////////////////////////////////////////////////////////////// \ No newline at end of file +///////////////////////////////////////////////////////////////////////////// diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index 746a69bb0..951ea6dc7 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -834,18 +834,7 @@ BEGIN IDS_2123 "Salvar" IDS_2124 "Sobre o 86Box" IDS_2125 "86Box versão" EMU_VERSION - IDS_2126 "Um emulador de computadores antigos\n\n" - - "Autores: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, e outros.\n\n" - - /* - Here uncomment following line and add your name like "Translated by: \n\n". - If such a line exists with name of previous translators, don't erase their name, just add yours to the end of line. - */ - - "Traduzido por: Altieres Lima da Silva\n\n" - - "Lançado sob a Licença Pública Geral GNU versão 2 ou posterior. Veja o arquivo LICENSE para mais informações." + IDS_2126 "Um emulador de computadores antigos\n\nAutores: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, e outros.\n\nTraduzido por: Altieres Lima da Silva\n\nLançado sob a Licença Pública Geral GNU versão 2 ou posterior. Veja o arquivo LICENSE para mais informações." IDS_2127 "OK" IDS_2128 "Hardware não disponível" #ifdef _WIN32 @@ -995,4 +984,4 @@ END #define IDS_LANG_ENUS IDS_7168 // Portuguese (pt-BR) resources -///////////////////////////////////////////////////////////////////////////// \ No newline at end of file +/////////////////////////////////////////////////////////////////////////////