Skip to content

Commit 9b9ae3a

Browse files
author
Mindaugas Veblauskas
committed
Merge branch 'release/4.3.9'
2 parents 5fc532d + 87fd874 commit 9b9ae3a

File tree

91 files changed

+906
-2620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+906
-2620
lines changed

‎.gitlab-ci-templates.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
.build-installer:
6666
stage: build-installer
6767
tags:
68-
- windows-vpn-signer
68+
- windows-vpn-signer-v1
6969
script:
7070
- python ci\build-scripts\main.py app-installer $env:CI_COMMIT_SHORT_SHA ${PLATFORM}
7171
artifacts:

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
9090
<PackageVersion Include="TimeZoneConverter" Version="7.0.0" />
9191
<PackageVersion Include="Vanara.PInvoke.PowrProf" Version="4.1.6" />
92-
<PackageVersion Include="Vanara.PInvoke.Security" Version="4.1.6" />
92+
<PackageVersion Include="Vanara.PInvoke.Security" Version="4.2.1" />
9393
<PackageVersion Include="Vanara.PInvoke.SHCore" Version="4.1.6" />
9494
<PackageVersion Include="Vanara.PInvoke.Shell32" Version="4.1.6" />
9595
<PackageVersion Include="Vanara.PInvoke.User32" Version="4.1.6" />

‎Setup/Dependencies/VC_redist.arm64.exe‎

17.7 KB
Binary file not shown.

‎Setup/Dependencies/VC_redist.x64.exe‎

-6.75 MB
Binary file not shown.

‎Setup/SetupBase.iss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ begin
719719
if RegQueryStringValue(HKEY_LOCAL_MACHINE, RegistryPath, 'Version', Version) then begin
720720
if (Length(Version) > 0) and (Version[1] = 'v') then
721721
Delete(Version, 1, 1);
722-
if CompareVersions(Version, '14.42.34438.0') >= 0 then begin
722+
if CompareVersions(Version, '14.50.35719.0') >= 0 then begin
723723
Log('The latest visual c++ redistributable package is already installed, skipping.');
724724
Exit;
725725
end;

‎ci/test-scripts/uninstall-app.ps1‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
$protonFolder = "C:\Program Files\Proton\VPN"
22
$protonUninstallExe = $protonFolder + "\unins000.exe"
3+
34
if (Test-Path -Path $protonFolder) {
45
Start-Process -FilePath $protonUninstallExe -ArgumentList "/verysilent" -Wait -ErrorAction Ignore
6+
7+
# Sometimes the callout driver is stuck running
8+
net stop ProtonVPNCallout 2>$null
9+
510
Remove-Item $protonFolder -Recurse -ErrorAction Ignore
611
}
12+
13+
# If the uninstaller failed for any reason, clean the registry manually
14+
$uninstallKey = "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\Proton VPN_is1"
15+
if (Test-Path $uninstallKey) {
16+
Remove-Item $uninstallKey -Recurse -Force -ErrorAction Ignore
17+
}

‎src/Client/Common/ProtonVPN.Client.Common.UI/Windowing/MonitorCalculator.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
using Microsoft.UI;
2323
using Microsoft.UI.Windowing;
2424
using Vanara.PInvoke;
25-
using Windows.Foundation;
2625
using Windows.Graphics;
2726
using static Vanara.PInvoke.SHCore;
2827
using static Vanara.PInvoke.Shell32;

‎src/Client/Localization/ProtonVPN.Client.Localization/Strings/.locale-state.metadata‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"project": "windows-vpn-redesign",
3-
"locale": "ac3c05582f08e379ffd5c9ee4275e63da217a481"
3+
"locale": "641bebdd22103420b517abe6188afb74fef9a7ef"
44
}

‎src/Client/Localization/ProtonVPN.Client.Localization/Strings/be-BY/Resources.resw‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2411,7 +2411,7 @@
24112411
<value>Немагчыма атрымаць нумар актыўнага парта. Перазапусціце ваша падключэнне і паспрабуйце яшчэ раз.</value>
24122412
</data>
24132413
<data name="Flyouts_PortForwarding_ActivePort_Info">
2414-
<value>Увядзіце нумар актыўнага порта ў свой кліент торэнт або праграму P2P для паляпшэння прадукцыйнасці.</value>
2414+
<value>Увядзіце нумар актыўнага парта ў свой кліент торэнт або праграму P2P для паляпшэння прадукцыйнасці.</value>
24152415
</data>
24162416
<data name="Flyouts_PortForwarding_Info">
24172417
<value>Палепшыце хуткасць спампоўвання аднарангавага падключэння</value>
@@ -3623,12 +3623,6 @@ Secure Core</value>
36233623
<data name="Settings_Connection_KillSwitch_Advanced_Description">
36243624
<value>Дазваляць доступ да інтэрнэту толькі, калі Proton VPN падключаны. Пашыраны Kill Switch застанецца актыўным нават, калі вы перазапусціце прыладу.</value>
36253625
</data>
3626-
<data name="Settings_Connection_KillSwitch_Conflict_Description">
3627-
<value>Гэта прывядзе да адключэння Split Tunneling.</value>
3628-
</data>
3629-
<data name="Settings_Connection_KillSwitch_Conflict_Title">
3630-
<value>Уключыць Kill Switch?</value>
3631-
</data>
36323626
<data name="Settings_Connection_KillSwitch_Description">
36333627
<value>Абараніце свой IP-адрас пры дапамозе адключэння ад інтэрнэту пры страце падключэння да VPN.</value>
36343628
</data>
@@ -3732,15 +3726,12 @@ Secure Core</value>
37323726
<value>Выбраныя праграмы ({0})</value>
37333727
<comment>Header for the list of Apps defined for Split Tunneling. {0} is a placeholder for the number of selected apps in the list. (eg. "Selected apps (2)")</comment>
37343728
</data>
3729+
<data name="Settings_Connection_SplitTunneling_Apps_NotFound">
3730+
<value>Application not found</value>
3731+
</data>
37353732
<data name="Settings_Connection_SplitTunneling_Apps_Remove">
37363733
<value>Выдаліць праграму</value>
37373734
</data>
3738-
<data name="Settings_Connection_SplitTunneling_Conflict_Description">
3739-
<value>Гэта прывядзе да адключэння Kill Switch.</value>
3740-
</data>
3741-
<data name="Settings_Connection_SplitTunneling_Conflict_Title">
3742-
<value>Уключыць Split Tunelling?</value>
3743-
</data>
37443735
<data name="Settings_Connection_SplitTunneling_Description">
37453736
<value>Наладзьце падключэнне вырашыўшы, якія праграмы і IP-адрасы будуць абаронены VPN.</value>
37463737
</data>

‎src/Client/Localization/ProtonVPN.Client.Localization/Strings/ca-ES/Resources.resw‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<value>Pàgina de NetShield</value>
149149
</data>
150150
<data name="Automation_Properties_NoServers_Page">
151-
<value>Aquesta pàgina no té servidors</value>
151+
<value>Pàgina sense servidors</value>
152152
</data>
153153
<data name="Automation_Properties_PortForwarding_Page">
154154
<value>Pàgina de redirecció de ports</value>
@@ -3408,12 +3408,6 @@ Una càrrega elevada del servidor pot alentir la vostra connexió.</value>
34083408
<data name="Settings_Connection_KillSwitch_Advanced_Description">
34093409
<value>Només permet l'accés a internet quan estigui connectat a Proton VPN. Kill switch avançat romandrà actiu fins i tot quan reinicieu el dispositiu.</value>
34103410
</data>
3411-
<data name="Settings_Connection_KillSwitch_Conflict_Description">
3412-
<value>Això desactivarà la tunelització dividida.</value>
3413-
</data>
3414-
<data name="Settings_Connection_KillSwitch_Conflict_Title">
3415-
<value>Voleu activar el kill switch?</value>
3416-
</data>
34173411
<data name="Settings_Connection_KillSwitch_Description">
34183412
<value>Protegeix la vostra adreça IP desconnectant-vos d'internet si perdeu la vostra connexió VPN.</value>
34193413
</data>
@@ -3517,15 +3511,12 @@ Una càrrega elevada del servidor pot alentir la vostra connexió.</value>
35173511
<value>Aplicacions seleccionades ({0})</value>
35183512
<comment>Header for the list of Apps defined for Split Tunneling. {0} is a placeholder for the number of selected apps in the list. (eg. "Selected apps (2)")</comment>
35193513
</data>
3514+
<data name="Settings_Connection_SplitTunneling_Apps_NotFound">
3515+
<value>No s'ha trobat l'aplicació</value>
3516+
</data>
35203517
<data name="Settings_Connection_SplitTunneling_Apps_Remove">
35213518
<value>Esborra l'aplicació</value>
35223519
</data>
3523-
<data name="Settings_Connection_SplitTunneling_Conflict_Description">
3524-
<value>Això desactivarà kill switch.</value>
3525-
</data>
3526-
<data name="Settings_Connection_SplitTunneling_Conflict_Title">
3527-
<value>Voleu activar la tunelització dividida?</value>
3528-
</data>
35293520
<data name="Settings_Connection_SplitTunneling_Description">
35303521
<value>Personalitzeu la vostra connexió decidint quines aplicacions i adreces IP estan protegides per VPN.</value>
35313522
</data>

0 commit comments

Comments
 (0)