Skip to content

Commit 2003510

Browse files
BornToBeRootBornToBeRoot
authored
Chore: Minor language improvements (BornToBeRoot#1769)
* Chore: Minor language improvements * Docs: Add BornToBeRoot#1413 BornToBeRoot#1769
1 parent e2e3425 commit 2003510

8 files changed

Lines changed: 34 additions & 24 deletions

File tree

‎.github/transifex.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ git:
1010
settings:
1111
# http://www.codedigest.com/CodeDigest/207-Get-All-Language-Country-Code-List-for-all-Culture-in-C---ASP-Net.aspx
1212
language_mapping:
13+
de_DE: de-DE
1314
zh_CN: zh-CN
1415
zh_TW: zh-TW
1516
cs_CZ: cs-CZ
1617
nl_NL: nl-NL
17-
fr_FR: fr-FR
18-
de_DE: de-DE
18+
fr_FR: fr-FR
1919
hu_HU: hu-HU
2020
it_IT: it-IT
2121
ko_KR: ko-KR

‎InnoSetup.iss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "NETworkManager"
5-
#define MyAppVersion "2022.12.14.0"
5+
#define MyAppVersion "2022.12.16.0"
66
#define MyAppPublisher "BornToBeRoot"
77
#define MyAppURL "https://github.com/BornToBeRoot/NETworkManager/"
88
#define MyAppExeName "NETworkManager.exe"
@@ -39,20 +39,20 @@ WizardSmallImageFile=Images\NETworkManager_InnoSetup.bmp
3939

4040
[Languages]
4141
Name: "english"; MessagesFile: "compiler:Default.isl"
42-
Name: "brasilian"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
42+
Name: "german"; MessagesFile: "compiler:Languages\German.isl"
4343
Name: "chinesesimplified"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
4444
Name: "chinesetraditional"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"
4545
Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
4646
Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
4747
Name: "french"; MessagesFile: "compiler:Languages\French.isl"
48-
Name: "german"; MessagesFile: "compiler:Languages\German.isl"
48+
Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
4949
Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
50-
Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
50+
Name: "korean"; MessagesFile: "compiler:Languages\Korean.isl"
5151
Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
52+
Name: "portuguese_brazil"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
5253
Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
53-
Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
5454
Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
55-
Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
55+
Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
5656

5757
[Tasks]
5858
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"

‎README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,12 @@ You can build the application like any other .NET Core / WPF application on Wind
105105
- [SDK .NET 6.x](https://dotnet.microsoft.com/download/dotnet/6.0)
106106
- Visual Studio 2019 or later with `.NET desktop development` and `Universal Windows Platform development`
107107

108-
2. (optional) If you want to create a setup
109-
110-
- [InnoSetup](https://jrsoftware.org/isinfo.php) software must be installed
111-
- 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.
108+
2. (optional) Install [InnoSetup](https://jrsoftware.org/isinfo.php) to create an installer.
109+
- 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`:
110+
- `ChineseSimplified.isl`
111+
- `ChineseTraditional.isl`
112+
- `Hungarian.isl`
113+
- `Korean.isl`
112114

113115
3. Clone or download the repository:
114116

‎Source/GlobalAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
[assembly: AssemblyTrademark("")]
77
[assembly: AssemblyCulture("")]
88

9-
[assembly: AssemblyVersion("2022.12.14.0")]
10-
[assembly: AssemblyFileVersion("2022.12.14.0")]
9+
[assembly: AssemblyVersion("2022.12.16.0")]
10+
[assembly: AssemblyFileVersion("2022.12.16.0")]

‎Source/NETworkManager.Localization/LocalizationManager.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public static Uri GetImageUri(string cultureCode)
7373
new LocalizationInfo("Russian (Russia)", "Русский", GetImageUri("ru-RU"), "ru-RU"),
7474
new LocalizationInfo("Slovenian (Slovenia)", "slovenski jezik", GetImageUri("sl-SI"), "sl-SI"),
7575
new LocalizationInfo("Spanish (Spain)", "Español", GetImageUri("es-ES"), "es-ES")
76+
7677
};
7778

7879
/// <summary>

‎build.ps1‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,22 @@ Remove-Item -Path "$BuildPath\NETworkManager\IsPortable.settings"
8888
# Installer Build
8989
$InnoSetupPath = "${env:ProgramFiles(x86)}\Inno Setup 6"
9090

91+
# Check if additional language files are available
9192
$InnoSetupLanguageMissing = $false
9293

93-
if(-not(Test-Path -Path "$InnoSetupPath\Languages\ChineseSimplified.isl"))
94-
{
95-
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
96-
$InnoSetupLanguageMissing = $true
94+
foreach($File in @("ChineseSimplified.isl", "ChineseTraditional.isl", "Hungarian.isl", "Korean.isl")) {
95+
if(-not(Test-Path -Path "$InnoSetupPath\Languages\$File" -PathType Leaf))
96+
{
97+
Write-Host "$File not found in InnoSetup language folder." -ForegroundColor Yellow
98+
$InnoSetupLanguageMissing = $true
99+
}
97100
}
98101

99-
if(-not(Test-Path -Path "$InnoSetupPath\Languages\ChineseTraditional.isl"))
100-
{
101-
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
102-
$InnoSetupLanguageMissing = $true
102+
if($InnoSetupLanguageMissing) {
103+
Write-Host "You can download the language files here: https://github.com/jrsoftware/issrc/blob/main/Files/Languages/" -ForegroundColor Yellow
103104
}
104105

106+
# Check if InnoSetup is installed
105107
$InnoSetupCompiler = "$InnoSetupPath\ISCC.exe"
106108

107109
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
119121
"$($hash.Algorithm) | $($hash.Hash) | $([System.IO.Path]::GetFileName($hash.Path))" | Out-File -FilePath "$BuildPath\NETworkManager_$($Version)_Hash.txt" -Encoding utf8 -Append
120122
}
121123

122-
Write-Host "Build finished! All files are here: $BuildPath" -ForegroundColor Green
124+
# Build finished
125+
Write-Host "`n`nBuild finished! The following files have been created under ""$BuildPath""`n" -ForegroundColor Green
126+
127+
Get-Content "$BuildPath\NETworkManager_$($Version)_Hash.txt"

‎docs/02_Features.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Hosts can be stored in profiles, which can be used across all features. Individu
3939

4040
## Languages
4141

42-
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.
42+
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.
4343

4444
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"}.
4545

‎docs/Changelog/next-release.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ New Feature
3838
- 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"}
3939
- Lookup - OUI, Lookup
4040
- Input cannot end with ";" [#1515](https://github.com/BornToBeRoot/NETworkManager/pull/1515){:target="\_blank"}
41+
- Installer
42+
- 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"}
4143

4244
## Deprecated
4345

0 commit comments

Comments
 (0)