[Libreoffice-commits] help.git: 3 commits - source/text
Andras Timar
atimar at suse.com
Sat Mar 23 03:56:41 PDT 2013
source/text/shared/01/mediaplayer.xhp | 12 ++----------
source/text/shared/explorer/database/dabawiz02jdbc.xhp | 4 ++--
source/text/shared/explorer/database/rep_main.xhp | 6 +++---
source/text/shared/main0650.xhp | 6 +++---
4 files changed, 10 insertions(+), 18 deletions(-)
New commits:
commit 31516bbabeb16119424c371fb17975a58b74d108
Author: Andras Timar <atimar at suse.com>
Date: Sat Mar 23 11:55:31 2013 +0100
fdo#61379 Java options are under Options - LibreOffice - Advanced
Change-Id: I2171d253700b78966520318efe31ef31cc77ef0a
diff --git a/source/text/shared/explorer/database/dabawiz02jdbc.xhp b/source/text/shared/explorer/database/dabawiz02jdbc.xhp
index 7c7bcd5..deb326e 100644
--- a/source/text/shared/explorer/database/dabawiz02jdbc.xhp
+++ b/source/text/shared/explorer/database/dabawiz02jdbc.xhp
@@ -37,7 +37,7 @@
<paragraph role="heading" id="par_idN10623" xml-lang="en-US" level="2" l10n="NEW">JDBC Examples</paragraph>
<paragraph role="paragraph" id="par_idN10627" xml-lang="en-US" l10n="NEW">
<item type="productname">You can use a JDBC driver class to connect to a JDBC database from %PRODUCTNAME</item>. The driver class is provided by the database manufacturer. Two examples of JDBC databases are Oracle and MySQL.</paragraph>
-<paragraph role="note" id="par_idN1062D" xml-lang="en-US" l10n="CHG">The driver classes must be added to %PRODUCTNAME in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Java.<comment>UFI: #i38525#</comment></paragraph>
+<paragraph role="note" id="par_idN1062D" xml-lang="en-US" l10n="CHG">The driver classes must be added to %PRODUCTNAME in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Advanced.</paragraph>
<paragraph role="heading" id="par_idN10634" xml-lang="en-US" level="3" l10n="NEW">Oracle database</paragraph>
<paragraph role="paragraph" id="par_idN10638" xml-lang="en-US" l10n="NEW">You can use a JDBC driver to access an Oracle database from Solaris or Linux. To access the database from Windows, you need an ODBC driver.</paragraph>
<switch select="sys">
@@ -83,7 +83,7 @@
<paragraph role="paragraph" id="par_idN106BF" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_DRIVERCLASS">Enter the name of the JDBC driver.</ahelp></paragraph>
<section id="classpath">
<paragraph role="warning" id="par_id7953733" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME</emph>
-<emph>- Java</emph>, and click the <emph>Class Path</emph> button. After you add the path information, restart <item type="productname">%PRODUCTNAME</item>.</paragraph>
+<emph>- Advanced</emph>, and click the <emph>Class Path</emph> button. After you add the path information, restart <item type="productname">%PRODUCTNAME</item>.</paragraph>
</section>
<!-- removed HID 852251216 --><paragraph role="heading" id="par_idN106CE" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: may be Test Connection - both strings are in spec</comment></paragraph>
<paragraph role="paragraph" id="par_idN106E4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the connection with the current settings.</ahelp></paragraph>
diff --git a/source/text/shared/explorer/database/rep_main.xhp b/source/text/shared/explorer/database/rep_main.xhp
index 01c2425..13e9273 100644
--- a/source/text/shared/explorer/database/rep_main.xhp
+++ b/source/text/shared/explorer/database/rep_main.xhp
@@ -38,7 +38,7 @@
<paragraph xml-lang="en-US" id="par_id4515823" role="paragraph" l10n="NEW">The Report Builder requires an installed Java Runtime Environment (JRE).</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id4044312" role="paragraph" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/java.xhp">Java</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4044312" role="paragraph" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/java.xhp">Advanced</link>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id1369060" role="paragraph" l10n="NEW">Wait up to one minute, while %PRODUCTNAME collects information on installed Java software on your system.</paragraph>
@@ -51,7 +51,7 @@
<paragraph xml-lang="en-US" id="par_id7730033" role="paragraph" l10n="NEW">Ensure that <emph>Use a Java runtime environment</emph> is enabled.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id6317636" role="paragraph" l10n="NEW">If no JRE version is found on your system, open your web browser and download the JRE software from <link href="http://www.java.com">http://www.java.com</link>. Install the JRE software. Then restart %PRODUCTNAME and open <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Java again.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6317636" role="paragraph" l10n="NEW">If no JRE version is found on your system, open your web browser and download the JRE software from <link href="http://www.java.com">http://www.java.com</link>. Install the JRE software. Then restart %PRODUCTNAME and open <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Advanced again.</paragraph>
<paragraph xml-lang="en-US" id="hd_id9759514" role="heading" level="2" l10n="NEW">To open the Report Builder</paragraph>
<list type="ordered">
<listitem>
diff --git a/source/text/shared/main0650.xhp b/source/text/shared/main0650.xhp
index 6df09f9..4bc5c73 100644
--- a/source/text/shared/main0650.xhp
+++ b/source/text/shared/main0650.xhp
@@ -37,10 +37,10 @@
<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="4">The Java platform support needs to be activated under $[officename] to run Java applications.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Activate Java platform support by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/java.xhp" name="$[officename] - Java">$[officename] - Java</link></emph>.</paragraph>
+<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Activate Java platform support by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/java.xhp" name="$[officename] - Advanced">$[officename] - Advanced</link></emph>.</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id9116183" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME- Java, and click the Class Path button. After you add the path information, restart %PRODUCTNAME.</paragraph>
-<paragraph role="note" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="11">Your modifications at the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Java</emph> tab page will be used even if the Java Virtual Machine (JVM, a virtual machine for the Java platform) already has been started. After modifications to the ClassPath you must restart $[officename]. The same is true for modifications under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</emph>. Only the two boxes "Http Proxy" and "Ftp Proxy" and their ports don't require a restart, they will be evaluated when you click <emph>OK</emph>.</paragraph>
+<paragraph role="note" id="par_id9116183" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Advanced, and click the Class Path button. After you add the path information, restart %PRODUCTNAME.</paragraph>
+<paragraph role="note" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="11">Your modifications at the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Advanced</emph> tab page will be used even if the Java Virtual Machine (JVM, a virtual machine for the Java platform) already has been started. After modifications to the ClassPath you must restart $[officename]. The same is true for modifications under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</emph>. Only the two boxes "Http Proxy" and "Ftp Proxy" and their ports don't require a restart, they will be evaluated when you click <emph>OK</emph>.</paragraph>
</body>
</helpdocument>
commit 3400bf6b126ed5fb66fa7a93b5e295c745f7f9fd
Author: Andras Timar <atimar at suse.com>
Date: Sat Mar 23 11:52:26 2013 +0100
remove obsolete comment about Java Media Framework API (JMF) and DirectShow
Change-Id: I7da16c9a061cf97f52df04043e2bcb3bb510c82d
diff --git a/source/text/shared/01/mediaplayer.xhp b/source/text/shared/01/mediaplayer.xhp
index 510d0d9..ce68a03 100644
--- a/source/text/shared/01/mediaplayer.xhp
+++ b/source/text/shared/01/mediaplayer.xhp
@@ -39,15 +39,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#mediaplayer"/>
</section>
- <paragraph xml-lang="en-US" id="par_idN10577" role="paragraph" l10n="NEW">The Media Player supports many different media formats. You can also insert media files from the Media Player into your document.<comment>UFI: add a list of keyboard shortcuts to /04/ file when available</comment></paragraph>
-<switch select="sys">
-<case select="UNIX">
-<paragraph xml-lang="en-US" id="par_idN105EF" role="note" l10n="NEW">On Linux or Solaris systems, the Media Player requires the Java Media Framework API (JMF). Download and install the JMF files from http://java.sun.com/javase/technologies/desktop/media/jmf/index.jsp and add the path to the installed jmf.jar to the class path in the Options dialog box in %PRODUCTNAME - Java.</paragraph>
-</case>
-<case select="WIN">
-<paragraph xml-lang="en-US" id="par_idN1064F" role="note" l10n="NEW">On Windows systems, the Media Player uses DirectShow, which should be installed on your system by default.</paragraph>
-</case>
-</switch>
+ <paragraph xml-lang="en-US" id="par_idN10577" role="paragraph" l10n="NEW">The Media Player supports many different media formats. You can also insert media files from the Media Player into your document.</paragraph>
<paragraph xml-lang="en-US" id="par_idN1057A" role="heading" level="2" l10n="NEW">Open</paragraph>
<paragraph xml-lang="en-US" id="par_idN1057E" role="paragraph" l10n="NEW">Opens a movie file or a sound file that you want to preview.</paragraph>
<paragraph xml-lang="en-US" id="par_idN10581" role="heading" level="2" l10n="CHG">Apply</paragraph>
@@ -72,4 +64,4 @@
<embed href="text/shared/01/moviesound.xhp#moviesoundtitle"/>
</section>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
commit 17fc35abbf9f9ddf4be1c4beb952e8ee780e71ce
Author: Andras Timar <atimar at suse.com>
Date: Sat Mar 23 11:34:05 2013 +0100
Report Builder is no longer an extension
Change-Id: I3d1377b11ccd01b3a6fd7d4f5be334adafe290da
diff --git a/source/text/shared/explorer/database/rep_main.xhp b/source/text/shared/explorer/database/rep_main.xhp
index 3e74bcb..01c2425 100644
--- a/source/text/shared/explorer/database/rep_main.xhp
+++ b/source/text/shared/explorer/database/rep_main.xhp
@@ -33,7 +33,7 @@
<paragraph xml-lang="en-US" id="hd_id8773155" role="heading" level="1" l10n="NEW"><variable id="rep_main"><link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id5248573" role="paragraph" l10n="NEW">The Report Builder is a tool to create your own database reports. Unlike with the <link href="text/shared/autopi/01100000.xhp">Report Wizard</link>, using the Report Builder you can take control to design the report the way you want. The generated report is a Writer document that you can edit, too.</paragraph>
- <paragraph xml-lang="en-US" id="par_id7128818" role="note" l10n="NEW">To use the Report Builder, the Report Builder extension must be installed. Report Builder extension is bundled with %PRODUCTNAME. In addition, the Java Runtime Environment (JRE) software must be installed, and this software must be selected in %PRODUCTNAME.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7128818" role="note" l10n="NEW">To use the Report Builder, the Report Builder component must be installed. In addition, the Java Runtime Environment (JRE) software must be installed, and this software must be selected in %PRODUCTNAME.</paragraph>
<paragraph xml-lang="en-US" id="hd_id556047" role="heading" level="2" l10n="NEW">To install the JRE software</paragraph>
<paragraph xml-lang="en-US" id="par_id4515823" role="paragraph" l10n="NEW">The Report Builder requires an installed Java Runtime Environment (JRE).</paragraph>
<list type="ordered">
More information about the Libreoffice-commits
mailing list