diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-02 13:31:45 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-02 13:31:45 +0000 |
| commit | ed1fe13f59aab5e3faa88c73a223c5599d796d4b (patch) | |
| tree | d07ba26710b10da252f389f4a80497a2865d6f67 /instsetoo_native/inc_openoffice | |
| parent | a03085b43e39a82476181cd6445a936dd8afbf7a (diff) | |
CWS-TOOLING: integrate CWS dv10
2009-03-10 11:09:48 +0100 dv r269257 : #158915# Check msi version before checking patches, better logging
2009-02-27 14:48:58 +0100 dv r268594 : #i99154# Added missing string, removed wrong svn flags
2009-02-26 16:07:25 +0100 dv r268531 : Removed superfluous file
2009-02-26 13:49:01 +0100 dv r268514 : CWS-TOOLING: rebase CWS dv10 to trunk@268395 (milestone: DEV300:m42)
2009-02-26 08:13:32 +0100 dv r268479 : #i86963# Listen to dispose events for xPackages
2009-02-12 15:40:06 +0100 dv r267668 : #i99154# Added missing string
2009-02-03 11:47:11 +0100 dv r267308 : #i73966# Ask for confirmation when removing an extension
2009-01-30 09:27:52 +0100 dv r267175 : #158915# Check for already installed patches to allow launching the setup in maintainance mode
Diffstat (limited to 'instsetoo_native/inc_openoffice')
3 files changed, 4 insertions, 1 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf index 29325b2bd42b..110925c8d7d9 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf @@ -6,3 +6,6 @@ en-US = "The same version of this product is already installed." [OOO_CUSTOMACTION_3] 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." diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt index f2d5eb2b8829..e3bb73b9ed90 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -46,4 +46,4 @@ SetLanguageSelected 51 LANG_SELECTED 1 ResetLanguageSelected 51 LANG_SELECTED 0 SetApplicationSelected 51 APP_SELECTED 1 ResetApplicationSelected 51 APP_SELECTED 0 -RunningOffice 19 "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." +RunningOffice 19 OOO_CUSTOMACTION_4 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt index d23d7cd0c15b..d23d7cd0c15b 100755..100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt |