From 9f6f775ce502a77bac372c5d6a5c0e0ec6b6898f Mon Sep 17 00:00:00 2001 From: lx-s Date: Sat, 16 Dec 2023 19:12:57 +0100 Subject: [PATCH] Restructured inno setup translations --- Dist/InnoSetup/info-before.ita.txt | 11 ----------- Dist/InnoSetup/info-before.txt | 10 ---------- Dist/InnoSetup/translations/info-before.de-de.txt | 6 ++++++ Dist/InnoSetup/translations/info-before.en-us.txt | 7 +++++++ Dist/InnoSetup/translations/info-before.it-it.txt | 8 ++++++++ Dist/InnoSetup/winmute-setup-languages.iss | 11 ++++++----- Dist/InnoSetup/winmute-setup-strings.iss | 8 -------- Dist/InnoSetup/winmute-setup.iss | 4 +--- 8 files changed, 28 insertions(+), 37 deletions(-) delete mode 100644 Dist/InnoSetup/info-before.ita.txt delete mode 100644 Dist/InnoSetup/info-before.txt create mode 100644 Dist/InnoSetup/translations/info-before.de-de.txt create mode 100644 Dist/InnoSetup/translations/info-before.en-us.txt create mode 100644 Dist/InnoSetup/translations/info-before.it-it.txt delete mode 100644 Dist/InnoSetup/winmute-setup-strings.iss diff --git a/Dist/InnoSetup/info-before.ita.txt b/Dist/InnoSetup/info-before.ita.txt deleted file mode 100644 index db8c820..0000000 --- a/Dist/InnoSetup/info-before.ita.txt +++ /dev/null @@ -1,11 +0,0 @@ -Assicurati che nel sistema sia installata lasione più recente di Microsoft Visual C++. -Per eseguire WinMute sono necessari solo i file runtime x64. - -Puoi scaricarlo qui: - -https://docs.microsoft.com/cpp/windows/latest-supported-vc-redist - -o direttamente qui - -https://aka.ms/vs/17/release/vc_redist.x64.exe - diff --git a/Dist/InnoSetup/info-before.txt b/Dist/InnoSetup/info-before.txt deleted file mode 100644 index 9ca8d77..0000000 --- a/Dist/InnoSetup/info-before.txt +++ /dev/null @@ -1,10 +0,0 @@ -Please make sure that the latest Microsoft Visual C++ runtime is installed on your system. -To run WinMute only the x64 runtime files are needed. - -You can download it here: - -https://docs.microsoft.com/cpp/windows/latest-supported-vc-redist - -or directly here - -https://aka.ms/vs/17/release/vc_redist.x64.exe diff --git a/Dist/InnoSetup/translations/info-before.de-de.txt b/Dist/InnoSetup/translations/info-before.de-de.txt new file mode 100644 index 0000000..0baa11a --- /dev/null +++ b/Dist/InnoSetup/translations/info-before.de-de.txt @@ -0,0 +1,6 @@ +WinMute benötigt eine installierte Microsoft Visual C++ Laufzeitumgebung. + +Diese kann hier unter den folgenden Links heruntergeladen werden: + +* https://docs.microsoft.com/cpp/windows/latest-supported-vc-redist +* https://aka.ms/vs/17/release/vc_redist.x64.exe diff --git a/Dist/InnoSetup/translations/info-before.en-us.txt b/Dist/InnoSetup/translations/info-before.en-us.txt new file mode 100644 index 0000000..eb74ec1 --- /dev/null +++ b/Dist/InnoSetup/translations/info-before.en-us.txt @@ -0,0 +1,7 @@ +Please make sure that the latest Microsoft Visual C++ runtime is installed on your system. +To run WinMute only the x64 runtime files are needed. + +You can download it here: + +* https://docs.microsoft.com/cpp/windows/latest-supported-vc-redist +* https://aka.ms/vs/17/release/vc_redist.x64.exe diff --git a/Dist/InnoSetup/translations/info-before.it-it.txt b/Dist/InnoSetup/translations/info-before.it-it.txt new file mode 100644 index 0000000..38e5f2f --- /dev/null +++ b/Dist/InnoSetup/translations/info-before.it-it.txt @@ -0,0 +1,8 @@ +Assicurati che nel sistema sia installata lasione più recente di Microsoft Visual C++. +Per eseguire WinMute sono necessari solo i file runtime x64. + +Puoi scaricarlo qui: + +* https://docs.microsoft.com/cpp/windows/latest-supported-vc-redist +* https://aka.ms/vs/17/release/vc_redist.x64.exe + diff --git a/Dist/InnoSetup/winmute-setup-languages.iss b/Dist/InnoSetup/winmute-setup-languages.iss index 3cc6d53..86fa299 100644 --- a/Dist/InnoSetup/winmute-setup-languages.iss +++ b/Dist/InnoSetup/winmute-setup-languages.iss @@ -1,8 +1,9 @@ [CustomMessages] -english.StartpAppLogon=Start WinMute when you log on -;italian.StartpAppLogon=Esegui WinMute all'accesso +en.StartpAppLogon=Start WinMute when you log on +de.StartpAppLogon=WinMute mit Windows starten +it.StartpAppLogon=Esegui WinMute all'accesso [Languages] -Name: "english"; MessagesFile: "compiler:Default.isl"; InfoBeforeFile: "info-before.txt"; -Name: "german"; MessagesFile: "compiler:Languages\German.isl"; InfoBeforeFile: "info-before.txt"; -;Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"; InfoBeforeFile: "info-before.ita.txt"; +Name: "en"; MessagesFile: "compiler:Default.isl"; InfoBeforeFile: "translations/info-before.en-us.txt"; +Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoBeforeFile: "translations/info-before.de-de.txt"; +Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoBeforeFile: "translations/info-before.it-it.txt"; diff --git a/Dist/InnoSetup/winmute-setup-strings.iss b/Dist/InnoSetup/winmute-setup-strings.iss deleted file mode 100644 index 3cc6d53..0000000 --- a/Dist/InnoSetup/winmute-setup-strings.iss +++ /dev/null @@ -1,8 +0,0 @@ -[CustomMessages] -english.StartpAppLogon=Start WinMute when you log on -;italian.StartpAppLogon=Esegui WinMute all'accesso - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl"; InfoBeforeFile: "info-before.txt"; -Name: "german"; MessagesFile: "compiler:Languages\German.isl"; InfoBeforeFile: "info-before.txt"; -;Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"; InfoBeforeFile: "info-before.ita.txt"; diff --git a/Dist/InnoSetup/winmute-setup.iss b/Dist/InnoSetup/winmute-setup.iss index f15ec5c..a646158 100644 --- a/Dist/InnoSetup/winmute-setup.iss +++ b/Dist/InnoSetup/winmute-setup.iss @@ -1,4 +1,3 @@ - #include ".\winmute-setup-languages.iss" #define MyAppName "WinMute" @@ -37,7 +36,7 @@ LanguageDetectionMethod=uilanguage DefaultDirName={autopf}\{#MyAppPublisher}\{#MyAppName} DisableProgramGroupPage=yes LicenseFile=..\bin\license.rtf -InfoBeforeFile=info-before.txt +InfoBeforeFile=translations\info-before.en-us.txt AppMutex={#MyAppMutex} SetupMutex={#MyAppMutex}Setup ;PrivilegesRequiredOverridesAllowed=dialog @@ -76,4 +75,3 @@ Root: HKCU; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType: [Run] Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent - -- 2.43.0