instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt | 1 + instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt | 1 + instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 3 +++ instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 1 + instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt | 1 + instsetoo_native/inc_ure/windows/msi_templates/Control.idt | 1 + 6 files changed, 8 insertions(+)
New commits: commit a82dee49aade4685af6a9b8f153cc5e7673a36ca Author: Andras Timar <ati...@suse.com> Date: Tue Mar 20 22:06:42 2012 +0100 fix control order in MSI diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt index e9a7742..9cde5eb 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt @@ -48,7 +48,7 @@ CustomerInformation BannerLine Line 0 44 374 0 1 CustomerInformation Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName] CustomerInformation Branding2 Text 3 228 140 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 CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 Next CustomerInformation CompanyLabel Text 21 89 75 10 3 OOO_CONTROL_37 CompanyEdit CustomerInformation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_38 CustomerInformation DlgLine Line 145 234 229 0 1 diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt index e9a7742..9cde5eb 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt @@ -48,7 +48,7 @@ CustomerInformation BannerLine Line 0 44 374 0 1 CustomerInformation Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName] CustomerInformation Branding2 Text 3 228 140 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 CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 Next CustomerInformation CompanyLabel Text 21 89 75 10 3 OOO_CONTROL_37 CompanyEdit CustomerInformation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_38 CustomerInformation DlgLine Line 145 234 229 0 1 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index 7599ae5..acd4bd0 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -51,7 +51,7 @@ CustomerInformation BannerLine Line 0 44 374 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 CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 Next CustomerInformation CompanyLabel Text 21 89 75 10 3 OOO_CONTROL_37 CompanyEdit CustomerInformation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_38 CustomerInformation DlgLine Line 90 234 284 0 1 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt index 2ec0a37..2ee3d5b 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt @@ -48,7 +48,7 @@ CustomerInformation BannerLine Line 0 44 374 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 CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 Next CustomerInformation CompanyLabel Text 21 89 75 10 3 OOO_CONTROL_37 CompanyEdit CustomerInformation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_38 CustomerInformation DlgLine Line 95 234 279 0 1 diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt index 71f84a8..c4640f2 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt @@ -48,7 +48,7 @@ CustomerInformation BannerLine Line 0 44 374 0 1 CustomerInformation Branding1 Text 4 229 32 13 3 {&MSSWhiteSerif8}[ProductName] CustomerInformation Branding2 Text 3 228 32 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 CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 Next CustomerInformation CompanyLabel Text 21 89 75 10 3 OOO_CONTROL_37 CompanyEdit CustomerInformation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_38 CustomerInformation DlgLine Line 35 234 339 0 1 commit c3e1643208a50ebf2841e6fd48ae5ddaf9dbcf1b Author: Andras Timar <ati...@suse.com> Date: Tue Mar 20 21:59:54 2012 +0100 Revert "remove last traces of serial number check from MSI" This reverts commit 90ec7ecb86f4cc2005ac1c5a7e70b19fbdc02426. diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt index 1369af6..e9a7742 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt @@ -48,6 +48,7 @@ CustomerInformation BannerLine Line 0 44 374 0 1 CustomerInformation Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName] CustomerInformation Branding2 Text 3 228 140 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 DlgLine Line 145 234 229 0 1 diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt index 1369af6..e9a7742 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt @@ -48,6 +48,7 @@ CustomerInformation BannerLine Line 0 44 374 0 1 CustomerInformation Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName] CustomerInformation Branding2 Text 3 228 140 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 DlgLine Line 145 234 229 0 1 diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index 5c54cc9..249120b 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -76,6 +76,9 @@ en-US = "< &Back" [OOO_CONTROL_35] en-US = "Cancel" +[OOO_CONTROL_36] +en-US = "{\Tahoma8}{80}" + [OOO_CONTROL_37] en-US = "&Organization:" diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index 05a7a79..7599ae5 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -51,6 +51,7 @@ CustomerInformation BannerLine Line 0 44 374 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 DlgLine Line 90 234 284 0 1 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt index d98a025..2ec0a37 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt @@ -48,6 +48,7 @@ CustomerInformation BannerLine Line 0 44 374 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 DlgLine Line 95 234 279 0 1 diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt index 40e66f4..71f84a8 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt @@ -48,6 +48,7 @@ CustomerInformation BannerLine Line 0 44 374 0 1 CustomerInformation Branding1 Text 4 229 32 13 3 {&MSSWhiteSerif8}[ProductName] CustomerInformation Branding2 Text 3 228 32 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 DlgLine Line 35 234 339 0 1 _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits