source/text/shared/00/00000005.xhp |   58 +++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 24 deletions(-)

New commits:
commit 218e253ba66a9459c4bbd92b59bee1c695fb0244
Author:     Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Sun Nov 1 02:03:53 2020 +0200
Commit:     Seth Chaiklin <sdc.bla...@youmail.dk>
CommitDate: Mon Nov 2 20:34:36 2020 +0100

    tdf#137221 add Register-true to Glossary as separate entry
    
       + reuse "Register-true" header (i.e., no retranslation)
       + add two variables to "Page line-spacing" and use that text
         to add back a revised 'register-true' entry with embedded
         variables.
       + revise the 'page line-spacing' entry in Glossary
       + add variables to sentences in entry to use in help page
         about printing.
       (Thanks to Regina Henschel for technical knowledge)
    
       General cleanup:
        + update all to <h2>
        + add <menuitem>,<keycode>
    
    Change-Id: I06baea0e7888ffdb33f8a349327f08415c6d3bdf
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105051
    Reviewed-by: Seth Chaiklin <sdc.bla...@youmail.dk>
    Tested-by: Jenkins

diff --git a/source/text/shared/00/00000005.xhp 
b/source/text/shared/00/00000005.xhp
index 7445b9350..e247e076e 100644
--- a/source/text/shared/00/00000005.xhp
+++ b/source/text/shared/00/00000005.xhp
@@ -41,13 +41,13 @@
   <section id="ascii">
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3156192"><bookmark_value>ASCII; definition</bookmark_value>
 </bookmark>
-   <paragraph xml-lang="en-US" id="hd_id3156192" role="heading" 
level="2">ASCII</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3156192">ASCII</h2>
    <paragraph xml-lang="en-US" id="par_id3155922" 
role="paragraph">Abbreviation for American Standard Code for Information 
Interchange. ASCII is a character set for displaying fonts on personal 
computers. It consists of 128 characters including letters, numbers, 
punctuation and symbols. The extended ASCII character set contains 256 
characters. Each character has been assigned a unique number, also referred to 
as ASCII Code.</paragraph>
    <paragraph xml-lang="en-US" id="par_id3150823" role="paragraph">In HTML 
pages, only characters from the 7 Bit ASCII character set should appear. Other 
characters, such as German umlauts, are distinguished by way of a separate 
code. You can input extended ASCII code characters: the $[officename] export 
filter performs the necessary conversion.</paragraph>
   </section>
 
   <section id="bezierobjekt">
-   <paragraph xml-lang="en-US" id="hd_id3151245" role="heading" 
level="2">Bézier Object</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3151245">Bézier Object</h2>
    <paragraph xml-lang="en-US" id="par_id3154924" role="paragraph">Developed 
by the French mathematician Pierre Bézier, a Bézier curve is a mathematically 
defined curve used in two-dimensional graphic applications. The curve is 
defined by four points: the initial position and the terminating position, and 
two separate middle points. Bézier objects can be modified by moving these 
points with the mouse.</paragraph>
   </section>
   <section id="ctl">
@@ -79,7 +79,7 @@
 
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3147084"><bookmark_value>DDE; definition</bookmark_value>
 </bookmark>
-   <paragraph xml-lang="en-US" id="hd_id3147084" role="heading" 
level="2">DDE</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3147084">DDE</h2>
    <paragraph xml-lang="en-US" id="par_id3145154" role="paragraph">DDE stands 
for "Dynamic Data Exchange," which is a predecessor of OLE, "Object Linking and 
Embedding". With DDE, objects are linked through file reference, but not 
embedded.</paragraph>
    <paragraph xml-lang="en-US" id="par_id3154820" role="paragraph">You can 
create a DDE link using the following procedure: Select cells from a Calc 
spreadsheet, copy them into the clipboard and switch to another spreadsheet and 
select the <emph>Edit - Paste Special</emph> dialog. Select <emph>the 
Link</emph> option to insert the contents as a DDE link. When activating a 
link, the inserted cell area will be read from its original file.</paragraph>
 
@@ -87,22 +87,22 @@
   <section id="Section7">
    <h2 xml-lang="en-US" id="hd_id3150439">Direct and Style Formatting</h2>
    <paragraph xml-lang="en-US" id="par_id3159254" role="paragraph">If you 
format a document without Styles, it is referred to as "direct" formatting. 
This means modifying text or other objects, such as frames or tables, by 
applying various attributes directly. The format applies only to the selected 
area and all changes must be made separately. Styles, on the other hand, are 
not applied to the text directly, but rather are defined in the Styles window 
and then applied. One advantage is that when you change a Style, all parts of 
the document to which that Style is assigned are modified at the same 
time.</paragraph>
-   <paragraph xml-lang="en-US" id="par_id3147287" role="paragraph">You can 
remove direct formatting from your document by selecting the entire text with 
the shortcut keys <switchinline select="sys"><caseinline 
select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A
 and then choosing <emph>Format - Clear Direct Formatting</emph>.</paragraph>
+   <paragraph xml-lang="en-US" id="par_id3147287" role="paragraph">You can 
remove direct formatting from your document by selecting the entire text with 
the shortcut keys <switchinline select="sys"><caseinline 
select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+A</keycode>
 and then choosing <menuitem>Format - Clear Direct 
Formatting</menuitem>.</paragraph>
   </section>
   <section id="andocken">
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3155132"><bookmark_value>windows; docking definition</bookmark_value>
 <bookmark_value>docking; definition</bookmark_value>
 </bookmark>
-   <paragraph xml-lang="en-US" id="hd_id3155132" role="heading" 
level="2">Docking</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3155132">Docking</h2>
    <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph"><variable 
id="andock1">Some windows in $[officename], for example the Styles window and 
the Navigator, are "dockable" windows. You can move these windows, re-size them 
or dock them to an edge. On each edge you can dock several windows on top of, 
or alongside each other; then, by moving the border lines, you can change the 
relative proportions of the windows.
 </variable></paragraph>
-   <paragraph xml-lang="en-US" id="par_id3147233" role="paragraph"><variable 
id="andock2">To undock and re-dock, holding down the <switchinline 
select="sys"><caseinline 
select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>
 key, double-click a vacant area in the window. In the Styles window, you can 
also double-click a gray part of the window next to the icons, while you hold 
down the <switchinline select="sys"><caseinline 
select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>
 key.
+   <paragraph xml-lang="en-US" id="par_id3147233" role="paragraph"><variable 
id="andock2">To undock and re-dock, holding down the <switchinline 
select="sys"><caseinline 
select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline>
 key, double-click a vacant area in the window. In the Styles window, you can 
also double-click a gray part of the window next to the icons, while you hold 
down the <switchinline select="sys"><caseinline 
select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline>
 key.
 </variable></paragraph>
 
   </section>
   <section id="andock3">
 
-   <paragraph xml-lang="en-US" id="hd_id3155306" role="heading" 
level="2">Docking (AutoHide)</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3155306">Docking (AutoHide)</h2>
    <paragraph xml-lang="en-US" id="par_id3155854" role="paragraph">On any 
window edge where another window is docked you will see a button which allows 
you to show or hide the window.<comment>UFI: fix button removed, see spec 
"Window Splitter"</comment></paragraph>
    <list type="unordered">
     <listitem>
@@ -117,7 +117,7 @@
   <section id="formatierung">
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3163710"><bookmark_value>formatting; definition</bookmark_value>
 </bookmark>
-   <paragraph xml-lang="en-US" id="hd_id3163710" role="heading" 
level="2">Formatting</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3163710">Formatting</h2>
    <paragraph xml-lang="en-US" id="par_id3163821" role="paragraph">Formatting 
refers to the visual layout of text using a word-processing or DTP program. 
This includes defining the paper format, page borders, fonts and font effects, 
as well as indents and spacing. You can format text <link 
href="text/shared/00/00000005.xhp#Section7">directly or with Styles</link> 
provided by $[officename].</paragraph>
 
   </section>
@@ -125,13 +125,13 @@
 
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3156006"><bookmark_value>IME; definition</bookmark_value>
 </bookmark>
-   <paragraph xml-lang="en-US" id="hd_id3156006" role="heading" 
level="2">IME</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3156006">IME</h2>
    <paragraph xml-lang="en-US" id="par_id3157874" role="paragraph">IME stands 
for Input Method Editor. A program that allows the user to enter complex 
characters from non-western character sets using a standard 
keyboard.</paragraph>
 
   </section>
   <section id="jdbc">
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3151172"><bookmark_value>JDBC; definition</bookmark_value></bookmark>
-   <paragraph xml-lang="en-US" id="hd_id3151172" role="heading" 
level="2">JDBC</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3151172">JDBC</h2>
    <paragraph xml-lang="en-US" id="par_id3148386" role="paragraph">You can use 
the Java Database Connectivity (JDBC) API to connect to a database from 
%PRODUCTNAME. JDBC drivers are written in the Java programming language and are 
platform independent.</paragraph>
 
   </section>
@@ -165,7 +165,7 @@
 
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3156358"><bookmark_value>objects; definition</bookmark_value>
 </bookmark>
-   <paragraph xml-lang="en-US" id="hd_id3156358" role="heading" 
level="2">Object</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3156358">Object</h2>
    <paragraph xml-lang="en-US" id="par_id3144748" role="paragraph">An object 
is a screen element containing data. It can refer to application data, such as 
text or graphics.</paragraph>
    <paragraph xml-lang="en-US" id="par_id3153839" role="paragraph">Objects are 
independent and do not influence each other. Any object containing data can be 
assigned certain commands. For example, a graphic object has commands for image 
editing and a spreadsheet contains calculation commands.</paragraph>
 
@@ -174,7 +174,7 @@
 
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3152827"><bookmark_value>ODBC; definition</bookmark_value>
 </bookmark>
-   <paragraph xml-lang="en-US" id="hd_id3152827" role="heading" 
level="2">ODBC</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3152827">ODBC</h2>
    <paragraph xml-lang="en-US" id="par_id3153530" role="paragraph">Open 
Database Connectivity (ODBC) is a protocol norm with which applications can 
access database systems. The query language used is Structured Query Language 
(SQL). In $[officename], you can determine for each database whether to use SQL 
commands to run queries. Alternatively, you can use the interactive help to 
define your query by mouseclick and have it automatically translated into SQL 
by $[officename].</paragraph>
    <paragraph xml-lang="en-US" id="par_id3153956" 
role="paragraph"><switchinline select="sys"><caseinline select="WIN">The 32bit 
ODBC functions required here can be installed on your system at any time with 
the help of the setup program supplied with your database. You can then amend 
the properties through the Control Panel.
 </caseinline></switchinline></paragraph>
@@ -184,7 +184,7 @@
 
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3154479"><bookmark_value>OLE; definition</bookmark_value>
 </bookmark>
-   <paragraph xml-lang="en-US" id="hd_id3154479" role="heading" 
level="2">OLE</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3154479">OLE</h2>
    <paragraph xml-lang="en-US" id="par_id3157840" role="paragraph">Object 
Linking and Embedding (OLE) objects can be linked to a target document or may 
also be embedded. Embedding inserts a copy of the object and details of the 
source program in the target document. If you want to edit the object, simply 
activate the source program by double-clicking on the object.</paragraph>
 
   </section>
@@ -204,24 +204,34 @@
   </section>
   <section id="primaerschluessel">
 
-   <paragraph xml-lang="en-US" id="hd_id3083286" role="heading" 
level="2">Primary key</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3083286">Primary key</h2>
    <paragraph xml-lang="en-US" id="par_id3150323" role="paragraph">A primary 
key serves as a unique identifier of database fields. The unique identification 
of database fields is used in <link 
href="text/shared/00/00000005.xhp#relational">relational databases</link>, to 
access data in other tables. If reference is made to a primary key from another 
table, this is termed a foreign key.</paragraph>
    <paragraph xml-lang="en-US" id="par_id3148916" role="paragraph">In 
$[officename], you define the primary key in the design view of a table, by 
choosing the relevant command from the context menu of a row header for the 
selected field.</paragraph>
   </section>
 
   <section id="relational">
-   <paragraph xml-lang="en-US" id="hd_id3147359" role="heading" 
level="2">Relational Database</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3147359">Relational Database</h2>
    <paragraph xml-lang="en-US" id="par_id3147585" role="paragraph">A 
relational database is a collection of data items organized as a set of 
formally described tables from which data can be accessed or reassembled in 
many different ways without having to reorganize the database tables. 
</paragraph>
    <paragraph xml-lang="en-US" id="par_id3154255" role="paragraph">A 
relational database management system (RDBMS) is a program that lets you 
create, update, and administer a relational database. An RDBMS takes Structured 
Query Language (SQL) statements entered by a user or contained in an 
application program and creates, updates, or provides access to the 
database.</paragraph>
    <paragraph xml-lang="en-US" id="par_id3147535" role="paragraph">A good 
example of a relational database can be given with a database containing 
Customer, Purchase, and Invoice tables. In the Invoice table, there is no 
actual customer or purchasing data; however, the table contains references 
through a relational link, or a relation, to the respective customer and 
purchasing table's fields (for example, the customer ID field from the customer 
table).</paragraph>
   </section>
 
- <section id="register-true">
- <bookmark xml-lang="en-US" branch="index" 
id="bm_id3147315"><bookmark_value>register-true; 
definition</bookmark_value></bookmark>
-  <h2 xml-lang="en-US" id="hd_id3147315">Page line-spacing</h2>
-  <paragraph xml-lang="en-US" id="par_id3154223" 
role="paragraph">Register-true is a typography term that is used in printing. 
This term refers to the congruent imprint of the lines within a type area on 
the front and the back side of book pages, newspaper pages and magazine pages. 
The register-true feature make these pages easier to read by preventing gray 
shadows from shining through between the lines of text. The register-true term 
also refers to lines in adjacent text columns that are of the same 
height.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3145230" role="paragraph">In 
%PRODUCTNAME, this feature is called <emph>Page line-spacing</emph>. When you 
activate Page line-spacing for a paragraph or Paragraph Style and the Page 
Style is using Page line-spacing, then the base lines of the affected 
characters are aligned to a vertical page grid, regardless of font size or of 
the presence of graphics. To specify the setting for this grid, choose 
<menuitem>Format - Page Style</menuitem><emph> - Page</emph> tab, and use 
<emph>Reference Style</emph>.</paragraph>
-</section>
+  <section id="page line-spacing">
+   <h2 id="hd_id551604189872115">Page line-spacing (register-true)</h2>
+     <paragraph xml-lang="en-US" id="par_id3154223" role="paragraph"><variable 
id="registertrue_intro">Register-true is a typography term that is used in 
printing.</variable> This term refers to the congruent imprint of the lines 
within a type area on the front and the back side of a page. The register-true 
feature makes a page easier to read by preventing gray shadows from shining 
through between the lines of text.</paragraph>
+     <paragraph role="paragraph" id="par_id441604191438775">The register-true 
term also refers to lines in adjacent text columns, where lines in different 
columns use the same vertical grid, thereby aligning them vertically with each 
other.</paragraph>
+     <paragraph role="paragraph" id="par_id761604345191168"><variable 
id="register_purpose">Register-true printing is particularly useful for 
documents that will have two pages set next to each other (e.g., in a book or 
brochure), for multi-column layouts, and for documents intended for 
double-sided printing.</variable></paragraph>
+     <paragraph xml-lang="en-US" id="par_id3145230" role="paragraph"><variable 
id="registertrue_in_LO">In %PRODUCTNAME, this feature is called <link 
href="text/swriter/guide/registertrue.xhp" 
name="pagelinespacinghelp"><emph>Page 
line-spacing</emph></link>.</variable></paragraph>
+  </section>
+
+  <section id="register-true">
+    <bookmark xml-lang="en-US" branch="index" 
id="bm_id3147315"><bookmark_value>register-true; 
definition</bookmark_value></bookmark>
+    <h2 xml-lang="en-US" id="hd_id3147315">Register-true</h2>
+      <paragraph role="paragraph" id="par_id961604191800181">
+        <embedvar href="text/shared/00/00000005.xhp#registertrue_intro"/>
+        <embedvar href="text/shared/00/00000005.xhp#registertrue_in_LO"/>
+      </paragraph>
+  </section>
 
   <section id="rtf">
    <h2 xml-lang="en-US" id="hd_id3156710">RTF</h2>
@@ -241,19 +251,19 @@
   <section id="sql">
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3149922"><bookmark_value>SQL;definition</bookmark_value>
 </bookmark>
-   <paragraph xml-lang="en-US" id="hd_id3149922" role="heading" 
level="2">SQL</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3149922">SQL</h2>
    <paragraph xml-lang="en-US" id="par_id3152863" role="paragraph">Structured 
Query Language (SQL) is a language used for database queries. In $[officename] 
you can formulate queries either in SQL or interactively with the 
mouse.</paragraph>
 
   </section>
   <section id="sqlserver">
 
-   <paragraph xml-lang="en-US" id="hd_id3147552" role="heading" level="2">SQL 
Database / SQL Server</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3147552">SQL Database / SQL Server</h2>
    <paragraph xml-lang="en-US" id="par_id3159239" role="paragraph">An SQL 
database is a database system which offers an <link 
href="text/shared/00/00000005.xhp#sql">SQL</link> interface. SQL databases are 
often used in client/server networks in which different clients access a 
central server (for example, an SQL server), hence they are also called SQL 
server databases, or SQL servers for short.</paragraph>
    <paragraph xml-lang="en-US" id="par_id3159118" role="paragraph">In 
$[officename], you can integrate external SQL databases. These may be located 
on your local hard disk as well as on the network. Access is achieved through 
<link href="text/shared/00/00000005.xhp#odbc">ODBC</link>, JDBC, or a native 
driver integrated into $[officename].</paragraph>
 
   </section>
   <section id="schuster">
-   <paragraph xml-lang="en-US" id="hd_id3166423" role="heading" 
level="2">Widows and Orphans</paragraph>
+   <h2 xml-lang="en-US" id="hd_id3166423">Widows and Orphans</h2>
    <paragraph xml-lang="en-US" id="par_id3149448" role="paragraph">Widows and 
orphans are historical typography terms, which have been in use for many years. 
A widow refers to a short line at the end of a paragraph, which when printed, 
appears alone at the top of the next page. An orphan is, in contrast, the first 
line of a paragraph printed alone at the bottom of the previous page. In a 
$[officename] text document you can automatically prevent such occurrences in 
the desired Paragraph Style. When doing so, you can determine the minimum 
amount of lines to be kept together on a page.</paragraph>
   </section>
 </sort>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to