diff options
| author | Andras Timar <atimar@suse.com> | 2012-09-26 18:53:30 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-09-26 18:59:13 +0200 |
| commit | 0475a7904978566dfb9f6e83497392b3841c0efc (patch) | |
| tree | 68749a6e1f6e954f22850bf295060ce7e8028140 /instsetoo_native/inc_openoffice | |
| parent | a99ddfdc2f3b1abef56c61ab727b602d38a2413b (diff) | |
use utf-8 instead of legacy code pages in all msi tables (related: fdo#39595)
Change-Id: Ib2dc00c024762800fdb74ffb376d92a8583d44ad
Diffstat (limited to 'instsetoo_native/inc_openoffice')
9 files changed, 7 insertions, 20 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf deleted file mode 100644 index 46e84bfe7876..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf +++ /dev/null @@ -1,12 +0,0 @@ -[OOO_SIS_TITLE] -en-US = "Installation database" - -[OOO_SIS_COMMENT] -en-US = "This installer database contains the logic and data required to install [ProductName]." - -[OOO_SIS_KEYWORDS] -en-US = "Install,MSI" - -[OOO_SIS_APPNAME] -en-US = "Windows Installer" - diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk index 2b7e1beafda2..36bc2647a3e1 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk @@ -44,7 +44,6 @@ ULFFILES = \ LaunchCo.ulf \ Property.ulf \ RadioBut.ulf \ - SIS.ulf \ UIText.ulf MLFFILES = $(foreach,i,$(ULFFILES) $(MISC)$/$(TARGET)$/$(i:b).mlf) diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt index ec6ecdd99f72..becf9cc7aeb5 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt @@ -1,6 +1,6 @@ Action Description Template s72 L0 L0 -WINDOWSENCODINGTEMPLATE ActionText Action +65001 ActionText Action Advertise OOO_ACTIONTEXT_1 AllocateRegistrySpace OOO_ACTIONTEXT_2 OOO_ACTIONTEXT_3 AppSearch OOO_ACTIONTEXT_4 OOO_ACTIONTEXT_5 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index a9c739f43f7b..a9fc6d22c616 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -1,6 +1,6 @@ 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 +65001 Control Dialog_ Control AdminChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp AdminChangeFolder BannerLine Line 0 44 374 0 1 AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt index 9789d0cf56f3..2f3a5912817d 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt @@ -1,6 +1,6 @@ Error Message i2 L0 -WINDOWSENCODINGTEMPLATE Error Error +65001 Error Error 0 OOO_ERROR_1 1 OOO_ERROR_2 2 OOO_ERROR_3 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt index 35d78694a664..e4d3f330b006 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt @@ -1,4 +1,4 @@ Condition Description s255 l255 -WINDOWSENCODINGTEMPLATE LaunchCondition Condition +65001 LaunchCondition Condition Privileged OOO_LAUNCH_1 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt index a1cb18aede44..44d2c381c432 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt @@ -1,6 +1,6 @@ Property Value s72 l0 -WINDOWSENCODINGTEMPLATE Property Property +65001 Property Property _IsMaintenance Change _IsSetupTypeMin Typical AgreeToLicense No diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt index e1d000070427..a08edf3a734c 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt @@ -1,6 +1,6 @@ Property Order Value X Y Width Height Text Help s72 i2 s64 i2 i2 i2 i2 L64 L50 -WINDOWSENCODINGTEMPLATE RadioButton Property Order +65001 RadioButton Property Order _IsMaintenance 1 Change 0 0 290 14 OOO_RADIOBUTTON_1 _IsMaintenance 2 Reinstall 0 60 290 14 OOO_RADIOBUTTON_2 _IsMaintenance 3 Remove 0 120 290 14 OOO_RADIOBUTTON_3 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/UIText.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/UIText.idt index ea581bff4601..82edac4d4e39 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/UIText.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/UIText.idt @@ -1,6 +1,6 @@ Key Text s72 L255 -WINDOWSENCODINGTEMPLATE UIText Key +65001 UIText Key AbsentPath bytes OOO_UITEXT_1 GB OOO_UITEXT_2 |