CWS-TOOLING: integrate CWS native214

2009-01-05 16:05:30 +0100 is  r265877 : #i97060# version number 3.1 instead of 3.0
2009-01-05 14:02:05 +0100 is  r265868 : #i97060# 3.1 also for slackware packages
2008-12-15 13:47:31 +0100 is  r265482 : #i94714# adding string
2008-12-15 10:40:59 +0100 is  r265464 : #i94746# math.desktop for all products
2008-12-12 14:31:01 +0100 is  r265418 : #i94871# adjust image for dmg file
2008-12-12 13:02:05 +0100 is  r265409 : #i92038# avoiding sending mails to root
2008-12-12 12:43:58 +0100 is  r265408 : #158469# removing registry entries for wps and ichitaro
2008-12-12 12:36:13 +0100 is  r265407 : #i95257# adding Mongolian as nsis language
2008-12-11 15:59:57 +0100 is  r265325 : #89742# fixing typo
2008-12-11 15:54:43 +0100 is  r265324 : #i89732# minor string fixes
2008-12-11 15:35:29 +0100 is  r265320 : #i97060# gnome also for user installation required
2008-12-11 12:34:36 +0100 is  r265283 : #i96575# removing superfluous dependencies
2008-12-10 15:31:04 +0100 is  r265196 : #i96306# adding Gaelic
2008-12-10 14:35:28 +0100 is  r265187 : #i94776# ure version 1.5
2008-12-10 11:40:47 +0100 is  r265161 : #158920# new extension process
2008-12-10 11:38:46 +0100 is  r265160 : #158920# new extension process
2008-12-10 11:37:32 +0100 is  r265159 : #158920# new extension process
2008-12-09 13:05:20 +0100 is  r265077 : #i94453# longer textbox
2008-12-09 12:41:35 +0100 is  r265076 : #i97060# setting version 3.1.0

2 files changed, 5 insertions, 2 deletions

diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java
index 4b91edf3c198..61dc02ca97f4 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java
@@ -120,6 +120,9 @@ public class SolarisHelper {
         //     adminFile.add(baseDirLine);
         // }
 
+        String mailLine = "mail=";
+        adminFile.add(mailLine);
+
         String conflictLine = "conflict=quit";
         if ( data.isUserInstallation() ) { conflictLine = "conflict=nocheck"; }
         adminFile.add(conflictLine);
diff --git a/javainstaller2/src/Localization/setupstrings.ulf b/javainstaller2/src/Localization/setupstrings.ulf
index 15114a1c05cf..8b28bac892f6 100755
--- a/javainstaller2/src/Localization/setupstrings.ulf
+++ b/javainstaller2/src/Localization/setupstrings.ulf
@@ -218,7 +218,7 @@ en-US = "The Installation Wizard has successfully installed ${PRODUCT_FULLNAME}
 en-US = "The Installation Wizard was aborted. ${PRODUCT_NAME} is not installed on your computer."
 
 [STRING_INSTALLATIONCOMPLETED2_ERROR]
-en-US = "An error has occured. Thus the Installation Wizard could not install ${PRODUCT_NAME} on your computer successfully. Click 'Details...' for more information."
+en-US = "An error has occurred. Thus the Installation Wizard could not install ${PRODUCT_NAME} on your computer successfully. Click 'Details...' for more information."
 
 [STRING_INSTALLATIONCOMPLETED3]
 en-US = "Click 'Finish' to exit the Wizard."
@@ -284,7 +284,7 @@ en-US = "The Uninstallation Wizard has successfully removed the selected compone
 en-US = "The Uninstallation Wizard was aborted before completely removing ${PRODUCT_NAME} from your computer."
 
 [STRING_UNINSTALLATIONCOMPLETED2_ERROR]
-en-US = "An error has occured. Thus the Uninstallation Wizard could not remove ${PRODUCT_NAME} from your computer successfully. Click 'Details...' for more information."
+en-US = "An error has occurred. Thus the Uninstallation Wizard could not remove ${PRODUCT_NAME} from your computer successfully. Click 'Details...' for more information."
 
 [STRING_INSTALLERFACTORY_OS_NOT_SUPPORTED]
 en-US = "Sorry, this Operating System is not supported yet."