Skip to content

Commit 8b129ad

Browse files
author
Mindaugas Veblauskas
committed
Merge branch 'release/2.3.2'
2 parents 5d4e97e + 8bf7f2c commit 8b129ad

File tree

10 files changed

+6572
-7
lines changed

10 files changed

+6572
-7
lines changed

Setup/ProtonVPN.aip

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<ROW Property="Manufacturer" Value="Proton Technologies AG"/>
3333
<ROW Property="MsiLogging" MultiBuildValue="DefaultBuild:vp"/>
3434
<ROW Property="PENDING_REBOOT" Value="0"/>
35-
<ROW Property="ProductCode" Value="1031:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1033:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1036:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1040:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1043:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1045:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1046:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1049:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1058:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1065:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 2070:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 3082:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} " Type="16"/>
35+
<ROW Property="ProductCode" Value="1029:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1031:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1033:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1036:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1040:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1043:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1045:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1046:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1049:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1058:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 1065:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 2070:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} 3082:{0102D7E4-DD33-494D-B34C-2DD6976A54B1} " Type="16"/>
3636
<ROW Property="ProductLanguage" Value="1033"/>
3737
<ROW Property="ProductName" Value="ProtonVPN"/>
3838
<ROW Property="ProductVersion" Value="2.0.0"/>
@@ -361,7 +361,7 @@
361361
<ROW Action="AI_DetectSoftware" Sequence="101"/>
362362
</COMPONENT>
363363
<COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
364-
<ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="ProtonVPN-SetupFiles" PackageFileName="ProtonVPN_win_v[|ProductVersion]" Languages="en;de;fr;fa;nl;it;pl;pt;ru;es;pt_BR;uk" LangOpt="1" InstallationType="2" CabsLocation="1" UseLzma="true" LzmaMethod="2" LzmaCompressionLevel="2" PackageType="1" FilesInsideExe="true" ExeIconPath="images\protonvpn.ico" ExeMetadata="FileDescription:[|ProductName] Installer [|CommitHash]" ExtUI="true" Options="4" LangsDialog="true" UseLargeSchema="true" Unicode="true" ExeName="ProtonVPN_win_v[|ProductVersion]" UACExecutionLevel="2"/>
364+
<ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="ProtonVPN-SetupFiles" PackageFileName="ProtonVPN_win_v[|ProductVersion]" Languages="en;de;fr;fa;nl;it;pl;pt;ru;es;pt_BR;uk;cs" LangOpt="1" InstallationType="2" CabsLocation="1" UseLzma="true" LzmaMethod="2" LzmaCompressionLevel="2" PackageType="1" FilesInsideExe="true" ExeIconPath="images\protonvpn.ico" ExeMetadata="FileDescription:[|ProductName] Installer [|CommitHash]" ExtUI="true" Options="4" LangsDialog="true" UseLargeSchema="true" Unicode="true" ExeName="ProtonVPN_win_v[|ProductVersion]" UACExecutionLevel="2"/>
365365
</COMPONENT>
366366
<COMPONENT cid="caphyon.advinst.msicomp.CacheComponent">
367367
<ATTRIBUTE name="Enable" value="false"/>
@@ -380,6 +380,7 @@
380380
<ROW Path="&lt;AI_DICTS&gt;ui_es.ail"/>
381381
<ROW Path="&lt;AI_DICTS&gt;ui_pt_BR.ail"/>
382382
<ROW Path="&lt;AI_DICTS&gt;ui_uk.ail"/>
383+
<ROW Path="&lt;AI_DICTS&gt;ui_cs.ail"/>
383384
</COMPONENT>
384385
<COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
385386
<ROW TimeStampUrl="http://timestamp.globalsign.com/tsa/r6advanced1" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" UseSha256="1" Thumbprint="44054e4d961e4efd5d3d90dec1444b26373d4a08 Subject: Proton Technologies AG&#10;Issuer: GlobalSign Extended Validation CodeSigning CA - SHA256 - G3&#10;Valid from 10/29/2020 to 10/30/2023&#10;User\MY"/>

src/GlobalAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515

16-
[assembly: AssemblyVersion("2.3.1.0")]
17-
[assembly: AssemblyFileVersion("2.3.1.0")]
16+
[assembly: AssemblyVersion("2.3.2.0")]
17+
[assembly: AssemblyFileVersion("2.3.2.0")]
1818
[assembly: ComVisible(false)]
1919
[assembly: AssemblyInformationalVersion("$AssemblyVersion")]

src/ProtonVPN.InstallActions/dllmain.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,8 @@ extern "C" EXPORT long SetLanguageISOCode(MSIHANDLE hInstall)
230230
case 1050: language = L"hr-HR"; break;
231231
case 1057: language = L"id-ID"; break;
232232
case 1058: language = L"uk-UA"; break;
233+
case 1029: language = L"cs-CZ"; break;
234+
case 1048: language = L"ro-RO"; break;
233235
}
234236
if (!language.empty())
235237
{

src/ProtonVPN.Resources/Properties/Strings.Designer.cs

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ProtonVPN.Resources/Properties/Strings.resx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@
123123
<data name="Language_ca" xml:space="preserve">
124124
<value>Català</value>
125125
</data>
126+
<data name="Language_cs-CZ" xml:space="preserve">
127+
<value>Čeština</value>
128+
</data>
126129
<data name="Language_de-DE" xml:space="preserve">
127130
<value>Deutsch</value>
128131
</data>
@@ -174,6 +177,9 @@
174177
<data name="Language_pt-PT" xml:space="preserve">
175178
<value>Português, Portugal</value>
176179
</data>
180+
<data name="Language_ro-RO" xml:space="preserve">
181+
<value>Română</value>
182+
</data>
177183
<data name="Language_ru-RU" xml:space="preserve">
178184
<value>Русский</value>
179185
</data>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"project": "windows-vpn",
3-
"locale": "e0fe86369e042deeb9ca39051b61af0d36381ef7"
3+
"locale": "f0907efab7a5d4f8517b074d0cabc1d5ac69b84e"
44
}

src/ProtonVPN.Translations/Properties/Resources.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)