summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf2
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf2
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt2
-rw-r--r--instsetoo_native/res/DS_Storebin12292 -> 12292 bytes
-rw-r--r--instsetoo_native/util/openoffice.lst6
5 files changed, 6 insertions, 6 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 771a46b32d4f..5468076d22d4 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -497,7 +497,7 @@ en-US = "&Abort"
en-US = "&Cancel"
[OOO_CONTROL_206]
-en-US = "<error text goes here><error text goes here><error text goes here><error text goes here><error text goes here><error text goes here><error text goes here><error text goes here><error text goes here><error text goes here><error text goes here>"
+en-US = "error text goes here error text goes here error text goes here error text goes here error text goes here error text goes here error text goes here error text goes here error text goes here error text goes here"
[OOO_CONTROL_207]
en-US = "&Ignore"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
index 2ae1db4827b5..a5371150465d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
@@ -206,7 +206,7 @@ en-US = "Out of disk space -- Volume: '[2]'; required space: [3] KB; available s
en-US = "Are you sure you want to cancel?"
[OOO_ERROR_70]
-en-US = "The file [2][3] is being held in use{ by the following process: Name: [4], ID: [5], Window Title: [6]}. Close that application and retry."
+en-US = "The file [2][3] is being held in use {by the following process: Name: [4], ID: [5], Window Title: [6]}. Close that application and retry."
[OOO_ERROR_71]
en-US = "The product [2] is already installed, preventing the installation of this product. The two products are incompatible."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 858d17f84c52..df12081ed1ef 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -269,7 +269,7 @@ 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 InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_173 Cancel
-ReadyToInstall DesktopLink CheckBox 21 100 200 10 3 CREATEDESKTOPLINK OOO_CONTROL_319
+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
diff --git a/instsetoo_native/res/DS_Store b/instsetoo_native/res/DS_Store
index 521691370161..ee936831bb43 100644
--- a/instsetoo_native/res/DS_Store
+++ b/instsetoo_native/res/DS_Store
Binary files differ
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 4b4380dff002..db12652c693a 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -6,7 +6,7 @@ Globals
{
OOOBASEVERSION 3.0
OOOPACKAGEVERSION 3.0.0
- UREPACKAGEVERSION 1.4.0
+ UREPACKAGEVERSION 1.5.0
URELAYERVERSION 1
BASISROOTNAME OpenOffice.org
UNIXBASISROOTNAME openoffice.org
@@ -244,8 +244,8 @@ URE
variables
{
PRODUCTNAME URE
- PRODUCTVERSION 1.4
- PACKAGEVERSION 1.4
+ PRODUCTVERSION 1.5
+ PACKAGEVERSION 1.5
PACKAGEREVISION 1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION