[Libreoffice-commits] help.git: source/text
Olivier Hallot
olivier.hallot at libreoffice.org
Sun Apr 29 10:03:31 UTC 2018
source/text/shared/00/00000403.xhp | 12 ++++++------
source/text/shared/04/01010000.xhp | 14 +++++++-------
source/text/shared/04/01020000.xhp | 2 +-
source/text/shared/guide/data_im_export.xhp | 2 +-
source/text/shared/guide/data_search2.xhp | 10 +++++-----
source/text/shared/guide/database_main.xhp | 4 ++--
source/text/shared/guide/keyboard.xhp | 2 +-
7 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit e159f81ef39cc9b489ba8a5fcd095b65266449c0
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date: Sat Apr 28 10:00:49 2018 -0300
tdf#117239 F4 -> Ctrl+Shift+F4
Update help pages woth F4 key for datasource
Change-Id: I20eb2b144dde11eb244dedde492e9c1b298fe103
Reviewed-on: https://gerrit.libreoffice.org/53588
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
diff --git a/source/text/shared/00/00000403.xhp b/source/text/shared/00/00000403.xhp
index dee857af0..50f35f501 100644
--- a/source/text/shared/00/00000403.xhp
+++ b/source/text/shared/00/00000403.xhp
@@ -20,7 +20,7 @@
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0000000403xml" indexer="exclude" status="PUBLISH">
@@ -36,8 +36,8 @@
<section id="masstab">
<paragraph role="paragraph" id="par_id3146936" xml-lang="en-US">Choose <emph>View - Zoom</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3149962" xml-lang="en-US"><switchinline select="appl"><caseinline select="DRAW">Zoom also with (+) (-) (×) and (÷) on the number keypad
-</caseinline><caseinline select="IMPRESS">Zoom also with (+) (-) (×) and (÷) on the number keypad
+<paragraph role="paragraph" id="par_id3149962" xml-lang="en-US"><switchinline select="appl"><caseinline select="DRAW">Zoom also with (+) (-) (×) and (÷) on the number keypad
+</caseinline><caseinline select="IMPRESS">Zoom also with (+) (-) (×) and (÷) on the number keypad
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3152895" xml-lang="en-US">Double-click or right-click the field on the <emph>Status</emph> Bar</paragraph>
</section>
@@ -95,7 +95,7 @@
<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US">If a text document or spreadsheet is open:</paragraph>
<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US">Menu <emph>View - Data Sources</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3149046" xml-lang="en-US">F4 key</paragraph>
+<paragraph role="paragraph" id="par_id3149046" xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + F4 keys</paragraph>
<section id="sydatenquellen">
<table id="tbl_id3149456">
<tablerow>
@@ -132,9 +132,9 @@
</section>
</section>
-<paragraph role="paragraph" id="par_idN1091B" xml-lang="en-US"><variable id="grid">Choose <emph>View - Grid</emph> (Impress or Draw)
+<paragraph role="paragraph" id="par_idN1091B" xml-lang="en-US"><variable id="grid">Choose <emph>View - Grid</emph> (Impress or Draw)
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN1092E" xml-lang="en-US"><variable id="guides">Choose <emph>View - Snap Lines</emph> (Impress or Draw)
+<paragraph role="paragraph" id="par_idN1092E" xml-lang="en-US"><variable id="guides">Choose <emph>View - Snap Lines</emph> (Impress or Draw)
</variable></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/04/01010000.xhp b/source/text/shared/04/01010000.xhp
index fab8da869..4103964c9 100644
--- a/source/text/shared/04/01010000.xhp
+++ b/source/text/shared/04/01010000.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,8 +18,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textshared0401010000xml" indexer="include">
<title xml-lang="en-US" id="tit">General Shortcut Keys in $[officename]</title>
@@ -97,8 +97,8 @@
<section id="autocompurl">
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153968" role="listitem"> $[officename] has an AutoComplete function which activates itself in some text and list boxes. For example, enter <switchinline select="sys"><caseinline select="WIN">c:\a
-</caseinline><defaultinline>~/a</defaultinline></switchinline> into the URL field and the AutoComplete function displays the first file or first directory found <switchinline select="sys"><caseinline select="WIN">on the C: drive
+ <paragraph xml-lang="en-US" id="par_id3153968" role="listitem"> $[officename] has an AutoComplete function which activates itself in some text and list boxes. For example, enter <switchinline select="sys"><caseinline select="WIN">c:\a
+</caseinline><defaultinline>~/a</defaultinline></switchinline> into the URL field and the AutoComplete function displays the first file or first directory found <switchinline select="sys"><caseinline select="WIN">on the C: drive
</caseinline><defaultinline>in your home folder</defaultinline></switchinline> that starts with the letter "a".</paragraph>
</listitem>
<listitem>
@@ -110,7 +110,7 @@
<paragraph xml-lang="en-US" id="par_id3159150" role="paragraph">If you want to terminate a macro that is currently running, press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Q.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3154123" role="heading" level="2">List of General Shortcut Keys in $[officename]</paragraph>
- <paragraph xml-lang="en-US" id="par_id3145421" role="paragraph">The shortcut keys are shown on the right hand side of the menu lists next to the corresponding menu command. <switchinline select="sys"><caseinline select="MAC">(Not all of the mentioned keys for controlling dialogs are available on the Macintosh.)
+ <paragraph xml-lang="en-US" id="par_id3145421" role="paragraph">The shortcut keys are shown on the right hand side of the menu lists next to the corresponding menu command. <switchinline select="sys"><caseinline select="MAC">(Not all of the mentioned keys for controlling dialogs are available on the Macintosh.)
</caseinline></switchinline></paragraph>
<paragraph xml-lang="en-US" id="hd_id31541231" role="heading" level="3">Shortcut keys for controlling dialogs</paragraph>
<table id="tbl_id3555101">
@@ -736,7 +736,7 @@
</table>
<section id="dbtable">
- <paragraph xml-lang="en-US" id="hd_id3149722" role="heading" level="2">Selecting Rows and Columns in a Database Table (opened by F4)</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149722" role="heading" level="2">Selecting Rows and Columns in a Database Table (opened by <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + F4 keys)</paragraph>
<table id="tbl_id1178319">
<tablerow>
<tablecell>
diff --git a/source/text/shared/04/01020000.xhp b/source/text/shared/04/01020000.xhp
index 8d1822076..5c1f0d094 100644
--- a/source/text/shared/04/01020000.xhp
+++ b/source/text/shared/04/01020000.xhp
@@ -268,8 +268,8 @@
</tablerow>
</table>
</section>
-<section id="relatedtopics">
<embed href="text/shared/04/01010000.xhp#dbtable"/>
+<section id="relatedtopics">
<embed href="text/shared/04/01010000.xhp#common_keys"/>
<embed href="text/shared/guide/keyboard.xhp#keyboard"/>
</section>
diff --git a/source/text/shared/guide/data_im_export.xhp b/source/text/shared/guide/data_im_export.xhp
index c91975a8c..8286ce489 100644
--- a/source/text/shared/guide/data_im_export.xhp
+++ b/source/text/shared/guide/data_im_export.xhp
@@ -86,7 +86,7 @@
<paragraph role="paragraph" id="par_id4815820" xml-lang="en-US">You see the Copy Table dialog. Most databases need a primary key, so you may want to check the <emph>Create primary key</emph> box.</paragraph>
</listitem>
</list>
-<paragraph role="tip" id="par_id2584002" xml-lang="en-US">On Windows systems, you can also use drag-and-drop instead of Copy and Paste. Also, for registered databases, you can open the datasource browser (press F4) instead of opening the Base window.</paragraph>
+<paragraph role="tip" id="par_id2584002" xml-lang="en-US">On Windows systems, you can also use drag-and-drop instead of Copy and Paste. Also, for registered databases, you can open the datasource browser (press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + F4 keys) instead of opening the Base window.</paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id5871761" xml-lang="en-US" localize="false">
<embedvar href="text/shared/explorer/database/main.xhp#base"/>
diff --git a/source/text/shared/guide/data_search2.xhp b/source/text/shared/guide/data_search2.xhp
index b5f2bc506..542a46885 100644
--- a/source/text/shared/guide/data_search2.xhp
+++ b/source/text/shared/guide/data_search2.xhp
@@ -42,15 +42,15 @@
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id3149182" xml-lang="en-US">Open a form document that contains database fields.</paragraph>
-<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US">As an example, open an empty text document and press F4. Open the bibliography database table <emph>biblio</emph> in the data source view. While pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, drag a few column headers into the document so that the form fields are created.</paragraph>
+<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US">As an example, open an empty text document and press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + F4 keys. Open the bibliography database table <emph>biblio</emph> in the data source view. While pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, drag a few column headers into the document so that the form fields are created.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US">On the <emph>Form Controls</emph> toolbar, click the <emph>Design Mode On/Off</emph> icon
+<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US">On the <emph>Form Controls</emph> toolbar, click the <emph>Design Mode On/Off</emph> icon
<image id="img_id3147618" src="cmd/sc_switchcontroldesignmode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147618" xml-lang="en-US">Icon</alt>
</image> to turn off the design mode.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US">On the <emph>Form Navigation</emph> toolbar, click the <emph>Form-Based Filters</emph> icon
+<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US">On the <emph>Form Navigation</emph> toolbar, click the <emph>Form-Based Filters</emph> icon
<image id="img_id3149807" src="cmd/sc_formfilter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149807" xml-lang="en-US">Icon</alt>
</image>. The current document is displayed with its form controls as an empty edit mask. The <emph>Form Filter </emph>toolbar appears.</paragraph>
</listitem>
@@ -63,10 +63,10 @@
<bookmark xml-lang="en-US" branch="hid/.uno:FormFilterExecute" id="bm_id3148617" localize="false"/><paragraph role="paragraph" id="par_id3152462" xml-lang="en-US"><ahelp hid=".uno:FormFilterExecute">If you click the <emph>Apply Form-Based Filter</emph> icon on the <emph>Form Filter</emph> toolbar, the filter will be applied.</ahelp> You see the <emph>Form Navigation</emph> toolbar and can browse through the found records.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:FormFilterExit" id="bm_id2865336" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:FormFilterExit" id="bm_id3149959" localize="false"/><paragraph role="paragraph" id="par_id3145273" xml-lang="en-US"><ahelp hid=".uno:FormFilterExit">If you click on the <emph>Close</emph> button on the <emph>Form Filter</emph> toolbar, the form is displayed without a filter.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3150114" xml-lang="en-US">Click the <link href="text/shared/02/12120000.xhp" name="Apply Filter"><emph>Apply Filter</emph></link> icon
+<paragraph role="paragraph" id="par_id3150114" xml-lang="en-US">Click the <link href="text/shared/02/12120000.xhp" name="Apply Filter"><emph>Apply Filter</emph></link> icon
<image id="img_id3144764" src="cmd/sc_datafilterstandardfilter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3144764" xml-lang="en-US">Icon</alt>
</image> on the <emph>Form Navigation</emph> toolbar to change to the filtered view.</paragraph>
-<paragraph role="paragraph" id="par_id3146898" xml-lang="en-US">The filter that has been set can be removed by clicking <link href="text/shared/02/12040000.xhp" name="Remove Filter/Sort"><emph>Reset Filter/Sort</emph></link> icon
+<paragraph role="paragraph" id="par_id3146898" xml-lang="en-US">The filter that has been set can be removed by clicking <link href="text/shared/02/12040000.xhp" name="Remove Filter/Sort"><emph>Reset Filter/Sort</emph></link> icon
<image id="img_id3151318" src="cmd/sc_removefiltersort.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151318" xml-lang="en-US">Icon</alt>
</image>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/source/text/shared/guide/database_main.xhp b/source/text/shared/guide/database_main.xhp
index 1ab5891ed..8add70b9a 100644
--- a/source/text/shared/guide/database_main.xhp
+++ b/source/text/shared/guide/database_main.xhp
@@ -18,7 +18,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedguidedatabase_mainxml" indexer="include" status="PUBLISH">
@@ -40,7 +40,7 @@
</variable><comment>remove this file when all links are resolved</comment></paragraph>
<paragraph role="paragraph" id="par_idN105F1" xml-lang="en-US"><link href="text/shared/explorer/database/main.xhp">Working with databases in %PRODUCTNAME</link></paragraph>
<paragraph role="heading" id="hd_id3153821" xml-lang="en-US" level="2">Data Source View</paragraph>
-<paragraph role="paragraph" id="par_id3149415" xml-lang="en-US">Choose <emph>View - Data Sources</emph> or press F4 to call the data source view from a text document or spreadsheet.</paragraph>
+<paragraph role="paragraph" id="par_id3149415" xml-lang="en-US">Choose <emph>View - Data Sources</emph> or press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + F4 keys to call the data source view from a text document or spreadsheet.</paragraph>
<paragraph role="paragraph" id="par_id3147531" xml-lang="en-US">On the left you can see the <link href="text/shared/02/12000000.xhp" name="Data source explorer">Data source explorer</link>. If you select a table or query there, you see the contents of this table or query on the right. At the top margin is the <link href="text/shared/main0212.xhp" name="Database bar">Table Data bar</link>.</paragraph>
<paragraph role="heading" id="hd_id3149047" xml-lang="en-US" level="2">Data Sources</paragraph>
<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US"><link href="text/shared/guide/data_addressbook.xhp" name="address book as data source">Address book as data source</link></paragraph>
diff --git a/source/text/shared/guide/keyboard.xhp b/source/text/shared/guide/keyboard.xhp
index 1a8bfb36a..e05272850 100644
--- a/source/text/shared/guide/keyboard.xhp
+++ b/source/text/shared/guide/keyboard.xhp
@@ -239,7 +239,7 @@
</list>
<section id="datenquellentext">
<paragraph xml-lang="en-US" id="hd_id3154492" role="heading" level="2">Controlling the Data Source View</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150515" role="paragraph">F4: opens and closes the data source view.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150515" role="paragraph"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + F4 opens and closes the data source view.</paragraph>
<paragraph xml-lang="en-US" id="par_id3159109" role="paragraph">F6: switches between document and toolbars.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153229" role="paragraph">+ (plus key): expands the selected entry in the data source explorer.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150312" role="paragraph">- (minus key): collapses the selected entry in the data source explorer.</paragraph>
More information about the Libreoffice-commits
mailing list