Chore: Minor language improvements (#1769)

* Chore: Minor language improvements

* Docs: Add #1413 #1769

.github/transifex.yml

@@ -10,12 +10,12 @@ git:
   settings:
       # http://www.codedigest.com/CodeDigest/207-Get-All-Language-Country-Code-List-for-all-Culture-in-C---ASP-Net.aspx
       language_mapping:        
+          de_DE: de-DE
           zh_CN: zh-CN
           zh_TW: zh-TW
           cs_CZ: cs-CZ
           nl_NL: nl-NL
-          fr_FR: fr-FR
-          de_DE: de-DE
+          fr_FR: fr-FR          
           hu_HU: hu-HU
           it_IT: it-IT
           ko_KR: ko-KR

InnoSetup.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "NETworkManager"
-#define MyAppVersion "2022.12.14.0"
+#define MyAppVersion "2022.12.16.0"
 #define MyAppPublisher "BornToBeRoot"
 #define MyAppURL "https://github.com/BornToBeRoot/NETworkManager/"
 #define MyAppExeName "NETworkManager.exe"
@@ -39,20 +39,20 @@ WizardSmallImageFile=Images\NETworkManager_InnoSetup.bmp
 
 [Languages]
 Name: "english";            MessagesFile: "compiler:Default.isl"
-Name: "brasilian";          MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
+Name: "german";             MessagesFile: "compiler:Languages\German.isl"
 Name: "chinesesimplified";  MessagesFile: "compiler:Languages\ChineseSimplified.isl"
 Name: "chinesetraditional"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"
 Name: "czech";              MessagesFile: "compiler:Languages\Czech.isl"
 Name: "dutch";              MessagesFile: "compiler:Languages\Dutch.isl"
 Name: "french";             MessagesFile: "compiler:Languages\French.isl"
-Name: "german";             MessagesFile: "compiler:Languages\German.isl"
+Name: "hungarian";          MessagesFile: "compiler:Languages\Hungarian.isl"
 Name: "italian";            MessagesFile: "compiler:Languages\Italian.isl"
-Name: "japanese";           MessagesFile: "compiler:Languages\Japanese.isl"
+Name: "korean";             MessagesFile: "compiler:Languages\Korean.isl"
 Name: "polish";             MessagesFile: "compiler:Languages\Polish.isl"
+Name: "portuguese_brazil";  MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
 Name: "russian";            MessagesFile: "compiler:Languages\Russian.isl"
-Name: "spanish";            MessagesFile: "compiler:Languages\Spanish.isl"
 Name: "slovenian";          MessagesFile: "compiler:Languages\Slovenian.isl"
-Name: "turkish";            MessagesFile: "compiler:Languages\Turkish.isl"
+Name: "spanish";            MessagesFile: "compiler:Languages\Spanish.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"

README.md

@@ -105,10 +105,12 @@ You can build the application like any other .NET Core / WPF application on Wind
    - [SDK .NET 6.x](https://dotnet.microsoft.com/download/dotnet/6.0)
    - Visual Studio 2019 or later with `.NET desktop development` and `Universal Windows Platform development`
 
-2. (optional) If you want to create a setup
-
-   - [InnoSetup](https://jrsoftware.org/isinfo.php) software must be installed
-   - Add the additional languages [`ChineseSimplified.isl`](https://github.com/jrsoftware/issrc/blob/main/Files/Languages/Unofficial/ChineseSimplified.isl) and [`ChineseTraditional.isl`](https://github.com/jrsoftware/issrc/blob/main/Files/Languages/Unofficial/ChineseTraditional.isl) to the InnoSetup installation directory.
+2. (optional) Install [InnoSetup](https://jrsoftware.org/isinfo.php) to create an installer.
+   - Download the additional languages from the [Inno Setup repository](https://github.com/jrsoftware/issrc/blob/main/Files/Languages/Unofficial/) and copy the following files to `%ProgramFiles%\Inno Setup 6\Languages`:   
+  - `ChineseSimplified.isl`
+  - `ChineseTraditional.isl`
+  - `Hungarian.isl`
+  - `Korean.isl`  
 
 3. Clone or download the repository:
 

Source/GlobalAssemblyInfo.cs

@@ -6,5 +6,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("2022.12.14.0")]
-[assembly: AssemblyFileVersion("2022.12.14.0")]
+[assembly: AssemblyVersion("2022.12.16.0")]
+[assembly: AssemblyFileVersion("2022.12.16.0")]

Source/NETworkManager.Localization/LocalizationManager.cs

@@ -73,6 +73,7 @@ public static Uri GetImageUri(string cultureCode)
             new LocalizationInfo("Russian (Russia)", "Русский", GetImageUri("ru-RU"), "ru-RU"),
             new LocalizationInfo("Slovenian (Slovenia)", "slovenski jezik", GetImageUri("sl-SI"), "sl-SI"),
             new LocalizationInfo("Spanish (Spain)", "Español", GetImageUri("es-ES"), "es-ES")
+
         };
 
         /// <summary>

build.ps1

@@ -88,20 +88,22 @@ Remove-Item -Path "$BuildPath\NETworkManager\IsPortable.settings"
 # Installer Build
 $InnoSetupPath = "${env:ProgramFiles(x86)}\Inno Setup 6"
 
+# Check if additional language files are available
 $InnoSetupLanguageMissing = $false
 
-if(-not(Test-Path -Path "$InnoSetupPath\Languages\ChineseSimplified.isl"))
-{
-    Write-Host "ChineseSimplified.isl not found in InnoSetup language folder.`nDownload URL: https://github.com/jrsoftware/issrc/blob/main/Files/Languages/Unofficial/ChineseSimplified.isl" -ForegroundColor Yellow
-    $InnoSetupLanguageMissing = $true
+foreach($File in @("ChineseSimplified.isl", "ChineseTraditional.isl", "Hungarian.isl", "Korean.isl")) {
+    if(-not(Test-Path -Path "$InnoSetupPath\Languages\$File" -PathType Leaf))
+    {
+        Write-Host "$File not found in InnoSetup language folder." -ForegroundColor Yellow
+        $InnoSetupLanguageMissing = $true
+    }
 }
 
-if(-not(Test-Path -Path "$InnoSetupPath\Languages\ChineseTraditional.isl"))
-{
-    Write-Host "ChineseTraditional.isl not found in InnoSetup language folder.`nDownload URL: https://github.com/jrsoftware/issrc/blob/main/Files/Languages/Unofficial/ChineseTraditional.isl" -ForegroundColor Yellow
-    $InnoSetupLanguageMissing = $true
+if($InnoSetupLanguageMissing) {
+    Write-Host "You can download the language files here: https://github.com/jrsoftware/issrc/blob/main/Files/Languages/" -ForegroundColor Yellow
 }
 
+# Check if InnoSetup is installed
 $InnoSetupCompiler = "$InnoSetupPath\ISCC.exe"
 
 if(-not(Test-Path -Path $InnoSetupCompiler -PathType Leaf) -or $InnoSetupLanguageMissing)
@@ -119,4 +121,7 @@ foreach($hash in Get-ChildItem -Path $BuildPath | Where-Object {$_.Name.EndsWith
     "$($hash.Algorithm) | $($hash.Hash) | $([System.IO.Path]::GetFileName($hash.Path))" | Out-File -FilePath "$BuildPath\NETworkManager_$($Version)_Hash.txt" -Encoding utf8 -Append
 }
 
-Write-Host "Build finished! All files are here: $BuildPath" -ForegroundColor Green
+# Build finished
+Write-Host "`n`nBuild finished! The following files have been created under ""$BuildPath""`n" -ForegroundColor Green
+
+Get-Content "$BuildPath\NETworkManager_$($Version)_Hash.txt"

docs/02_Features.md

@@ -39,7 +39,7 @@ Hosts can be stored in profiles, which can be used across all features. Individu
 
 ## Languages
 
-NETworkManager is available in 16 languages. [Here](https://www.transifex.com/BornToBeRoot/NETworkManager/dashboard/){:target="\_blank"} you can find the list with all languages and the progress of the translation.
+NETworkManager is available in 15 languages. [Here](https://www.transifex.com/BornToBeRoot/NETworkManager/dashboard/){:target="\_blank"} you can find the list with all languages and the progress of the translation.
 
 If you miss a language, find missing or incorrect translations, you can request a language and help to improve the translation on [Transifex](https://www.transifex.com/BornToBeRoot/NETworkManager){:target="\_blank"}.
 

docs/Changelog/next-release.md

@@ -38,6 +38,8 @@ New Feature
 - Fixed a bug in Dragablz that in certain circumstances locks the tab when you right-click on it and try to move it (See [#132](https://github.com/ButchersBoy/Dragablz/issues/132) & [#1702](https://github.com/BornToBeRoot/NETworkManager/issues/1702) for more details) [#1712](https://github.com/BornToBeRoot/NETworkManager/pull/1712){:target="\_blank"}
 - Lookup - OUI, Lookup
   - Input cannot end with ";" [#1515](https://github.com/BornToBeRoot/NETworkManager/pull/1515){:target="\_blank"}
+- Installer
+  - Encoding für chinese language files fixed [#1413](https://github.com/BornToBeRoot/NETworkManager/issues/1413){:target="\_blank"} [#1769](https://github.com/BornToBeRoot/NETworkManager/pull/1769){:target="\_blank"}
 
 ## Deprecated