Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/transifex.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ git:
ru_RU: ru-RU
sl_SI: sl-SI
sv_SE: sv-SE
uk_UA: uk-UA
zh_CN: zh-CN
zh_TW: zh-TW
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -255,3 +255,5 @@ paket-files/
# Custom
Build/
.vscode/
*.exe
*.dll
1 change: 0 additions & 1 deletion .nuget/.gitignore

This file was deleted.

4 changes: 2 additions & 2 deletions Scripts/Create-FlagFromSVG.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

$ConvertPath = "C:\Tools\ImageMagick-7.1.0-portable-Q16-x64\convert.exe"

$SourcePath = "C:\Temp\jp.svg"
$DestinationPath = "C:\Temp\ja-JP.png"
$SourcePath = "C:\Temp\ua.svg"
$DestinationPath = "C:\Temp\uk-UA.png"
Comment on lines +9 to +10
Copy link

Copilot AI Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This script file appears to contain temporary/local paths specific to the development environment. The $SourcePath and $DestinationPath should either be parameterized or reverted to placeholder values (or a previously used language example). Committing developer-specific paths can cause confusion for other contributors.

Copilot uses AI. Check for mistakes.

Start-Process -FilePath $ConvertPath -ArgumentList "-antialias -density 600 -background transparent -resize x48 ""$SourcePath"" ""$DestinationPath""" -NoNewWindow -Wait
3 changes: 2 additions & 1 deletion Source/NETworkManager.Localization/LocalizationManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ private LocalizationManager(string cultureCode = DefaultCultureCode)
new LocalizationInfo("Portuguese (Brazil)", "português brasileiro", GetImageUri("pt-BR"), "pt-BR"),
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")
new LocalizationInfo("Spanish (Spain)", "Español", GetImageUri("es-ES"), "es-ES"),
new LocalizationInfo("Ukrainian (Ukraine)", "Українська", GetImageUri("uk-UA"), "uk-UA"),
];

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<None Remove="Resources\Flags\pt-BR.png" />
<None Remove="Resources\Flags\ru-RU.png" />
<None Remove="Resources\Flags\sl-SI.png" />
<None Remove="Resources\Flags\uk-UA.png" />
<None Remove="Resources\Flags\zh-CN.png" />
<None Remove="Resources\Flags\zh-TW.png" />
</ItemGroup>
Expand All @@ -49,6 +50,7 @@
<Resource Include="Resources\Flags\pt-BR.png" />
<Resource Include="Resources\Flags\ru-RU.png" />
<Resource Include="Resources\Flags\sl-SI.png" />
<Resource Include="Resources\Flags\uk-UA.png" />
<Resource Include="Resources\Flags\zh-CN.png" />
<Resource Include="Resources\Flags\zh-TW.png" />
</ItemGroup>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Source/NETworkManager.Localization/Resources/Strings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -3942,4 +3942,7 @@ Right-click for more options.</value>
You can enable or disable encryption later at any time by right-clicking the profile file to manage encryption settings.
If you click Cancel, the profile file will remain unencrypted.</value>
</data>
<data name="ToolTip_RestartRequired" xml:space="preserve">
<value>A restart is required to apply changes such as language settings.</value>
</data>
</root>
21 changes: 13 additions & 8 deletions Source/NETworkManager/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,19 @@
<Button Command="{Binding Path=RestartApplicationCommand}"
Opacity="1"
Visibility="{Binding Path=IsRestartRequired, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}"
ToolTip="{x:Static Member=localization:Strings.RestartRequired}"
ToolTip="{x:Static Member=localization:Strings.ToolTip_RestartRequired}"
Cursor="Hand">
<Rectangle Width="20" Height="20"
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<Rectangle Width="20" Height="20"
Fill="{DynamicResource ResourceKey=MahApps.Brushes.Accent}">
<Rectangle.OpacityMask>
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ReloadAlert}" />
</Rectangle.OpacityMask>
</Rectangle>
<Rectangle.OpacityMask>
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ProgressCheck}" />
</Rectangle.OpacityMask>
</Rectangle>
<TextBlock Text="{x:Static Member=localization:Strings.RestartRequired}"
VerticalAlignment="Center"
Style="{StaticResource LinkTextBlock}" Margin="5,0,0,0"/>
</StackPanel>
</Button>
<Button Command="{Binding Path=OpenWebsiteCommand}"
Opacity="1"
Expand Down Expand Up @@ -194,7 +199,7 @@
</Grid>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</ComboBox>
<Button Command="{Binding Path=OpenWebsiteCommand}"
ToolTip="{x:Static Member=localization:Strings.ToolTip_StarForkProjectOnGitHub}"
CommandParameter="{x:Static Member=resources:Resources.NETworkManager_GitHubRepoUrl}"
Expand All @@ -209,7 +214,7 @@
</Rectangle>
</StackPanel>
</Button>

<Button Command="{Binding Path=OpenWebsiteCommand}"
ToolTip="{x:Static Member=localization:Strings.ToolTip_ReportIssueOrCreateFeatureRequest}"
CommandParameter="{x:Static Member=resources:Resources.NETworkManager_GitHubNewIssueUrl}"
Expand Down
2 changes: 2 additions & 0 deletions Website/docs/changelog/next-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ Release date: **xx.xx.2025**

## What's new?

- New language Ukrainian (`uk-UA`) has been added. Thanks to [@vadickkt](https://github.com/vadickkt) [#3240](https://github.com/BornToBeRoot/NETworkManager/pull/3240)

**Remote Desktop**

- Flag to enable `Admin (console) session` added to the RDP connect, profile and group dialogs. This flag allows connecting to the console session of the remote computer. [#3216](https://github.com/BornToBeRoot/NETworkManager/pull/3216)
Expand Down
1 change: 1 addition & 0 deletions Website/docs/settings/language.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Language for the user interface of the application.
- `Russian (Russia)` (`ru-RU`)
- `Slovenian (Slovenia)` (`sl-SI`)
- `Spanish (Spain)` (`es-ES`)
- `Ukrainian (Ukraine)` (`uk-UA`)

:::note

Expand Down