diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
commit | 9a199ee8f4566941ce4f70bd64e48d609d61e3ab (patch) | |
tree | 7600e262fc497a625b6ac2df90b7c9e0522a0abf /helpcontent2/source/text/shared/optionen/java.xhp | |
parent | 1cfd512d4f5bf7b3009dc52197abb4fce0d9d2c9 (diff) | |
parent | 917b93ce25b18f06fc4e3c41f1b66b5dc497260c (diff) |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'helpcontent2/source/text/shared/optionen/java.xhp')
-rw-r--r--[-rwxr-xr-x] | helpcontent2/source/text/shared/optionen/java.xhp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/helpcontent2/source/text/shared/optionen/java.xhp b/helpcontent2/source/text/shared/optionen/java.xhp index b71eeaa119..04badd01d5 100755..100644 --- a/helpcontent2/source/text/shared/optionen/java.xhp +++ b/helpcontent2/source/text/shared/optionen/java.xhp @@ -53,7 +53,7 @@ <!-- removed HID SVX_CHECKBOX_RID_SVXPAGE_INET_SCRIPTING_CB_J_ENABLE --> <bookmark xml-lang="en-US" branch="hid/cui: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="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> +<bookmark xml-lang="en-US" branch="hid/CUI_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/cui: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> <paragraph role="paragraph" id="par_idN10635" xml-lang="en-US" l10n="CHG"><ahelp hid="svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD">Add a path to the root folder of a JRE on your computer.</ahelp> The path is set in the following dialog.<comment>UFI: #i38927#</comment></paragraph> |