INTEGRATION: CWS native87 (1.1.10); FILE MERGED

2007/06/28 14:58:51 is 1.1.10.3: #i65425# user info string on welcome page
2007/06/20 08:31:04 is 1.1.10.2: RESYNC: (1.1-1.2); FILE MERGED
2007/04/24 10:09:31 is 1.1.10.1: #i65425# adding header

1 files changed, 39 insertions, 1 deletions

diff --git a/javainstaller2/src/Localization/setupstrings.ulf b/javainstaller2/src/Localization/setupstrings.ulf
index 1a8b0d5268be..c4355bd13a1d 100755
--- a/javainstaller2/src/Localization/setupstrings.ulf
+++ b/javainstaller2/src/Localization/setupstrings.ulf
@@ -1,3 +1,38 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: setupstrings.ulf,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: rt $ $Date: 2007-07-03 12:03:52 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
 [STRING_PREVIOUS]
 en-US = "Back"
 
@@ -169,6 +204,9 @@ en-US = "This Installation Wizard will install ${PRODUCT_FULLNAME} on your compu
 [STRING_PROLOGUE3]
 en-US = "To continue, click 'Next'."
 
+[STRING_PROLOGUE4]
+en-US = "Note: This installation will be done without root privileges. Therefore you will have a reduced functionality (Java Runtime Environment (JRE) not installable, system integration not possible).\nClick 'Cancel' and change your privileges to root privileges, if you want to use the complete functionality."
+
 [STRING_INSTALLATIONCOMPLETED1]
 en-US = "Installation Completed"
 
@@ -260,7 +298,7 @@ en-US = "Sorry, this Operating System is not supported yet."
 en-US = "A newer version of ${PRODUCT_NAME} was found on your system in:"
 
 [STRING_NEWER_VERSION_INSTALLED_REMOVE]
-en-US = "You have to remove the newer version of ${PRODUCT_NAME} before you can install the older one.\nTo remove the newer version start the "setup" program in ${DIR}"
+en-US = "You have to remove the newer version of ${PRODUCT_NAME} before you can install the older one."
 	
 [STRING_NEWER_VERSION_DATABASE]
 en-US = "Database"