Merge branch 'develop' into prod

d2phap · Dec 5, 2023 · ed011e8 · ed011e8
2 parents 0499296 + f26d16a
commit ed011e8
Show file tree

Hide file tree

Showing 239 changed files with 2,387 additions and 1,563 deletions.
diff --git a/Setup/AdvancedInstaller/ImageGlass_9_x64.aip b/Setup/AdvancedInstaller/ImageGlass_9_x64.aip
@@ -19,10 +19,10 @@
     <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:3"/>
     <ROW Property="Manufacturer" Value="Duong Dieu Phap"/>
     <ROW Property="MsiLogging" MultiBuildValue="DefaultBuild:vp"/>
-    <ROW Property="ProductCode" Value="1033:{8A0789C2-BEE5-470D-B0C6-182E0F616E7D} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{77BF099B-9BF5-41B2-AFB1-3DC27F7EF1A4} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="ImageGlass"/>
-    <ROW Property="ProductVersion" Value="9.0.7.1130" Options="32"/>
+    <ROW Property="ProductVersion" Value="9.0.8.1208" Options="32"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{877DB994-AB03-4025-B99D-41CE565E810B}"/>
@@ -363,7 +363,6 @@
     <ROW File="WindowFit.svg_1" Component_="ActualSize.svg_1" FileName="WINDOW~1.SVG|WindowFit.svg" Attributes="0" SourcePath="..\Assets\Themes\Kobe-Light\WindowFit.svg" SelfReg="false"/>
     <ROW File="ZoomIn.svg_1" Component_="ActualSize.svg_1" FileName="ZoomIn.svg" Attributes="0" SourcePath="..\Assets\Themes\Kobe-Light\ZoomIn.svg" SelfReg="false"/>
     <ROW File="ZoomOut.svg_1" Component_="ActualSize.svg_1" FileName="ZoomOut.svg" Attributes="0" SourcePath="..\Assets\Themes\Kobe-Light\ZoomOut.svg" SelfReg="false"/>
-    <ROW File="Armenian.iglang.json" Component_="Vietnamese.iglang.json" FileName="ARMENI~1.JSO|Armenian.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Armenian.iglang.json" SelfReg="false"/>
     <ROW File="ChineseSimplified.iglang.json" Component_="Vietnamese.iglang.json" FileName="CHINES~1.JSO|Chinese Simplified.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Chinese Simplified.iglang.json" SelfReg="false"/>
     <ROW File="ChineseTraditional.iglang.json" Component_="Vietnamese.iglang.json" FileName="CHINES~2.JSO|Chinese Traditional.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Chinese Traditional.iglang.json" SelfReg="false"/>
     <ROW File="Croatian.iglang.json" Component_="Vietnamese.iglang.json" FileName="CROATI~1.JSO|Croatian.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Croatian.iglang.json" SelfReg="false"/>
@@ -380,7 +379,6 @@
     <ROW File="Polish.iglang.json" Component_="Vietnamese.iglang.json" FileName="POLISH~1.JSO|Polish.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Polish.iglang.json" SelfReg="false"/>
     <ROW File="PortugueseBrazilian.iglang.json" Component_="Vietnamese.iglang.json" FileName="PORTUG~1.JSO|Portuguese, Brazilian.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Portuguese, Brazilian.iglang.json" SelfReg="false"/>
     <ROW File="Portuguese.iglang.json" Component_="Vietnamese.iglang.json" FileName="PORTUG~2.JSO|Portuguese.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Portuguese.iglang.json" SelfReg="false"/>
-    <ROW File="Romanian.iglang.json" Component_="Vietnamese.iglang.json" FileName="ROMANI~1.JSO|Romanian.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Romanian.iglang.json" SelfReg="false"/>
     <ROW File="Russian.iglang.json" Component_="Vietnamese.iglang.json" FileName="RUSSIA~1.JSO|Russian.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Russian.iglang.json" SelfReg="false"/>
     <ROW File="SerbianCyrillic.iglang.json" Component_="Vietnamese.iglang.json" FileName="SERBIA~1.JSO|Serbian (Cyrillic).iglang.json" Attributes="0" SourcePath="..\Assets\Language\Serbian (Cyrillic).iglang.json" SelfReg="false"/>
     <ROW File="Slovak.iglang.json" Component_="Vietnamese.iglang.json" FileName="SLOVAK~1.JSO|Slovak.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Slovak.iglang.json" SelfReg="false"/>
@@ -389,6 +387,10 @@
     <ROW File="Swedish.iglang.json" Component_="Vietnamese.iglang.json" FileName="SWEDIS~1.JSO|Swedish.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Swedish.iglang.json" SelfReg="false"/>
     <ROW File="Thai.iglang.json" Component_="Vietnamese.iglang.json" FileName="THAIIG~1.JSO|Thai.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Thai.iglang.json" SelfReg="false"/>
     <ROW File="Turkish.iglang.json" Component_="Vietnamese.iglang.json" FileName="TURKIS~1.JSO|Turkish.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Turkish.iglang.json" SelfReg="false"/>
+    <ROW File="Bulgarian.iglang.json" Component_="Vietnamese.iglang.json" FileName="BULGAR~1.JSO|Bulgarian.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Bulgarian.iglang.json" SelfReg="false"/>
+    <ROW File="Hungarian.iglang.json" Component_="Vietnamese.iglang.json" FileName="HUNGAR~1.JSO|Hungarian.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Hungarian.iglang.json" SelfReg="false"/>
+    <ROW File="Japanese.iglang.json" Component_="Vietnamese.iglang.json" FileName="JAPANE~1.JSO|Japanese.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Japanese.iglang.json" SelfReg="false"/>
+    <ROW File="NorwegianBokmal.iglang.json" Component_="Vietnamese.iglang.json" FileName="NORWEG~1.JSO|Norwegian Bokmal.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Norwegian Bokmal.iglang.json" SelfReg="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.AiPersistentPropComponent">
     <ROW Property="AI_INSTALLPERUSER" Registry="AI_INSTALLPERUSER" HklmSearch="AI_INSTALLPERUSER" HkcuSearch="AI_INSTALLPERUSER_1" Hklm64Search="AI_INSTALLPERUSER_2" Hkcu64Search="AI_INSTALLPERUSER_3"/>