From 4e1d247ce373b3ccb6f131399eb6d98cd0c3cc6f Mon Sep 17 00:00:00 2001 From: Slawek Mikula Date: Tue, 9 Feb 2021 16:56:25 +0100 Subject: [PATCH] - info-before-en.txt, info-before-pl.txt - EN/PL information before installation - unstable - FlightGear-files.iss - removed commented-out files - FlightGear.iss - add InfoBeforeFile for EN/PL languages --- FlightGear-files.iss | 17 +---------------- FlightGear.iss | 7 +++++-- windows/info-before-en.txt | 20 ++++++++++++++++++++ windows/info-before-pl.txt | 21 +++++++++++++++++++++ 4 files changed, 47 insertions(+), 18 deletions(-) create mode 100644 windows/info-before-en.txt create mode 100644 windows/info-before-pl.txt diff --git a/FlightGear-files.iss b/FlightGear-files.iss index c9f0c4b..c8db0e3 100644 --- a/FlightGear-files.iss +++ b/FlightGear-files.iss @@ -1,8 +1,6 @@ [Files] ; 64 bits install Source: "{#InstallDir64}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode -;locale only exists for fgrun - which has been disabled -;Source: "{#InstallDir64}\share\locale\*"; DestDir: "{app}\bin\locale"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode Source: "{#ThirdPartyDir}\3rdParty.x64\bin\zlib.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode Source: "{#ThirdPartyDir}\3rdParty.x64\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode @@ -43,17 +41,4 @@ Source: "{#OSG64PluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\osgPlugins-{#OSG Source: "{#OSG64PluginsDir}\osgdb_dds.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode Source: "{#OSG64PluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode Source: "{#OSG64PluginsDir}\osgdb_tiff.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode -Source: "{#OSG64PluginsDir}\osgdb_freetype.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode - -;Source: "{#OSG64PluginsDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode -;Source: "{#OSG64PluginsDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode -;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode -;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgmanipulator.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode -;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgparticle.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode -;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgshadow.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode -;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgsim.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode -;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgterrain.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode -;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgtext.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode -;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgvolume.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode -;Source: "{#OSG64PluginsDir}\osgdb_deprecated_osg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode -;Source: "{#OSG64PluginsDir}\osgdb_deprecated_osgparticle.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode +Source: "{#OSG64PluginsDir}\osgdb_freetype.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode \ No newline at end of file diff --git a/FlightGear.iss b/FlightGear.iss index cd7a7d6..a68d7e1 100644 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -19,6 +19,9 @@ ; C:\> subst X: F:\Path\to\FlightGear\root ; C:\> subst X: F:\ ; +; TRANSLATION NOTE: +; - external i18n files HAVE to be UTF-8 with BOM encoded. Otherwise the installer can +; not detect correct file encoding ; ; InstallConfig.iss example content: ; @@ -85,8 +88,8 @@ ArchitecturesAllowed=x64 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:CreateDesktopIconGroup}" [Languages] -Name: "en"; MessagesFile: "compiler:Default.isl"; -Name: "pl"; MessagesFile: "compiler:Languages\Polish.isl"; +Name: "en"; MessagesFile: "compiler:Default.isl"; InfoBeforeFile: "{#FgHarnessPath}\windows\info-before-en.txt" +Name: "pl"; MessagesFile: "compiler:Languages\Polish.isl"; InfoBeforeFile: "{#FgHarnessPath}\windows\info-before-pl.txt" Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl"; Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; Name: "de"; MessagesFile: "compiler:Languages\German.isl"; diff --git a/windows/info-before-en.txt b/windows/info-before-en.txt new file mode 100644 index 0000000..9217588 --- /dev/null +++ b/windows/info-before-en.txt @@ -0,0 +1,20 @@ +FlightGear Unstable +=================== + +Contains FlightGear from the source code repository ('next' branch). +Please note that this installer is using the latest development code. +There is no guarantee that the code does not contain serious bugs and other issues. +It contains in-development features which are not yet considered stable, but whichare ready for +testing and feedback. + + +I have found a bug! +-------------------- + +If you find serious bugs, instability, performance degradation: + +- look at the FlightGear Tickets page (on the SourceForge project page) +- ask on the FlightGear forum (explicitly say that you're using unstable version) +- look at the flightgear-devel mailing list + +Many problems are already known or reported, but don't be afraid to ask and check. diff --git a/windows/info-before-pl.txt b/windows/info-before-pl.txt new file mode 100644 index 0000000..8ff02d7 --- /dev/null +++ b/windows/info-before-pl.txt @@ -0,0 +1,21 @@ +FlightGear Unstable +=================== + +Zawiera kod źródłowy FlightGear z repozytorium kodu źródłowego (gałąź 'next'). +Proszę, zauważ że to jest instalator, który zawiera najnowszy kod rozwojowy. +Nie ma gwarancji, że ten kod nie zawiera poważnych błędów i innych problemów. +Niemniej, to jest pakiet, który zawiera najwięcej nowej funkcjonalności, która +nie jest jeszcze dostępna w oficjalnej, stabilnej wersji oprogramowania. +Miłej zabawy i korzystania z niego ! + + +Znalazłem błąd ! +-------------------- + +Jeśli znalazłeś poważny błąd, niestabilność, ograniczenie wydajności: + +- sprawdź stronę ze zgłoszeniami błędów FlightGear (na stronie projektu SourceForge) +- zapytaj na forum FlightGear (wskaż jasno, że korzystasz z wersji niestabilnej/unstable) +- sprawdź mailową listę dyskusyjną flightgear-devel + +Jest prawdopodobne, że programiści już pracują nad rozwiązaniem tego problemu ! \ No newline at end of file