[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo
Matthias Seidel
mseidel at apache.org
Mon Sep 4 00:10:03 UTC 2017
instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp |binary
instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt | 158 +++------
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 6
instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp |binary
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 170 +++-------
instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp |binary
instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt | 164 +++------
7 files changed, 191 insertions(+), 307 deletions(-)
New commits:
commit 51fa5a1e26e35efc67651411a92128249edc5783
Author: Matthias Seidel <mseidel at apache.org>
Date: Sun Sep 3 22:55:17 2017 +0000
Cleaned up
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 7e32e213d9a4..ee911a835a66 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -18,8 +18,6 @@ AdminChangeFolder Up PushButton 310 64 19 19 3670019 UpIco NewFolder OOO_CONTRO
AdminNetworkLocation Back PushButton 164 243 66 17 3 OOO_CONTROL_14 InstallNow
AdminNetworkLocation Banner Bitmap 0 0 374 44 1 BannerBmp
AdminNetworkLocation BannerLine Line 0 44 376 0 1
-#AdminNetworkLocation Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#AdminNetworkLocation Branding2 Text 3 228 88 13 65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back
AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_19
@@ -46,8 +44,6 @@ CancelSetup Yes PushButton 62 57 66 17 3 OOO_CONTROL_31 No
CustomerInformation Back PushButton 164 243 66 17 3 OOO_CONTROL_32 Next
CustomerInformation Banner Bitmap 0 0 374 44 1 BannerBmp
CustomerInformation BannerLine Line 0 44 376 0 1
-#CustomerInformation Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#CustomerInformation Branding2 Text 3 228 88 13 65537 [ProductName]
CustomerInformation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_35 NameLabel
CustomerInformation CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformation CompanyLabel Text 21 89 75 10 3 OOO_CONTROL_37 CompanyEdit
@@ -64,8 +60,6 @@ CustomerInformation SerialNumber MaskedEdit 21 138 237 17 2 ISX_SERIALNUM Radio
CustomSetup Back PushButton 164 243 66 17 3 OOO_CONTROL_46 Next
CustomSetup Banner Bitmap 0 0 374 44 1 BannerBmp
CustomSetup BannerLine Line 0 44 376 0 1
-#CustomSetup Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#CustomSetup Branding2 Text 3 228 88 13 65537 [ProductName]
CustomSetup Cancel PushButton 301 243 66 17 3 OOO_CONTROL_49 Tree
CustomSetup ChangeFolder PushButton 301 203 66 17 3 OOO_CONTROL_50 Help
CustomSetup Details PushButton 93 243 66 17 3 OOO_CONTROL_51 Back
@@ -83,8 +77,6 @@ CustomSetup Size Text 241 133 120 50 3 OOO_CONTROL_61
CustomSetup Tree SelectionTree 8 70 220 118 7 _BrowseProperty ChangeFolder
CustomSetupTips Banner Bitmap 0 0 374 44 1 BannerBmp
CustomSetupTips BannerLine Line 0 44 376 0 1
-#CustomSetupTips Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#CustomSetupTips Branding2 Text 3 228 88 13 65537 [ProductName]
CustomSetupTips DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_64
CustomSetupTips DlgLine Line 0 234 376 0 1
CustomSetupTips DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_65
@@ -101,8 +93,6 @@ CustomSetupTips PartialText Text 60 130 300 20 3 OOO_CONTROL_73
DatabaseFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_74 Next
DatabaseFolder Banner Bitmap 0 0 374 44 1 BannerBmp
DatabaseFolder BannerLine Line 0 44 376 0 1
-#DatabaseFolder Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#DatabaseFolder Branding2 Text 3 228 88 13 65537 [ProductName]
DatabaseFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_77 ChangeFolder
DatabaseFolder ChangeFolder PushButton 301 65 66 17 3 OOO_CONTROL_78 Back
DatabaseFolder DatabaseFolder Icon 21 52 24 24 5242881 OpenFolderIco
@@ -115,8 +105,6 @@ DatabaseFolder Next PushButton 230 243 66 17 3 OOO_CONTROL_83 Cancel
DestinationFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_84 Next
DestinationFolder Banner Bitmap 0 0 374 44 1 BannerBmp
DestinationFolder BannerLine Line 0 44 376 0 1
-#DestinationFolder Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#DestinationFolder Branding2 Text 3 228 88 13 65537 [ProductName]
DestinationFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_87 ChangeFolder
DestinationFolder ChangeFolder PushButton 301 65 66 17 3 OOO_CONTROL_88 Back
DestinationFolder DestFolder Icon 21 52 24 24 5242881 OpenFolderIco
@@ -128,8 +116,6 @@ DestinationFolder LocLabel Text 57 52 290 10 3 OOO_CONTROL_92
DestinationFolder Next PushButton 230 243 66 17 3 OOO_CONTROL_93 Cancel
DiskSpaceRequirements Banner Bitmap 0 0 374 44 1 BannerBmp
DiskSpaceRequirements BannerLine Line 0 44 376 0 1
-#DiskSpaceRequirements Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#DiskSpaceRequirements Branding2 Text 3 228 88 13 65537 [ProductName]
DiskSpaceRequirements DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_96
DiskSpaceRequirements DlgLine Line 0 234 376 0 1
DiskSpaceRequirements DlgText Text 10 185 358 41 3 OOO_CONTROL_97
@@ -138,8 +124,6 @@ DiskSpaceRequirements List VolumeCostList 8 55 358 125 393223 {120}{70}{70}{70}
DiskSpaceRequirements OK PushButton 301 243 66 17 3 OOO_CONTROL_100
FilesInUse Banner Bitmap 0 0 374 44 1 BannerBmp
FilesInUse BannerLine Line 0 44 376 0 1
-#FilesInUse Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#FilesInUse Branding2 Text 3 228 88 13 65537 [ProductName]
FilesInUse DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_103
FilesInUse DlgLine Line 0 234 376 0 1
FilesInUse DlgText Text 21 51 348 29 3 OOO_CONTROL_104
@@ -151,8 +135,6 @@ FilesInUse Retry PushButton 164 243 66 17 3 OOO_CONTROL_108 Ignore
FileTypeDialog Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
FileTypeDialog Banner Bitmap 0 0 374 44 1 BannerBmp
FileTypeDialog BannerLine Line 0 44 376 0 1
-#FileTypeDialog Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#FileTypeDialog Branding2 Text 3 228 88 13 65537 [ProductName]
FileTypeDialog Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 CheckBox1
FileTypeDialog CheckBox1 CheckBox 41 106 200 10 3 SELECT_WORD OOO_CONTROL_270 CheckBox2
FileTypeDialog CheckBox2 CheckBox 41 131 200 10 3 SELECT_EXCEL OOO_CONTROL_271 CheckBox3
@@ -165,8 +147,6 @@ FileTypeDialog DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_278
FileTypeDialog Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
InstallChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp
InstallChangeFolder BannerLine Line 0 44 376 0 1
-#InstallChangeFolder Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#InstallChangeFolder Branding2 Text 3 228 88 13 65537 [ProductName]
InstallChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_111 ComboText
InstallChangeFolder Combo DirectoryCombo 21 64 277 80 4128779 _BrowseProperty Up
InstallChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_113 Combo
@@ -193,8 +173,6 @@ LanguageInfo1 Text Text 48 15 194 30 3 OOO_CONTROL_317
LanguageSelection Back PushButton 164 243 66 17 3 OOO_CONTROL_122 CheckBox1
LanguageSelection Banner Bitmap 0 0 374 44 1 BannerBmp
LanguageSelection BannerLine Line 0 44 376 0 1
-#LanguageSelection Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#LanguageSelection Branding2 Text 3 228 88 13 65537 [ProductName]
LanguageSelection Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Back
LanguageSelection DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_267
LanguageSelection DlgLine Line 0 234 376 0 1
@@ -204,8 +182,6 @@ LicenseAgreement Agree RadioButtonGroup 8 190 330 40 3 AgreeToLicense Back
LicenseAgreement Back PushButton 164 243 66 17 3 OOO_CONTROL_128 Next
LicenseAgreement Banner Bitmap 0 0 374 44 1 BannerBmp
LicenseAgreement BannerLine Line 0 44 376 0 1
-#LicenseAgreement Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#LicenseAgreement Branding2 Text 3 228 88 13 65537 [ProductName]
LicenseAgreement Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Agree
LicenseAgreement DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_132
LicenseAgreement DlgLine Line 0 234 376 0 1
@@ -215,8 +191,6 @@ LicenseAgreement Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
MaintenanceType Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
MaintenanceType Banner Bitmap 0 0 374 44 1 BannerBmp
MaintenanceType BannerLine Line 0 44 376 0 1
-#MaintenanceType Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#MaintenanceType Branding2 Text 3 228 88 13 65537 [ProductName]
MaintenanceType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 RadioGroup
MaintenanceType DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_139
MaintenanceType DlgLine Line 0 234 376 0 1
@@ -238,8 +212,6 @@ MaintenanceWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_149
MaintenanceWelcome TextLine2 Text 135 55 228 50 65539 OOO_CONTROL_150
OutOfSpace Banner Bitmap 0 0 374 44 1 BannerBmp
OutOfSpace BannerLine Line 0 44 376 0 1
-#OutOfSpace Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#OutOfSpace Branding2 Text 3 228 88 13 65537 [ProductName]
OutOfSpace DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_153
OutOfSpace DlgLine Line 0 234 376 0 1
OutOfSpace DlgText Text 21 51 326 43 3 OOO_CONTROL_154
@@ -256,8 +228,6 @@ PatchWelcome TextLine2 Text 135 54 228 45 65539 OOO_CONTROL_162
ReadyToInstall Back PushButton 164 243 66 17 3 OOO_CONTROL_163 InstallNow
ReadyToInstall Banner Bitmap 0 0 374 44 1 BannerBmp
ReadyToInstall BannerLine Line 0 44 376 0 1
-#ReadyToInstall Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#ReadyToInstall Branding2 Text 3 228 88 13 65537 [ProductName]
ReadyToInstall Cancel PushButton 301 243 66 17 3 OOO_CONTROL_166 Back
ReadyToInstall DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_167
ReadyToInstall DlgLine Line 0 234 376 0 1
@@ -272,8 +242,6 @@ ReadyToInstall UpdateCheckBox CheckBox 21 120 200 10 3 REMOVEOLDPRODUCTS OOO_CON
ReadyToRemove Back PushButton 164 243 66 17 3 OOO_CONTROL_174 RemoveNow
ReadyToRemove Banner Bitmap 0 0 374 44 1 BannerBmp
ReadyToRemove BannerLine Line 0 44 376 0 1
-#ReadyToRemove Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#ReadyToRemove Branding2 Text 3 228 88 13 65537 [ProductName]
ReadyToRemove Cancel PushButton 301 243 66 17 3 OOO_CONTROL_177 Back
ReadyToRemove DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_178
ReadyToRemove DlgLine Line 0 234 376 0 1
@@ -344,8 +312,6 @@ SetupProgress ActionText Text 59 100 275 12 3
SetupProgress Back PushButton 164 243 66 17 1 OOO_CONTROL_230 Next
SetupProgress Banner Bitmap 0 0 374 44 1 BannerBmp
SetupProgress BannerLine Line 0 44 376 0 1
-#SetupProgress Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#SetupProgress Branding2 Text 3 228 88 13 65537 [ProductName]
SetupProgress Cancel PushButton 301 243 66 17 3 OOO_CONTROL_233 Back
SetupProgress DlgDesc Text 21 23 249 25 65538 OOO_CONTROL_234
SetupProgress DlgDesc2 Text 21 23 249 25 65538 OOO_CONTROL_235
@@ -371,8 +337,6 @@ SetupResume TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_250
SetupType Back PushButton 164 243 66 17 3 OOO_CONTROL_251 Next
SetupType Banner Bitmap 0 0 374 44 1 BannerBmp
SetupType BannerLine Line 0 44 376 0 1
-#SetupType Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#SetupType Branding2 Text 3 228 88 13 65537 [ProductName]
SetupType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_254 RadioGroup
SetupType CompleteIco Icon 34 94 24 24 5242881 SetupCompleteIco
SetupType CompText Text 80 94 246 35 3 OOO_CONTROL_255
@@ -385,8 +349,6 @@ SetupType DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_259
SetupType Next PushButton 230 243 66 17 3 OOO_CONTROL_260 Cancel
SetupType RadioGroup RadioButtonGroup 21 79 264 120 3 _IsSetupTypeMin Back
SplashBitmap Back PushButton 164 243 66 17 1 OOO_CONTROL_262 Next
-#SplashBitmap Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#SplashBitmap Branding2 Text 3 228 88 13 65537 [ProductName]
SplashBitmap Cancel PushButton 301 243 66 17 3 OOO_CONTROL_265 Back
SplashBitmap DlgLine Line 0 234 376 0 1
SplashBitmap Image Bitmap 13 12 114 211 1 ImageBmp
commit 1b8f4144d6f880bcee8b9cdc795b7110b5034a78
Author: Matthias Seidel <mseidel at apache.org>
Date: Sun Sep 3 17:35:30 2017 +0000
White background for banner, centered logo
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
index 3ed1fe32a736..27c504bafcd9 100644
Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index e0c92c969972..7e32e213d9a4 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -1,33 +1,31 @@
Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help
s72 s50 s20 i2 i2 i2 i2 I4 S50 L0 S50 L50
WINDOWSENCODINGTEMPLATE Control Dialog_ Control
-AdminChangeFolder Banner Bitmap 297 0 77 44 1 BannerBmp
+AdminChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp
AdminChangeFolder BannerLine Line 0 44 376 0 1
-#AdminChangeFolder Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-#AdminChangeFolder Branding2 Text 3 228 88 13 65537 [ProductName]
AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText
AdminChangeFolder Combo DirectoryCombo 21 64 277 80 458755 TARGETDIR Up
AdminChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_5 Combo
-AdminChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_6
+AdminChangeFolder DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_6
AdminChangeFolder DlgLine Line 0 234 376 0 1
-AdminChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_7
+AdminChangeFolder DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_7
AdminChangeFolder List DirectoryList 21 90 332 97 7 TARGETDIR TailText
-AdminChangeFolder NewFolder PushButton 335 66 19 19 3670019 NewFolderIco List OOO_CONTROL_9
+AdminChangeFolder NewFolder PushButton 335 64 19 19 3670019 NewFolderIco List OOO_CONTROL_9
AdminChangeFolder OK PushButton 230 243 66 17 3 OOO_CONTROL_10 Cancel
AdminChangeFolder Tail PathEdit 21 207 332 17 3 TARGETDIR OK
AdminChangeFolder TailText Text 21 193 99 13 3 OOO_CONTROL_12 Tail
-AdminChangeFolder Up PushButton 310 66 19 19 3670019 UpIco NewFolder OOO_CONTROL_13
+AdminChangeFolder Up PushButton 310 64 19 19 3670019 UpIco NewFolder OOO_CONTROL_13
AdminNetworkLocation Back PushButton 164 243 66 17 3 OOO_CONTROL_14 InstallNow
-AdminNetworkLocation Banner Bitmap 297 0 77 44 1 BannerBmp
+AdminNetworkLocation Banner Bitmap 0 0 374 44 1 BannerBmp
AdminNetworkLocation BannerLine Line 0 44 376 0 1
#AdminNetworkLocation Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#AdminNetworkLocation Branding2 Text 3 228 88 13 65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back
AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse
-AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19
+AdminNetworkLocation DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_19
AdminNetworkLocation DlgLine Line 0 234 376 0 1
AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20
-AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21
+AdminNetworkLocation DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_21
AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel
AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit
AdminNetworkLocation SetupPathEdit PathEdit 21 102 330 17 3 TARGETDIR Browse
@@ -46,17 +44,17 @@ CancelSetup No PushButton 135 57 66 17 3 OOO_CONTROL_29 Yes
CancelSetup Text Text 48 15 194 30 3 OOO_CONTROL_30
CancelSetup Yes PushButton 62 57 66 17 3 OOO_CONTROL_31 No
CustomerInformation Back PushButton 164 243 66 17 3 OOO_CONTROL_32 Next
-CustomerInformation Banner Bitmap 297 0 77 44 1 BannerBmp
+CustomerInformation Banner Bitmap 0 0 374 44 1 BannerBmp
CustomerInformation BannerLine Line 0 44 376 0 1
#CustomerInformation Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#CustomerInformation Branding2 Text 3 228 88 13 65537 [ProductName]
CustomerInformation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_35 NameLabel
CustomerInformation CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformation CompanyLabel Text 21 89 75 10 3 OOO_CONTROL_37 CompanyEdit
-CustomerInformation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_38
+CustomerInformation DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_38
CustomerInformation DlgLine Line 0 234 376 0 1
CustomerInformation DlgRadioGroupText Text 21 161 300 14 3 OOO_CONTROL_39
-CustomerInformation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_40
+CustomerInformation DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_40
CustomerInformation NameEdit Edit 21 63 237 17 3 USERNAME OOO_CONTROL_41 CompanyLabel
CustomerInformation NameLabel Text 21 52 75 10 3 OOO_CONTROL_42 NameEdit
CustomerInformation Next PushButton 230 243 66 17 3 OOO_CONTROL_43 Cancel
@@ -64,17 +62,17 @@ CustomerInformation RadioGroup RadioButtonGroup 63 170 300 50 3 ApplicationUsers
CustomerInformation SerialLabel Text 21 127 109 10 2 OOO_CONTROL_45 SerialNumber
CustomerInformation SerialNumber MaskedEdit 21 138 237 17 2 ISX_SERIALNUM RadioGroup
CustomSetup Back PushButton 164 243 66 17 3 OOO_CONTROL_46 Next
-CustomSetup Banner Bitmap 297 0 77 44 1 BannerBmp
+CustomSetup Banner Bitmap 0 0 374 44 1 BannerBmp
CustomSetup BannerLine Line 0 44 376 0 1
#CustomSetup Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#CustomSetup Branding2 Text 3 228 88 13 65537 [ProductName]
CustomSetup Cancel PushButton 301 243 66 17 3 OOO_CONTROL_49 Tree
CustomSetup ChangeFolder PushButton 301 203 66 17 3 OOO_CONTROL_50 Help
CustomSetup Details PushButton 93 243 66 17 3 OOO_CONTROL_51 Back
-CustomSetup DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_52
+CustomSetup DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_52
CustomSetup DlgLine Line 0 234 376 0 1
CustomSetup DlgText Text 9 51 360 10 3 OOO_CONTROL_53
-CustomSetup DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_54
+CustomSetup DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_54
CustomSetup FeatureGroup GroupBox 235 67 131 120 1 OOO_CONTROL_55
CustomSetup Help PushButton 22 243 66 17 3 OOO_CONTROL_56 Details
CustomSetup InstallLabel Text 8 190 360 10 3 OOO_CONTROL_57
@@ -83,13 +81,13 @@ CustomSetup Location Text 8 203 291 20 3 OOO_CONTROL_59
CustomSetup Next PushButton 230 243 66 17 3 OOO_CONTROL_60 Cancel
CustomSetup Size Text 241 133 120 50 3 OOO_CONTROL_61
CustomSetup Tree SelectionTree 8 70 220 118 7 _BrowseProperty ChangeFolder
-CustomSetupTips Banner Bitmap 297 0 77 44 1 BannerBmp
+CustomSetupTips Banner Bitmap 0 0 374 44 1 BannerBmp
CustomSetupTips BannerLine Line 0 44 376 0 1
#CustomSetupTips Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#CustomSetupTips Branding2 Text 3 228 88 13 65537 [ProductName]
-CustomSetupTips DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_64
+CustomSetupTips DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_64
CustomSetupTips DlgLine Line 0 234 376 0 1
-CustomSetupTips DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_65
+CustomSetupTips DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_65
CustomSetupTips DontInstall Icon 21 155 24 24 5242881 DontInstallIco
CustomSetupTips DontInstallText Text 60 155 300 20 3 OOO_CONTROL_66
CustomSetupTips Install Icon 21 105 24 24 5242881 InstallIco
@@ -101,57 +99,57 @@ CustomSetupTips MenuText Text 50 52 300 36 3 OOO_CONTROL_70
CustomSetupTips OK PushButton 301 243 66 17 3 OOO_CONTROL_72
CustomSetupTips PartialText Text 60 130 300 20 3 OOO_CONTROL_73
DatabaseFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_74 Next
-DatabaseFolder Banner Bitmap 297 0 77 44 1 BannerBmp
+DatabaseFolder Banner Bitmap 0 0 374 44 1 BannerBmp
DatabaseFolder BannerLine Line 0 44 376 0 1
#DatabaseFolder Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#DatabaseFolder Branding2 Text 3 228 88 13 65537 [ProductName]
DatabaseFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_77 ChangeFolder
DatabaseFolder ChangeFolder PushButton 301 65 66 17 3 OOO_CONTROL_78 Back
DatabaseFolder DatabaseFolder Icon 21 52 24 24 5242881 OpenFolderIco
-DatabaseFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_79
+DatabaseFolder DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_79
DatabaseFolder DlgLine Line 0 234 376 0 1
-DatabaseFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_80
+DatabaseFolder DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_80
DatabaseFolder Location Text 57 65 240 40 3 _BrowseProperty OOO_CONTROL_81
DatabaseFolder LocLabel Text 57 52 290 10 3 OOO_CONTROL_82
DatabaseFolder Next PushButton 230 243 66 17 3 OOO_CONTROL_83 Cancel
DestinationFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_84 Next
-DestinationFolder Banner Bitmap 297 0 77 44 1 BannerBmp
+DestinationFolder Banner Bitmap 0 0 374 44 1 BannerBmp
DestinationFolder BannerLine Line 0 44 376 0 1
#DestinationFolder Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#DestinationFolder Branding2 Text 3 228 88 13 65537 [ProductName]
DestinationFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_87 ChangeFolder
DestinationFolder ChangeFolder PushButton 301 65 66 17 3 OOO_CONTROL_88 Back
DestinationFolder DestFolder Icon 21 52 24 24 5242881 OpenFolderIco
-DestinationFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_89
+DestinationFolder DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_89
DestinationFolder DlgLine Line 0 234 376 0 1
-DestinationFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_90
+DestinationFolder DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_90
DestinationFolder Location Text 57 65 240 40 3 _BrowseProperty OOO_CONTROL_91
DestinationFolder LocLabel Text 57 52 290 10 3 OOO_CONTROL_92
DestinationFolder Next PushButton 230 243 66 17 3 OOO_CONTROL_93 Cancel
-DiskSpaceRequirements Banner Bitmap 297 0 77 44 1 BannerBmp
+DiskSpaceRequirements Banner Bitmap 0 0 374 44 1 BannerBmp
DiskSpaceRequirements BannerLine Line 0 44 376 0 1
#DiskSpaceRequirements Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#DiskSpaceRequirements Branding2 Text 3 228 88 13 65537 [ProductName]
-DiskSpaceRequirements DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_96
+DiskSpaceRequirements DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_96
DiskSpaceRequirements DlgLine Line 0 234 376 0 1
DiskSpaceRequirements DlgText Text 10 185 358 41 3 OOO_CONTROL_97
-DiskSpaceRequirements DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_98
+DiskSpaceRequirements DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_98
DiskSpaceRequirements List VolumeCostList 8 55 358 125 393223 {120}{70}{70}{70}{70}
DiskSpaceRequirements OK PushButton 301 243 66 17 3 OOO_CONTROL_100
-FilesInUse Banner Bitmap 297 0 77 44 1 BannerBmp
+FilesInUse Banner Bitmap 0 0 374 44 1 BannerBmp
FilesInUse BannerLine Line 0 44 376 0 1
#FilesInUse Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#FilesInUse Branding2 Text 3 228 88 13 65537 [ProductName]
-FilesInUse DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_103
+FilesInUse DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_103
FilesInUse DlgLine Line 0 234 376 0 1
FilesInUse DlgText Text 21 51 348 29 3 OOO_CONTROL_104
-FilesInUse DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_105
+FilesInUse DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_105
FilesInUse Exit PushButton 301 243 66 17 3 OOO_CONTROL_106 List
FilesInUse Ignore PushButton 230 243 66 17 3 OOO_CONTROL_107 Exit
FilesInUse List ListBox 21 87 331 135 7 FileInUseProcess Retry
FilesInUse Retry PushButton 164 243 66 17 3 OOO_CONTROL_108 Ignore
FileTypeDialog Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
-FileTypeDialog Banner Bitmap 297 0 77 44 1 BannerBmp
+FileTypeDialog Banner Bitmap 0 0 374 44 1 BannerBmp
FileTypeDialog BannerLine Line 0 44 376 0 1
#FileTypeDialog Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#FileTypeDialog Branding2 Text 3 228 88 13 65537 [ProductName]
@@ -159,28 +157,28 @@ FileTypeDialog Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 CheckBox1
FileTypeDialog CheckBox1 CheckBox 41 106 200 10 3 SELECT_WORD OOO_CONTROL_270 CheckBox2
FileTypeDialog CheckBox2 CheckBox 41 131 200 10 3 SELECT_EXCEL OOO_CONTROL_271 CheckBox3
FileTypeDialog CheckBox3 CheckBox 41 156 200 10 3 SELECT_POWERPOINT OOO_CONTROL_272 Back
-FileTypeDialog DlgDesc Text 21 20 272 25 65539 OOO_CONTROL_274
+FileTypeDialog DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_274
FileTypeDialog DlgLine Line 0 234 376 0 1
FileTypeDialog DlgText Text 21 56 326 40 3 OOO_CONTROL_275
FileTypeDialog DlgText2 Text 21 190 326 30 3 OOO_CONTROL_309
-FileTypeDialog DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_278
+FileTypeDialog DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_278
FileTypeDialog Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
-InstallChangeFolder Banner Bitmap 297 0 77 44 1 BannerBmp
+InstallChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp
InstallChangeFolder BannerLine Line 0 44 376 0 1
#InstallChangeFolder Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#InstallChangeFolder Branding2 Text 3 228 88 13 65537 [ProductName]
InstallChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_111 ComboText
InstallChangeFolder Combo DirectoryCombo 21 64 277 80 4128779 _BrowseProperty Up
InstallChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_113 Combo
-InstallChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_114
+InstallChangeFolder DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_114
InstallChangeFolder DlgLine Line 0 234 376 0 1
-InstallChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_115
+InstallChangeFolder DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_115
InstallChangeFolder List DirectoryList 21 90 332 97 15 _BrowseProperty TailText
-InstallChangeFolder NewFolder PushButton 335 66 19 19 3670019 NewFolderIco List OOO_CONTROL_117
+InstallChangeFolder NewFolder PushButton 335 64 19 19 3670019 NewFolderIco List OOO_CONTROL_117
InstallChangeFolder OK PushButton 230 243 66 17 3 OOO_CONTROL_118 Cancel
InstallChangeFolder Tail PathEdit 21 207 332 17 15 _BrowseProperty OK
InstallChangeFolder TailText Text 21 193 99 13 3 OOO_CONTROL_120 Tail
-InstallChangeFolder Up PushButton 310 66 19 19 3670019 UpIco NewFolder OOO_CONTROL_121
+InstallChangeFolder Up PushButton 310 64 19 19 3670019 UpIco NewFolder OOO_CONTROL_121
InstallWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_122 Copyright
InstallWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_123 Back
InstallWelcome Copyright Text 135 144 228 73 65539 OOO_CONTROL_124 Next
@@ -193,36 +191,36 @@ LanguageInfo1 Icon Icon 15 15 24 24 5242881 CautionIco
LanguageInfo1 OK PushButton 100 57 66 17 3 OOO_CONTROL_10
LanguageInfo1 Text Text 48 15 194 30 3 OOO_CONTROL_317
LanguageSelection Back PushButton 164 243 66 17 3 OOO_CONTROL_122 CheckBox1
-LanguageSelection Banner Bitmap 297 0 77 44 1 BannerBmp
+LanguageSelection Banner Bitmap 0 0 374 44 1 BannerBmp
LanguageSelection BannerLine Line 0 44 376 0 1
#LanguageSelection Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#LanguageSelection Branding2 Text 3 228 88 13 65537 [ProductName]
LanguageSelection Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Back
-LanguageSelection DlgDesc Text 21 23 292 25 65539 OOO_CONTROL_267
+LanguageSelection DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_267
LanguageSelection DlgLine Line 0 234 376 0 1
-LanguageSelection DlgTitle Text 13 6 292 25 65539 OOO_CONTROL_268
+LanguageSelection DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_268
LanguageSelection Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
LicenseAgreement Agree RadioButtonGroup 8 190 330 40 3 AgreeToLicense Back
LicenseAgreement Back PushButton 164 243 66 17 3 OOO_CONTROL_128 Next
-LicenseAgreement Banner Bitmap 297 0 77 44 1 BannerBmp
+LicenseAgreement Banner Bitmap 0 0 374 44 1 BannerBmp
LicenseAgreement BannerLine Line 0 44 376 0 1
#LicenseAgreement Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#LicenseAgreement Branding2 Text 3 228 88 13 65537 [ProductName]
LicenseAgreement Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Agree
-LicenseAgreement DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_132
+LicenseAgreement DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_132
LicenseAgreement DlgLine Line 0 234 376 0 1
-LicenseAgreement DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_133
+LicenseAgreement DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_133
LicenseAgreement Memo ScrollableText 8 54 358 130 7
LicenseAgreement Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
MaintenanceType Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
-MaintenanceType Banner Bitmap 297 0 77 44 1 BannerBmp
+MaintenanceType Banner Bitmap 0 0 374 44 1 BannerBmp
MaintenanceType BannerLine Line 0 44 376 0 1
#MaintenanceType Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#MaintenanceType Branding2 Text 3 228 88 13 65537 [ProductName]
MaintenanceType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 RadioGroup
-MaintenanceType DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_139
+MaintenanceType DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_139
MaintenanceType DlgLine Line 0 234 376 0 1
-MaintenanceType DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_140
+MaintenanceType DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_140
MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupPartialIco
MaintenanceType Ico2 Icon 35 135 24 24 5242881 SetupRepairIco
MaintenanceType Ico3 Icon 35 195 24 24 5242881 TrashcanIco
@@ -238,14 +236,14 @@ MaintenanceWelcome Image Bitmap 0 0 122 234 1 ImageBmp
MaintenanceWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_148 Cancel
MaintenanceWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_149
MaintenanceWelcome TextLine2 Text 135 55 228 50 65539 OOO_CONTROL_150
-OutOfSpace Banner Bitmap 297 0 77 44 1 BannerBmp
+OutOfSpace Banner Bitmap 0 0 374 44 1 BannerBmp
OutOfSpace BannerLine Line 0 44 376 0 1
#OutOfSpace Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#OutOfSpace Branding2 Text 3 228 88 13 65537 [ProductName]
-OutOfSpace DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_153
+OutOfSpace DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_153
OutOfSpace DlgLine Line 0 234 376 0 1
OutOfSpace DlgText Text 21 51 326 43 3 OOO_CONTROL_154
-OutOfSpace DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_155
+OutOfSpace DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_155
OutOfSpace List VolumeCostList 21 95 332 120 393223 OOO_CONTROL_156
OutOfSpace Resume PushButton 301 243 66 17 3 OOO_CONTROL_157
PatchWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_158 Next
@@ -256,33 +254,33 @@ PatchWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_160 Cancel
PatchWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_161
PatchWelcome TextLine2 Text 135 54 228 45 65539 OOO_CONTROL_162
ReadyToInstall Back PushButton 164 243 66 17 3 OOO_CONTROL_163 InstallNow
-ReadyToInstall Banner Bitmap 297 0 77 44 1 BannerBmp
+ReadyToInstall Banner Bitmap 0 0 374 44 1 BannerBmp
ReadyToInstall BannerLine Line 0 44 376 0 1
#ReadyToInstall Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#ReadyToInstall Branding2 Text 3 228 88 13 65537 [ProductName]
ReadyToInstall Cancel PushButton 301 243 66 17 3 OOO_CONTROL_166 Back
-ReadyToInstall DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_167
+ReadyToInstall DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_167
ReadyToInstall DlgLine Line 0 234 376 0 1
ReadyToInstall DlgText Text 21 51 326 20 3 OOO_CONTROL_168
ReadyToInstall DlgText1 Text 21 70 330 24 3 OOO_CONTROL_169
-ReadyToInstall DlgTitle Text 13 6 280 25 65538 OOO_CONTROL_170
-ReadyToInstall DlgTitle2 Text 13 6 280 25 65538 OOO_CONTROL_171
-ReadyToInstall DlgTitle3 Text 13 6 280 25 65538 OOO_CONTROL_172
+ReadyToInstall DlgTitle Text 13 6 257 25 65538 OOO_CONTROL_170
+ReadyToInstall DlgTitle2 Text 13 6 257 25 65538 OOO_CONTROL_171
+ReadyToInstall DlgTitle3 Text 13 6 257 25 65538 OOO_CONTROL_172
ReadyToInstall InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_173 Cancel
ReadyToInstall DesktopLink CheckBox 21 100 300 10 3 CREATEDESKTOPLINK OOO_CONTROL_319
ReadyToInstall UpdateCheckBox CheckBox 21 120 200 10 3 REMOVEOLDPRODUCTS OOO_CONTROL_320
ReadyToRemove Back PushButton 164 243 66 17 3 OOO_CONTROL_174 RemoveNow
-ReadyToRemove Banner Bitmap 297 0 77 44 1 BannerBmp
+ReadyToRemove Banner Bitmap 0 0 374 44 1 BannerBmp
ReadyToRemove BannerLine Line 0 44 376 0 1
#ReadyToRemove Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#ReadyToRemove Branding2 Text 3 228 88 13 65537 [ProductName]
ReadyToRemove Cancel PushButton 301 243 66 17 3 OOO_CONTROL_177 Back
-ReadyToRemove DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_178
+ReadyToRemove DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_178
ReadyToRemove DlgLine Line 0 234 376 0 1
ReadyToRemove DlgText Text 21 51 326 24 3 OOO_CONTROL_179
ReadyToRemove DlgText1 Text 21 79 330 23 3 OOO_CONTROL_180
ReadyToRemove DlgText2 Text 21 102 330 24 3
-ReadyToRemove DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_181
+ReadyToRemove DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_181
ReadyToRemove RemoveNow PushButton 230 243 66 17 3 OOO_CONTROL_182 Cancel
SetupCompleteError Back PushButton 164 243 66 17 1 OOO_CONTROL_183 Finish
SetupCompleteError Cancel PushButton 301 243 66 17 1 OOO_CONTROL_184 Back
@@ -344,18 +342,18 @@ SetupInterrupted TextLine2 Text 135 55 228 25 65539 OOO_CONTROL_227
SetupProgress ActionProgress95 ProgressBar 59 113 275 12 65537 OOO_CONTROL_228
SetupProgress ActionText Text 59 100 275 12 3
SetupProgress Back PushButton 164 243 66 17 1 OOO_CONTROL_230 Next
-SetupProgress Banner Bitmap 297 0 77 44 1 BannerBmp
+SetupProgress Banner Bitmap 0 0 374 44 1 BannerBmp
SetupProgress BannerLine Line 0 44 376 0 1
#SetupProgress Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#SetupProgress Branding2 Text 3 228 88 13 65537 [ProductName]
SetupProgress Cancel PushButton 301 243 66 17 3 OOO_CONTROL_233 Back
-SetupProgress DlgDesc Text 21 23 272 25 65538 OOO_CONTROL_234
-SetupProgress DlgDesc2 Text 21 23 272 25 65538 OOO_CONTROL_235
+SetupProgress DlgDesc Text 21 23 249 25 65538 OOO_CONTROL_234
+SetupProgress DlgDesc2 Text 21 23 249 25 65538 OOO_CONTROL_235
SetupProgress DlgLine Line 0 234 376 0 1
SetupProgress DlgText Text 59 51 275 30 65538 OOO_CONTROL_236
SetupProgress DlgText2 Text 59 51 275 30 65538 OOO_CONTROL_237
-SetupProgress DlgTitle Text 13 6 280 25 65538 OOO_CONTROL_238
-SetupProgress DlgTitle2 Text 13 6 280 25 65538 OOO_CONTROL_239
+SetupProgress DlgTitle Text 13 6 257 25 65538 OOO_CONTROL_238
+SetupProgress DlgTitle2 Text 13 6 257 25 65538 OOO_CONTROL_239
SetupProgress LbSec Text 172 139 32 12 2 OOO_CONTROL_240
SetupProgress LbStatus Text 59 85 70 12 3 OOO_CONTROL_241
SetupProgress Next PushButton 230 243 66 17 1 OOO_CONTROL_242 Cancel
@@ -371,7 +369,7 @@ SetupResume PreselectedText Text 135 55 228 45 65539 OOO_CONTROL_248
SetupResume ResumeText Text 135 46 228 45 65539 OOO_CONTROL_249
SetupResume TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_250
SetupType Back PushButton 164 243 66 17 3 OOO_CONTROL_251 Next
-SetupType Banner Bitmap 297 0 77 44 1 BannerBmp
+SetupType Banner Bitmap 0 0 374 44 1 BannerBmp
SetupType BannerLine Line 0 44 376 0 1
#SetupType Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
#SetupType Branding2 Text 3 228 88 13 65537 [ProductName]
@@ -380,10 +378,10 @@ SetupType CompleteIco Icon 34 94 24 24 5242881 SetupCompleteIco
SetupType CompText Text 80 94 246 35 3 OOO_CONTROL_255
SetupType CustomIco Icon 34 154 24 24 5242881 SetupPartialIco
SetupType CustText Text 80 154 246 35 3 OOO_CONTROL_256
-SetupType DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_257
+SetupType DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_257
SetupType DlgLine Line 0 234 376 0 1
SetupType DlgText Text 21 51 326 10 3 OOO_CONTROL_258
-SetupType DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_259
+SetupType DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_259
SetupType Next PushButton 230 243 66 17 3 OOO_CONTROL_260 Cancel
SetupType RadioGroup RadioButtonGroup 21 79 264 120 3 _IsSetupTypeMin Back
SplashBitmap Back PushButton 164 243 66 17 1 OOO_CONTROL_262 Next
commit 4e2b0c14b49d5e74a2c7493ed4bcc1f8080efdb3
Author: Matthias Seidel <mseidel at apache.org>
Date: Sun Sep 3 14:50:58 2017 +0000
Removed quotation marks that destroyed some strings for Pootle export
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 7fa14f268615..29ee915d7d8e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -719,13 +719,13 @@ en-US = "The version specified in the folder below cannot be updated."
en-US = "Check the destination folder."
[OOO_CONTROL_305]
-en-US = "To continue, click "Next"."
+en-US = "To continue, click Next."
[OOO_CONTROL_306]
-en-US = "To select a different version, click "Change". Otherwise click "Cancel" to abort the Installation Wizard."
+en-US = "To select a different version, click Change. Otherwise click Cancel to abort the Installation Wizard."
[OOO_CONTROL_307]
-en-US = "To select a different folder, click "Change"."
+en-US = "To select a different folder, click Change."
[OOO_CONTROL_308]
en-US = "Install [ProductName] to:"
commit ec558d297c084ee453741b7658d0eb87dec009e1
Author: Matthias Seidel <mseidel at apache.org>
Date: Sun Sep 3 13:30:57 2017 +0000
White background for banner, centered logo
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
index 3ed1fe32a736..27c504bafcd9 100644
Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index 14e7bf2ef288..ad5a2a21939b 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -1,33 +1,29 @@
Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help
s72 s50 s20 i2 i2 i2 i2 I4 S50 L0 S50 L50
WINDOWSENCODINGTEMPLATE Control Dialog_ Control
-AdminChangeFolder Banner Bitmap 297 0 77 44 1 BannerBmp
+AdminChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp
AdminChangeFolder BannerLine Line 0 44 376 0 1
-#AdminChangeFolder Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#AdminChangeFolder Branding2 Text 3 228 130 13 65537 [ProductName]
AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText
AdminChangeFolder Combo DirectoryCombo 21 64 277 80 458755 TARGETDIR Up
AdminChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_5 Combo
-AdminChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_6
+AdminChangeFolder DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_6
AdminChangeFolder DlgLine Line 0 234 376 0 1
-AdminChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_7
+AdminChangeFolder DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_7
AdminChangeFolder List DirectoryList 21 90 332 97 7 TARGETDIR TailText
-AdminChangeFolder NewFolder PushButton 335 66 19 19 3670019 NewFolderIco List OOO_CONTROL_9
+AdminChangeFolder NewFolder PushButton 335 64 19 19 3670019 NewFolderIco List OOO_CONTROL_9
AdminChangeFolder OK PushButton 230 243 66 17 3 OOO_CONTROL_10 Cancel
AdminChangeFolder Tail PathEdit 21 207 332 17 3 TARGETDIR OK
AdminChangeFolder TailText Text 21 193 99 13 3 OOO_CONTROL_12 Tail
-AdminChangeFolder Up PushButton 310 66 19 19 3670019 UpIco NewFolder OOO_CONTROL_13
+AdminChangeFolder Up PushButton 310 64 19 19 3670019 UpIco NewFolder OOO_CONTROL_13
AdminNetworkLocation Back PushButton 164 243 66 17 3 OOO_CONTROL_14 InstallNow
-AdminNetworkLocation Banner Bitmap 297 0 77 44 1 BannerBmp
+AdminNetworkLocation Banner Bitmap 0 0 374 44 1 BannerBmp
AdminNetworkLocation BannerLine Line 0 44 376 0 1
-#AdminNetworkLocation Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#AdminNetworkLocation Branding2 Text 3 228 130 13 65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back
AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse
-AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19
+AdminNetworkLocation DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_19
AdminNetworkLocation DlgLine Line 0 234 376 0 1
AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20
-AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21
+AdminNetworkLocation DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_21
AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel
AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit
AdminNetworkLocation SetupPathEdit PathEdit 21 102 330 17 3 TARGETDIR Browse
@@ -43,17 +39,15 @@ CancelSetup No PushButton 135 57 66 17 3 OOO_CONTROL_29 Yes
CancelSetup Text Text 48 15 194 30 3 OOO_CONTROL_30
CancelSetup Yes PushButton 62 57 66 17 3 OOO_CONTROL_31 No
CustomerInformation Back PushButton 164 243 66 17 3 OOO_CONTROL_32 Next
-CustomerInformation Banner Bitmap 297 0 77 44 1 BannerBmp
+CustomerInformation Banner Bitmap 0 0 374 44 1 BannerBmp
CustomerInformation BannerLine Line 0 44 376 0 1
-#CustomerInformation Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#CustomerInformation Branding2 Text 3 228 130 13 65537 [ProductName]
CustomerInformation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_35 NameLabel
CustomerInformation CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformation CompanyLabel Text 21 89 75 10 3 OOO_CONTROL_37 CompanyEdit
-CustomerInformation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_38
+CustomerInformation DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_38
CustomerInformation DlgLine Line 0 234 376 0 1
CustomerInformation DlgRadioGroupText Text 21 161 300 14 3 OOO_CONTROL_39
-CustomerInformation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_40
+CustomerInformation DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_40
CustomerInformation NameEdit Edit 21 63 237 17 3 USERNAME OOO_CONTROL_41 CompanyLabel
CustomerInformation NameLabel Text 21 52 75 10 3 OOO_CONTROL_42 NameEdit
CustomerInformation Next PushButton 230 243 66 17 3 OOO_CONTROL_43 Cancel
@@ -61,17 +55,15 @@ CustomerInformation RadioGroup RadioButtonGroup 63 170 300 50 3 ApplicationUsers
CustomerInformation SerialLabel Text 21 127 109 10 2 OOO_CONTROL_45 SerialNumber
CustomerInformation SerialNumber MaskedEdit 21 138 237 17 2 ISX_SERIALNUM RadioGroup
CustomSetup Back PushButton 164 243 66 17 3 OOO_CONTROL_46 Next
-CustomSetup Banner Bitmap 297 0 77 44 1 BannerBmp
+CustomSetup Banner Bitmap 0 0 374 44 1 BannerBmp
CustomSetup BannerLine Line 0 44 376 0 1
-#CustomSetup Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#CustomSetup Branding2 Text 3 228 130 13 65537 [ProductName]
CustomSetup Cancel PushButton 301 243 66 17 3 OOO_CONTROL_49 Tree
CustomSetup ChangeFolder PushButton 301 203 66 17 3 OOO_CONTROL_50 Help
CustomSetup Details PushButton 93 243 66 17 3 OOO_CONTROL_51 Back
-CustomSetup DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_52
+CustomSetup DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_52
CustomSetup DlgLine Line 0 234 376 0 1
CustomSetup DlgText Text 9 51 360 10 3 OOO_CONTROL_53
-CustomSetup DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_54
+CustomSetup DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_54
CustomSetup FeatureGroup GroupBox 235 67 131 120 1 OOO_CONTROL_55
CustomSetup Help PushButton 22 243 66 17 3 OOO_CONTROL_56 Details
CustomSetup InstallLabel Text 8 190 360 10 3 OOO_CONTROL_57
@@ -80,13 +72,11 @@ CustomSetup Location Text 8 203 291 20 3 OOO_CONTROL_59
CustomSetup Next PushButton 230 243 66 17 3 OOO_CONTROL_60 Cancel
CustomSetup Size Text 241 133 120 50 3 OOO_CONTROL_61
CustomSetup Tree SelectionTree 8 70 220 118 7 _BrowseProperty ChangeFolder
-CustomSetupTips Banner Bitmap 297 0 77 44 1 BannerBmp
+CustomSetupTips Banner Bitmap 0 0 374 44 1 BannerBmp
CustomSetupTips BannerLine Line 0 44 376 0 1
-#CustomSetupTips Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#CustomSetupTips Branding2 Text 3 228 130 13 65537 [ProductName]
-CustomSetupTips DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_64
+CustomSetupTips DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_64
CustomSetupTips DlgLine Line 0 234 376 0 1
-CustomSetupTips DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_65
+CustomSetupTips DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_65
CustomSetupTips DontInstall Icon 21 155 24 24 5242881 DontInstallIco
CustomSetupTips DontInstallText Text 60 155 300 20 3 OOO_CONTROL_66
CustomSetupTips Install Icon 21 105 24 24 5242881 InstallIco
@@ -98,30 +88,26 @@ CustomSetupTips MenuText Text 50 52 300 36 3 OOO_CONTROL_70
CustomSetupTips OK PushButton 301 243 66 17 3 OOO_CONTROL_72
CustomSetupTips PartialText Text 60 130 300 20 3 OOO_CONTROL_73
DatabaseFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_74 Next
-DatabaseFolder Banner Bitmap 297 0 77 44 1 BannerBmp
+DatabaseFolder Banner Bitmap 0 0 374 44 1 BannerBmp
DatabaseFolder BannerLine Line 0 44 376 0 1
-#DatabaseFolder Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#DatabaseFolder Branding2 Text 3 228 130 13 65537 [ProductName]
DatabaseFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_77 ChangeFolder
DatabaseFolder ChangeFolder PushButton 301 65 66 17 3 OOO_CONTROL_78 Back
DatabaseFolder DatabaseFolder Icon 21 52 24 24 5242881 OpenFolderIco
-DatabaseFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_79
+DatabaseFolder DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_79
DatabaseFolder DlgLine Line 0 234 376 0 1
-DatabaseFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_80
+DatabaseFolder DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_80
DatabaseFolder Location Text 57 65 240 40 3 _BrowseProperty OOO_CONTROL_81
DatabaseFolder LocLabel Text 57 52 290 10 3 OOO_CONTROL_82
DatabaseFolder Next PushButton 230 243 66 17 3 OOO_CONTROL_83 Cancel
DestinationFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_84 Next
-DestinationFolder Banner Bitmap 297 0 77 44 1 BannerBmp
+DestinationFolder Banner Bitmap 0 0 374 44 1 BannerBmp
DestinationFolder BannerLine Line 0 44 376 0 1
-#DestinationFolder Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#DestinationFolder Branding2 Text 3 228 130 13 65537 [ProductName]
DestinationFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_87 ChangeFolder
DestinationFolder ChangeFolder PushButton 301 125 66 17 3 OOO_CONTROL_88 Back
DestinationFolder DestFolder Icon 21 112 24 24 5242881 OpenFolderIco
-DestinationFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_304
+DestinationFolder DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_304
DestinationFolder DlgLine Line 0 234 376 0 1
-DestinationFolder DlgTitle Text 13 6 280 25 65539 {&MSSansBold8}[ProductName]
+DestinationFolder DlgTitle Text 13 6 257 25 65539 {&MSSansBold8}[ProductName]
DestinationFolder Location Text 57 128 240 40 3 _BrowseProperty [INSTALLLOCATION]
DestinationFolder LocLabel Text 57 115 290 10 3 OOO_CONTROL_92
DestinationFolder Next PushButton 230 243 66 17 3 OOO_CONTROL_93 Cancel
@@ -131,53 +117,45 @@ DestinationFolder LabelWrongProduct Text 21 52 290 30 2 OOO_CONTROL_303
DestinationFolder LabelStartInstall2 Text 21 82 290 30 2 OOO_CONTROL_305
DestinationFolder LabelInvalidDir2 Text 21 82 290 30 2 OOO_CONTROL_307
DestinationFolder LabelWrongProduct2 Text 21 82 290 30 2 OOO_CONTROL_306
-DiskSpaceRequirements Banner Bitmap 297 0 77 44 1 BannerBmp
+DiskSpaceRequirements Banner Bitmap 0 0 374 44 1 BannerBmp
DiskSpaceRequirements BannerLine Line 0 44 376 0 1
-#DiskSpaceRequirements Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#DiskSpaceRequirements Branding2 Text 3 228 130 13 65537 [ProductName]
-DiskSpaceRequirements DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_96
+DiskSpaceRequirements DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_96
DiskSpaceRequirements DlgLine Line 0 234 376 0 1
DiskSpaceRequirements DlgText Text 10 185 358 41 3 OOO_CONTROL_97
-DiskSpaceRequirements DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_98
+DiskSpaceRequirements DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_98
DiskSpaceRequirements List VolumeCostList 8 55 358 125 393223 {120}{70}{70}{70}{70}
DiskSpaceRequirements OK PushButton 301 243 66 17 3 OOO_CONTROL_100
-FilesInUse Banner Bitmap 297 0 77 44 1 BannerBmp
+FilesInUse Banner Bitmap 0 0 374 44 1 BannerBmp
FilesInUse BannerLine Line 0 44 376 0 1
-#FilesInUse Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#FilesInUse Branding2 Text 3 228 130 13 65537 [ProductName]
-FilesInUse DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_103
+FilesInUse DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_103
FilesInUse DlgLine Line 0 234 376 0 1
FilesInUse DlgText Text 21 51 348 29 3 OOO_CONTROL_104
-FilesInUse DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_105
+FilesInUse DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_105
FilesInUse Exit PushButton 301 243 66 17 3 OOO_CONTROL_106 List
FilesInUse Ignore PushButton 230 243 66 17 3 OOO_CONTROL_107 Exit
FilesInUse List ListBox 21 87 331 135 7 FileInUseProcess Retry
FilesInUse Retry PushButton 164 243 66 17 3 OOO_CONTROL_108 Ignore
FileTypeDialog Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
-FileTypeDialog Banner Bitmap 297 0 77 44 1 BannerBmp
+FileTypeDialog Banner Bitmap 0 0 374 44 1 BannerBmp
FileTypeDialog BannerLine Line 0 44 376 0 1
-#FileTypeDialog Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#FileTypeDialog Branding2 Text 3 228 130 13 65537 [ProductName]
FileTypeDialog Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 CheckBox1
FileTypeDialog CheckBox1 CheckBox 41 106 200 10 3 SELECT_WORD OOO_CONTROL_270 CheckBox2
FileTypeDialog CheckBox2 CheckBox 41 131 200 10 3 SELECT_EXCEL OOO_CONTROL_271 CheckBox3
FileTypeDialog CheckBox3 CheckBox 41 156 200 10 3 SELECT_POWERPOINT OOO_CONTROL_272 Back
-FileTypeDialog DlgDesc Text 21 20 272 25 65539 OOO_CONTROL_274
+FileTypeDialog DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_274
FileTypeDialog DlgLine Line 0 234 376 0 1
FileTypeDialog DlgText Text 21 56 326 40 3 OOO_CONTROL_275
FileTypeDialog DlgText2 Text 21 190 326 30 3 OOO_CONTROL_309
-FileTypeDialog DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_278
+FileTypeDialog DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_278
FileTypeDialog Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
-InstallChangeFolder Banner Bitmap 297 0 77 44 1 BannerBmp
+InstallChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp
InstallChangeFolder BannerLine Line 0 44 376 0 1
-#InstallChangeFolder Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#InstallChangeFolder Branding2 Text 3 228 130 13 65537 [ProductName]
InstallChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_111 ComboText
InstallChangeFolder Combo DirectoryCombo 21 64 302 80 4128779 _BrowseProperty Up
InstallChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_113 Combo
-InstallChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_114
+InstallChangeFolder DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_114
InstallChangeFolder DlgLine Line 0 234 376 0 1
-InstallChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_115
+InstallChangeFolder DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_115
InstallChangeFolder List DirectoryList 21 90 332 97 15 _BrowseProperty TailText
InstallChangeFolder OK PushButton 230 243 66 17 3 OOO_CONTROL_118 Cancel
InstallChangeFolder Tail PathEdit 21 207 332 17 15 _BrowseProperty OK
@@ -193,25 +171,21 @@ InstallWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_126
InstallWelcome TextLine2 Text 135 55 228 45 65539 OOO_CONTROL_127
LicenseAgreement Agree RadioButtonGroup 8 190 330 40 3 AgreeToLicense Back
LicenseAgreement Back PushButton 164 243 66 17 3 OOO_CONTROL_128 Next
-LicenseAgreement Banner Bitmap 297 0 77 44 1 BannerBmp
+LicenseAgreement Banner Bitmap 0 0 374 44 1 BannerBmp
LicenseAgreement BannerLine Line 0 44 376 0 1
-#LicenseAgreement Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#LicenseAgreement Branding2 Text 3 228 130 13 65537 [ProductName]
LicenseAgreement Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Agree
-LicenseAgreement DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_132
+LicenseAgreement DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_132
LicenseAgreement DlgLine Line 0 234 376 0 1
-LicenseAgreement DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_133
+LicenseAgreement DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_133
LicenseAgreement Memo ScrollableText 8 54 358 130 7
LicenseAgreement Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
MaintenanceType Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
-MaintenanceType Banner Bitmap 297 0 77 44 1 BannerBmp
+MaintenanceType Banner Bitmap 0 0 374 44 1 BannerBmp
MaintenanceType BannerLine Line 0 44 376 0 1
-#MaintenanceType Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#MaintenanceType Branding2 Text 3 228 130 13 65537 [ProductName]
MaintenanceType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 RadioGroup
-MaintenanceType DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_139
+MaintenanceType DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_139
MaintenanceType DlgLine Line 0 234 376 0 1
-MaintenanceType DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_140
+MaintenanceType DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_140
MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupRepairIco
MaintenanceType Ico2 Icon 35 135 24 24 5242881 TrashcanIco
MaintenanceType Next PushButton 230 243 66 17 3 OOO_CONTROL_141 Cancel
@@ -225,14 +199,12 @@ MaintenanceWelcome Image Bitmap 0 0 122 234 1 ImageBmp
MaintenanceWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_148 Cancel
MaintenanceWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_149
MaintenanceWelcome TextLine2 Text 135 55 228 50 65539 OOO_CONTROL_150
-OutOfSpace Banner Bitmap 297 0 77 44 1 BannerBmp
+OutOfSpace Banner Bitmap 0 0 374 44 1 BannerBmp
OutOfSpace BannerLine Line 0 44 376 0 1
-#OutOfSpace Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#OutOfSpace Branding2 Text 3 228 130 13 65537 [ProductName]
-OutOfSpace DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_153
+OutOfSpace DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_153
OutOfSpace DlgLine Line 0 234 376 0 1
OutOfSpace DlgText Text 21 51 326 43 3 OOO_CONTROL_154
-OutOfSpace DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_155
+OutOfSpace DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_155
OutOfSpace List VolumeCostList 21 95 332 120 393223 OOO_CONTROL_156
OutOfSpace Resume PushButton 301 243 66 17 3 OOO_CONTROL_157
PatchWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_158 Next
@@ -243,31 +215,27 @@ PatchWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_160 Cancel
PatchWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_161
PatchWelcome TextLine2 Text 135 54 228 45 65539 OOO_CONTROL_162
ReadyToInstall Back PushButton 164 243 66 17 3 OOO_CONTROL_163 InstallNow
-ReadyToInstall Banner Bitmap 297 0 77 44 1 BannerBmp
+ReadyToInstall Banner Bitmap 0 0 374 44 1 BannerBmp
ReadyToInstall BannerLine Line 0 44 376 0 1
-#ReadyToInstall Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#ReadyToInstall Branding2 Text 3 228 130 13 65537 [ProductName]
ReadyToInstall Cancel PushButton 301 243 66 17 3 OOO_CONTROL_166 Back
-ReadyToInstall DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_167
+ReadyToInstall DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_167
ReadyToInstall DlgLine Line 0 234 376 0 1
ReadyToInstall DlgText Text 21 51 326 20 3 OOO_CONTROL_168
ReadyToInstall DlgText1 Text 21 70 330 24 3 OOO_CONTROL_169
-ReadyToInstall DlgTitle Text 13 6 280 25 65538 OOO_CONTROL_170
-ReadyToInstall DlgTitle2 Text 13 6 280 25 65538 OOO_CONTROL_171
-ReadyToInstall DlgTitle3 Text 13 6 280 25 65538 OOO_CONTROL_172
+ReadyToInstall DlgTitle Text 13 6 257 25 65538 OOO_CONTROL_170
+ReadyToInstall DlgTitle2 Text 13 6 257 25 65538 OOO_CONTROL_171
+ReadyToInstall DlgTitle3 Text 13 6 257 25 65538 OOO_CONTROL_172
ReadyToInstall InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_173 Cancel
ReadyToRemove Back PushButton 164 243 66 17 3 OOO_CONTROL_174 RemoveNow
-ReadyToRemove Banner Bitmap 297 0 77 44 1 BannerBmp
+ReadyToRemove Banner Bitmap 0 0 374 44 1 BannerBmp
ReadyToRemove BannerLine Line 0 44 376 0 1
-#ReadyToRemove Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#ReadyToRemove Branding2 Text 3 228 130 13 65537 [ProductName]
ReadyToRemove Cancel PushButton 301 243 66 17 3 OOO_CONTROL_177 Back
-ReadyToRemove DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_178
+ReadyToRemove DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_178
ReadyToRemove DlgLine Line 0 234 376 0 1
ReadyToRemove DlgText Text 21 51 326 24 3 OOO_CONTROL_179
ReadyToRemove DlgText1 Text 21 79 330 23 3 OOO_CONTROL_180
ReadyToRemove DlgText2 Text 21 102 330 24 3
-ReadyToRemove DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_181
+ReadyToRemove DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_181
ReadyToRemove RemoveNow PushButton 230 243 66 17 3 OOO_CONTROL_182 Cancel
SetupCompleteError Back PushButton 164 243 66 17 1 OOO_CONTROL_183 Finish
SetupCompleteError Cancel PushButton 301 243 66 17 1 OOO_CONTROL_184 Back
@@ -329,18 +297,16 @@ SetupInterrupted TextLine2 Text 135 55 228 25 65539 OOO_CONTROL_227
SetupProgress ActionProgress95 ProgressBar 59 113 275 12 65537 OOO_CONTROL_228
SetupProgress ActionText Text 59 100 275 12 3
SetupProgress Back PushButton 164 243 66 17 1 OOO_CONTROL_230 Next
-SetupProgress Banner Bitmap 297 0 77 44 1 BannerBmp
+SetupProgress Banner Bitmap 0 0 374 44 1 BannerBmp
SetupProgress BannerLine Line 0 44 376 0 1
-#SetupProgress Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#SetupProgress Branding2 Text 3 228 130 13 65537 [ProductName]
SetupProgress Cancel PushButton 301 243 66 17 3 OOO_CONTROL_233 Back
-SetupProgress DlgDesc Text 21 23 272 25 65538 OOO_CONTROL_234
-SetupProgress DlgDesc2 Text 21 23 272 25 65538 OOO_CONTROL_235
+SetupProgress DlgDesc Text 21 23 249 25 65538 OOO_CONTROL_234
+SetupProgress DlgDesc2 Text 21 23 249 25 65538 OOO_CONTROL_235
SetupProgress DlgLine Line 0 234 376 0 1
SetupProgress DlgText Text 59 51 275 30 65538 OOO_CONTROL_236
SetupProgress DlgText2 Text 59 51 275 30 65538 OOO_CONTROL_237
-SetupProgress DlgTitle Text 13 6 280 25 65538 OOO_CONTROL_238
-SetupProgress DlgTitle2 Text 13 6 280 25 65538 OOO_CONTROL_239
+SetupProgress DlgTitle Text 13 6 257 25 65538 OOO_CONTROL_238
+SetupProgress DlgTitle2 Text 13 6 257 25 65538 OOO_CONTROL_239
SetupProgress LbSec Text 172 139 32 12 2 OOO_CONTROL_240
SetupProgress LbStatus Text 59 85 70 12 3 OOO_CONTROL_241
SetupProgress Next PushButton 230 243 66 17 1 OOO_CONTROL_242 Cancel
@@ -356,24 +322,20 @@ SetupResume PreselectedText Text 135 55 228 45 65539 OOO_CONTROL_248
SetupResume ResumeText Text 135 46 228 45 65539 OOO_CONTROL_249
SetupResume TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_250
SetupType Back PushButton 164 243 66 17 3 OOO_CONTROL_251 Next
-SetupType Banner Bitmap 297 0 77 44 1 BannerBmp
+SetupType Banner Bitmap 0 0 374 44 1 BannerBmp
SetupType BannerLine Line 0 44 376 0 1
-#SetupType Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#SetupType Branding2 Text 3 228 130 13 65537 [ProductName]
SetupType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_254 RadioGroup
SetupType CompleteIco Icon 34 94 24 24 5242881 SetupCompleteIco
SetupType CompText Text 80 94 246 35 3 OOO_CONTROL_255
SetupType CustomIco Icon 34 154 24 24 5242881 SetupPartialIco
SetupType CustText Text 80 154 246 35 3 OOO_CONTROL_256
-SetupType DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_257
+SetupType DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_257
SetupType DlgLine Line 0 234 376 0 1
SetupType DlgText Text 21 51 326 10 3 OOO_CONTROL_258
-SetupType DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_259
+SetupType DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_259
SetupType Next PushButton 230 243 66 17 3 OOO_CONTROL_260 Cancel
SetupType RadioGroup RadioButtonGroup 21 79 264 120 3 _IsSetupTypeMin Back
SplashBitmap Back PushButton 164 243 66 17 1 OOO_CONTROL_262 Next
-#SplashBitmap Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-#SplashBitmap Branding2 Text 3 228 130 13 65537 [ProductName]
SplashBitmap Cancel PushButton 301 243 66 17 3 OOO_CONTROL_265 Back
SplashBitmap DlgLine Line 0 234 376 0 1
SplashBitmap Image Bitmap 13 12 114 211 1 ImageBmp
commit 43479366f74c78f5dcd1e875854340da2c1b856f
Author: Matthias Seidel <mseidel at apache.org>
Date: Sun Sep 3 13:00:45 2017 +0000
White background for banner, centered logo
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp
index 3ed1fe32a736..27c504bafcd9 100644
Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
index 0adde5099766..f893a630ae34 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
@@ -1,33 +1,29 @@
Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help
s72 s50 s20 i2 i2 i2 i2 I4 S50 L0 S50 L50
WINDOWSENCODINGTEMPLATE Control Dialog_ Control
-AdminChangeFolder Banner Bitmap 297 0 77 44 1 BannerBmp
+AdminChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp
AdminChangeFolder BannerLine Line 0 44 376 0 1
-#AdminChangeFolder Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#AdminChangeFolder Branding2 Text 3 228 92 13 65537 [ProductName]
AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText
AdminChangeFolder Combo DirectoryCombo 21 64 277 80 458755 TARGETDIR Up
AdminChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_5 Combo
-AdminChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_6
+AdminChangeFolder DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_6
AdminChangeFolder DlgLine Line 0 234 376 0 1
-AdminChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_7
+AdminChangeFolder DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_7
AdminChangeFolder List DirectoryList 21 90 332 97 7 TARGETDIR TailText
-AdminChangeFolder NewFolder PushButton 335 66 19 19 3670019 NewFolderIco List OOO_CONTROL_9
+AdminChangeFolder NewFolder PushButton 335 64 19 19 3670019 NewFolderIco List OOO_CONTROL_9
AdminChangeFolder OK PushButton 230 243 66 17 3 OOO_CONTROL_10 Cancel
AdminChangeFolder Tail PathEdit 21 207 332 17 3 TARGETDIR OK
AdminChangeFolder TailText Text 21 193 99 13 3 OOO_CONTROL_12 Tail
-AdminChangeFolder Up PushButton 310 66 19 19 3670019 UpIco NewFolder OOO_CONTROL_13
+AdminChangeFolder Up PushButton 310 64 19 19 3670019 UpIco NewFolder OOO_CONTROL_13
AdminNetworkLocation Back PushButton 164 243 66 17 3 OOO_CONTROL_14 InstallNow
-AdminNetworkLocation Banner Bitmap 297 0 77 44 1 BannerBmp
+AdminNetworkLocation Banner Bitmap 0 0 374 44 1 BannerBmp
AdminNetworkLocation BannerLine Line 0 44 376 0 1
-#AdminNetworkLocation Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#AdminNetworkLocation Branding2 Text 3 228 92 13 65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back
AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse
-AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19
+AdminNetworkLocation DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_19
AdminNetworkLocation DlgLine Line 0 234 376 0 1
AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20
-AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21
+AdminNetworkLocation DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_21
AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel
AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit
AdminNetworkLocation SetupPathEdit PathEdit 21 102 330 17 3 TARGETDIR Browse
@@ -43,17 +39,15 @@ CancelSetup No PushButton 135 57 66 17 3 OOO_CONTROL_29 Yes
CancelSetup Text Text 48 15 194 30 3 OOO_CONTROL_30
CancelSetup Yes PushButton 62 57 66 17 3 OOO_CONTROL_31 No
CustomerInformation Back PushButton 164 243 66 17 3 OOO_CONTROL_32 Next
-CustomerInformation Banner Bitmap 297 0 77 44 1 BannerBmp
+CustomerInformation Banner Bitmap 0 0 374 44 1 BannerBmp
CustomerInformation BannerLine Line 0 44 376 0 1
-#CustomerInformation Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#CustomerInformation Branding2 Text 3 228 92 13 65537 [ProductName]
CustomerInformation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_35 NameLabel
CustomerInformation CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformation CompanyLabel Text 21 89 75 10 3 OOO_CONTROL_37 CompanyEdit
-CustomerInformation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_38
+CustomerInformation DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_38
CustomerInformation DlgLine Line 0 234 376 0 1
CustomerInformation DlgRadioGroupText Text 21 161 300 14 3 OOO_CONTROL_39
-CustomerInformation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_40
+CustomerInformation DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_40
CustomerInformation NameEdit Edit 21 63 237 17 3 USERNAME OOO_CONTROL_41 CompanyLabel
CustomerInformation NameLabel Text 21 52 75 10 3 OOO_CONTROL_42 NameEdit
CustomerInformation Next PushButton 230 243 66 17 3 OOO_CONTROL_43 Cancel
@@ -61,17 +55,15 @@ CustomerInformation RadioGroup RadioButtonGroup 63 170 300 50 3 ApplicationUsers
CustomerInformation SerialLabel Text 21 127 109 10 2 OOO_CONTROL_45 SerialNumber
CustomerInformation SerialNumber MaskedEdit 21 138 237 17 2 ISX_SERIALNUM RadioGroup
CustomSetup Back PushButton 164 243 66 17 3 OOO_CONTROL_46 Next
-CustomSetup Banner Bitmap 297 0 77 44 1 BannerBmp
+CustomSetup Banner Bitmap 0 0 374 44 1 BannerBmp
CustomSetup BannerLine Line 0 44 376 0 1
-#CustomSetup Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#CustomSetup Branding2 Text 3 228 92 13 65537 [ProductName]
CustomSetup Cancel PushButton 301 243 66 17 3 OOO_CONTROL_49 Tree
CustomSetup ChangeFolder PushButton 301 203 66 17 3 OOO_CONTROL_50 Help
CustomSetup Details PushButton 93 243 66 17 3 OOO_CONTROL_51 Back
-CustomSetup DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_52
+CustomSetup DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_52
CustomSetup DlgLine Line 0 234 376 0 1
CustomSetup DlgText Text 9 51 360 10 3 OOO_CONTROL_53
-CustomSetup DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_54
+CustomSetup DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_54
CustomSetup FeatureGroup GroupBox 235 67 131 120 1 OOO_CONTROL_55
CustomSetup Help PushButton 22 243 66 17 3 OOO_CONTROL_56 Details
CustomSetup InstallLabel Text 8 190 360 10 3 OOO_CONTROL_57
@@ -80,13 +72,11 @@ CustomSetup Location Text 8 203 291 20 3 OOO_CONTROL_59
CustomSetup Next PushButton 230 243 66 17 3 OOO_CONTROL_60 Cancel
CustomSetup Size Text 241 133 120 50 3 OOO_CONTROL_61
CustomSetup Tree SelectionTree 8 70 220 118 7 _BrowseProperty ChangeFolder
-CustomSetupTips Banner Bitmap 297 0 77 44 1 BannerBmp
+CustomSetupTips Banner Bitmap 0 0 374 44 1 BannerBmp
CustomSetupTips BannerLine Line 0 44 376 0 1
-#CustomSetupTips Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#CustomSetupTips Branding2 Text 3 228 92 13 65537 [ProductName]
-CustomSetupTips DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_64
+CustomSetupTips DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_64
CustomSetupTips DlgLine Line 0 234 376 0 1
-CustomSetupTips DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_65
+CustomSetupTips DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_65
CustomSetupTips DontInstall Icon 21 155 24 24 5242881 DontInstallIco
CustomSetupTips DontInstallText Text 60 155 300 20 3 OOO_CONTROL_66
CustomSetupTips Install Icon 21 105 24 24 5242881 InstallIco
@@ -98,86 +88,74 @@ CustomSetupTips MenuText Text 50 52 300 36 3 OOO_CONTROL_70
CustomSetupTips OK PushButton 301 243 66 17 3 OOO_CONTROL_72
CustomSetupTips PartialText Text 60 130 300 20 3 OOO_CONTROL_73
DatabaseFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_74 Next
-DatabaseFolder Banner Bitmap 297 0 77 44 1 BannerBmp
+DatabaseFolder Banner Bitmap 0 0 374 44 1 BannerBmp
DatabaseFolder BannerLine Line 0 44 376 0 1
-#DatabaseFolder Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#DatabaseFolder Branding2 Text 3 228 92 13 65537 [ProductName]
DatabaseFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_77 ChangeFolder
DatabaseFolder ChangeFolder PushButton 301 65 66 17 3 OOO_CONTROL_78 Back
DatabaseFolder DatabaseFolder Icon 21 52 24 24 5242881 OpenFolderIco
-DatabaseFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_79
+DatabaseFolder DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_79
DatabaseFolder DlgLine Line 0 234 376 0 1
-DatabaseFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_80
+DatabaseFolder DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_80
DatabaseFolder Location Text 57 65 240 40 3 _BrowseProperty OOO_CONTROL_81
DatabaseFolder LocLabel Text 57 52 290 10 3 OOO_CONTROL_82
DatabaseFolder Next PushButton 230 243 66 17 3 OOO_CONTROL_83 Cancel
DestinationFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_84 Next
-DestinationFolder Banner Bitmap 297 0 77 44 1 BannerBmp
+DestinationFolder Banner Bitmap 0 0 374 44 1 BannerBmp
DestinationFolder BannerLine Line 0 44 376 0 1
-#DestinationFolder Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#DestinationFolder Branding2 Text 3 228 92 13 65537 [ProductName]
DestinationFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_87 ChangeFolder
DestinationFolder ChangeFolder PushButton 301 65 66 17 3 OOO_CONTROL_88 Back
DestinationFolder DestFolder Icon 21 52 24 24 5242881 OpenFolderIco
-DestinationFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_89
+DestinationFolder DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_89
DestinationFolder DlgLine Line 0 234 376 0 1
-DestinationFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_90
+DestinationFolder DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_90
DestinationFolder Location Text 57 65 240 40 3 _BrowseProperty [INSTALLLOCATION]
DestinationFolder LocLabel Text 57 52 290 10 3 OOO_CONTROL_92
DestinationFolder Next PushButton 230 243 66 17 3 OOO_CONTROL_93 Cancel
-DiskSpaceRequirements Banner Bitmap 297 0 77 44 1 BannerBmp
+DiskSpaceRequirements Banner Bitmap 0 0 374 44 1 BannerBmp
DiskSpaceRequirements BannerLine Line 0 44 376 0 1
-#DiskSpaceRequirements Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#DiskSpaceRequirements Branding2 Text 3 228 92 13 65537 [ProductName]
-DiskSpaceRequirements DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_96
+DiskSpaceRequirements DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_96
DiskSpaceRequirements DlgLine Line 0 234 376 0 1
DiskSpaceRequirements DlgText Text 10 185 358 41 3 OOO_CONTROL_97
-DiskSpaceRequirements DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_98
+DiskSpaceRequirements DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_98
DiskSpaceRequirements List VolumeCostList 8 55 358 125 393223 {120}{70}{70}{70}{70}
DiskSpaceRequirements OK PushButton 301 243 66 17 3 OOO_CONTROL_100
-FilesInUse Banner Bitmap 297 0 77 44 1 BannerBmp
+FilesInUse Banner Bitmap 0 0 374 44 1 BannerBmp
FilesInUse BannerLine Line 0 44 376 0 1
-#FilesInUse Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#FilesInUse Branding2 Text 3 228 92 13 65537 [ProductName]
-FilesInUse DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_103
+FilesInUse DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_103
FilesInUse DlgLine Line 0 234 376 0 1
FilesInUse DlgText Text 21 51 348 29 3 OOO_CONTROL_104
-FilesInUse DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_105
+FilesInUse DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_105
FilesInUse Exit PushButton 301 243 66 17 3 OOO_CONTROL_106 List
FilesInUse Ignore PushButton 230 243 66 17 3 OOO_CONTROL_107 Exit
FilesInUse List ListBox 21 87 331 135 7 FileInUseProcess Retry
FilesInUse Retry PushButton 164 243 66 17 3 OOO_CONTROL_108 Ignore
FileTypeDialog Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
-FileTypeDialog Banner Bitmap 297 0 77 44 1 BannerBmp
+FileTypeDialog Banner Bitmap 0 0 374 44 1 BannerBmp
FileTypeDialog BannerLine Line 0 44 376 0 1
-#FileTypeDialog Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#FileTypeDialog Branding2 Text 3 228 92 13 65537 [ProductName]
FileTypeDialog Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 CheckBox1
FileTypeDialog CheckBox1 CheckBox 41 106 200 10 3 SELECT_WORD OOO_CONTROL_270 CheckBox2
FileTypeDialog CheckBox2 CheckBox 41 131 200 10 3 SELECT_EXCEL OOO_CONTROL_271 CheckBox3
FileTypeDialog CheckBox3 CheckBox 41 156 200 10 3 SELECT_POWERPOINT OOO_CONTROL_272 Back
-FileTypeDialog DlgDesc Text 21 20 272 25 65539 OOO_CONTROL_274
+FileTypeDialog DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_274
FileTypeDialog DlgLine Line 0 234 376 0 1
FileTypeDialog DlgText Text 21 56 326 40 3 OOO_CONTROL_275
FileTypeDialog DlgText2 Text 21 190 326 30 3 OOO_CONTROL_309
-FileTypeDialog DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_278
+FileTypeDialog DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_278
FileTypeDialog Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
-InstallChangeFolder Banner Bitmap 297 0 77 44 1 BannerBmp
+InstallChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp
InstallChangeFolder BannerLine Line 0 44 376 0 1
-#InstallChangeFolder Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#InstallChangeFolder Branding2 Text 3 228 92 13 65537 [ProductName]
InstallChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_111 ComboText
InstallChangeFolder Combo DirectoryCombo 21 64 277 80 4128779 _BrowseProperty Up
InstallChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_113 Combo
-InstallChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_114
+InstallChangeFolder DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_114
InstallChangeFolder DlgLine Line 0 234 376 0 1
-InstallChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_115
+InstallChangeFolder DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_115
InstallChangeFolder List DirectoryList 21 90 332 97 15 _BrowseProperty TailText
-InstallChangeFolder NewFolder PushButton 335 66 19 19 3670019 NewFolderIco List OOO_CONTROL_117
+InstallChangeFolder NewFolder PushButton 335 64 19 19 3670019 NewFolderIco List OOO_CONTROL_117
InstallChangeFolder OK PushButton 230 243 66 17 3 OOO_CONTROL_118 Cancel
InstallChangeFolder Tail PathEdit 21 207 332 17 15 _BrowseProperty OK
InstallChangeFolder TailText Text 21 193 99 13 3 OOO_CONTROL_120 Tail
-InstallChangeFolder Up PushButton 310 66 19 19 3670019 UpIco NewFolder OOO_CONTROL_121
+InstallChangeFolder Up PushButton 310 64 19 19 3670019 UpIco NewFolder OOO_CONTROL_121
InstallWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_122 Copyright
InstallWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_123 Back
InstallWelcome Copyright Text 135 144 228 73 65539 OOO_CONTROL_124 Next
@@ -188,25 +166,21 @@ InstallWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_126
InstallWelcome TextLine2 Text 135 55 228 45 65539 OOO_CONTROL_127
LicenseAgreement Agree RadioButtonGroup 8 190 330 40 3 AgreeToLicense Back
LicenseAgreement Back PushButton 164 243 66 17 3 OOO_CONTROL_128 Next
-LicenseAgreement Banner Bitmap 297 0 77 44 1 BannerBmp
+LicenseAgreement Banner Bitmap 0 0 374 44 1 BannerBmp
LicenseAgreement BannerLine Line 0 44 376 0 1
-#LicenseAgreement Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#LicenseAgreement Branding2 Text 3 228 92 13 65537 [ProductName]
LicenseAgreement Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Agree
-LicenseAgreement DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_132
+LicenseAgreement DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_132
LicenseAgreement DlgLine Line 0 234 376 0 1
-LicenseAgreement DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_133
+LicenseAgreement DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_133
LicenseAgreement Memo ScrollableText 8 54 358 130 7
LicenseAgreement Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
MaintenanceType Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
-MaintenanceType Banner Bitmap 297 0 77 44 1 BannerBmp
+MaintenanceType Banner Bitmap 0 0 374 44 1 BannerBmp
MaintenanceType BannerLine Line 0 44 376 0 1
-#MaintenanceType Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#MaintenanceType Branding2 Text 3 228 92 13 65537 [ProductName]
MaintenanceType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 RadioGroup
-MaintenanceType DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_139
+MaintenanceType DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_139
MaintenanceType DlgLine Line 0 234 376 0 1
-MaintenanceType DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_140
+MaintenanceType DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_140
MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupPartialIco
MaintenanceType Ico2 Icon 35 135 24 24 5242881 SetupRepairIco
MaintenanceType Ico3 Icon 35 195 24 24 5242881 TrashcanIco
@@ -222,14 +196,12 @@ MaintenanceWelcome Image Bitmap 0 0 122 234 1 ImageBmp
MaintenanceWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_148 Cancel
MaintenanceWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_149
MaintenanceWelcome TextLine2 Text 135 55 228 50 65539 OOO_CONTROL_150
-OutOfSpace Banner Bitmap 297 0 77 44 1 BannerBmp
+OutOfSpace Banner Bitmap 0 0 374 44 1 BannerBmp
OutOfSpace BannerLine Line 0 44 376 0 1
-#OutOfSpace Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#OutOfSpace Branding2 Text 3 228 92 13 65537 [ProductName]
-OutOfSpace DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_153
+OutOfSpace DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_153
OutOfSpace DlgLine Line 0 234 376 0 1
OutOfSpace DlgText Text 21 51 326 43 3 OOO_CONTROL_154
-OutOfSpace DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_155
+OutOfSpace DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_155
OutOfSpace List VolumeCostList 21 95 332 120 393223 OOO_CONTROL_156
OutOfSpace Resume PushButton 301 243 66 17 3 OOO_CONTROL_157
PatchWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_158 Next
@@ -240,31 +212,27 @@ PatchWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_160 Cancel
PatchWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_161
PatchWelcome TextLine2 Text 135 54 228 45 65539 OOO_CONTROL_162
ReadyToInstall Back PushButton 164 243 66 17 3 OOO_CONTROL_163 InstallNow
-ReadyToInstall Banner Bitmap 297 0 77 44 1 BannerBmp
+ReadyToInstall Banner Bitmap 0 0 374 44 1 BannerBmp
ReadyToInstall BannerLine Line 0 44 376 0 1
-#ReadyToInstall Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#ReadyToInstall Branding2 Text 3 228 92 13 65537 [ProductName]
ReadyToInstall Cancel PushButton 301 243 66 17 3 OOO_CONTROL_166 Back
-ReadyToInstall DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_167
+ReadyToInstall DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_167
ReadyToInstall DlgLine Line 0 234 376 0 1
ReadyToInstall DlgText Text 21 51 326 20 3 OOO_CONTROL_168
ReadyToInstall DlgText1 Text 21 70 330 24 3 OOO_CONTROL_169
-ReadyToInstall DlgTitle Text 13 6 280 25 65538 OOO_CONTROL_170
-ReadyToInstall DlgTitle2 Text 13 6 280 25 65538 OOO_CONTROL_171
-ReadyToInstall DlgTitle3 Text 13 6 280 25 65538 OOO_CONTROL_172
+ReadyToInstall DlgTitle Text 13 6 257 25 65538 OOO_CONTROL_170
+ReadyToInstall DlgTitle2 Text 13 6 257 25 65538 OOO_CONTROL_171
+ReadyToInstall DlgTitle3 Text 13 6 257 25 65538 OOO_CONTROL_172
ReadyToInstall InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_173 Cancel
ReadyToRemove Back PushButton 164 243 66 17 3 OOO_CONTROL_174 RemoveNow
-ReadyToRemove Banner Bitmap 297 0 77 44 1 BannerBmp
+ReadyToRemove Banner Bitmap 0 0 374 44 1 BannerBmp
ReadyToRemove BannerLine Line 0 44 376 0 1
-#ReadyToRemove Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#ReadyToRemove Branding2 Text 3 228 92 13 65537 [ProductName]
ReadyToRemove Cancel PushButton 301 243 66 17 3 OOO_CONTROL_177 Back
-ReadyToRemove DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_178
+ReadyToRemove DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_178
ReadyToRemove DlgLine Line 0 234 376 0 1
ReadyToRemove DlgText Text 21 51 326 24 3 OOO_CONTROL_179
ReadyToRemove DlgText1 Text 21 79 330 23 3 OOO_CONTROL_180
ReadyToRemove DlgText2 Text 21 102 330 24 3
-ReadyToRemove DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_181
+ReadyToRemove DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_181
ReadyToRemove RemoveNow PushButton 230 243 66 17 3 OOO_CONTROL_182 Cancel
SetupCompleteError Back PushButton 164 243 66 17 1 OOO_CONTROL_183 Finish
SetupCompleteError Cancel PushButton 301 243 66 17 1 OOO_CONTROL_184 Back
@@ -304,7 +272,7 @@ SetupError R PushButton 192 80 66 17 3 OOO_CONTROL_210
SetupError WarningIcon Icon 15 15 24 24 5242881 CautionIco
SetupError Y PushButton 192 80 66 17 3 OOO_CONTROL_211
SetupInitialization ActionData Text 135 125 228 12 65539
-SetupInitialization ActionText Text 135 109 220 36 65539
+SetupInitialization ActionText Text 135 109 228 36 65539
SetupInitialization Back PushButton 164 243 66 17 1 OOO_CONTROL_214
SetupInitialization Cancel PushButton 301 243 66 17 3 OOO_CONTROL_215
SetupInitialization DlgLine Line 0 234 376 0 1
@@ -326,18 +294,16 @@ SetupInterrupted TextLine2 Text 135 55 228 25 65539 OOO_CONTROL_227
SetupProgress ActionProgress95 ProgressBar 59 113 275 12 65537 OOO_CONTROL_228
SetupProgress ActionText Text 59 100 275 12 3
SetupProgress Back PushButton 164 243 66 17 1 OOO_CONTROL_230 Next
-SetupProgress Banner Bitmap 297 0 77 44 1 BannerBmp
+SetupProgress Banner Bitmap 0 0 374 44 1 BannerBmp
SetupProgress BannerLine Line 0 44 376 0 1
-#SetupProgress Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#SetupProgress Branding2 Text 3 228 92 13 65537 [ProductName]
SetupProgress Cancel PushButton 301 243 66 17 3 OOO_CONTROL_233 Back
-SetupProgress DlgDesc Text 21 23 272 25 65538 OOO_CONTROL_234
-SetupProgress DlgDesc2 Text 21 23 272 25 65538 OOO_CONTROL_235
+SetupProgress DlgDesc Text 21 23 249 25 65538 OOO_CONTROL_234
+SetupProgress DlgDesc2 Text 21 23 249 25 65538 OOO_CONTROL_235
SetupProgress DlgLine Line 0 234 376 0 1
SetupProgress DlgText Text 59 51 275 30 65538 OOO_CONTROL_236
SetupProgress DlgText2 Text 59 51 275 30 65538 OOO_CONTROL_237
-SetupProgress DlgTitle Text 13 6 280 25 65538 OOO_CONTROL_238
-SetupProgress DlgTitle2 Text 13 6 280 25 65538 OOO_CONTROL_239
+SetupProgress DlgTitle Text 13 6 257 25 65538 OOO_CONTROL_238
+SetupProgress DlgTitle2 Text 13 6 257 25 65538 OOO_CONTROL_239
SetupProgress LbSec Text 172 139 32 12 2 OOO_CONTROL_240
SetupProgress LbStatus Text 59 85 70 12 3 OOO_CONTROL_241
SetupProgress Next PushButton 230 243 66 17 1 OOO_CONTROL_242 Cancel
@@ -353,24 +319,20 @@ SetupResume PreselectedText Text 135 55 228 45 65539 OOO_CONTROL_248
SetupResume ResumeText Text 135 46 228 45 65539 OOO_CONTROL_249
SetupResume TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_250
SetupType Back PushButton 164 243 66 17 3 OOO_CONTROL_251 Next
-SetupType Banner Bitmap 297 0 77 44 1 BannerBmp
+SetupType Banner Bitmap 0 0 374 44 1 BannerBmp
SetupType BannerLine Line 0 44 376 0 1
-#SetupType Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#SetupType Branding2 Text 3 228 92 13 65537 [ProductName]
SetupType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_254 RadioGroup
SetupType CompleteIco Icon 34 94 24 24 5242881 SetupCompleteIco
SetupType CompText Text 80 94 246 35 3 OOO_CONTROL_255
SetupType CustomIco Icon 34 154 24 24 5242881 SetupPartialIco
SetupType CustText Text 80 154 246 35 3 OOO_CONTROL_256
-SetupType DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_257
+SetupType DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_257
SetupType DlgLine Line 0 234 376 0 1
SetupType DlgText Text 21 51 326 10 3 OOO_CONTROL_258
-SetupType DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_259
+SetupType DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_259
SetupType Next PushButton 230 243 66 17 3 OOO_CONTROL_260 Cancel
SetupType RadioGroup RadioButtonGroup 21 79 264 120 3 _IsSetupTypeMin Back
SplashBitmap Back PushButton 164 243 66 17 1 OOO_CONTROL_262 Next
-#SplashBitmap Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-#SplashBitmap Branding2 Text 3 228 92 13 65537 [ProductName]
SplashBitmap Cancel PushButton 301 243 66 17 3 OOO_CONTROL_265 Back
SplashBitmap DlgLine Line 0 234 376 0 1
SplashBitmap Image Bitmap 13 12 114 211 1 ImageBmp
More information about the Libreoffice-commits
mailing list