INTEGRATION: CWS jl89_DEV300 (1.5.46); FILE MERGED

2008/02/19 10:14:08 ufi 1.5.46.1: makefiles

1 files changed, 4 insertions, 4 deletions

diff --git a/helpcontent2/source/text/shared/optionen/java.xhp b/helpcontent2/source/text/shared/optionen/java.xhp
index ef08fc0013..a95e3decb1 100755
--- a/helpcontent2/source/text/shared/optionen/java.xhp
+++ b/helpcontent2/source/text/shared/optionen/java.xhp
@@ -7,9 +7,9 @@
  *
  *  $RCSfile: java.xhp,v $fileonly,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: rt $ $Date: 2008-02-20 00:44:33 $
+ *  last change: $Author: kz $ $Date: 2008-03-07 11:51:16 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -50,7 +50,7 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id4077578"><bookmark_value>Java;setting options</bookmark_value>
 </bookmark>
 <paragraph role="heading" id="par_idN10558" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/optionen/java.xhp">Java</link></paragraph>
-<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW">Specifies the support options for Java applications and applets in %PRODUCTNAME, including which Java Runtime Environment (JRE) to use.</paragraph>
+<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="CHG">Specifies the support options for Java applications in %PRODUCTNAME, including which Java Runtime Environment (JRE) to use.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#java"/>
@@ -58,7 +58,7 @@
 <paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2" l10n="NEW">Java options</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_INET_SCRIPTING_CB_J_ENABLE" id="bm_id3150325" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_OPTIONS_JAVA_CB_JAVA_ENABLE" id="bm_id6882839" localize="false"/><paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="3" l10n="NEW">Use a Java runtime environment</paragraph>
-<paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE">Allows you to run Java applications and applets in %PRODUCTNAME.</ahelp> When a Java application or applet attempts to access your hard drive, a prompt opens.<comment>UFI: moved this para here from Security tab page</comment></paragraph>
+<paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="CHG"><ahelp hid="svx:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE">Allows you to run Java applications in %PRODUCTNAME.</ahelp> When a Java application attempts to access your hard drive, a prompt opens.<comment>UFI: moved this para here from Security tab page</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_JAVA_LIST" id="bm_id6775719" localize="false"/><paragraph role="heading" id="par_idN10610" xml-lang="en-US" level="3" l10n="NEW">Java runtime environments (JRE) already installed:</paragraph>
 <paragraph role="paragraph" id="par_idN10614" xml-lang="en-US" l10n="CHG"><ahelp hid="HID_OPTIONS_JAVA_LIST">Select the JRE that you want to use. On some systems, you must wait a minute until the list gets populated. On some systems, you must restart %PRODUCTNAME to use your changed setting.</ahelp> The path to the JRE is displayed beneath the list box.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_OPTIONS_JAVA_PB_ADD" id="bm_id5543382" localize="false"/><paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>