nativea: #161909# Exchange names and URLs

2 files changed, 8 insertions, 10 deletions

diff --git a/crashrep/source/all/crashrep.ulf b/crashrep/source/all/crashrep.ulf
index 4bc69015cb1d..2de1753918d2 100644
--- a/crashrep/source/all/crashrep.ulf
+++ b/crashrep/source/all/crashrep.ulf
@@ -7,7 +7,7 @@ en-US = "Welcome to the %PRODUCTNAME% %PRODUCTVERSION% Error Report"
 
 
 [%WELCOME_BODY1%]
-en-US = "This error report tool gathers information about how %PRODUCTNAME% is working and sends it to Sun Microsystems to help improve future versions.\n\n"
+en-US = "This error report tool gathers information about how %PRODUCTNAME% is working and sends it to Oracle to help improve future versions.\n\n"
 
 
 [%WELCOME_BODY2%]
@@ -15,11 +15,11 @@ en-US = "It's easy - just send the report without any further effort on your par
 
 
 [%WELCOME_BODY3%]
-en-US = "Customer Privacy\nThe information gathered is limited to data concerning the state of %PRODUCTNAME% %PRODUCTVERSION% when the error occurred. Other information about passwords or document contents is not collected.\n\nThe information will only be used to improve the quality of %PRODUCTNAME% and will not be shared with third parties.\nFor more information on Sun Microsystems' privacy policy, visit\n"
+en-US = "Customer Privacy\nThe information gathered is limited to data concerning the state of %PRODUCTNAME% %PRODUCTVERSION% when the error occurred. Other information about passwords or document contents is not collected.\n\nThe information will only be used to improve the quality of %PRODUCTNAME% and will not be shared with third parties.\nFor more information on Oracle's privacy policy, visit\n"
 
 
 [%PRIVACY_URL%]
-en-US = "http://www.sun.com/privacy/"
+en-US = "http://www.oracle.com/html/services-privacy-policy.html"
 
 
 [%NEXT_BUTTON%]
@@ -43,7 +43,7 @@ en-US = "An error occurred while running %PRODUCTNAME% %PRODUCTVERSION%"
 
 
 [%REPORT_BODY%]
-en-US = "The %PRODUCTNAME% %PRODUCTVERSION% Error Report has gathered information that could help Sun Microsystems improve %PRODUCTNAME%.\nIn the spaces below, you can enter a title for your crash report and describe the action you were trying to carry out when the error occurred. Then click 'Send'.\n"
+en-US = "The %PRODUCTNAME% %PRODUCTVERSION% Error Report has gathered information that could help Oracle improve %PRODUCTNAME%.\nIn the spaces below, you can enter a title for your crash report and describe the action you were trying to carry out when the error occurred. Then click 'Send'.\n"
 
 
 [%ENTER_TITLE%]
@@ -51,7 +51,7 @@ en-US = "Which type of document (e.g. presentation) were you using when the erro
 
 
 [%ALLOW_CONTACT%]
-en-US = "~I allow Sun Microsystems to contact me regarding this report."
+en-US = "~I allow Oracle to contact me regarding this report."
 
 
 [%ENTER_EMAIL%]
@@ -156,7 +156,7 @@ en-US = "Status: The error report has been sent successfully."
 
 
 [%ERROR_MSG_NOEMAILADDRESS%]
-en-US = "You have marked the option 'I allow Sun Microsystems to contact me regarding this report.'\nPlease enter your e-mail address."
+en-US = "You have marked the option 'I allow Oracle to contact me regarding this report.'\nPlease enter your e-mail address."
 
 
 [%MSG_CMDLINE_USAGE%]
diff --git a/extensions/source/preload/preload.src b/extensions/source/preload/preload.src
index feea7249ce70..59805b768adf 100644
--- a/extensions/source/preload/preload.src
+++ b/extensions/source/preload/preload.src
@@ -86,10 +86,8 @@ TabPage RID_TP_WELCOME
         Text [ en-US ] = "Welcome to %PRODUCTNAME %PRODUCTVERSION OEM\n\nTo start the %PRODUCTNAME %PRODUCTVERSION OEM, "
         "please enter your personal data in the dialog following the license text. Important information is contained "
         "in the readme files which are located in the %PRODUCTNAME product directory. Please read these files carefully. "
-        "You can also find detailed information at the Sun website \n\n"
-        "http://www.sun.com/staroffice.\n\nSupport and Training:\n\nGet FREE software support valid for 60 days from date "
-        "of purchase. To take advantage of this offer, visit the website below.\n\n"
-        "http://www.sun.com/star/service\n\nWe hope you enjoy working with %PRODUCTNAME.";
+        "You can also find detailed information at the Oracle website \n\n"
+        "http://www.oracle.com/us/products/applications/open-office.";
     };
 };