summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2010-03-26 16:32:15 +0100
committerVladimir Glazunov <vg@openoffice.org>2010-03-26 16:32:15 +0100
commit62cd454460b7212fd695dde32f9f99029ed10727 (patch)
tree3e83e8c2d14eb2b22387c4de291a79e49fd89e8f
parentcd12db15734b8a6f27c8cf3e88fd3e8c579ea363 (diff)
native0: some last changes to Help content - transplanted from c7b5a24b2dcf@native0
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000002.xhp4
-rw-r--r--helpcontent2/source/text/shared/05/00000110.xhp4
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_main.xhp6
3 files changed, 7 insertions, 7 deletions
diff --git a/helpcontent2/source/text/shared/00/00000002.xhp b/helpcontent2/source/text/shared/00/00000002.xhp
index 55ee485e8..25ddb8c54 100755
--- a/helpcontent2/source/text/shared/00/00000002.xhp
+++ b/helpcontent2/source/text/shared/00/00000002.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -112,7 +112,7 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3159125"><bookmark_value>Java; definition</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3159125" xml-lang="en-US" level="2" l10n="U" oldref="92">Java</paragraph>
-<paragraph role="paragraph" id="par_id3153188" xml-lang="en-US" l10n="CHG" oldref="93">The Java programming language is a platform independent programming language developed by Sun Microsystems, Inc. (http://www.sun.com) that is especially suited for use in the Internet. Web pages and applications programmed with Java class files can be used on all modern operating systems. Programs using Java programming language are usually developed in a Java development environment and then compiled to a "byte code".</paragraph>
+<paragraph role="paragraph" id="par_id3153188" xml-lang="en-US" l10n="CHG" oldref="93">The Java programming language is a platform independent programming language that is especially suited for use in the Internet. Web pages and applications programmed with Java class files can be used on all modern operating systems. Programs using Java programming language are usually developed in a Java development environment and then compiled to a "byte code".</paragraph>
</section>
<section id="plugin">
<bookmark xml-lang="en-US" branch="index" id="bm_id3159153"><bookmark_value>plug-ins; definition</bookmark_value>
diff --git a/helpcontent2/source/text/shared/05/00000110.xhp b/helpcontent2/source/text/shared/05/00000110.xhp
index 20317efc8..0ff57de8c 100644
--- a/helpcontent2/source/text/shared/05/00000110.xhp
+++ b/helpcontent2/source/text/shared/05/00000110.xhp
@@ -42,8 +42,8 @@
<bookmark xml-lang="en-US" branch="hid/.uno:HelpOnHelp" id="bm_id3153244" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153884" role="heading" level="1" l10n="U" oldref="1"><variable id="00000110"><link href="text/shared/05/00000110.xhp" name="The %PRODUCTNAME Help Window">The <item type="productname">%PRODUCTNAME</item> Help Window</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156183" role="warning" l10n="CHG" oldref="25">The Help system for all versions of the software is based on the same source files. Some of the functions described here may not be included in this particular <item type="productname">%PRODUCTNAME</item> distribution.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3147143" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:HelpOnHelp" visibility="hidden">Provides an overview of the Help system</ahelp>The Help window shows the currently selected Help page.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156183" role="warning" l10n="CHG" oldref="25">The Help system for all versions of the software is based on the same source files. Some of the functions described in Help may not be included in this particular distribution. Some features specific to a distribution may not be mentioned in this Help.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147143" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:HelpOnHelp" visibility="hidden">Provides an overview of the Help system</ahelp>The Help window shows the currently selected Help page.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOX" id="bm_id3153114" localize="false"/>
<paragraph xml-lang="en-US" id="par_id3159201" role="paragraph" l10n="U" oldref="24"><ahelp hid="HID_HELP_TOOLBOX">The <emph>Toolbar</emph> contains important functions for controlling the Help system</ahelp>:</paragraph>
<table id="tbl_id3155555">
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
index a5dfb8c7c..05116569b 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
@@ -56,7 +56,7 @@
<paragraph xml-lang="en-US" id="par_id7858516" role="paragraph" l10n="NEW">Find the Report Builder extension. Click at the icon or the "click here" text link. This opens the download page for the extension.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id973540" role="paragraph" l10n="NEW">Click the "Get it!" icon. The file "sun-report-builder.oxt" will be downloaded to your computer.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id973540" role="paragraph" l10n="NEW">Click the "Get it!" icon. The file "report-builder.oxt" will be downloaded to your computer.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id4680928" role="paragraph" l10n="NEW">Switch back from your web browser to the %PRODUCTNAME window. The Extension Manager should still be visible.</paragraph>
@@ -65,8 +65,8 @@
<paragraph xml-lang="en-US" id="par_id9014252" role="paragraph" l10n="NEW">In the Extension Manager, click Add to open the Add extensions dialog.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id6011841" role="paragraph" l10n="NEW">Select the "sun-report-builder.oxt" file that you downloaded. Click Open.</paragraph>
- <paragraph xml-lang="en-US" id="par_id2591326" role="paragraph" l10n="NEW">This starts the installation of the Sun Report Builder extension.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6011841" role="paragraph" l10n="NEW">Select the "report-builder.oxt" file that you downloaded. Click Open.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2591326" role="paragraph" l10n="NEW">This starts the installation of the Report Builder extension.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id6201666" role="paragraph" l10n="NEW">Read the license. If you accept the license, click Accept to continue the installation.</paragraph>