Merge branch 'release/3.2.12'

.gitlab-ci-templates.yml

@@ -25,14 +25,19 @@
     - echo "Building native dependencies..."
     - nuget restore ProtonVPN.InstallActions.sln
     - cmd.exe /c BuildDependencies.bat $DEPENDENCIES
-    - echo "Downloading translations from crowdin..."
     - python ci\build-scripts\main.py add-commit-hash $env:CI_COMMIT_SHORT_SHA
     - python ci\build-scripts\main.py defaultConfig    
     - dotnet build src\Builds\ProtonVPN.Builds.ConsoleJob\ProtonVPN.Builds.ConsoleJob.csproj
     - echo "Injecting CI variables"
     - src\bin\ProtonVPN.Builds.ConsoleJob.exe
     - echo "Publishing ${TYPE}..."
-    - dotnet publish ProtonVpn.sln -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
+    - dotnet publish src/ProtonVPN.App/ProtonVPN.App.csproj -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
+    - dotnet publish src/ProtonVPN.Service/ProtonVPN.Service.csproj -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
+    - dotnet publish src/ProtonVPN.WireguardService/ProtonVPN.WireguardService.csproj -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
+    - dotnet publish src/ProtonVPN.TlsVerify/ProtonVPN.TlsVerify.csproj -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
+    - dotnet publish src/ProtonVPN.Launcher/ProtonVPN.Launcher.csproj -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
+    - dotnet publish src/ProtonVPN.RestoreInternet/ProtonVPN.RestoreInternet.csproj -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
+    - dotnet publish src/ProtonDrive.Downloader/ProtonDrive.Downloader.csproj -c ${TYPE} -r win-x64 --self-contained -o $BUILD_PATH
     - msbuild src\ProtonVPN.NativeHost\NativeHost.vcxproj /p:Configuration=Release /p:Platform=x64
   artifacts:
     expire_in: 1 day

ProtonVpn.sln

@@ -53,13 +53,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Native", "src\Pro
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.NetworkFilter", "src\ProtonVPN.NetworkFilter\ProtonVPN.NetworkFilter.csproj", "{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.MarkupValidator", "src\ProtonVPN.MarkupValidator\ProtonVPN.MarkupValidator.csproj", "{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.TlsVerify", "src\ProtonVPN.TlsVerify\ProtonVPN.TlsVerify.csproj", "{643CA26B-B80E-4E6A-AAE4-BCEC021D2AA0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Translations", "src\ProtonVPN.Translations\ProtonVPN.Translations.csproj", "{2A00C747-8BC0-4EF1-A53E-37A7E156D910}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.RestoreInternet", "ProtonVPN.RestoreInternet\ProtonVPN.RestoreInternet.csproj", "{8D07769D-0AAE-4224-AECB-DF68567F6B00}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.RestoreInternet", "src\ProtonVPN.RestoreInternet\ProtonVPN.RestoreInternet.csproj", "{8D07769D-0AAE-4224-AECB-DF68567F6B00}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtonVPN.Crypto", "src\ProtonVPN.Crypto\ProtonVPN.Crypto.csproj", "{BA2D505E-CED3-4FCB-A463-DAF6B77C18DE}"
 EndProject
@@ -411,18 +409,6 @@ Global
 		{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}.Release|x64.Build.0 = Release|Any CPU
 		{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}.Release|x86.ActiveCfg = Release|Any CPU
 		{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}.Release|x86.Build.0 = Release|Any CPU
-		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|x64.Build.0 = Debug|Any CPU
-		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|x86.Build.0 = Debug|Any CPU
-		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Release|x64.ActiveCfg = Release|Any CPU
-		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Release|x64.Build.0 = Release|Any CPU
-		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Release|x86.ActiveCfg = Release|Any CPU
-		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Release|x86.Build.0 = Release|Any CPU
 		{643CA26B-B80E-4E6A-AAE4-BCEC021D2AA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{643CA26B-B80E-4E6A-AAE4-BCEC021D2AA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{643CA26B-B80E-4E6A-AAE4-BCEC021D2AA0}.Debug|x64.ActiveCfg = Debug|Any CPU

Setup/Strings/BrazilianPortuguese.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Instale Proton Drive — Armazenamento de nuvem criptografado (Gratuito com Proton VPN)
+InstallProtonDriveTitle=Instale Proton Drive — Armazenamento de nuvem criptografado (Gratuito com Proton VPN)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/Czech.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Nainstalujte si Proton Drive - Šifrované cloudové úložiště (zdarma s Proton VPN)
+InstallProtonDriveTitle=Nainstalujte si Proton Drive - Šifrované cloudové úložiště (zdarma s Proton VPN)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/Default.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Install Proton Drive - Encrypted cloud storage (Free with Proton VPN)
+InstallProtonDriveTitle=Install Proton Drive - Encrypted cloud storage (Free with Proton VPN)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/Dutch.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Installeer Proton Drive - Versleutelde cloudopslag (Gratis met Proton VPN)
+InstallProtonDriveTitle=Installeer Proton Drive - Versleutelde cloudopslag (Gratis met Proton VPN)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/Finnish.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Asenna Proton Drive - Salattu pilvitallennus (ilmainen Proton VPN:n kanssa)
+InstallProtonDriveTitle=Asenna Proton Drive - Salattu pilvitallennus (ilmainen Proton VPN:n kanssa)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/French.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Installez Proton Drive : un espace de stockage chiffré dans le cloud (gratuit avec Proton VPN)
+InstallProtonDriveTitle=Installez Proton Drive : un espace de stockage chiffré dans le cloud (gratuit avec Proton VPN)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/German.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Proton Drive installieren - Verschlüsselter Cloud-Speicher (kostenlos mit Proton VPN)
+InstallProtonDriveTitle=Proton Drive installieren - Verschlüsselter Cloud-Speicher (kostenlos mit Proton VPN)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/Italian.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Installa Proton Drive - Archiviazione su cloud crittografata (Gratuita con Proton VPN)
+InstallProtonDriveTitle=Installa Proton Drive - Archiviazione su cloud crittografata (Gratuita con Proton VPN)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/Japanese.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Proton Drive をインストール - 暗号化クラウドストレージ (無料で利用可能)
+InstallProtonDriveTitle=Proton Drive をインストール - 暗号化クラウドストレージ (無料で利用可能)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/Norwegian.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Installer Proton Drive - kryptert skylagring (gratis med Proton VPN)
+InstallProtonDriveTitle=Installer Proton Drive - kryptert skylagring (gratis med Proton VPN)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/Polish.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Zainstaluj Proton Drive - Szyfrowana przestrzeń dyskowa w chmurze (za darmo z usługą Proton VPN)
+InstallProtonDriveTitle=Zainstaluj Proton Drive - Szyfrowana przestrzeń dyskowa w chmurze (za darmo z usługą Proton VPN)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/Portuguese.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Instale Proton Drive: um armazenamento de nuvem encriptado (gratuito com Proton VPN)
+InstallProtonDriveTitle=Instale Proton Drive: um armazenamento de nuvem encriptado (gratuito com Proton VPN)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/Russian.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Установите Proton Drive – зашифрованное облачное хранилище (бесплатно с Proton VPN)
+InstallProtonDriveTitle=Установите Proton Drive – зашифрованное облачное хранилище (бесплатно с Proton VPN)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/Slovenian.isl

@@ -0,0 +1,3 @@
+[CustomMessages]
+InstallProtonDriveTitle=Namestite Proton Drive - Šifrirano shranjevanje v oblaku (brezplačno s Proton VPN)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/Spanish.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Instala Proton Drive: almacenamiento en la nube cifrado (gratis con Proton VPN)
+InstallProtonDriveTitle=Instala Proton Drive: almacenamiento en la nube cifrado (gratis con Proton VPN)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/Turkish.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Proton Drive kurun - Şifrelenmiş bulut depolaması (Proton VPN ile ücretsiz)
+InstallProtonDriveTitle=Proton Drive kurun - Şifrelenmiş bulut depolaması (Proton VPN ile ücretsiz)
+InstallingWebview2Runtime=Installing Web View 2 runtime...

Setup/Strings/Ukrainian.isl

@@ -1,2 +1,3 @@
 [CustomMessages]
-InstallProtonDriveTitle=Установіть Proton Drive - Зашифроване хмарне сховище (Безплатно з Proton VPN)
+InstallProtonDriveTitle=Установіть Proton Drive - Зашифроване хмарне сховище (Безплатно з Proton VPN)
+InstallingWebview2Runtime=Installing Web View 2 runtime...