[Libreoffice-commits] .: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt | 117
--
1 file changed, 117 deletions(-)
New commits:
commit 91f20d6449f0fca905082a2004af9dfa4f683239
Author: Andras Timar
Date: Fri Mar 23 21:17:11 2012 +0100
remove old product from MSI's CustomAction table
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index 8708803..6423f1e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -2,123 +2,6 @@ ActionTypeSource Target
s72i2 S64 S255
CustomAction Action
ISInitAllUsers 307 ALLUSERS1
-DontRemoveProducts 51 OLDPRODUCTS {}
-DontRemoveLpafProducts 51 O2LPAF {}
-DontRemoveLparProducts 51 O2LPAR {}
-DontRemoveLpasinProducts 51 O2LPASIN{}
-DontRemoveLpbebyProducts 51 O2LPBEBY{}
-DontRemoveLpboProducts 51 O2LPBO {}
-DontRemoveLpbgProducts 51 O2LPBG {}
-DontRemoveLpbrProducts 51 O2LPBR {}
-DontRemoveLpbrxProducts51 O2LPBRX {}
-DontRemoveLpbnProducts 51 O2LPBN {}
-DontRemoveLpbnbdProducts 51 O2LPBNBD{}
-DontRemoveLpbninProducts 51 O2LPBNIN{}
-DontRemoveLpbsProducts 51 O2LPBS {}
-DontRemoveLpbyProducts 51 O2LPBY {}
-DontRemoveLpcaProducts 51 O2LPCA {}
-DontRemoveLpcsProducts 51 O2LPCS {}
-DontRemoveLpcyProducts 51 O2LPCY {}
-DontRemoveLpdaProducts 51 O2LPDA {}
-DontRemoveLpdeProducts 51 O2LPDE {}
-DontRemoveLpdgoProducts51 O2LPDGO {}
-DontRemoveLpdzProducts 51 O2LPDZ {}
-DontRemoveLpelProducts 51 O2LPEL {}
-DontRemoveLpengbProducts 51 O2LPENGB{}
-DontRemoveLpenusProducts 51 O2LPENUS{}
-DontRemoveLpenzaProducts 51 O2LPENZA{}
-DontRemoveLpeoProducts 51 O2LPEO {}
-DontRemoveLpesProducts 51 O2LPES {}
-DontRemoveLpetProducts 51 O2LPET {}
-DontRemoveLpeuProducts 51 O2LPEU {}
-DontRemoveLpfaProducts 51 O2LPFA {}
-DontRemoveLpfiProducts 51 O2LPFI {}
-DontRemoveLpfrProducts 51 O2LPFR {}
-DontRemoveLpgaProducts 51 O2LPGA {}
-DontRemoveLpgdProducts 51 O2LPGD {}
-DontRemoveLpglProducts 51 O2LPGL {}
-DontRemoveLpguProducts 51 O2LPGU {}
-DontRemoveLpguinProducts 51 O2LPGUIN{}
-DontRemoveLpheProducts 51 O2LPHE {}
-DontRemoveLphiProducts 51 O2LPHI {}
-DontRemoveLphiinProducts 51 O2LPHIIN{}
-DontRemoveLphrProducts 51 O2LPHR {}
-DontRemoveLphuProducts 51 O2LPHU {}
-DontRemoveLpisProducts 51 O2LPIS {}
-DontRemoveLpitProducts 51 O2LPIT {}
-DontRemoveLpjaProducts 51 O2LPJA {}
-DontRemoveLpkidProducts51 O2LPKID {}
-DontRemoveLpkyProducts 51 O2LPKY {}
-DontRemoveLpkaProducts 51 O2LPKA {}
-DontRemoveLpkkProducts 51 O2LPKK {}
-DontRemoveLpkmProducts 51 O2LPKM {}
-DontRemoveLpknProducts 51 O2LPKN {}
-DontRemoveLpkoProducts 51 O2LPKO {}
-DontRemoveLpkokProducts51 O2LPKOK {}
-DontRemoveLpksProducts 51 O2LPKS {}
-DontRemoveLpkuProducts 51 O2LPKU {}
-DontRemoveLploProducts 51 O2LPLO {}
-DontRemoveLpltProducts 51 O2LPLT {}
-DontRemoveLplvProducts 51 O2LPLV {}
-DontRemoveLpmaiProducts51 O2LPMAI {}
-DontRemoveLpmkProducts 51 O2LPMK {}
-DontRemoveLpmnProducts 51 O2LPMN {}
-DontRemoveLpmniProducts51 O2LPMNI {}
-DontRemoveLpmsProducts 51 O2LPMS {}
-DontRemoveLpmlinProducts 51 O2LPMLIN{}
-DontRemoveLpmrinProducts 51 O2LPMRIN{}
-DontRemoveLpmyProducts 51 O2LPMY {}
-DontRemoveLpneProducts 51 O2LPNE {}
-DontRemoveLpnbProducts 51 O2LPNB {}
-DontRemoveLpnlProducts 51 O2LPNL {}
-DontRemoveLpnnProducts 51 O2LPNN {}
-DontRemoveLpnoProducts 51 O2LPNO {}
-DontRemoveLpnrProducts 51 O2LPNR {}
-DontRemoveLpnsProducts 51 O2LPNS {}
-DontRemoveLpomProducts 51 O2LPOM {}
-DontRemoveLpocProducts 51 O2LPOC {}
-DontRemoveLporinProducts 51 O2LPORIN{}
-DontRemoveLppapProducts51 O2LPPAP {}
-DontRemoveLppainProducts 51 O2LPPAIN{}
-DontRemoveLpplProducts 51 O2LPPL {}
-DontRemoveLppsProducts 51 O2LPPS {}
-DontRemoveLpptProducts 51 O2LPPT {}
-DontRemoveLpptbrProducts 51 O2LPPTBR{}
-DontRemoveLpruProducts 51 O2LPRU {}
-DontRemoveLprwProducts 51 O2LPRW {}
-DontRemoveLpsatProducts51 O2LPSAT {}
-DontRemoveLpsainProducts 51 O2LPSAIN{}
-DontRemoveLpsiProducts 51 O2LPSI {}
-DontRemoveLpscProducts 51 O2LPSC {}
-DontRemoveLpsdProducts 51 O2LPSD {}
-DontRemoveLpskProducts 51 O2LPSK {}
-DontRemoveLpslProducts 51 O2LPSL {}
[Libreoffice-commits] .: instsetoo_native/inc_openoffice instsetoo_native/util
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |3 instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt |1 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |1 instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt |2 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt | 116 - instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |3 instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt | 121 -- instsetoo_native/util/openoffice.lst |2 8 files changed, 1 insertion(+), 248 deletions(-) New commits: commit 9c327e138ec1877a0befe6ca6829a2ec674006a2 Author: Andras Timar Date: Fri Mar 23 17:00:18 2012 +0100 old products are unconditionally removed, clean up unused code diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index 3014793..28b1614 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -675,6 +675,3 @@ en-US = "No applications have been selected for installation. Click OK, then sel [OOO_CONTROL_319] en-US = "Create a start link on desktop" - -[OOO_CONTROL_320] -en-US = "Remove all older product versions" diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt index 55fa877..e7f4169 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt @@ -3,4 +3,3 @@ s72 S64 CheckBox Property ISCHECKFORPRODUCTUPDATES 1 CREATEDESKTOPLINK 1 -REMOVEOLDPRODUCTS 1 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index b932ae5..1a3b3b3 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -232,7 +232,6 @@ ReadyToInstall DlgTitle2 Text13 6 280 25 65538 OOO_CONTROL_171 ReadyToInstall DlgTitle3 Text13 6 280 25 65538 OOO_CONTROL_172 ReadyToInstall InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_173 Cancel ReadyToInstall DesktopLink CheckBox21 100 300 10 3 CREATEDESKTOPLINK OOO_CONTROL_319 -ReadyToInstall UpdateCheckBox CheckBox21 120 200 10 3 REMOVEOLDPRODUCTS OOO_CONTROL_320 ReadyToRemove BackPushButton 164 243 66 17 3 OOO_CONTROL_174 RemoveNow ReadyToRemove Banner Bitmap 297 0 77 44 1 BannerBmp ReadyToRemove BannerLine Line0 44 374 0 1 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt index 478b317..1b874bc 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt @@ -22,8 +22,6 @@ ReadyToInstallDlgTitleShow ProgressType0="Modify" ReadyToInstall DlgTitle2 ShowProgressType0="Repair" ReadyToInstall DlgTitle3 ShowProgressType0="install" ReadyToInstall DesktopLink HideNOT DESKTOPLINKEXISTS -ReadyToInstall UpdateCheckBox HideOLDPRODUCTS="" -ReadyToInstall UpdateCheckBox ShowOLDPRODUCTS<>"" SetupCompleteError BackDefault UpdateStarted SetupCompleteError BackDisable NOT UpdateStarted SetupCompleteError BackEnable UpdateStarted diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index 13ac5a5..c4db5c2 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -10,122 +10,6 @@ CostInitialize 350 CreateFolders 1850 CreateShortcuts2150 DeleteServices VersionNT 1000 -DontRemoveProducts REMOVEOLDPRODUCTS<>"1" 155 -DontRemoveLpafProducts REMOVEOLDPRODUCTS<>"1" 160 -DontRemoveLparProducts REMOVEOLDPRODUCTS<>"1" 160 -DontRemoveLpasinProducts REMOVEOLDPRODUCTS<>"1" 160 -DontRemoveLpbebyProducts REMOVEOLDPRODUCTS<>"1" 160 -DontRemoveLpboProducts REMOVEOLDPRODUCTS<>"1" 160 -D
[Libreoffice-commits] .: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5e7dab83e6425a2e2e8bf9f4cf496669aa6713f6 Author: Andras Timar Date: Tue Mar 20 14:28:03 2012 +0100 amended UI text in MSI diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index 90d331e..194da51 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -704,10 +704,10 @@ en-US = "Install [ProductName] to:" en-US = "If you are just trying out [ProductName], you probably don't want this to happen, so leave the boxes unchecked." [OOO_CONTROL_317] -en-US = "No languages have been selected for installation. Click OK to select one or more languages for installation." +en-US = "No languages have been selected for installation. Click OK, then select one or more languages for installation." [OOO_CONTROL_318] -en-US = "No applications have been selected for installation. Click OK to select one or more applications for installation." +en-US = "No applications have been selected for installation. Click OK, then select one or more applications for installation." [OOO_CONTROL_319] en-US = "Create a start link on desktop" ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: instsetoo_native/inc_openoffice solenv/bin
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 17 --
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 10 -
instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt |3
instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt |1
solenv/bin/make_installer.pl | 14 -
solenv/bin/modules/installer/windows/idtglobal.pm | 72
--
6 files changed, 117 deletions(-)
New commits:
commit 0778689797eda887dd2f73fbcbed6b478633e734
Author: Andras Timar
Date: Tue Mar 20 13:26:51 2012 +0100
remove unused Language selection dialog from MSI
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index a7cc609..8d351fd 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -646,12 +646,6 @@ en-US = "Cancel"
[OOO_CONTROL_266]
en-US = "&Next >"
-[OOO_CONTROL_267]
-en-US = "Please select the product language for [ProductName]."
-
-[OOO_CONTROL_268]
-en-US = "{&MSSansBold8}Language Selection"
-
[OOO_CONTROL_269]
en-US = "Repair or remove the program."
@@ -723,14 +717,3 @@ en-US = "Create a start link on desktop"
[OOO_CONTROL_320]
en-US = "Remove all older product versions"
-
-[OOO_CONTROL_LANG_1033]
-en-US = "English"
-
-[OOO_CONTROL_LANG_1031]
-en-US = "German"
-
-[OOO_CONTROL_LANG_1034]
-en-US = "Spanish"
-
-
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index bd48e9a..a3a8347 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -192,16 +192,6 @@ InstallWelcome TextLine2 Text135 55
228 45 65539 OOO_CONTROL_127
LanguageInfo1 IconIcon15 15 24 24 5242881
CautionIco
LanguageInfo1 OK PushButton 100 57 66 17 3
OOO_CONTROL_10
LanguageInfo1 TextText48 15 194 30 3
OOO_CONTROL_317
-LanguageSelection BackPushButton 164 243 66 17
3 OOO_CONTROL_122 CheckBox1
-LanguageSelection Banner Bitmap 297 0 77 44 1
BannerBmp
-LanguageSelection BannerLine Line0 44 374 0
1
-LanguageSelection Branding1 Text4 229 88 13
3 {&MSSWhiteSerif8}[ProductName]
-LanguageSelection Branding2 Text3 228 88 13
65537 [ProductName]
-LanguageSelection Cancel PushButton 301 243 66 17
3 OOO_CONTROL_131 Back
-LanguageSelection DlgDesc Text21 23 292 25 65539
OOO_CONTROL_267
-LanguageSelection DlgLine Line90 234 284 0 1
-LanguageSelection DlgTitleText13 6 292 25
65539 OOO_CONTROL_268
-LanguageSelection NextPushButton 230 243 66 17
3 OOO_CONTROL_134 Cancel
LicenseAgreement Agree RadioButtonGroup8 190 330
40 3 AgreeToLicense Back
LicenseAgreement BackPushButton 164 243 66 17
3 OOO_CONTROL_128 Next
LicenseAgreement Banner Bitmap 297 0 77 44 1
BannerBmp
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 56bf6b9..fb788fd 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -71,9 +71,6 @@ InstallWelcomeCancel SpawnDialog CancelSetup
1 0
InstallWelcome NextNewDialog LicenseAgreementHIDEEULA <> 1 0
InstallWelcome NextNewDialog CustomerInformation HIDEEULA = 10
LanguageInfo1 OK EndDialog Return 1 0
-LanguageSelection BackNewDialog CustomerInformation 1
1
-LanguageSelection Cancel SpawnDialog CancelSetup 1 1
-LanguageSelection NextNewDialog SetupType 1 1
LicenseAgreement BackNewDialog InstallWelcome 1 0
LicenseAgreement Cancel SpawnDialog CancelSetup 1 0
LicenseAgreement NextNewDialog CustomerInformatio
[Libreoffice-commits] .: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a4ae955534ccc449ddf55fe1b5e5a25065af2ecd Author: Andras Timar Date: Fri Feb 24 11:38:17 2012 +0100 fdo#44717 More helpful text when installer detects a running soffice.bin diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf index 110925c..b80d173 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf @@ -8,4 +8,4 @@ en-US = "The same version of this product is already installed." en-US = "An older version of [ProductName] was found. To install a newer version, the older version needs to be removed first." [OOO_CUSTOMACTION_4] -en-US = "Please exit [DEFINEDPRODUCT] [DEFINEDVERSION] and the [DEFINEDPRODUCT] [DEFINEDVERSION] Quickstarter before you continue. If you are using a multi-user system, also make sure that no other user has [DEFINEDPRODUCT] [DEFINEDVERSION] open." +en-US = "Setup detected a running soffice.bin process. Before you restart the installation, please exit the application that owns soffice.bin. It can be LibreOffice, OpenOffice.org, Lotus Symphony, etc. Also check for the running Quickstarter on Windows taskbar. If you are using a multi-user system, also make sure that no other user has this application open." ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 57ecb72e86f68aaea06053d71b1063264a0aa140 Author: Andras Timar Date: Tue Nov 15 10:58:03 2011 +0100 make Default install/Custom install help text a bit more specific diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index 7b8b940..a7cc609 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -620,10 +620,10 @@ en-US = "< &Back" en-US = "Cancel" [OOO_CONTROL_255] -en-US = "The main components will be installed. Recommended for most users." +en-US = "[ProductName] will be installed with the default components, including spelling dictionaries in all available languages." [OOO_CONTROL_256] -en-US = "Choose which program features you want installed and where they will be installed. Recommended for advanced users." +en-US = "Choose which program features you want installed and where they will be installed. For example here you can select additional user interface languages or deselect unwanted dictionaries." [OOO_CONTROL_257] en-US = "Choose the setup type that best suits your needs." ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
