summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-06-12 18:19:30 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-06-12 18:19:30 +0000
commit4dd442010398f4d280ebaa1de3d066185da00daf (patch)
tree21c432407105663703a62af771d16039cde3ae80 /helpcontent2/source/text/shared
parent2dd63f45787b45ec66c3f1f15edac59c8b4408c1 (diff)
CWS-TOOLING: integrate CWS hcshared21
2009-05-13 09:49:59 +0200 ufi r271841 : CWS-TOOLING: rebase CWS hcshared21 to trunk@271427 (milestone: DEV300:m47) 2009-04-16 11:01:43 +0200 ufi r270873 : again 2009-03-17 10:19:50 +0100 ufi r269575 : before builds 2009-02-13 16:03:59 +0100 ufi r267726 : CWS-TOOLING: rebase CWS hcshared21 to trunk@267171 (milestone: DEV300:m41) 2009-02-10 10:30:11 +0100 ufi r267539 : vor neuem rebase Versuch 2009-02-03 15:55:58 +0100 ufi r267334 : before rebase 2009-01-06 10:38:41 +0100 ufi r265901 : i97718
Diffstat (limited to 'helpcontent2/source/text/shared')
-rw-r--r--helpcontent2/source/text/shared/00/00000001.xhp4
-rw-r--r--helpcontent2/source/text/shared/00/00000401.xhp18
-rw-r--r--helpcontent2/source/text/shared/00/00000406.xhp6
-rw-r--r--helpcontent2/source/text/shared/00/makefile.mk4
-rw-r--r--helpcontent2/source/text/shared/01/02100000.xhp212
-rw-r--r--helpcontent2/source/text/shared/01/02110000.xhp14
-rw-r--r--helpcontent2/source/text/shared/01/02230401.xhp83
-rw-r--r--helpcontent2/source/text/shared/01/04050000.xhp105
-rwxr-xr-xhelpcontent2/source/text/shared/01/04150000.xhp68
-rw-r--r--helpcontent2/source/text/shared/01/05020200.xhp286
-rw-r--r--helpcontent2/source/text/shared/01/05040100.xhp88
-rw-r--r--helpcontent2/source/text/shared/01/05110600m.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/05120600.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/06040100.xhp421
-rwxr-xr-xhelpcontent2/source/text/shared/01/06050100.xhp69
-rw-r--r--helpcontent2/source/text/shared/01/08060100.xhp58
-rwxr-xr-xhelpcontent2/source/text/shared/01/formatting_mark.xhp86
-rw-r--r--helpcontent2/source/text/shared/01/makefile.mk4
-rwxr-xr-xhelpcontent2/source/text/shared/01/mediaplayer.xhp100
-rwxr-xr-xhelpcontent2/source/text/shared/01/moviesound.xhp134
-rw-r--r--helpcontent2/source/text/shared/01/online_update.xhp116
-rw-r--r--helpcontent2/source/text/shared/01/xformsdata.xhp110
-rw-r--r--helpcontent2/source/text/shared/02/01170000.xhp50
-rw-r--r--helpcontent2/source/text/shared/02/02010000.xhp78
-rw-r--r--helpcontent2/source/text/shared/02/02020000.xhp89
-rw-r--r--helpcontent2/source/text/shared/02/02140000.xhp153
-rw-r--r--helpcontent2/source/text/shared/02/09070000.xhp115
-rw-r--r--helpcontent2/source/text/shared/02/14020100.xhp70
-rw-r--r--helpcontent2/source/text/shared/02/makefile.mk4
-rwxr-xr-xhelpcontent2/source/text/shared/02/paintbrush.xhp4
-rw-r--r--helpcontent2/source/text/shared/04/makefile.mk4
-rwxr-xr-xhelpcontent2/source/text/shared/05/00000001.xhp67
-rw-r--r--helpcontent2/source/text/shared/05/makefile.mk4
-rw-r--r--helpcontent2/source/text/shared/07/makefile.mk4
-rw-r--r--helpcontent2/source/text/shared/autokorr/makefile.mk4
-rw-r--r--helpcontent2/source/text/shared/autopi/makefile.mk4
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/02010101.xhp92
-rw-r--r--helpcontent2/source/text/shared/explorer/database/makefile.mk5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/migrate_macros.xhp71
-rwxr-xr-xhelpcontent2/source/text/shared/guide/autocorr_url.xhp97
-rw-r--r--helpcontent2/source/text/shared/guide/data_enter_sql.xhp107
-rw-r--r--helpcontent2/source/text/shared/guide/data_tabledefine.xhp98
-rwxr-xr-xhelpcontent2/source/text/shared/guide/fontwork.xhp191
-rw-r--r--helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp117
-rw-r--r--helpcontent2/source/text/shared/guide/labels_database.xhp119
-rwxr-xr-xhelpcontent2/source/text/shared/guide/language_select.xhp316
-rw-r--r--helpcontent2/source/text/shared/guide/makefile.mk4
-rw-r--r--helpcontent2/source/text/shared/guide/numbering_stop.xhp132
-rwxr-xr-xhelpcontent2/source/text/shared/guide/paintbrush.xhp2
-rw-r--r--helpcontent2/source/text/shared/makefile.mk4
-rw-r--r--helpcontent2/source/text/shared/optionen/01040400.xhp229
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01130200.xhp65
-rw-r--r--helpcontent2/source/text/shared/optionen/makefile.mk4
-rw-r--r--helpcontent2/source/text/shared/optionen/online_update.xhp97
54 files changed, 2288 insertions, 2102 deletions
diff --git a/helpcontent2/source/text/shared/00/00000001.xhp b/helpcontent2/source/text/shared/00/00000001.xhp
index f0840beb2e..55625fbee8 100644
--- a/helpcontent2/source/text/shared/00/00000001.xhp
+++ b/helpcontent2/source/text/shared/00/00000001.xhp
@@ -175,7 +175,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3157808" xml-lang="en-US" l10n="E">
-<image id="img_id3148685" src="sc/res/refinp1.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148685" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3148685" src="sc/res/refinp1.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148685" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -185,7 +185,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3153349" xml-lang="en-US" l10n="E">
-<image id="img_id3149784" src="sc/res/refinp2.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149784" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149784" src="sc/res/refinp2.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149784" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/00/00000401.xhp b/helpcontent2/source/text/shared/00/00000401.xhp
index 560fec4726..340f31fb65 100644
--- a/helpcontent2/source/text/shared/00/00000401.xhp
+++ b/helpcontent2/source/text/shared/00/00000401.xhp
@@ -54,7 +54,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150127" xml-lang="en-US" l10n="E">
-<image id="img_id3156053" src="res/sx03251.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156053" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3156053" src="res/sx03251.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156053" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -103,7 +103,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="E">
-<image id="img_id3149415" src="res/commandimagelist/sc_open.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149415" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149415" src="res/commandimagelist/sc_open.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149415" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -224,7 +224,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3156712" xml-lang="en-US" l10n="E">
-<image id="img_id3155939" src="res/commandimagelist/sc_save.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155939" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155939" src="res/commandimagelist/sc_save.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155939" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -240,7 +240,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_idN10F11" xml-lang="en-US" l10n="NEW">
-<image id="img_id8276619" src="res/commandimagelist/sc_saveas.png" width="0.566cm" height="0.566cm"><alt id="alt_id8276619" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id8276619" src="res/commandimagelist/sc_saveas.png" width="0.566cm" height="0.566cm"><alt id="alt_id8276619" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -335,7 +335,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_idN11366" xml-lang="en-US" l10n="NEW">
-<image id="img_id2603534" src="res/commandimagelist/sc_printpreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id2603534" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id2603534" src="res/commandimagelist/sc_printpreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id2603534" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -362,7 +362,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_idN113AB" xml-lang="en-US" l10n="NEW">
-<image id="img_id4044007" src="res/commandimagelist/sc_sendmail.png" width="0.566cm" height="0.566cm"><alt id="alt_id4044007" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id4044007" src="res/commandimagelist/sc_sendmail.png" width="0.566cm" height="0.566cm"><alt id="alt_id4044007" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -383,7 +383,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150521" xml-lang="en-US" l10n="E">
-<image id="img_id3147306" src="res/commandimagelist/sc_exportdirecttopdf.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147306" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3147306" src="res/commandimagelist/sc_exportdirecttopdf.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147306" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -410,7 +410,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3155187" xml-lang="en-US" l10n="E">
-<image id="img_id3153318" src="res/commandimagelist/sc_print.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153318" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153318" src="res/commandimagelist/sc_print.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153318" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -428,7 +428,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3153068" xml-lang="en-US" l10n="E">
-<image id="img_id3155362" src="res/commandimagelist/sc_printpagepreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155362" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155362" src="res/commandimagelist/sc_printpagepreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155362" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index cd019d9589..ded3b8b559 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.xhp
@@ -49,7 +49,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="E">
-<image id="img_id3154894" src="res/commandimagelist/sc_gallery.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154894" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154894" src="res/commandimagelist/sc_gallery.png" width="0.1665in" height="0.1665in"><alt id="alt_id3154894" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -72,7 +72,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="E">
-<image id="img_id3153665" src="res/commandimagelist/sc_spelling.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153665" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153665" src="res/commandimagelist/sc_spelling.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153665" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -207,7 +207,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3153876" xml-lang="en-US" l10n="E">
-<image id="img_id3148386" src="svx/res/colordlg.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148386" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3148386" src="svx/res/colordlg.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148386" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/00/makefile.mk b/helpcontent2/source/text/shared/00/makefile.mk
index a9c8e493ad..65cbb49aaf 100644
--- a/helpcontent2/source/text/shared/00/makefile.mk
+++ b/helpcontent2/source/text/shared/00/makefile.mk
@@ -6,9 +6,9 @@
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
+# $RCSfile: makefile.template,v $
#
-# $Revision: 1.9.4.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/01/02100000.xhp b/helpcontent2/source/text/shared/01/02100000.xhp
index 5f612cf3dd..0087c1bd60 100644
--- a/helpcontent2/source/text/shared/01/02100000.xhp
+++ b/helpcontent2/source/text/shared/01/02100000.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02100000.xhp,v $
- * $Revision: 1.15.4.3 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -35,58 +35,61 @@
<meta>
-<topic id="textshared0102100000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Find &amp; Replace</title>
-<filename>/text/shared/01/02100000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="suchenersetzen">le<comment>mw distributed the 7 index entries among "finding" guides in Writer (5 entries copied) and Calc (5 entries copied)</comment>
+ <topic id="textshared0102100000xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Find &amp; Replace</title>
+ <filename>/text/shared/01/02100000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="suchenersetzen"><comment>mw distributed the 7 index entries among "finding" guides in Writer (5 entries copied) and Calc (5 entries copied)</comment>
<bookmark xml-lang="en-US" branch="hid/SID_SEARCH_ITEM" id="bm_id9184950" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SearchProperties" id="bm_id3160463" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_SEARCH_DLG" id="bm_id7754440" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SearchDialog" id="bm_id3149031" localize="false"/>
-<paragraph role="heading" id="hd_id3154044" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="02100000"><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace">Find &amp; Replace</link>
+<paragraph xml-lang="en-US" id="hd_id3154044" role="heading" level="1" l10n="U" oldref="1"><variable id="02100000"><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace">Find &amp; Replace</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149893" xml-lang="en-US" l10n="U" oldref="2"><variable id="suchenersetzentext"><ahelp hid=".uno:SearchDialog">Searches for or replaces text or formats in the current document.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3149893" role="paragraph" l10n="U" oldref="2"><variable id="suchenersetzentext"><ahelp hid=".uno:SearchDialog">Searches for or replaces text or formats in the current document.</ahelp>
</variable></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000402.xhp#suchen"/>
-</section>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000402.xhp#suchen"/>
+ </section>
<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_SEARCH" id="bm_id3147572" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_ComboBox_RID_SVXDLG_SEARCH_ED_SEARCH" id="bm_id2687459" localize="false"/>
-<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="2" l10n="U" oldref="3">Search For</paragraph>
-<paragraph role="paragraph" id="par_id3155805" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_SEARCH">Enter the text that you want to search for, or select a previous search from the list.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152425" role="heading" level="2" l10n="U" oldref="3">Search For</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155805" role="paragraph" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_SEARCH">Enter the text that you want to search for, or select a previous search from the list.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS" id="bm_id3154317" localize="false"/>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="189"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS">Search options are listed in the <emph>Options </emph>area of the dialog</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3153683" role="paragraph" l10n="U" oldref="189"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS">Search options are listed in the <emph>Options </emph>area of the dialog</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXDLG_SEARCH:ED_REPLACE" id="bm_id3148621" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_REPLACE" id="bm_id3149096" localize="false"/>
-<paragraph role="heading" id="hd_id3152551" xml-lang="en-US" level="2" l10n="U" oldref="5">Replace With</paragraph>
-<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_REPLACE">Enter the replacement text, or select a recent replacement text or style from the list.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152551" role="heading" level="2" l10n="U" oldref="5">Replace With</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156426" role="paragraph" l10n="U" oldref="6"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_REPLACE">Enter the replacement text, or select a recent replacement text or style from the list.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS" id="bm_id3150355" localize="false"/>
-<paragraph role="paragraph" id="par_id3150506" xml-lang="en-US" l10n="U" oldref="190"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS">Replacement options are listed in the <emph>Options </emph>area of the dialog.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="8">Options</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150506" role="paragraph" l10n="U" oldref="190"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS">Replacement options are listed in the <emph>Options </emph>area of the dialog.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3166410" role="heading" level="2" l10n="U" oldref="8">Options</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_CELLS" id="bm_id3155179" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_WHOLE_WORDS" id="bm_id7736442" localize="false"/>
-<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Entire Cells
+<paragraph xml-lang="en-US" id="hd_id3148538" role="heading" level="3" l10n="U"
+ oldref="10"><switchinline select="appl"><caseinline select="CALC">Entire Cells
</caseinline><defaultinline>Whole words only</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149579" xml-lang="en-US" l10n="CHG" oldref="11"><variable id="ganze"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_CELLS">Searches for whole words or cells that are identical to the search text.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3149579" role="paragraph" l10n="CHG" oldref="11"><variable id="ganze"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_CELLS">Searches for whole words or cells that are identical to the search text.</ahelp>
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_BACKWARDS" id="bm_id3152910" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_BACKWARDS" id="bm_id7027802" localize="false"/>
-<paragraph role="heading" id="hd_id3156192" xml-lang="en-US" level="3" l10n="U" oldref="14">Backwards</paragraph>
-<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_BACKWARDS">Search starts at the current cursor position and goes backwards to the beginning of the file.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156192" role="heading" level="3" l10n="U"
+ oldref="14">Backwards</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150771" role="paragraph" l10n="U" oldref="15"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_BACKWARDS">Search starts at the current cursor position and goes backwards to the beginning of the file.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_REGEXP" id="bm_id3153542" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_REGEXP" id="bm_id5147862" localize="false"/>
-<paragraph role="heading" id="hd_id3144439" xml-lang="en-US" level="3" l10n="U" oldref="16"><switchinline select="appl"><caseinline select="DRAW">
+<paragraph xml-lang="en-US" id="hd_id3144439" role="heading" level="3" l10n="U"
+ oldref="16"><switchinline select="appl"><caseinline select="DRAW">
</caseinline><caseinline select="IMPRESS">
</caseinline><defaultinline>Regular expressions</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3155342" xml-lang="en-US" l10n="CHG" oldref="156"><switchinline select="appl"><caseinline select="DRAW">
+ <paragraph xml-lang="en-US" id="par_id3155342" role="paragraph" l10n="CHG" oldref="156"><switchinline select="appl"><caseinline select="DRAW">
</caseinline><caseinline select="IMPRESS">
</caseinline><defaultinline>Allows you to use wildcards in your search.</defaultinline></switchinline></paragraph><comment>i72448
Ext help text not found within switches. Solution: Keep switched text for normal display, add hidden help text as "fall through".</comment>
-<paragraph role="paragraph" id="par_id3727225" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Allows you to use wildcards in your search.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3727225" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Allows you to use wildcards in your search.</ahelp></paragraph>
<switch select="appl">
<case select="DRAW">
</case>
@@ -96,20 +99,22 @@ Ext help text not found within switches. Solution: Keep switched text for normal
</default>
</switch>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_MATCH_CASE" id="bm_id3147303" localize="false"/>
-<paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3" l10n="U" oldref="45">Match case</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154924" role="heading" level="3" l10n="U"
+ oldref="45">Match case</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154760"><bookmark_value>case sensitivity;searching</bookmark_value>
</bookmark><comment>mw made "case sensitive.." a two level entry</comment>
-<paragraph role="paragraph" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="46"><variable id="exakt"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_MATCH_CASE">Distinguishes between uppercase and lowercase characters.</ahelp>
+<paragraph xml-lang="en-US" id="par_id3154760" role="paragraph" l10n="U" oldref="46"><variable id="exakt"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_MATCH_CASE">Distinguishes between uppercase and lowercase characters.</ahelp>
</variable></paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3147264"><bookmark_value>finding; selections</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_SELECTIONS" id="bm_id3152771" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_SELECTIONS" id="bm_id7007354" localize="false"/>
-<paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="47">Current selection only</paragraph>
-<paragraph role="paragraph" id="par_id3150866" xml-lang="en-US" l10n="CHG" oldref="48"><ahelp hid=".">Searches only the selected text or cells.</ahelp></paragraph><comment>had to copy extended help to outside of switch construct - see issue 72448</comment>
+<paragraph xml-lang="en-US" id="hd_id3147264" role="heading" level="3" l10n="U"
+ oldref="47">Current selection only</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150866" role="paragraph" l10n="CHG" oldref="48"><ahelp hid=".">Searches only the selected text or cells.</ahelp></paragraph><comment>had to copy extended help to outside of switch construct - see issue 72448</comment>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_BTN_LAYOUTS" id="bm_id1775566" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_LAYOUTS" id="bm_id6146427" localize="false"/>
-<paragraph role="paragraph" id="par_id8876918" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the Search for list. To specify a replacement style, select a style from the Replace with list.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id8876918" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the Search for list. To specify a replacement style, select a style from the Replace with list.</ahelp></paragraph>
<switch select="appl">
<case select="DRAW">
</case>
@@ -118,124 +123,145 @@ Ext help text not found within switches. Solution: Keep switched text for normal
<default>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_BTN_LAYOUTS" id="bm_id1775566" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_LAYOUTS" id="bm_id6146427" localize="false"/>
-<paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="3" l10n="CHG" oldref="49">Search for Styles / Including Styles</paragraph>
-<paragraph role="paragraph" id="par_id3155103" xml-lang="en-US" l10n="CHG" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_LAYOUTS">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the <emph>Search for </emph>list. To specify a replacement style, select a style from the <emph>Replace with</emph> list.</ahelp></paragraph>
-<paragraph role="note" id="par_idN109CC" xml-lang="en-US" l10n="NEW">After you select the attributes that you want to search for, the <emph>Search for Styles</emph> box in the <emph>Options </emph>area of the %PRODUCTNAME Writer <emph>Find &amp; Replace </emph>dialog changes to <emph>Including Styles</emph>.</paragraph>
-<paragraph role="note" id="par_idN109DF" xml-lang="en-US" l10n="NEW">If you want to search for text in which attributes were set by using direct formatting and styles, select the <emph>Including Styles</emph> box.</paragraph>
-<embed href="text/shared/guide/find_attributes.xhp#find_attributes"/>
+<paragraph xml-lang="en-US" id="hd_id3153524" role="heading" level="3" l10n="CHG"
+ oldref="49">Search for Styles / Including Styles</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155103" role="paragraph" l10n="CHG" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_LAYOUTS">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the <emph>Search for </emph>list. To specify a replacement style, select a style from the <emph>Replace with</emph> list.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN109CC" role="note" l10n="NEW">After you select the attributes that you want to search for, the <emph>Search for Styles</emph> box in the <emph>Options </emph>area of the %PRODUCTNAME Writer <emph>Find &amp; Replace </emph>dialog changes to <emph>Including Styles</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN109DF" role="note" l10n="NEW">If you want to search for text in which attributes were set by using direct formatting and styles, select the <emph>Including Styles</emph> box.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_NOTES" id="bm_id0302200901445934" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0302200901464169" role="heading" level="3" l10n="NEW">Notes</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0302200901464150" role="paragraph" l10n="NEW"><ahelp hid=".">In Writer, you can select to include the notes texts in your searches.</ahelp></paragraph>
+ <embed href="text/shared/guide/find_attributes.xhp#find_attributes"/>
</default>
-</switch>
-<embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
+</switch><embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_MATCH_FULL_HALF_WIDTH" id="bm_id3149807" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCHFORM_CB_HALFFULLFORMS" id="bm_id3153655" localize="false"/>
-<paragraph role="heading" id="hd_id3149167" xml-lang="en-US" level="3" l10n="U" oldref="204"><variable id="halbnormaltitel">Match character width (only if Asian languages are enabled)
+<paragraph xml-lang="en-US" id="hd_id3149167" role="heading" level="3" l10n="U"
+ oldref="204"><variable id="halbnormaltitel">Match character width (only if Asian languages are enabled)
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145744" xml-lang="en-US" l10n="U" oldref="208"><variable id="halbnormaltext"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_MATCH_FULL_HALF_WIDTH">Distinguishes between half-width and full-width character forms.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3145744" role="paragraph" l10n="U" oldref="208"><variable id="halbnormaltext"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_MATCH_FULL_HALF_WIDTH">Distinguishes between half-width and full-width character forms.</ahelp>
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_SOUNDS_LIKE" id="bm_id3156422" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCHFORM_CB_SOUNDSLIKECJK" id="bm_id3148750" localize="false"/>
-<paragraph role="heading" id="hd_id3153178" xml-lang="en-US" level="3" l10n="U" oldref="205"><variable id="aehnlichtitel">Sounds like (Japanese) (only if Asian languages are enabled)
+<paragraph xml-lang="en-US" id="hd_id3153178" role="heading" level="3" l10n="U"
+ oldref="205"><variable id="aehnlichtitel">Sounds like (Japanese) (only if Asian languages are enabled)
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145421" xml-lang="en-US" l10n="U" oldref="206"><variable id="aehnlichtext"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_SOUNDS_LIKE">Lets you specify the search options for similar notation used in Japanese text. Select this checkbox, and then click the <emph>...</emph> button to specify the search options. </ahelp>
+ <paragraph xml-lang="en-US" id="par_id3145421" role="paragraph" l10n="U" oldref="206"><variable id="aehnlichtext"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_SOUNDS_LIKE">Lets you specify the search options for similar notation used in Japanese text. Select this checkbox, and then click the <emph>...</emph> button to specify the search options. </ahelp>
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS" id="bm_id3150650" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCHFORM_PB_SOUNDSLIKESETTINGS" id="bm_id3155506" localize="false"/>
-<paragraph role="paragraph" id="par_id3149765" xml-lang="en-US" l10n="U" oldref="209"><variable id="aehnlichbutton"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS" visibility="hidden">Sets the search options for similar notation used in Japanese text.</ahelp>
+<paragraph xml-lang="en-US" id="par_id3149765" role="paragraph" l10n="U" oldref="209"><variable id="aehnlichbutton"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS" visibility="hidden">Sets the search options for similar notation used in Japanese text.</ahelp>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="U" oldref="212"><link href="text/shared/optionen/01150200.xhp" name="Searching in Japanese">Searching in Japanese</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148672" role="paragraph" l10n="U" oldref="212"><link href="text/shared/optionen/01150200.xhp" name="Searching in Japanese">Searching in Japanese</link></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL" id="bm_id3150439" localize="false"/>
-<paragraph role="heading" id="hd_id3154299" xml-lang="en-US" level="2" l10n="U" oldref="66">Find All</paragraph>
-<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="CHG" oldref="67"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL">Finds and selects all instances of the text or the format that you are searching for in the document (only in Writer and Calc documents).</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154299" role="heading" level="2" l10n="U"
+ oldref="66">Find All</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" l10n="CHG" oldref="67"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL">Finds and selects all instances of the text or the format that you are searching for in the document (only in Writer and Calc documents).</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH" id="bm_id3153954" localize="false"/>
-<paragraph role="heading" id="hd_id3163821" xml-lang="en-US" level="2" l10n="U" oldref="68">Find</paragraph>
-<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="69"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH">Finds and selects the next occurrence of the text or format that you searching for in the document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3163821" role="heading" level="2" l10n="U"
+ oldref="68">Find</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147436" role="paragraph" l10n="U" oldref="69"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH">Finds and selects the next occurrence of the text or format that you searching for in the document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SEARCH_BTN_REPLACE_ALL" id="bm_id1346781" localize="false"/>
-<paragraph role="heading" id="hd_id3153742" xml-lang="en-US" level="2" l10n="U" oldref="70">Replace All</paragraph>
-<paragraph role="paragraph" id="par_id3145660" xml-lang="en-US" l10n="CHG" oldref="71"><ahelp hid=".">Replaces all of the occurrences of the text or format that you want to replace.</ahelp><switchinline select="appl"><caseinline select="IMPRESS">Repeat this command until all replacements on your slide have been made.
+<paragraph xml-lang="en-US" id="hd_id3153742" role="heading" level="2" l10n="U"
+ oldref="70">Replace All</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145660" role="paragraph" l10n="CHG" oldref="71"><ahelp hid=".">Replaces all of the occurrences of the text or format that you want to replace.</ahelp><switchinline select="appl"><caseinline select="IMPRESS">Repeat this command until all replacements on your slide have been made.
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SEARCH_BTN_REPLACE" id="bm_id2296212" localize="false"/>
-<paragraph role="heading" id="hd_id3149065" xml-lang="en-US" level="2" l10n="U" oldref="72">Replace</paragraph>
-<paragraph role="paragraph" id="par_id3151170" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_REPLACE">Replaces the selected text or format that you searched for, and then searches for the next occurrence.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="2" l10n="U" oldref="192"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/02100200.xhp" name="Attribute">Attribute</link>
+<paragraph xml-lang="en-US" id="hd_id3149065" role="heading" level="2" l10n="U"
+ oldref="72">Replace</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151170" role="paragraph" l10n="U" oldref="73"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_REPLACE">Replaces the selected text or format that you searched for, and then searches for the next occurrence.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147348" role="heading" level="2" l10n="U"
+ oldref="192"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/02100200.xhp" name="Attribute">Attribute</link>
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="WRITER"><embed href="text/shared/01/02100200.xhp#attributetext"/>
</case>
</switch>
-<paragraph role="heading" id="hd_id3155854" xml-lang="en-US" level="2" l10n="U" oldref="193"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/02100300.xhp" name="Format">Format</link>
+<paragraph xml-lang="en-US" id="hd_id3155854" role="heading" level="2" l10n="U"
+ oldref="193"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/02100300.xhp" name="Format">Format</link>
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="WRITER">
-<paragraph role="paragraph" id="par_id8641315" xml-lang="en-US" l10n="NEW">Finds specific text formatting features, such as font types, font effects, and text flow characteristics.</paragraph>
+<paragraph xml-lang="en-US" id="par_id8641315" role="paragraph" l10n="NEW">Finds specific text formatting features, such as font types, font effects, and text flow characteristics.</paragraph>
</case>
</switch>
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_NOFORMAT" id="bm_id3153138" localize="false"/>
-<paragraph role="heading" id="hd_id3154188" xml-lang="en-US" level="2" l10n="U" oldref="135"><switchinline select="appl"><caseinline select="WRITER">No Format
+<paragraph xml-lang="en-US" id="hd_id3154188" role="heading" level="2" l10n="U"
+ oldref="135"><switchinline select="appl"><caseinline select="WRITER">No Format
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3159155" xml-lang="en-US" l10n="CHG" oldref="136"><switchinline select="appl"><caseinline select="WRITER">Click in the <emph>Search for </emph>or the <emph>Replace with </emph>box, and then click this button to remove the search criteria based on formats.
+ <paragraph xml-lang="en-US" id="par_id3159155" role="paragraph" l10n="CHG" oldref="136"><switchinline select="appl"><caseinline select="WRITER">Click in the <emph>Search for </emph>or the <emph>Replace with </emph>box, and then click this button to remove the search criteria based on formats.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id1334269" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click in the Search for or the Replace with box, and then click this button to remove the search criteria based on formats.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id1334269" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click in the Search for or the Replace with box, and then click this button to remove the search criteria based on formats.</ahelp></paragraph>
<switch select="appl">
<case select="WRITER">
-<paragraph role="note" id="par_id3150337" xml-lang="en-US" l10n="U" oldref="137">The search criteria for formatting attributes are displayed under the <emph>Search for </emph>or the <emph>Replace with </emph>box.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150337" role="note" l10n="U" oldref="137">The search criteria for formatting attributes are displayed under the <emph>Search for </emph>or the <emph>Replace with </emph>box.</paragraph>
</case>
</switch>
<bookmark xml-lang="en-US" branch="hid/svx_MoreButton_RID_SVXDLG_SEARCH_BTN_MORE" id="bm_id7809076" localize="false"/><comment>More Options / Less Options / Fewer Options - name subject to change</comment>
-<paragraph role="paragraph" id="par_id3150113" xml-lang="en-US" l10n="CHG" oldref="139"><ahelp hid="." visibility="hidden">Shows more or fewer search options. Click this button again to hide the extended search options.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="3" l10n="U" oldref="140"><switchinline select="appl"><caseinline select="CALC">Search in
+<paragraph xml-lang="en-US" id="par_id3150113" role="paragraph" l10n="CHG" oldref="139"><ahelp hid="." visibility="hidden">Shows more or fewer search options. Click this button again to hide the extended search options.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154944" role="heading" level="3" l10n="U"
+ oldref="140"><switchinline select="appl"><caseinline select="CALC">Search in
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_FORMULAS" id="bm_id3153876" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXDLG_SEARCH_LB_CALC_SEARCHIN" id="bm_id6838282" localize="false"/>
-<paragraph role="heading" id="hd_id3146925" xml-lang="en-US" level="4" l10n="U" oldref="142"><switchinline select="appl"><caseinline select="CALC">Formulas
+<paragraph xml-lang="en-US" id="hd_id3146925" role="heading" level="4" l10n="U"
+ oldref="142"><switchinline select="appl"><caseinline select="CALC">Formulas
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id6719870" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in formulas and in fixed (not calculated) values. For example, you could look for formulas that contain 'SUM'.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id6719870" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in formulas and in fixed (not calculated) values. For example, you could look for formulas that contain 'SUM'.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_VALUES" id="bm_id3154015" localize="false"/>
-<paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="4" l10n="U" oldref="144"><switchinline select="appl"><caseinline select="CALC">Values
+<paragraph xml-lang="en-US" id="hd_id3149400" role="heading" level="4" l10n="U"
+ oldref="144"><switchinline select="appl"><caseinline select="CALC">Values
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146969" xml-lang="en-US" l10n="CHG" oldref="145"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in values and in the results of formulas.
+ <paragraph xml-lang="en-US" id="par_id3146969" role="paragraph" l10n="CHG" oldref="145"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in values and in the results of formulas.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id6064943" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in values and in the results of formulas.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id6064943" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in values and in the results of formulas.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_NOTES" id="bm_id3148496" localize="false"/>
-<paragraph role="heading" id="hd_id3145650" xml-lang="en-US" level="4" l10n="U" oldref="146"><switchinline select="appl"><caseinline select="CALC">Notes
+<paragraph xml-lang="en-US" id="hd_id3145650" role="heading" level="4" l10n="U"
+ oldref="146"><switchinline select="appl"><caseinline select="CALC">Notes
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153947" xml-lang="en-US" l10n="CHG" oldref="147"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in the notes that are attached to the cells.
+ <paragraph xml-lang="en-US" id="par_id3153947" role="paragraph" l10n="CHG" oldref="147"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in the notes that are attached to the cells.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id9799798" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in the notes that are attached to the cells.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153004" xml-lang="en-US" level="3" l10n="U" oldref="148"><switchinline select="appl"><caseinline select="CALC">Search direction
+ <paragraph xml-lang="en-US" id="par_id9799798" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in the notes that are attached to the cells.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153004" role="heading" level="3" l10n="U"
+ oldref="148"><switchinline select="appl"><caseinline select="CALC">Search direction
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156332" xml-lang="en-US" l10n="U" oldref="207"><switchinline select="appl"><caseinline select="CALC">Determines the order for searching the cells.
+ <paragraph xml-lang="en-US" id="par_id3156332" role="paragraph" l10n="U" oldref="207"><switchinline select="appl"><caseinline select="CALC">Determines the order for searching the cells.
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_ROWS" id="bm_id3156362" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_ROWS" id="bm_id4603106" localize="false"/>
-<paragraph role="heading" id="hd_id3155064" xml-lang="en-US" level="4" l10n="U" oldref="150"><switchinline select="appl"><caseinline select="CALC">By Rows
+<paragraph xml-lang="en-US" id="hd_id3155064" role="heading" level="4" l10n="U"
+ oldref="150"><switchinline select="appl"><caseinline select="CALC">By Rows
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id743430" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches from left to right across the rows.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id743430" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches from left to right across the rows.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_COLUMNS" id="bm_id3155445" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_COLUMNS" id="bm_id3145542" localize="false"/>
-<paragraph role="heading" id="hd_id3156277" xml-lang="en-US" level="4" l10n="U" oldref="152"><switchinline select="appl"><caseinline select="CALC">By Columns
+<paragraph xml-lang="en-US" id="hd_id3156277" role="heading" level="4" l10n="U"
+ oldref="152"><switchinline select="appl"><caseinline select="CALC">By Columns
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145207" xml-lang="en-US" l10n="CHG" oldref="153"><switchinline select="appl"><caseinline select="CALC">Searches from top to bottom through the columns.
+ <paragraph xml-lang="en-US" id="par_id3145207" role="paragraph" l10n="CHG" oldref="153"><switchinline select="appl"><caseinline select="CALC">Searches from top to bottom through the columns.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3470564" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches from top to bottom through the columns.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153764" xml-lang="en-US" level="2" l10n="U" oldref="194"><switchinline select="appl"><caseinline select="CALC">Extras
+ <paragraph xml-lang="en-US" id="par_id3470564" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches from top to bottom through the columns.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153764" role="heading" level="2" l10n="U"
+ oldref="194"><switchinline select="appl"><caseinline select="CALC">Extras
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3152960"><bookmark_value>searching; all sheets</bookmark_value>
-<bookmark_value>finding; in all sheets</bookmark_value>
-<bookmark_value>sheets; searching all</bookmark_value>
+ <bookmark_value>finding; in all sheets</bookmark_value>
+ <bookmark_value>sheets; searching all</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:CB_ALLTABLES" id="bm_id3151358" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_ALL_SHEETS" id="bm_id4897915" localize="false"/>
-<paragraph role="heading" id="hd_id3152960" xml-lang="en-US" level="3" l10n="U" oldref="196"><switchinline select="appl"><caseinline select="CALC">Search in all sheets
+<paragraph xml-lang="en-US" id="hd_id3152960" role="heading" level="3" l10n="U"
+ oldref="196"><switchinline select="appl"><caseinline select="CALC">Search in all sheets
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145619" xml-lang="en-US" l10n="CHG" oldref="197"><switchinline select="appl"><caseinline select="CALC">Searches through all of the sheets in the current spreadsheet file.
+ <paragraph xml-lang="en-US" id="par_id3145619" role="paragraph" l10n="CHG" oldref="197"><switchinline select="appl"><caseinline select="CALC">Searches through all of the sheets in the current spreadsheet file.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id4089175" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches through all of the sheets in the current spreadsheet file.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#schliessen"/>
-<paragraph role="tip" id="par_id3151101" xml-lang="en-US" l10n="U" oldref="188">After you close the <emph>Find &amp; Replace</emph> dialog, you can still search using the last search criteria that you entered, by pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id4089175" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches through all of the sheets in the current spreadsheet file.</ahelp></paragraph>
+ <embed href="text/shared/00/00000001.xhp#schliessen"/>
+ <paragraph xml-lang="en-US" id="par_id3151101" role="tip" l10n="U" oldref="188">After you close the <emph>Find &amp; Replace</emph> dialog, you can still search using the last search criteria that you entered, by pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F.</paragraph>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/finding.xhp#finding"/>
-<embed href="text/swriter/guide/finding.xhp#finding"/>
-</section>
-</body>
-</helpdocument>
+ <section id="relatedtopics">
+ <embed href="text/scalc/guide/finding.xhp#finding"/>
+ <embed href="text/swriter/guide/finding.xhp#finding"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/02110000.xhp b/helpcontent2/source/text/shared/01/02110000.xhp
index ad1acee33f..0a0d8f6d86 100644
--- a/helpcontent2/source/text/shared/01/02110000.xhp
+++ b/helpcontent2/source/text/shared/01/02110000.xhp
@@ -58,7 +58,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3145313" role="paragraph" l10n="E">
-<image id="img_id3155535" src="sw/imglst/sc20244.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155535">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155535" src="sw/imglst/sc20244.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155535">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -75,7 +75,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3153716" role="paragraph" l10n="E">
-<image id="img_id3145416" src="sw/imglst/sc20245.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3145416">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3145416" src="sw/imglst/sc20245.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3145416">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -93,7 +93,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3159166" role="paragraph" l10n="E">
-<image id="img_id3153146" src="sw/imglst/sc20246.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153146">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153146" src="sw/imglst/sc20246.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153146">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -132,7 +132,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3153951" role="paragraph" l10n="E">
-<image id="img_id3146984" src="sw/imglst/sc20247.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3146984">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3146984" src="sw/imglst/sc20247.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3146984">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -165,7 +165,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3151351" role="paragraph" l10n="E">
-<image id="img_id3152885" src="sw/imglst/sc20248.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152885">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3152885" src="sw/imglst/sc20248.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152885">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -182,7 +182,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3154790" role="paragraph" l10n="E">
-<image id="img_id3166413" src="sw/imglst/sc20171.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3166413">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3166413" src="sw/imglst/sc20171.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3166413">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -199,7 +199,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3156178" role="paragraph" l10n="E">
-<image id="img_id3155083" src="sw/imglst/sc20174.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155083">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155083" src="sw/imglst/sc20174.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155083">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/01/02230401.xhp b/helpcontent2/source/text/shared/01/02230401.xhp
index deed07c0a1..3e4d4f9cf1 100644
--- a/helpcontent2/source/text/shared/01/02230401.xhp
+++ b/helpcontent2/source/text/shared/01/02230401.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02230401.xhp,v $
- * $Revision: 1.5.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -101,7 +101,6 @@
</tablecell>
</tablerow>
</table>
-
</case>
</switch>
<bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_DG_VIEW" id="bm_id3151384" localize="false"/>
@@ -117,26 +116,35 @@
<paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="11"><switchinline select="appl"><caseinline select="CALC">Lists the cells with contents that were changed.
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SC_SORT_AUTHOR" id="bm_id3149765" localize="false"/>
-<paragraph role="heading" id="hd_id3148452" xml-lang="en-US" level="3" l10n="U" oldref="12">Author</paragraph>
-<paragraph role="paragraph" id="par_id3153178" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_SC_SORT_AUTHOR">Lists the user who made the change.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148452" role="heading" level="3" l10n="U"
+ oldref="12">Author</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153178" role="paragraph" l10n="U" oldref="13"><ahelp hid="HID_SC_SORT_AUTHOR">Lists the user who made the change.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SC_SORT_DATE" id="bm_id3145171" localize="false"/>
-<paragraph role="heading" id="hd_id3144762" xml-lang="en-US" level="3" l10n="U" oldref="14">Date</paragraph>
-<paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="HID_SC_SORT_DATE">Lists the date and time that the change was made.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3144762" role="heading" level="3" l10n="U"
+ oldref="14">Date</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156422" role="paragraph" l10n="U" oldref="15"><ahelp hid="HID_SC_SORT_DATE">Lists the date and time that the change was made.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SC_SORT_COMMENT" id="bm_id3145744" localize="false"/>
-<paragraph role="heading" id="hd_id3157962" xml-lang="en-US" level="3" l10n="U" oldref="16">Comment</paragraph>
-<paragraph role="paragraph" id="par_id3150868" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_SC_SORT_COMMENT">Lists the comments that are attached to the change.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3157962" role="heading" level="3" l10n="U"
+ oldref="16">Comment</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150868" role="paragraph" l10n="U" oldref="17"><ahelp hid="HID_SC_SORT_COMMENT">Lists the comments that are attached to the change.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_PB_ACCEPT" id="bm_id3153106" localize="false"/>
-<paragraph role="heading" id="hd_id3154218" xml-lang="en-US" level="2" l10n="U" oldref="18">Accept</paragraph>
-<paragraph role="paragraph" id="par_id3152935" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_REDLINING_VIEW_PB_ACCEPT">Accepts the selected change and removes the highlighting from the change in the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_REDLINE_ACCEPT_DIRECT" id="bm_id0122200903133817" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154218" role="heading" level="2" l10n="U"
+ oldref="18">Accept</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152935" role="paragraph" l10n="U" oldref="19"><ahelp hid="HID_REDLINING_VIEW_PB_ACCEPT">Accepts the selected change and removes the highlighting from the change in the document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_PB_REJECT" id="bm_id3157892" localize="false"/>
-<paragraph role="heading" id="hd_id3156543" xml-lang="en-US" level="2" l10n="U" oldref="22">Reject</paragraph>
-<paragraph role="paragraph" id="par_id3150441" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_REDLINING_VIEW_PB_REJECT">Rejects the selected change and removes the highlighting from the change in the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_REDLINE_REJECT_DIRECT" id="bm_id0122200903140685" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156543" role="heading" level="2" l10n="U"
+ oldref="22">Reject</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150441" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_REDLINING_VIEW_PB_REJECT">Rejects the selected change and removes the highlighting from the change in the document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_PB_ACCEPTALL" id="bm_id3149985" localize="false"/>
-<paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="2" l10n="U" oldref="20">Accept All</paragraph>
-<paragraph role="paragraph" id="par_id3150012" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_REDLINING_VIEW_PB_ACCEPTALL">Accepts all of the changes and removes the highlighting from the document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155429" role="heading" level="2" l10n="U"
+ oldref="20">Accept All</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150012" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_REDLINING_VIEW_PB_ACCEPTALL">Accepts all of the changes and removes the highlighting from the document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_PB_REJECTALL" id="bm_id3153093" localize="false"/>
-<paragraph role="heading" id="hd_id3153742" xml-lang="en-US" level="2" l10n="U" oldref="24">Reject All</paragraph>
-<paragraph role="paragraph" id="par_id3151353" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="HID_REDLINING_VIEW_PB_REJECTALL">Rejects all of the changes and removes the highlighting from the document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153742" role="heading" level="2" l10n="U"
+ oldref="24">Reject All</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151353" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_REDLINING_VIEW_PB_REJECTALL">Rejects all of the changes and removes the highlighting from the document.</ahelp></paragraph>
<switch select="appl">
<case select="WRITER">
<paragraph role="note" id="par_id3147442" xml-lang="en-US" l10n="U" oldref="28">To reverse the acceptance or rejection of a change, choose <emph>Undo </emph>on the <emph>Edit </emph>menu.</paragraph>
@@ -147,27 +155,34 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="appl"><caseinline select="WRITER">If you made changes by choosing <emph>Format - AutoCorrect - Apply and Edit Changes</emph>, the <emph>Undo </emph>button appears in the dialog.<ahelp hid="HID_REDLINING_VIEW_PB_UNDO"> Reverse the last Accept or Reject command.</ahelp>
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="43">There are additional commands in the <emph>context menu</emph> of the list:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152576" role="paragraph" l10n="U" oldref="43">There are additional commands in the <emph>context menu</emph> of the list:</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_EDIT_COMMENT" id="bm_id3152416" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SC_CHANGES_COMMENT" id="bm_id3155307" localize="false"/>
-<paragraph role="heading" id="hd_id3146975" xml-lang="en-US" level="2" l10n="U" oldref="44">Edit comment</paragraph>
-<paragraph role="paragraph" id="par_id3153210" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="HID_SC_CHANGES_COMMENT">Edit the comment for the selected change.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153281" xml-lang="en-US" level="2" l10n="U" oldref="46">Sort</paragraph>
-<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="U" oldref="47">Sorts the list according to the column headings.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146975" role="heading" level="2" l10n="U"
+ oldref="44">Edit comment</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153210" role="paragraph" l10n="U" oldref="45"><ahelp hid="HID_SC_CHANGES_COMMENT">Edit the comment for the selected change.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153281" role="heading" level="2" l10n="U"
+ oldref="46">Sort</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149486" role="paragraph" l10n="U" oldref="47">Sorts the list according to the column headings.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SORT_ACTION" id="bm_id3148387" localize="false"/>
-<paragraph role="heading" id="hd_id3155316" xml-lang="en-US" level="3" l10n="U" oldref="48">Action</paragraph>
-<paragraph role="paragraph" id="par_id3151280" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_SORT_ACTION">Sorts the list according to the type of change.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155316" role="heading" level="3" l10n="U"
+ oldref="48">Action</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151280" role="paragraph" l10n="U" oldref="49"><ahelp hid="HID_SORT_ACTION">Sorts the list according to the type of change.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SORT_AUTHOR" id="bm_id3150094" localize="false"/>
-<paragraph role="heading" id="hd_id3150116" xml-lang="en-US" level="3" l10n="U" oldref="50">Author</paragraph>
-<paragraph role="paragraph" id="par_id3149960" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="HID_SORT_AUTHOR">Sorts the list according to the Author.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150116" role="heading" level="3" l10n="U"
+ oldref="50">Author</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149960" role="paragraph" l10n="U" oldref="51"><ahelp hid="HID_SORT_AUTHOR">Sorts the list according to the Author.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SORT_DATE" id="bm_id3150420" localize="false"/>
-<paragraph role="heading" id="hd_id3148775" xml-lang="en-US" level="3" l10n="U" oldref="52">Date</paragraph>
-<paragraph role="paragraph" id="par_id3153223" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="HID_SORT_DATE">Sorts the list according to the date and time.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148775" role="heading" level="3" l10n="U"
+ oldref="52">Date</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153223" role="paragraph" l10n="U" oldref="53"><ahelp hid="HID_SORT_DATE">Sorts the list according to the date and time.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SORT_COMMENT" id="bm_id3156286" localize="false"/>
-<paragraph role="heading" id="hd_id3150594" xml-lang="en-US" level="3" l10n="U" oldref="54">Comment</paragraph>
-<paragraph role="paragraph" id="par_id3145595" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="HID_SORT_COMMENT">Sorts the list according to the comments that are attached to the changes.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150594" role="heading" level="3" l10n="U"
+ oldref="54">Comment</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145595" role="paragraph" l10n="U" oldref="55"><ahelp hid="HID_SORT_COMMENT">Sorts the list according to the comments that are attached to the changes.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SORT_POSITION" id="bm_id3150338" localize="false"/>
-<paragraph role="heading" id="hd_id3153157" xml-lang="en-US" level="3" l10n="U" oldref="56">Document Position</paragraph>
-<paragraph role="paragraph" id="par_id3157976" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="HID_SORT_POSITION">Sorts the list in a descending order according to the position of the changes in the document. This is the default sorting method.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3153157" role="heading" level="3" l10n="U"
+ oldref="56">Document Position</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157976" role="paragraph" l10n="U" oldref="57"><ahelp hid="HID_SORT_POSITION">Sorts the list in a descending order according to the position of the changes in the document. This is the default sorting method.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/04050000.xhp b/helpcontent2/source/text/shared/01/04050000.xhp
index d4129c08fd..30d5082362 100644
--- a/helpcontent2/source/text/shared/01/04050000.xhp
+++ b/helpcontent2/source/text/shared/01/04050000.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04050000.xhp,v $
- * $Revision: 1.10.4.2 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -35,74 +35,73 @@
<meta>
-<topic id="textshared0104050000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Notes</title>
-<filename>/text/shared/01/04050000.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared0104050000xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Notes</title>
+ <filename>/text/shared/01/04050000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154100"><bookmark_value>notes;inserting/editing/deleting/printing</bookmark_value>
-<bookmark_value>inserting; notes</bookmark_value>
-<bookmark_value>editing; notes</bookmark_value>
-<bookmark_value>deleting;notes</bookmark_value>
-<bookmark_value>Navigator;notes</bookmark_value>
-<bookmark_value>printing;notes</bookmark_value>
-<bookmark_value>records; inserting notes </bookmark_value>
-<bookmark_value>remarks, see also notes</bookmark_value>
+ <bookmark_value>inserting; notes</bookmark_value>
+ <bookmark_value>editing; notes</bookmark_value>
+ <bookmark_value>deleting;notes</bookmark_value>
+ <bookmark_value>Navigator;notes</bookmark_value>
+ <bookmark_value>printing;notes</bookmark_value>
+ <bookmark_value>records; inserting notes </bookmark_value>
+ <bookmark_value>remarks, see also notes</bookmark_value>
</bookmark><comment>mw changed "notes;" and added 3 entries</comment>
<bookmark xml-lang="en-US" branch="hid/SID_INSERT_POSTIT" id="bm_id8906707" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertAnnotation" id="bm_id3156045" localize="false"/>
-<paragraph role="heading" id="hd_id3154100" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Notes</paragraph>
-<paragraph role="paragraph" id="par_id3151100" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="notizbearbeitentext"><ahelp hid=".uno:InsertAnnotation">Inserts a note anchored to the current cursor position.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3154100" role="heading" level="1" l10n="CHG"
+ oldref="1">Notes</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="CHG" oldref="2"><variable id="notizbearbeitentext"><ahelp hid=".uno:InsertAnnotation">Inserts a note anchored to the current cursor position.</ahelp>
</variable></paragraph>
-<section id="howtoget">
-<embed href="text/shared/00/00000404.xhp#notiz"/>
-</section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000404.xhp#notiz"/>
+ </section>
<switch select="appl">
<case select="WRITER"><comment>Writer</comment>
-<paragraph role="heading" id="hd_id9851680" xml-lang="en-US" level="2" l10n="NEW">Inserting notes</paragraph>
-<paragraph role="paragraph" id="par_id1830500" xml-lang="en-US" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Note</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option
+<paragraph xml-lang="en-US" id="hd_id9851680" role="heading" level="2" l10n="NEW">Inserting notes</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1830500" role="paragraph" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Note</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option
</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+N key combination inserts a note anchor at the current cursor position. A note box is shown at the page margin, where you can enter the text of your note. A line connects anchor and note box.</paragraph>
-<paragraph role="paragraph" id="par_id1831" xml-lang="en-US" l10n="NEW">The author name and the date and time of creating this note is shown at the bottom of the note box.</paragraph>
-<paragraph role="paragraph" id="par_id6718649" xml-lang="en-US" l10n="NEW">The notes by different authors get different colors. Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the note author.</paragraph>
-<paragraph role="heading" id="hd_id2929166" xml-lang="en-US" level="2" l10n="NEW">Editing notes</paragraph>
-<paragraph role="paragraph" id="par_id5201879" xml-lang="en-US" l10n="NEW">Every user with write permission to the text document can edit and delete notes of all authors.</paragraph>
-<paragraph role="paragraph" id="par_id2571794" xml-lang="en-US" l10n="NEW">The note box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete notes.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1831" role="paragraph" l10n="NEW">The author name and the date and time of creating this note is shown at the bottom of the note box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6718649" role="paragraph" l10n="NEW">The notes by different authors get different colors. Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the note author.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id2929166" role="heading" level="2" l10n="NEW">Editing notes</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5201879" role="paragraph" l10n="NEW">Every user with write permission to the text document can edit and delete notes of all authors.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2571794" role="paragraph" l10n="NEW">The note box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete notes.</paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_DELETE_NOTE" id="bm_id0429200810584478" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809383431" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Delete the current note.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id0522200809383431" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete the current note.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_DELETE_NOTE_AUTHOR" id="bm_id0429200810592549" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809383485" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all notes by this author in the current document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id0522200809383485" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all notes by this author in the current document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_DELETE_ALL_NOTES" id="bm_id0429200810593994" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809383428" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all notes in the current document.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1857051" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose a command to delete the current note, or all notes from the same author as the current note, or all notes in the document.</ahelp></paragraph><comment>View - Notes command</comment>
+<paragraph xml-lang="en-US" id="par_id0522200809383428" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all notes in the current document.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id1857051" role="paragraph" l10n="NEW"><ahelp hid=".">Choose a command to delete the current note, or all notes from the same author as the current note, or all notes in the document.</ahelp></paragraph><comment>22500 shown for Reply, which is the same as Delete.</comment>
+<paragraph xml-lang="en-US" id="par_id0305200911090684" role="paragraph" l10n="NEW">If the note was written by another author, there is a Reply command in the context menu. <ahelp hid=".">This command inserts a new note adjacent to the note to which you want to reply.</ahelp> The note anchor is the same for both notes. Type your reply text in the new note. Save and send your document to other authors, then those authors can add replies, too.</paragraph><comment>View - Notes command</comment>
<bookmark xml-lang="en-US" branch="hid/.uno:ShowAnnotations" id="bm_id0804200803411260" localize="false"/>
-<paragraph role="paragraph" id="par_id0804200803435883" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use <item type="menuitem">View - Notes</item> to show or hide all notes.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3445539" xml-lang="en-US" level="2" l10n="NEW">Navigating from note to note</paragraph>
-<paragraph role="paragraph" id="par_id4271370" xml-lang="en-US" l10n="NEW">When the cursor is inside a note, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option
-</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Down to jump to the next note, or press <switchinline select="sys"><caseinline select="MAC">Command+Option
+<paragraph xml-lang="en-US" id="par_id0804200803435883" role="paragraph" l10n="NEW"><ahelp hid=".">Use <item type="menuitem">View - Notes</item> to show or hide all notes.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0302200901430918" role="paragraph" l10n="NEW">In the Find &amp; Replace dialog, you can select to include the notes texts in your searches.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3445539" role="heading" level="2" l10n="NEW">Navigating from note to note</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4271370" role="paragraph" l10n="NEW">When the cursor is inside a note, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Down to jump to the next note, or press <switchinline select="sys"><caseinline select="MAC">Command+Option
</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Up to jump to the previous note.</paragraph>
-<paragraph role="paragraph" id="par_id2116153" xml-lang="en-US" l10n="NEW">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous note anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one note anchor to the next note anchor.</paragraph>
-<paragraph role="tip" id="par_id5381328" xml-lang="en-US" l10n="NEW">You can also open the Navigator to see a list of all notes. Right-click a note name in the Navigator to edit or delete the note.</paragraph>
-<paragraph role="heading" id="hd_id5664235" xml-lang="en-US" level="2" l10n="NEW">Printing notes</paragraph>
-<paragraph role="paragraph" id="par_id2254402" xml-lang="en-US" l10n="NEW">To set the printing options for notes in your text document, choose <item type="menuitem">File - Print</item>, then click <emph>Options</emph>. To change the printing option for notes for all your text documents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Print</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2116153" role="paragraph" l10n="NEW">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous note anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one note anchor to the next note anchor.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5381328" role="tip" l10n="NEW">You can also open the Navigator to see a list of all notes. Right-click a note name in the Navigator to edit or delete the note.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id5664235" role="heading" level="2" l10n="NEW">Printing notes</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2254402" role="paragraph" l10n="NEW">To set the printing options for notes in your text document, choose <item type="menuitem">File - Print</item>, then click <emph>Options</emph>. To change the printing option for notes for all your text documents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Print</item>.</paragraph>
</case>
<case select="CALC"><comment>Calc</comment>
-<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="CHG" oldref="6">When you attach a note to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a note. To display the note permanently, right-click the cell, and choose <emph>Show Note</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id8336741" xml-lang="en-US" l10n="NEW">To change the object properties of a note, for example the background color, choose <emph>Show Note</emph> as above, then right-click the note (do not double-click the text).</paragraph>
-<paragraph role="paragraph" id="par_id3155390" xml-lang="en-US" l10n="CHG" oldref="7">To edit a shown note, double-click the note text. To edit a note that is not shown permanently, click in the cell that contains the note, and then choose <emph>Insert - Note</emph>. To specify the formatting of the note text, right-click the note text in edit mode.</paragraph>
-<paragraph role="paragraph" id="par_idN107A1" xml-lang="en-US" l10n="NEW">To change the position or size of a note, drag a border or corner of the note. <comment>UFI: see specs.openoffice.org/calc/compatibility/AnnotationPosition.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_id9499496" xml-lang="en-US" l10n="NEW">To delete a note, right-click the cell, then choose <emph>Delete Note</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id2036805" xml-lang="en-US" l10n="NEW">You can also right-click a note name in the Navigator window to choose some editing commands.</paragraph>
-<paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="U" oldref="8">To set the printing options for notes in your spreadsheet, choose <emph>Format - Page</emph>, and then click the <emph>Sheet</emph> tab.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="CHG" oldref="6">When you attach a note to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a note. To display the note permanently, right-click the cell, and choose <emph>Show Note</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8336741" role="paragraph" l10n="NEW">To change the object properties of a note, for example the background color, choose <emph>Show Note</emph> as above, then right-click the note (do not double-click the text).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155390" role="paragraph" l10n="CHG" oldref="7">To edit a shown note, double-click the note text. To edit a note that is not shown permanently, click in the cell that contains the note, and then choose <emph>Insert - Note</emph>. To specify the formatting of the note text, right-click the note text in edit mode.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107A1" role="paragraph" l10n="NEW">To change the position or size of a note, drag a border or corner of the note. <comment>UFI: see specs.openoffice.org/calc/compatibility/AnnotationPosition.sxw</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id9499496" role="paragraph" l10n="NEW">To delete a note, right-click the cell, then choose <emph>Delete Note</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2036805" role="paragraph" l10n="NEW">You can also right-click a note name in the Navigator window to choose some editing commands.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153716" role="paragraph" l10n="U" oldref="8">To set the printing options for notes in your spreadsheet, choose <emph>Format - Page</emph>, and then click the <emph>Sheet</emph> tab.</paragraph>
</case>
<default><comment>Draw, Impress</comment>
-<paragraph role="paragraph" id="par_id4844508" xml-lang="en-US" l10n="NEW">In Draw, there are no notes. If you want some annotations, use a custom layer and set the layer to visible or invisible as desired.</paragraph>
-<paragraph role="paragraph" id="par_id2419507" xml-lang="en-US" l10n="NEW">In Impress, you can use the Notes view to write a page of notes for every slide.</paragraph>
+<paragraph xml-lang="en-US" id="par_id4844508" role="paragraph" l10n="NEW">In Draw, there are no notes. If you want some annotations, use a custom layer and set the layer to visible or invisible as desired.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2419507" role="paragraph" l10n="NEW">In Impress, you can use the Notes view to write a page of notes for every slide.</paragraph>
</default>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_POSTIT:ED_EDIT" id="bm_id3154935" localize="false"/><comment>Text edit box - are these still in use?</comment>
-<paragraph role="paragraph" id="par_id3153362" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="." visibility="hidden">Enter the text for your note.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_POSTIT:BTN_AUTHOR" id="bm_id3144434" localize="false"/><comment>Author edit box</comment>
-<paragraph role="paragraph" id="par_id3154153" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="." visibility="hidden">Enters your initials and the current date and time into the contents of the note.</ahelp></paragraph>
</body>
-</helpdocument>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/04150000.xhp b/helpcontent2/source/text/shared/01/04150000.xhp
index ef435dc50e..b7a2021bae 100755
--- a/helpcontent2/source/text/shared/01/04150000.xhp
+++ b/helpcontent2/source/text/shared/01/04150000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04150000.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -33,31 +32,36 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0104150000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Object</title>
-<filename>/text/shared/01/04150000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="objekt">
-<bookmark xml-lang="en-US" branch="hid/.uno:ObjectMenu" id="bm_id2569353" localize="false"/><paragraph role="heading" id="hd_id3146873" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/04150000.xhp" name="Objects">Object</link></paragraph>
-<paragraph role="paragraph" id="par_id3159079" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Inserts an object into your document. For movies and sounds, use <emph>Insert - Movie and Sound</emph> instead.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000404.xhp#objekteinf"/>
-</section>
-<paragraph role="heading" id="hd_id3154894" xml-lang="en-US" level="2" l10n="U" oldref="8"><link href="text/shared/01/04150100.xhp" name="OLE Object">OLE Object</link></paragraph>
-<embed href="text/shared/01/04150100.xhp#ole"/>
-<paragraph role="heading" id="hd_id3159201" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/01/04150400.xhp" name="Sound">Sound</link></paragraph>
-<embed href="text/shared/01/04150400.xhp#klang"/>
-<paragraph role="heading" id="hd_id3157896" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/shared/01/04150500.xhp" name="Video">Video</link></paragraph>
-<embed href="text/shared/01/04150500.xhp#video"/><comment>removed Insert Applet link</comment><paragraph role="heading" id="hd_id3153577" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/04160300.xhp" name="Formula">Formula</link></paragraph>
-<embed href="text/shared/01/04160300.xhp#starmath"/>
-<paragraph role="heading" id="hd_id3152552" xml-lang="en-US" level="2" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="WRITER"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link>
+ <topic id="textshared0104150000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Drawing Object</title>
+ <filename>/text/shared/01/04150000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="objekt">
+<bookmark xml-lang="en-US" branch="hid/.uno:ObjectMenu" id="bm_id2569353" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146873" role="heading" level="1" l10n="CHG"
+ oldref="1"><link href="text/shared/01/04150000.xhp" name="Drawing Object">Drawing Object</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159079" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Inserts an object into your document. For movies and sounds, use <emph>Insert - Movie and Sound</emph> instead.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000404.xhp#objekteinf"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3154894" role="heading" level="2" l10n="U" oldref="8"><link href="text/shared/01/04150100.xhp" name="OLE Object">OLE Object</link></paragraph>
+ <embed href="text/shared/01/04150100.xhp#ole"/>
+ <paragraph xml-lang="en-US" id="hd_id3159201" role="heading" level="2" l10n="U" oldref="6"><link href="text/shared/01/04150400.xhp" name="Sound">Sound</link></paragraph>
+ <embed href="text/shared/01/04150400.xhp#klang"/>
+ <paragraph xml-lang="en-US" id="hd_id3157896" role="heading" level="2" l10n="U" oldref="7"><link href="text/shared/01/04150500.xhp" name="Video">Video</link></paragraph>
+ <embed href="text/shared/01/04150500.xhp#video"/><comment>removed Insert Applet link</comment>
+<paragraph xml-lang="en-US" id="hd_id3153577" role="heading" level="2" l10n="U" oldref="4"><link href="text/shared/01/04160300.xhp" name="Formula">Formula</link></paragraph>
+ <embed href="text/shared/01/04160300.xhp#starmath"/>
+ <paragraph xml-lang="en-US" id="hd_id3152552" role="heading" level="2" l10n="U"
+ oldref="10"><switchinline select="appl"><caseinline select="WRITER"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link>
</caseinline></switchinline></paragraph>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id0302200903593543" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="WRITER">Inserts a chart.
+</caseinline></switchinline></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05020200.xhp b/helpcontent2/source/text/shared/01/05020200.xhp
index 3bafd19072..04573dcba0 100644
--- a/helpcontent2/source/text/shared/01/05020200.xhp
+++ b/helpcontent2/source/text/shared/01/05020200.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05020200.xhp,v $
- * $Revision: 1.17 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -33,136 +32,171 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0105020200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Font Effects</title>
-<filename>/text/shared/01/05020200.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="schrifteffekt">
+ <topic id="textshared0105020200xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Font Effects</title>
+ <filename>/text/shared/01/05020200.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="schrifteffekt">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153514"><bookmark_value>fonts;effects</bookmark_value>
-<bookmark_value>formatting; font effects</bookmark_value>
-<bookmark_value>characters; font effects</bookmark_value>
-<bookmark_value>text; font effects</bookmark_value>
-<bookmark_value>effects; fonts</bookmark_value>
-<bookmark_value>underlining; text</bookmark_value>
-<bookmark_value>capital letters; font effects</bookmark_value>
-<bookmark_value>lowercase letters; font effects</bookmark_value>
-<bookmark_value>titles; font effects</bookmark_value>
-<bookmark_value>small capitals</bookmark_value>
-<bookmark_value>strikethrough; font effects</bookmark_value>
-<bookmark_value>fonts; strikethrough</bookmark_value>
-<bookmark_value>outlines; font effects</bookmark_value>
-<bookmark_value>fonts; outlines</bookmark_value>
-<bookmark_value>shadows; characters</bookmark_value>
-<bookmark_value>fonts; shadows</bookmark_value>
-<bookmark_value>colors; fonts</bookmark_value>
-<bookmark_value>fonts;colors</bookmark_value>
+ <bookmark_value>formatting; font effects</bookmark_value>
+ <bookmark_value>characters; font effects</bookmark_value>
+ <bookmark_value>text; font effects</bookmark_value>
+ <bookmark_value>effects; fonts</bookmark_value>
+ <bookmark_value>underlining; text</bookmark_value>
+ <bookmark_value>capital letters; font effects</bookmark_value>
+ <bookmark_value>lowercase letters; font effects</bookmark_value>
+ <bookmark_value>titles; font effects</bookmark_value>
+ <bookmark_value>small capitals</bookmark_value>
+ <bookmark_value>strikethrough; font effects</bookmark_value>
+ <bookmark_value>fonts; strikethrough</bookmark_value>
+ <bookmark_value>outlines; font effects</bookmark_value>
+ <bookmark_value>fonts; outlines</bookmark_value>
+ <bookmark_value>shadows; characters</bookmark_value>
+ <bookmark_value>fonts; shadows</bookmark_value>
+ <bookmark_value>colors; fonts</bookmark_value>
+ <bookmark_value>fonts;colors</bookmark_value>
</bookmark><comment>ufi inserted "fonts;colors"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SVXPAGE_CHAR_EFFECTS" id="bm_id3147090" localize="false"/><paragraph role="heading" id="hd_id3153514" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05020200.xhp" name="Font Effects">Font Effects</link></paragraph>
-<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SVXPAGE_CHAR_EFFECTS">Specify the font effects that you want to use.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#schrifteffekt"/>
-</section>
-<embed href="text/shared/01/05020100.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE" id="bm_id3153527" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="2" l10n="U" oldref="41">Underlining</paragraph>
-<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE">Select the underlining style that you want to apply. To apply the underlining to words only, select the <emph>Individual Words </emph>box.</ahelp></paragraph>
-<paragraph role="note" id="par_id3153147" xml-lang="en-US" l10n="U" oldref="58">If you apply underlining to a superscript text, the underlining is raised to the level of the superscript. If the superscript is contained in a word with normal text, the underlining is not raised.</paragraph>
-<embed href="text/shared/00/00000007.xhp#objektleiste"/>
-<embed href="text/shared/00/00040502.xhp#syunterstreichen"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE_COLOR" id="bm_id3156327" localize="false"/><paragraph role="heading" id="hd_id3148642" xml-lang="en-US" level="2" l10n="U" oldref="78">Color</paragraph>
-<paragraph role="paragraph" id="par_id3150254" xml-lang="en-US" l10n="U" oldref="79"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE_COLOR">Select the color for the underlining.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EFFECTS2" id="bm_id3153666" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SVXPAGE_CHAR_EFFECTS" id="bm_id3147090" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153514" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05020200.xhp" name="Font Effects">Font Effects</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149205" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SVXPAGE_CHAR_EFFECTS">Specify the font effects that you want to use.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040500.xhp#schrifteffekt"/>
+ </section>
+ <embed href="text/shared/01/05020100.xhp#hinweis"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_COLOR2" id="bm_id3153728" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_FONTCOLOR" id="bm_id0123200902114658" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149482" role="heading" level="2" l10n="U"
+ oldref="81">Font Color</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146924" role="paragraph" l10n="U" oldref="82"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_FONTCOLOR">Sets the color for the selected text. If you select<emph> Automatic</emph>, the text color is set to black for light backgrounds and to white for dark backgrounds.</ahelp></paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10CC2" role="paragraph" l10n="CHG">To change the color of a text selection, select the text that you want to change, and click the <emph>Font Color</emph> icon. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10CC9" role="paragraph" l10n="CHG">If you click the <emph>Font Color</emph> icon before you select text, the paint can cursor appears. To change the color of text, select the text with the paint can cursor. To change the color of a single word, double-click in a word. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10CD6" role="paragraph" l10n="NEW">To undo the last change, right-click.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10CDA" role="paragraph" l10n="NEW">To exit the paint can mode, click once, or press the Escape key.</paragraph>
+ </listitem>
+ </list>
<switch select="appl">
-<case select="WRITER"><paragraph role="heading" id="hd_id3146137" xml-lang="en-US" level="2" l10n="U" oldref="3">Effects</paragraph>
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EFFECTS2">Select the font effects that you want to apply.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149575" xml-lang="en-US" level="3" l10n="U" oldref="65">Effects</paragraph>
-<paragraph role="paragraph" id="par_id3148944" xml-lang="en-US" l10n="U" oldref="66">The following capitalization effects are available:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="67">Without - no effect is applied</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154280" xml-lang="en-US" l10n="U" oldref="68">Capitals - changes the selected lowercase characters to uppercase characters</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148947" xml-lang="en-US" l10n="U" oldref="69">Lowercase - changes the selected uppercase characters to lower characters</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="71">Title font - changes the first character of each selected word to an uppercase character</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154937" xml-lang="en-US" l10n="U" oldref="70">Small capitals - changes the selected lowercase characters to uppercase characters, and then reduces their size</paragraph>
-</listitem>
-</list>
+<case select="WRITER">
+<paragraph xml-lang="en-US" id="par_id3150037" role="warning" l10n="CHG" oldref="85">The text color is ignored when printing, if the <emph>Print black </emph>check box is selected in <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.</paragraph>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_STRIKEOUT" id="bm_id3150791" localize="false"/><paragraph role="heading" id="hd_id3150400" xml-lang="en-US" level="2" l10n="U" oldref="43">Strikethrough</paragraph>
-<paragraph role="paragraph" id="par_id3145203" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_STRIKEOUT">Select a strikethrough style for the selected text.</ahelp></paragraph>
-<paragraph role="note" id="par_id3150496" xml-lang="en-US" l10n="U" oldref="48">If you save your document in MS Word format, all of the strikethrough styles are converted to the single line style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_INDIVIDUALWORDS" id="bm_id3154125" localize="false"/><paragraph role="heading" id="hd_id3153104" xml-lang="en-US" level="2" l10n="U" oldref="45">Individual words</paragraph>
-<paragraph role="paragraph" id="par_id3152935" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_INDIVIDUALWORDS">Applies the selected effect only to words and ignores spaces.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_OUTLINE" id="bm_id3149985" localize="false"/><paragraph role="heading" id="hd_id3147287" xml-lang="en-US" level="3" l10n="U" oldref="72">Outlines</paragraph>
-<paragraph role="paragraph" id="par_id3159126" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_OUTLINE">Displays the outline of the selected characters. This effect does not work with every font.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_SHADOW" id="bm_id3147326" localize="false"/><paragraph role="heading" id="hd_id3163714" xml-lang="en-US" level="3" l10n="U" oldref="74">Shadows</paragraph>
-<paragraph role="paragraph" id="par_id3150962" xml-lang="en-US" l10n="U" oldref="75"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_SHADOW">Adds a shadow that casts below and to the right of the selected characters.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id7613757" role="warning" l10n="NEW">The text color is ignored on screen, if the <emph>Use automatic font color for screen display</emph> check box is selected in <link href="text/shared/optionen/01013000.xhp"><emph>Tools - Options - %PRODUCTNAME - Accessibility</emph></link>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR" id="bm_id5399546" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Color" id="bm_id3155418" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR2" id="bm_id371323" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:FontColor" id="bm_id3145801" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3144766" role="paragraph" l10n="CHG" oldref="84"><ahelp hid=".uno:FontColor" visibility="hidden"><variable id="textfarbe">Click to apply the current font color to the selected characters. You can also click here, and then drag a selection to change the text color. Click the arrow next to the icon to open the Font color toolbar.
+</variable></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_EFFECTS2" id="bm_id0123200902144733" localize="false"/>
<switch select="appl">
<case select="WRITER">
-<bookmark xml-lang="en-US" branch="index" id="bm_id410168"><bookmark_value>blinking fonts</bookmark_value>
-<bookmark_value>flashing fonts</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING" id="bm_id3159179" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING" id="bm_id1213415" localize="false"/><paragraph role="heading" id="hd_id3152941" xml-lang="en-US" level="3" l10n="U" oldref="15">Blinking</paragraph>
-<paragraph role="paragraph" id="par_id3145662" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING">Makes the selected characters blink. You cannot change the blink frequency.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_CHARHIDDEN" id="bm_id2219000" localize="false"/><paragraph role="heading" id="par_idN10B81" xml-lang="en-US" level="3" l10n="NEW">Hidden</paragraph>
-<paragraph role="paragraph" id="par_idN10B85" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph> and select <emph>Hidden text</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146137" role="heading" level="2" l10n="U" oldref="3">Effects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="U" oldref="64"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EFFECTS2">Select the font effects that you want to apply.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149575" role="heading" level="3" l10n="U"
+ oldref="65">Effects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148944" role="paragraph" l10n="U" oldref="66">The following capitalization effects are available:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155922" role="listitem" l10n="U" oldref="67">Without - no effect is applied</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154280" role="listitem" l10n="U" oldref="68">Capitals - changes the selected lowercase characters to uppercase characters</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148947" role="listitem" l10n="U" oldref="69">Lowercase - changes the selected uppercase characters to lower characters</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149456" role="listitem" l10n="U" oldref="71">Title font - changes the first character of each selected word to an uppercase character</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154937" role="listitem" l10n="U" oldref="70">Small capitals - changes the selected lowercase characters to uppercase characters, and then reduces their size</paragraph>
+ </listitem>
+ </list>
</case>
</switch>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<embed href="text/shared/00/00000007.xhp#asia"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EMPHASIS" id="bm_id3163710" localize="false"/><paragraph role="heading" id="hd_id3150332" xml-lang="en-US" level="2" l10n="U" oldref="60">Emphasis mark</paragraph>
-<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EMPHASIS">Select a character to display over or below the entire length of the selected text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_POSITION" id="bm_id3163820" localize="false"/><paragraph role="heading" id="hd_id3152460" xml-lang="en-US" level="2" l10n="U" oldref="62">Position</paragraph>
-<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_POSITION">Specify where to display the emphasis marks.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_RELIEF" id="bm_id3155511" localize="false"/><paragraph role="heading" id="hd_id3154129" xml-lang="en-US" level="2" l10n="U" oldref="76">Relief</paragraph>
-<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_RELIEF">Select a relief effect to apply to the selected text. The embossed relief makes the characters appear as if they are raised above the page. The engraved relief makes the characters appear as if they are pressed into the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_COLOR2" id="bm_id3153728" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_FONTCOLOR" id="bm_id3147214" localize="false"/><paragraph role="heading" id="hd_id3149482" xml-lang="en-US" level="2" l10n="U" oldref="81">Font Color</paragraph>
-<paragraph role="paragraph" id="par_id3146924" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_FONTCOLOR">Sets the color for the selected text. If you select<emph> Automatic</emph>, the text color is set to black for light backgrounds and to white for dark backgrounds.</ahelp></paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10CC2" xml-lang="en-US" l10n="CHG">To change the color of a text selection, select the text that you want to change, and click the <emph>Font Color</emph> icon. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10CC9" xml-lang="en-US" l10n="CHG">If you click the <emph>Font Color</emph> icon before you select text, the paint can cursor appears. To change the color of text, select the text with the paint can cursor. To change the color of a single word, double-click in a word. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10CD6" xml-lang="en-US" l10n="NEW">To undo the last change, right-click.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10CDA" xml-lang="en-US" l10n="NEW">To exit the paint can mode, click once, or press the Escape key.</paragraph>
-</listitem>
-</list>
+<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_RELIEF" id="bm_id0123200902202314" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154129" role="heading" level="2" l10n="U"
+ oldref="76">Relief</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146974" role="paragraph" l10n="U" oldref="77"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_RELIEF">Select a relief effect to apply to the selected text. The embossed relief makes the characters appear as if they are raised above the page. The engraved relief makes the characters appear as if they are pressed into the page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_OUTLINE" id="bm_id0123200902155356" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147287" role="heading" level="3" l10n="CHG"
+ oldref="72">Outline</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159126" role="paragraph" l10n="U" oldref="73"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_OUTLINE">Displays the outline of the selected characters. This effect does not work with every font.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_SHADOW" id="bm_id0123200902163281" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3163714" role="heading" level="3" l10n="CHG"
+ oldref="74">Shadow</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150962" role="paragraph" l10n="U" oldref="75"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_SHADOW">Adds a shadow that casts below and to the right of the selected characters.</ahelp></paragraph>
<switch select="appl">
-<case select="WRITER"><paragraph role="warning" id="par_id3150037" xml-lang="en-US" l10n="CHG" oldref="85">The text color is ignored when printing, if the <emph>Print black </emph>check box is selected in <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.</paragraph>
+<case select="WRITER">
+<bookmark xml-lang="en-US" branch="index" id="bm_id410168"><bookmark_value>blinking fonts</bookmark_value>
+ <bookmark_value>flashing fonts</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING" id="bm_id3159179" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING" id="bm_id012320090217277" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152941" role="heading" level="3" l10n="U"
+ oldref="15">Blinking</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145662" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING">Makes the selected characters blink. You cannot change the blink frequency.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_CHARHIDDEN" id="bm_id0123200902180465" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10B81" role="heading" level="3" l10n="NEW">Hidden</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B85" role="paragraph" l10n="NEW"><ahelp hid="svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph> and select <emph>Hidden text</emph>.</paragraph>
</case>
</switch>
-<paragraph role="warning" id="par_id7613757" xml-lang="en-US" l10n="NEW">The text color is ignored on screen, if the <emph>Use automatic font color for screen display</emph> check box is selected in <link href="text/shared/optionen/01013000.xhp"><emph>Tools - Options - %PRODUCTNAME - Accessibility</emph></link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR" id="bm_id5399546" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Color" id="bm_id3155418" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR2" id="bm_id371323" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:FontColor" id="bm_id3145801" localize="false"/><paragraph role="paragraph" id="par_id3144766" xml-lang="en-US" l10n="CHG" oldref="84"><ahelp hid=".uno:FontColor" visibility="hidden"><variable id="textfarbe">Click to apply the current font color to the selected characters. You can also click here, and then drag a selection to change the text color. Click the arrow next to the icon to open the <emph>Font color </emph>toolbar.
-</variable></ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
-<embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
-<paragraph role="paragraph" id="par_id3151053" xml-lang="en-US" l10n="C"><link href="text/shared/optionen/01010500.xhp" name="$[officename] color tables">$[officename] color tables</link></paragraph>
-<embed href="text/shared/guide/text_color.xhp#text_color"/>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/.uno:Overline" id="bm_id0123200902261777" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0123200902291084" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden"><emph>Overlines or removes overlining from the selected text. If the cursor is not in a word, the new text that you enter is overlined.</emph></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_OVERLINE" id="bm_id0123200902014986" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0123200902243376" role="heading" level="2" l10n="NEW">Overlining</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0123200902243343" role="paragraph" l10n="NEW"><ahelp hid=".">Select the overlining style that you want to apply. To apply the overlining to words only, select the <emph>Individual Words </emph>box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_OVERLINE_COLOR" id="bm_id0123200902032228" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0123200902243470" role="heading" level="2" l10n="NEW">Overline color</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0123200902243466" role="paragraph" l10n="NEW"><ahelp hid=".">Select the color for the overlining.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_STRIKEOUT" id="bm_id0123200902074215" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150400" role="heading" level="2" l10n="U"
+ oldref="43">Strikethrough</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145203" role="paragraph" l10n="U" oldref="44"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_STRIKEOUT">Select a strikethrough style for the selected text.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150496" role="note" l10n="U" oldref="48">If you save your document in MS Word format, all of the strikethrough styles are converted to the single line style.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE" id="bm_id0123200902053711" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151226" role="heading" level="2" l10n="U"
+ oldref="41">Underlining</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="U" oldref="42"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE">Select the underlining style that you want to apply. To apply the underlining to words only, select the <emph>Individual Words </emph>box.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153147" role="note" l10n="U" oldref="58">If you apply underlining to a superscript text, the underlining is raised to the level of the superscript. If the superscript is contained in a word with normal text, the underlining is not raised.</paragraph>
+ <embed href="text/shared/00/00000007.xhp#objektleiste"/>
+ <embed href="text/shared/00/00040502.xhp#syunterstreichen"/>
+<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE_COLOR" id="bm_id0123200902050229" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148642" role="heading" level="2" l10n="CHG"
+ oldref="78">Underline color</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150254" role="paragraph" l10n="U" oldref="79"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE_COLOR">Select the color for the underlining.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_CHAR_EFFECTS_CB_INDIVIDUALWORDS" id="bm_id0123200902090860" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153104" role="heading" level="2" l10n="U"
+ oldref="45">Individual words</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152935" role="paragraph" l10n="U" oldref="46"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_INDIVIDUALWORDS">Applies the selected effect only to words and ignores spaces.</ahelp></paragraph>
+ <embed href="text/shared/00/00000007.xhp#asia"/>
+<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_EMPHASIS" id="bm_id0123200902235399" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150332" role="heading" level="2" l10n="U"
+ oldref="60">Emphasis mark</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152576" role="paragraph" l10n="U" oldref="61"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EMPHASIS">Select a character to display over or below the entire length of the selected text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_POSITION" id="bm_id0123200902241815" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152460" role="heading" level="2" l10n="U"
+ oldref="62">Position</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147436" role="paragraph" l10n="U" oldref="63"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_POSITION">Specify where to display the emphasis marks.</ahelp></paragraph>
+ <embed href="text/shared/00/00000001.xhp#vorschau"/>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
+ <embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
+ <paragraph xml-lang="en-US" id="par_id3151053" role="paragraph" l10n="C"><link href="text/shared/optionen/01010500.xhp" name="$[officename] color tables">$[officename] color tables</link></paragraph>
+ <embed href="text/shared/guide/text_color.xhp#text_color"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05040100.xhp b/helpcontent2/source/text/shared/01/05040100.xhp
index d6c4be1fe3..34656fcbd5 100644
--- a/helpcontent2/source/text/shared/01/05040100.xhp
+++ b/helpcontent2/source/text/shared/01/05040100.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05040100.xhp,v $
- * $Revision: 1.8 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -32,56 +32,54 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105040100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Organizer</title>
-<filename>/text/shared/01/05040100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-24T11:30:14">UFI: spec "Assign Keyboard Shortcuts to Styles"
-dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="verwalten">
+ <topic id="textshared0105040100xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Organizer</title>
+ <filename>/text/shared/01/05040100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="verwalten">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153383"><bookmark_value>organizing; styles</bookmark_value>
-<bookmark_value>styles; organizing</bookmark_value>
+ <bookmark_value>styles; organizing</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_MANAGE_STYLES" id="bm_id3145356" localize="false"/>
-<paragraph role="heading" id="hd_id3153383" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040100.xhp" name="Organizer">Organizer</link></paragraph>
-<paragraph role="paragraph" id="par_id3147588" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_MANAGE_STYLES">Set the options for the selected style.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#seiteverwalten"/>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3153383" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040100.xhp" name="Organizer">Organizer</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147588" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_MANAGE_STYLES">Set the options for the selected style.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040500.xhp#seiteverwalten"/>
+ </section>
<bookmark xml-lang="en-US" branch="hid/sfx2_Edit_TP_MANAGE_STYLES_ED_NAME" id="bm_id3804437" localize="false"/>
-<paragraph role="heading" id="hd_id3149525" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
-<paragraph role="paragraph" id="par_id3160481" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:TP_MANAGE_STYLES:ED_NAME">Displays the name of the selected style. If you are creating or modifying a custom style, enter a name for the style. You cannot change the name of a predefined style.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149525" role="heading" level="2" l10n="U" oldref="3">Name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3160481" role="paragraph" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:TP_MANAGE_STYLES:ED_NAME">Displays the name of the selected style. If you are creating or modifying a custom style, enter a name for the style. You cannot change the name of a predefined style.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sfx2_CheckBox_TP_MANAGE_STYLES_CB_AUTO" id="bm_id8273873" localize="false"/>
-<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">AutoUpdate
+<paragraph xml-lang="en-US" id="hd_id3153750" role="heading" level="2" l10n="U"
+ oldref="13"><switchinline select="appl"><caseinline select="WRITER">AutoUpdate
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153749" xml-lang="en-US" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SFX2:CHECKBOX:TP_MANAGE_STYLES:CB_AUTO">Updates the style when you apply direct formatting to a paragraph using this style in your document. The formatting of all paragraphs using this style is automatically updated.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3153749" role="paragraph" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SFX2:CHECKBOX:TP_MANAGE_STYLES:CB_AUTO">Updates the style when you apply direct formatting to a paragraph using this style in your document. The formatting of all paragraphs using this style is automatically updated.</ahelp>
</caseinline></switchinline></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0107200910584081" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Updates the style when you apply direct formatting to a paragraph using this style in your document. The formatting of all paragraphs using this style is automatically updated.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sfx2_ListBox_TP_MANAGE_STYLES_LB_NEXT" id="bm_id1614123" localize="false"/>
-<paragraph role="heading" id="hd_id3155392" xml-lang="en-US" level="2" l10n="U" oldref="5">Next Style</paragraph>
-<paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_NEXT">Select an existing style that you want to follow the current style in your document. For paragraph styles, the next style is applied to the paragraph that is created when you press Enter. For page styles, the next style is applied when a new page is created.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155392" role="heading" level="2" l10n="U" oldref="5">Next Style</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155941" role="paragraph" l10n="U" oldref="6"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_NEXT">Select an existing style that you want to follow the current style in your document. For paragraph styles, the next style is applied to the paragraph that is created when you press Enter. For page styles, the next style is applied when a new page is created.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sfx2_ListBox_TP_MANAGE_STYLES_LB_BASE" id="bm_id373241" localize="false"/>
-<paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="2" l10n="U" oldref="7">Linked with</paragraph>
-<paragraph role="paragraph" id="par_id3166461" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_BASE">Select an existing style that you want to base the new style on, or select none to define your own style.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3163802" role="heading" level="2" l10n="U" oldref="7">Linked with</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166461" role="paragraph" l10n="U" oldref="8"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_BASE">Select an existing style that you want to base the new style on, or select none to define your own style.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sfx2_ListBox_TP_MANAGE_STYLES_LB_REGION" id="bm_id7994018" localize="false"/>
-<paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="2" l10n="U" oldref="9">Category</paragraph>
-<paragraph role="paragraph" id="par_id3159269" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_REGION">Displays the category for the current style. If you are creating or modifying a new style, select 'Custom Style' from the list.</ahelp></paragraph>
-<paragraph role="note" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="17">You cannot change the category for a predefined style.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148474" role="heading" level="2" l10n="U" oldref="9">Category</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159269" role="paragraph" l10n="U" oldref="10"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_REGION">Displays the category for the current style. If you are creating or modifying a new style, select 'Custom Style' from the list.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150771" role="note" l10n="U" oldref="17">You cannot change the category for a predefined style.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SFX2:MULTILINEEDIT:TP_MANAGE_STYLES:ED_DESC" id="bm_id3153127" localize="false"/>
-<paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="2" l10n="U" oldref="11">Contains</paragraph>
-<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SFX2:MULTILINEEDIT:TP_MANAGE_STYLES:ED_DESC">Describes the relevant formatting used in the current style.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN1072D" xml-lang="en-US" level="2" l10n="NEW">Assign Shortcut Key</paragraph>
-<paragraph role="paragraph" id="par_idN10731" xml-lang="en-US" l10n="NEW">Opens the <emph>Tools - Customize - Keyboard</emph> tab page where you can assign a shortcut key to the current Style.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3145085" xml-lang="en-US" l10n="C"><link href="text/swriter/01/05140000.xhp" name="Update Style">Update Style</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3153717" role="heading" level="2" l10n="U"
+ oldref="11">Contains</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154306" role="paragraph" l10n="U" oldref="12"><ahelp hid="SFX2:MULTILINEEDIT:TP_MANAGE_STYLES:ED_DESC">Describes the relevant formatting used in the current style.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1072D" role="heading" level="2" l10n="NEW">Assign Shortcut Key</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="NEW">Opens the <emph>Tools - Customize - Keyboard</emph> tab page where you can assign a shortcut key to the current Style.</paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3145085" role="paragraph" l10n="C"><link href="text/swriter/01/05140000.xhp" name="Update Style">Update Style</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05110600m.xhp b/helpcontent2/source/text/shared/01/05110600m.xhp
index 5846a241ac..4b2dca7e7c 100644
--- a/helpcontent2/source/text/shared/01/05110600m.xhp
+++ b/helpcontent2/source/text/shared/01/05110600m.xhp
@@ -61,7 +61,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3145297" xml-lang="en-US" l10n="E">
-<image id="img_id3155994" src="res/commandimagelist/sc_distributerows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3155994" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155994" src="res/commandimagelist/sc_distributerows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3155994" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/01/05120600.xhp b/helpcontent2/source/text/shared/01/05120600.xhp
index a7d0233c12..326f78dfff 100644
--- a/helpcontent2/source/text/shared/01/05120600.xhp
+++ b/helpcontent2/source/text/shared/01/05120600.xhp
@@ -61,7 +61,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3145179" xml-lang="en-US" l10n="E">
-<image id="img_id3145186" src="res/commandimagelist/sc_distributecolumns.png" width="0.423cm" height="0.423cm"><alt id="alt_id3145186" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3145186" src="res/commandimagelist/sc_distributecolumns.png" width="0.423cm" height="0.423cm"><alt id="alt_id3145186" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/01/06040100.xhp b/helpcontent2/source/text/shared/01/06040100.xhp
index 00059a9cc2..f2fb333c30 100644
--- a/helpcontent2/source/text/shared/01/06040100.xhp
+++ b/helpcontent2/source/text/shared/01/06040100.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -35,252 +35,269 @@
<meta>
-<topic id="textshared0106040100xml" indexer="include">
-<title id="tit" xml-lang="en-US">Options</title>
-<filename>/text/shared/01/06040100.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="optionen">
+ <topic id="textshared0106040100xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Options</title>
+ <filename>/text/shared/01/06040100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="optionen">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155620"><bookmark_value>AutoCorrect function; options</bookmark_value>
-<bookmark_value>replacement options</bookmark_value>
-<bookmark_value>words; automatically replacing</bookmark_value>
-<bookmark_value>abbreviation replacement</bookmark_value>
-<bookmark_value>capital letters; AutoCorrect function</bookmark_value>
-<bookmark_value>bold; AutoFormat function</bookmark_value>
-<bookmark_value>underlining; AutoFormat function</bookmark_value>
-<bookmark_value>1/2 replacement</bookmark_value>
-<bookmark_value>spaces; ignoring double</bookmark_value>
-<bookmark_value>numbering; using automatically</bookmark_value>
-<bookmark_value>paragraphs; numbering automatically</bookmark_value>
-<bookmark_value>numbering;paragraphs</bookmark_value>
-<bookmark_value>tables in text; creating automatically</bookmark_value>
-<bookmark_value>titles; formatting automatically</bookmark_value>
-<bookmark_value>empty paragraph removal</bookmark_value>
-<bookmark_value>paragraphs; removing blank ones</bookmark_value>
-<bookmark_value>styles; replacing automatically</bookmark_value>
-<bookmark_value>user-defined styles; automatically replacing</bookmark_value>
-<bookmark_value>bullets; replacing</bookmark_value>
-<bookmark_value>quotation marks; replacing</bookmark_value>
-<bookmark_value>typographical quotes in $[officename] Writer</bookmark_value>
-<bookmark_value>paragraphs; joining</bookmark_value>
-<bookmark_value>joining; paragraphs</bookmark_value>
-</bookmark><comment>removed two bookmarks "automatic..."</comment>
+ <bookmark_value>replacement options</bookmark_value>
+ <bookmark_value>words; automatically replacing</bookmark_value>
+ <bookmark_value>abbreviation replacement</bookmark_value>
+ <bookmark_value>capital letters; AutoCorrect function</bookmark_value>
+ <bookmark_value>bold; AutoFormat function</bookmark_value>
+ <bookmark_value>underlining; AutoFormat function</bookmark_value>
+ <bookmark_value>1/2 replacement</bookmark_value>
+ <bookmark_value>spaces; ignoring double</bookmark_value>
+ <bookmark_value>numbering; using automatically</bookmark_value>
+ <bookmark_value>paragraphs; numbering automatically</bookmark_value>
+ <bookmark_value>tables in text; creating automatically</bookmark_value>
+ <bookmark_value>titles; formatting automatically</bookmark_value>
+ <bookmark_value>empty paragraph removal</bookmark_value>
+ <bookmark_value>paragraphs; removing blank ones</bookmark_value>
+ <bookmark_value>styles; replacing automatically</bookmark_value>
+ <bookmark_value>user-defined styles; automatically replacing</bookmark_value>
+ <bookmark_value>bullets; replacing</bookmark_value>
+ <bookmark_value>quotation marks; replacing</bookmark_value>
+ <bookmark_value>typographical quotes in $[officename] Writer</bookmark_value>
+ <bookmark_value>paragraphs; joining</bookmark_value>
+ <bookmark_value>joining; paragraphs</bookmark_value>
+</bookmark><comment>removed two bookmarks "automatic..."</comment><comment>MW removed "numbering;paragraphs"</comment>
<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOCORR_CLB" id="bm_id3148765" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOCORR_OPTIONS" id="bm_id3147527" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOFMT_OPTIONS" id="bm_id3149962" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOFORMAT_CLB" id="bm_id3150999" localize="false"/>
-<paragraph role="heading" id="hd_id3155620" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06040100.xhp" name="Options">Options</link></paragraph>
-<paragraph role="paragraph" id="par_id3146946" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OFAPAGE_AUTOFORMAT_CLB">Select the options for automatically correcting errors as you type, and then click <emph>OK</emph>.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3155620" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/06040100.xhp" name="Options">Options</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146946" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OFAPAGE_AUTOFORMAT_CLB">Select the options for automatically correcting errors as you type, and then click <emph>OK</emph>.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
+ </section>
<switch select="appl">
<case select="WRITER">
-<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="32">In text documents, you can choose to apply the AutoCorrect corrections while you type [T], or only when you modify existing text [M] with <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
-<paragraph role="note" id="par_id7547227" xml-lang="en-US" l10n="CHG">When you choose to modify existing text with all options deselected, still all "Default" paragraph styles will be converted to "Text body" styles. <comment>see i72339</comment><comment>Don't use inline switches for notes, tips and warnings. The icon will still show up.</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id3153124" role="paragraph" l10n="CHG" oldref="32">In text documents, you can choose to apply the AutoCorrect corrections while you type [T], or only when you modify existing text [M] with <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7547227" role="note" l10n="CHG">When you choose to modify existing text with all options deselected, still all "Default" paragraph styles will be converted to "Text body" styles. <comment>see i72339</comment><comment>Don't use inline switches for notes, tips and warnings. The icon will still show up.</comment></paragraph>
</case>
</switch>
-<paragraph role="heading" id="hd_id3154398" xml-lang="en-US" level="3" l10n="U" oldref="3">Use replacement table</paragraph>
-<paragraph role="paragraph" id="par_id3151234" xml-lang="en-US" l10n="CHG" oldref="4">If you type a letter combination that matches a shortcut in the <link href="text/shared/01/06040200.xhp" name="replacement table">replacement table</link>, the letter combination is replaced with the replacement text.</paragraph>
-<paragraph role="heading" id="hd_id3150144" xml-lang="en-US" level="3" l10n="U" oldref="5">Correct TWo INitial CApitals</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="6">If you type two uppercase letters at the beginning of a "WOrd", the second uppercase letter is automatically replaced with a lowercase letter.</paragraph>
-<paragraph role="heading" id="hd_id3156426" xml-lang="en-US" level="3" l10n="U" oldref="7">Capitalize first letter of every sentence.</paragraph>
-<paragraph role="paragraph" id="par_id3155339" xml-lang="en-US" l10n="U" oldref="8">Capitalizes the first letter of every sentence.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154398" role="heading" level="3" l10n="U" oldref="3">Use replacement table</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151234" role="paragraph" l10n="CHG" oldref="4">If you type a letter combination that matches a shortcut in the <link href="text/shared/01/06040200.xhp" name="replacement table">replacement table</link>, the letter combination is replaced with the replacement text.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150144" role="heading" level="3" l10n="U" oldref="5">Correct TWo INitial CApitals</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="6">If you type two uppercase letters at the beginning of a "WOrd", the second uppercase letter is automatically replaced with a lowercase letter.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156426" role="heading" level="3" l10n="U" oldref="7">Capitalize first letter of every sentence.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155339" role="paragraph" l10n="U" oldref="8">Capitalizes the first letter of every sentence.</paragraph>
<switch select="appl">
<case select="CALC">
-<paragraph role="note" id="par_id5240028" xml-lang="en-US" l10n="NEW">The first letter in a Calc cell will never be capitalized automatically.<comment>see i78661</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id5240028" role="note" l10n="NEW">The first letter in a Calc cell will never be capitalized automatically.<comment>see i78661</comment></paragraph>
</case>
</switch>
-<paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="24">Automatic *bold* and _underline_</paragraph>
-<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="CHG" oldref="26">Automatically applies bold formatting to text enclosed by asterisks (*), and underline to text enclosed by underscores ( _ ), for example, *bold*. The asterisks and underscores are not displayed after the formatting is applied.</paragraph>
-<paragraph role="note" id="par_id3153127" xml-lang="en-US" l10n="U" oldref="105">This feature does not work if the formatting characters * or _ are entered with an <link href="text/shared/00/00000005.xhp#IME" name="Input Method Editor">Input Method Editor</link>.</paragraph>
-<paragraph role="heading" id="hd_id3150275" xml-lang="en-US" level="3" l10n="U" oldref="17">URL Recognition</paragraph>
-<paragraph role="paragraph" id="par_id3158430" xml-lang="en-US" l10n="U" oldref="18">Automatically creates a hyperlink when you type a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link>.</paragraph>
-<paragraph role="heading" id="hd_id3151338" xml-lang="en-US" level="3" l10n="U" oldref="15">Replace 1/2 ... with ½ ...</paragraph>
-<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="16">Replaces 1/2, 1/4, 3/4 with the corresponding fraction characters.</paragraph>
-<paragraph role="heading" id="hd_id3159400" xml-lang="en-US" level="3" l10n="U" oldref="25">Replace 1st ... with 1^st ...</paragraph>
-<paragraph role="paragraph" id="par_id3154173" xml-lang="en-US" l10n="U" oldref="27">Displays the text characters of ordinals, such as 1st, 2nd, or 3rd, as superscripts.</paragraph>
-<paragraph role="heading" id="hd_id3148473" xml-lang="en-US" level="3" l10n="U" oldref="19">Replace Dashes<comment>UFI: changed switches, added table, #61325#</comment></paragraph><comment>UFI: see i73558 for name: not the dashes are replaced but the hyphens (or even better the minus signs)</comment>
-<paragraph role="paragraph" id="par_id3144439" xml-lang="en-US" l10n="CHG" oldref="20">Replaces one or two hyphens with a long dash (see the following table).</paragraph>
-<paragraph role="paragraph" id="par_id87282" xml-lang="en-US" l10n="CHG">Text will be replaced after you type a trailing white space (space, tab, or return). In the following table, the A and B represent text consisting of letters A to z or digits 0 to 9.</paragraph>
-<table id="tbl_id2444227">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3408612" xml-lang="en-US" l10n="NEW">Text that you type:</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id4362010" xml-lang="en-US" l10n="NEW">Result that you get:</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1432844" xml-lang="en-US" l10n="NEW">A - B (A, space, minus, space, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id7553941" xml-lang="en-US" l10n="NEW">A – B (A, space, en-dash, space, B)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1421246" xml-lang="en-US" l10n="NEW">A -- B (A, space, minus, minus, space, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id2305673" xml-lang="en-US" l10n="NEW">A – B (A, space, en-dash, space, B)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id8703573" xml-lang="en-US" l10n="NEW">A--B (A, minus, minus, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id6049684" xml-lang="en-US" l10n="CHG">A—B (A, em-dash, B)<br/>(see note below the table)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id2219916" xml-lang="en-US" l10n="NEW">A-B (A, minus, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1868037" xml-lang="en-US" l10n="NEW">A-B (unchanged)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id714438" xml-lang="en-US" l10n="NEW">A -B (A, space, minus, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3924985" xml-lang="en-US" l10n="NEW">A -B (unchanged)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1486861" xml-lang="en-US" l10n="NEW">A --B (A, space, minus, minus, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id844141" xml-lang="en-US" l10n="NEW">A –B (A, space, en-dash, B)</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3145072" role="heading" level="3" l10n="U"
+ oldref="24">Automatic *bold* and _underline_</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153577" role="paragraph" l10n="CHG" oldref="26">Automatically applies bold formatting to text enclosed by asterisks (*), and underline to text enclosed by underscores ( _ ), for example, *bold*. The asterisks and underscores are not displayed after the formatting is applied.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153127" role="note" l10n="U" oldref="105">This feature does not work if the formatting characters * or _ are entered with an <link href="text/shared/00/00000005.xhp#IME" name="Input Method Editor">Input Method Editor</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150275" role="heading" level="3" l10n="U"
+ oldref="17">URL Recognition</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158430" role="paragraph" l10n="U" oldref="18">Automatically creates a hyperlink when you type a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3151338" role="heading" level="3" l10n="U"
+ oldref="15">Replace 1/2 ... with ½ ...</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149235" role="paragraph" l10n="U" oldref="16">Replaces 1/2, 1/4, 3/4 with the corresponding fraction characters.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3159400" role="heading" level="3" l10n="U"
+ oldref="25">Replace 1st ... with 1^st ...</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154173" role="paragraph" l10n="U" oldref="27">Displays the text characters of ordinals, such as 1st, 2nd, or 3rd, as superscripts.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148473" role="heading" level="3" l10n="U"
+ oldref="19">Replace Dashes<comment>UFI: changed switches, added table, #61325#</comment></paragraph><comment>UFI: see i73558 for name: not the dashes are replaced but the hyphens (or even better the minus signs)</comment>
+<paragraph xml-lang="en-US" id="par_id3144439" role="paragraph" l10n="CHG" oldref="20">Replaces one or two hyphens with a long dash (see the following table).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id87282" role="paragraph" l10n="CHG">Text will be replaced after you type a trailing white space (space, tab, or return). In the following table, the A and B represent text consisting of letters A to z or digits 0 to 9.</paragraph>
+ <table id="tbl_id2444227">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3408612" role="tablehead" l10n="NEW">Text that you type:</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id4362010" role="tablehead" l10n="NEW">Result that you get:</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1432844" role="tablecontent" l10n="NEW">A - B (A, space, minus, space, B)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id7553941" role="tablecontent" l10n="NEW">A – B (A, space, en-dash, space, B)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1421246" role="tablecontent" l10n="NEW">A -- B (A, space, minus, minus, space, B)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id2305673" role="tablecontent" l10n="NEW">A – B (A, space, en-dash, space, B)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id8703573" role="tablecontent" l10n="NEW">A--B (A, minus, minus, B)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id6049684" role="tablecontent" l10n="CHG">A—B (A, em-dash, B)<br/>(see note below the table)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id2219916" role="tablecontent" l10n="NEW">A-B (A, minus, B)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1868037" role="tablecontent" l10n="NEW">A-B (unchanged)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id714438" role="tablecontent" l10n="NEW">A -B (A, space, minus, B)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3924985" role="tablecontent" l10n="NEW">A -B (unchanged)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1486861" role="tablecontent" l10n="NEW">A --B (A, space, minus, minus, B)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id844141" role="tablecontent" l10n="NEW">A –B (A, space, en-dash, B)</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="note" id="par_id1416974" xml-lang="en-US" l10n="NEW">If the text has the Hungarian or Finnish language attribute, then two hyphens in the sequence A--B are replaced by an en-dash instead of an em-dash.<comment>i71908</comment></paragraph>
-<paragraph role="heading" id="hd_id3152472" xml-lang="en-US" level="3" l10n="U" oldref="99"><switchinline select="appl"><caseinline select="WRITER">Delete spaces and tabs at beginning and end of paragraph
+ <paragraph xml-lang="en-US" id="par_id1416974" role="note" l10n="NEW">If the text has the Hungarian or Finnish language attribute, then two hyphens in the sequence A--B are replaced by an en-dash instead of an em-dash.<comment>i71908</comment></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3152472" role="heading" level="3" l10n="U"
+ oldref="99"><switchinline select="appl"><caseinline select="WRITER">Delete spaces and tabs at beginning and end of paragraph
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156024" xml-lang="en-US" l10n="U" oldref="100"><switchinline select="appl"><caseinline select="WRITER">Removes spaces and tabs at the beginning of a paragraph. To use this option, the <emph>Apply Styles</emph> option must also be selected.
+ <paragraph xml-lang="en-US" id="par_id3156024" role="paragraph" l10n="U" oldref="100"><switchinline select="appl"><caseinline select="WRITER">Removes spaces and tabs at the beginning of a paragraph. To use this option, the <emph>Apply Styles</emph> option must also be selected.
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="3" l10n="U" oldref="101"><switchinline select="appl"><caseinline select="WRITER">Delete blanks and tabs at end and start of lines
+ <paragraph xml-lang="en-US" id="hd_id3147303" role="heading" level="3" l10n="U"
+ oldref="101"><switchinline select="appl"><caseinline select="WRITER">Delete blanks and tabs at end and start of lines
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150866" xml-lang="en-US" l10n="U" oldref="102"><switchinline select="appl"><caseinline select="WRITER">Removes spaces and tabs at the beginning of each line. To use this option, the <emph>Apply Styles</emph> option must also be selected.
+ <paragraph xml-lang="en-US" id="par_id3150866" role="paragraph" l10n="U" oldref="102"><switchinline select="appl"><caseinline select="WRITER">Removes spaces and tabs at the beginning of each line. To use this option, the <emph>Apply Styles</emph> option must also be selected.
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3150400" xml-lang="en-US" level="3" l10n="U" oldref="28">Ignore double spaces</paragraph>
-<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="29">Replaces two or more consecutive spaces with a single space.</paragraph>
-<paragraph role="heading" id="hd_id3145116" xml-lang="en-US" level="3" l10n="U" oldref="33"><switchinline select="appl"><caseinline select="WRITER">Apply numbering - symbol
+ <paragraph xml-lang="en-US" id="hd_id3150400" role="heading" level="3" l10n="U"
+ oldref="28">Ignore double spaces</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154938" role="paragraph" l10n="U" oldref="29">Replaces two or more consecutive spaces with a single space.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3145116" role="heading" level="3" l10n="U"
+ oldref="33"><switchinline select="appl"><caseinline select="WRITER">Apply numbering - symbol
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="34"><switchinline select="appl"><caseinline select="WRITER">Automatically creates a numbered list when you press Enter at the end of a line that starts with a number followed by a period, a space, and text. If a line starts with a hyphen (-), a plus sign (+), or an asterisk (*), followed by a space, and text, a bulleted list is created when you press Enter.
+ <paragraph xml-lang="en-US" id="par_id3150870" role="paragraph" l10n="U" oldref="34"><switchinline select="appl"><caseinline select="WRITER">Automatically creates a numbered list when you press Enter at the end of a line that starts with a number followed by a period, a space, and text. If a line starts with a hyphen (-), a plus sign (+), or an asterisk (*), followed by a space, and text, a bulleted list is created when you press Enter.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146874" xml-lang="en-US" l10n="U" oldref="92"><switchinline select="appl"><caseinline select="WRITER">To cancel automatic numbering when you press Enter at the end of a line that starts with a numbering symbol, press Enter again.
+ <paragraph xml-lang="en-US" id="par_id3146874" role="paragraph" l10n="U" oldref="92"><switchinline select="appl"><caseinline select="WRITER">To cancel automatic numbering when you press Enter at the end of a line that starts with a numbering symbol, press Enter again.
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="WRITER">
-<paragraph role="tip" id="par_id3145606" xml-lang="en-US" l10n="U" oldref="77">The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145606" role="tip" l10n="U" oldref="77">The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style.</paragraph>
</case>
</switch>
<switch select="appl">
<case select="WRITER">
-<paragraph role="heading" id="hd_id3157962" xml-lang="en-US" level="3" l10n="U" oldref="35">Apply border</paragraph>
-<paragraph role="paragraph" id="par_id3144445" xml-lang="en-US" l10n="U" oldref="36">Automatically applies a border at the base of the preceding paragraph when you type three or more specific characters, and then press Enter. To create a single line, type three or more hyphens (-), or underscores ( _ ), and then press Enter. To create a double line, type three or more equal signs (=), asterisks (*), tildes (~), or hash marks (#), and then press Enter.</paragraph>
-<paragraph role="paragraph" id="par_idN10C2E" xml-lang="en-US" l10n="NEW">To delete the created line, click the paragraph above the line, choose <emph>Format - Paragraph - Borders</emph>, delete the bottom border.</paragraph>
-<paragraph role="paragraph" id="par_idN10C35" xml-lang="en-US" l10n="NEW">The following table summarizes the line thickness for the different characters: </paragraph>
-<table id="tbl_id3149985">
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="37">---</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154690" xml-lang="en-US" l10n="U" oldref="38">0.5pt single underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154472" xml-lang="en-US" l10n="U" oldref="39">___</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149266" xml-lang="en-US" l10n="U" oldref="40">1.0pt single underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147580" xml-lang="en-US" l10n="U" oldref="41">===</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145364" xml-lang="en-US" l10n="U" oldref="42">1.1pt double underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148647" xml-lang="en-US" l10n="U" oldref="43">***</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152791" xml-lang="en-US" l10n="U" oldref="44">4.5pt double underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="45">~~~</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="46">6.0pt double underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145591" xml-lang="en-US" l10n="U" oldref="47">###</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153188" xml-lang="en-US" l10n="U" oldref="48">9.0pt double underline</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/shared/guide/line_intext.xhp#line_intext"/>
-<embed href="text/swriter/guide/insert_line.xhp#insert_line"/>
+<paragraph xml-lang="en-US" id="hd_id3157962" role="heading" level="3" l10n="U"
+ oldref="35">Apply border</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144445" role="paragraph" l10n="U" oldref="36">Automatically applies a border at the base of the preceding paragraph when you type three or more specific characters, and then press Enter. To create a single line, type three or more hyphens (-), or underscores ( _ ), and then press Enter. To create a double line, type three or more equal signs (=), asterisks (*), tildes (~), or hash marks (#), and then press Enter.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10C2E" role="paragraph" l10n="NEW">To delete the created line, click the paragraph above the line, choose <emph>Format - Paragraph - Borders</emph>, delete the bottom border.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10C35" role="paragraph" l10n="NEW">The following table summarizes the line thickness for the different characters: </paragraph>
+ <table id="tbl_id3149985">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148576" role="tablecontent" l10n="U" oldref="37">---</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154690" role="tablecontent" l10n="U" oldref="38">0.5pt single underline</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154472" role="tablecontent" l10n="U" oldref="39">___</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149266" role="tablecontent" l10n="U" oldref="40">1.0pt single underline</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147580" role="tablecontent" l10n="U" oldref="41">===</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145364" role="tablecontent" l10n="U" oldref="42">1.1pt double underline</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148647" role="tablecontent" l10n="U" oldref="43">***</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152791" role="tablecontent" l10n="U" oldref="44">4.5pt double underline</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146975" role="tablecontent" l10n="U" oldref="45">~~~</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152885" role="tablecontent" l10n="U" oldref="46">6.0pt double underline</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145591" role="tablecontent" l10n="U" oldref="47">###</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153188" role="tablecontent" l10n="U" oldref="48">9.0pt double underline</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ <embed href="text/shared/guide/line_intext.xhp#line_intext"/>
+ <embed href="text/swriter/guide/insert_line.xhp#insert_line"/>
</case>
</switch>
-<paragraph role="heading" id="hd_id3149064" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="WRITER">Create table
+<paragraph xml-lang="en-US" id="hd_id3149064" role="heading" level="3" l10n="U"
+ oldref="49"><switchinline select="appl"><caseinline select="WRITER">Create table
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="appl"><caseinline select="WRITER">Creates a table when you press Enter after typing a series of hyphens (-) or tabs separated by plus signs, that is, +------+---+. Plus signs indicate column dividers, while hyphens and tabs indicate the width of a column.
+ <paragraph xml-lang="en-US" id="par_id3146119" role="paragraph" l10n="U" oldref="50"><switchinline select="appl"><caseinline select="WRITER">Creates a table when you press Enter after typing a series of hyphens (-) or tabs separated by plus signs, that is, +------+---+. Plus signs indicate column dividers, while hyphens and tabs indicate the width of a column.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3147219" xml-lang="en-US" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER">+-----------------+---------------+------+
+ <paragraph xml-lang="en-US" id="par_id3147219" role="paragraph" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER">+-----------------+---------------+------+
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3153334" xml-lang="en-US" level="3" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Apply Styles
+ <paragraph xml-lang="en-US" id="hd_id3153334" role="heading" level="3" l10n="U"
+ oldref="55"><switchinline select="appl"><caseinline select="WRITER">Apply Styles
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="56"><switchinline select="appl"><caseinline select="WRITER">Automatically replaces the "Default" paragraph style with the Heading 1 to Heading 8 paragraph styles. To apply the Heading 1 paragraph style, type the text that you want to use as a heading (without a period), and then press Enter twice. To apply a sub-heading, press Tab one or more times, type the text (without a period), and then press Enter.
+ <paragraph xml-lang="en-US" id="par_id3147396" role="paragraph" l10n="U" oldref="56"><switchinline select="appl"><caseinline select="WRITER">Automatically replaces the "Default" paragraph style with the Heading 1 to Heading 8 paragraph styles. To apply the Heading 1 paragraph style, type the text that you want to use as a heading (without a period), and then press Enter twice. To apply a sub-heading, press Tab one or more times, type the text (without a period), and then press Enter.
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3151075" xml-lang="en-US" level="3" l10n="U" oldref="58"><switchinline select="appl"><caseinline select="WRITER">Remove blank paragraphs
+ <paragraph xml-lang="en-US" id="hd_id3151075" role="heading" level="3" l10n="U"
+ oldref="58"><switchinline select="appl"><caseinline select="WRITER">Remove blank paragraphs
</caseinline></switchinline></paragraph><comment>UFI: test if this also only applies to Default, body and body indented, or to all para styles</comment>
-<paragraph role="paragraph" id="par_id3145728" xml-lang="en-US" l10n="U" oldref="59"><switchinline select="appl"><caseinline select="WRITER">Removes empty paragraphs from the current document when you choose <emph>Format - AutoCorrect - Apply</emph>.
+<paragraph xml-lang="en-US" id="par_id3145728" role="paragraph" l10n="U" oldref="59"><switchinline select="appl"><caseinline select="WRITER">Removes empty paragraphs from the current document when you choose <emph>Format - AutoCorrect - Apply</emph>.
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3152375" xml-lang="en-US" level="3" l10n="U" oldref="60"><switchinline select="appl"><caseinline select="WRITER">Replace Custom Styles
+ <paragraph xml-lang="en-US" id="hd_id3152375" role="heading" level="3" l10n="U"
+ oldref="60"><switchinline select="appl"><caseinline select="WRITER">Replace Custom Styles
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156299" xml-lang="en-US" l10n="U" oldref="61"><switchinline select="appl"><caseinline select="WRITER">Replaces the custom paragraph styles in the current document with the "Default", the "Text Body", or the "Text Body Indent" paragraph style.
+ <paragraph xml-lang="en-US" id="par_id3156299" role="paragraph" l10n="U" oldref="61"><switchinline select="appl"><caseinline select="WRITER">Replaces the custom paragraph styles in the current document with the "Default", the "Text Body", or the "Text Body Indent" paragraph style.
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3147045" xml-lang="en-US" level="3" l10n="U" oldref="62"><switchinline select="appl"><caseinline select="WRITER">Replace bullets with
+ <paragraph xml-lang="en-US" id="hd_id3147045" role="heading" level="3" l10n="U"
+ oldref="62"><switchinline select="appl"><caseinline select="WRITER">Replace bullets with
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150420" xml-lang="en-US" l10n="U" oldref="63"><switchinline select="appl"><caseinline select="WRITER">Converts paragraphs that start with a hyphen (-), a plus sign (+), or an asterisk (*) directly followed by a space or a tab, to bulleted lists. This option only works on paragraphs that are formatted with the "Default", "Text Body", or "Text Body Indent" paragraph styles. To change the bullet style that is used, select this option, and then click <emph>Edit</emph>.
+ <paragraph xml-lang="en-US" id="par_id3150420" role="paragraph" l10n="U" oldref="63"><switchinline select="appl"><caseinline select="WRITER">Converts paragraphs that start with a hyphen (-), a plus sign (+), or an asterisk (*) directly followed by a space or a tab, to bulleted lists. This option only works on paragraphs that are formatted with the "Default", "Text Body", or "Text Body Indent" paragraph styles. To change the bullet style that is used, select this option, and then click <emph>Edit</emph>.
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3154792" xml-lang="en-US" level="3" l10n="U" oldref="64"><switchinline select="appl"><caseinline select="WRITER">Replace standard quotes with custom quotes
+ <paragraph xml-lang="en-US" id="hd_id3154792" role="heading" level="3" l10n="U"
+ oldref="64"><switchinline select="appl"><caseinline select="WRITER">Replace standard quotes with custom quotes
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156180" xml-lang="en-US" l10n="U" oldref="65"><switchinline select="appl"><caseinline select="WRITER">Changes quotation marks in the text to the quotation marks that you specify in the <link href="text/shared/01/06040400.xhp" name="Custom Quotes">Custom Quotes</link> tab of this dialog.
+ <paragraph xml-lang="en-US" id="par_id3156180" role="paragraph" l10n="U" oldref="65"><switchinline select="appl"><caseinline select="WRITER">Changes quotation marks in the text to the quotation marks that you specify in the <link href="text/shared/01/06040400.xhp" name="Custom Quotes">Custom Quotes</link> tab of this dialog.
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3151019" xml-lang="en-US" level="3" l10n="U" oldref="66"><switchinline select="appl"><caseinline select="WRITER">Combine single line paragraphs if length greater than ...
+ <paragraph xml-lang="en-US" id="hd_id3151019" role="heading" level="3" l10n="U"
+ oldref="66"><switchinline select="appl"><caseinline select="WRITER">Combine single line paragraphs if length greater than ...
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154162" xml-lang="en-US" l10n="U" oldref="67"><switchinline select="appl"><caseinline select="WRITER">Combines consecutive single-line paragraphs into a single paragraph. This option only works on paragraphs that use the "Default" paragraph style. If a paragraph is longer than the specified length value, the paragraph is combined with the next paragraph. To enter a different length value, select the option, and then click <link href="text/swriter/01/05150104.xhp"><emph>Edit</emph></link>.
+ <paragraph xml-lang="en-US" id="par_id3154162" role="paragraph" l10n="U" oldref="67"><switchinline select="appl"><caseinline select="WRITER">Combines consecutive single-line paragraphs into a single paragraph. This option only works on paragraphs that use the "Default" paragraph style. If a paragraph is longer than the specified length value, the paragraph is combined with the next paragraph. To enter a different length value, select the option, and then click <link href="text/swriter/01/05150104.xhp"><emph>Edit</emph></link>.
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT" id="bm_id3156334" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT" id="bm_id9193700" localize="false"/>
-<paragraph role="heading" id="hd_id3144749" xml-lang="en-US" level="2" l10n="U" oldref="75"><switchinline select="appl"><caseinline select="WRITER">Edit
+<paragraph xml-lang="en-US" id="hd_id3144749" role="heading" level="2" l10n="U"
+ oldref="75"><switchinline select="appl"><caseinline select="WRITER">Edit
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153841" xml-lang="en-US" l10n="U" oldref="76"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT">Modifies the selected AutoCorrect option.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3153841" role="paragraph" l10n="U" oldref="76"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT">Modifies the selected AutoCorrect option.</ahelp>
</caseinline></switchinline></paragraph>
-</body>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06050100.xhp b/helpcontent2/source/text/shared/01/06050100.xhp
index 8f757e2af4..585459e531 100755
--- a/helpcontent2/source/text/shared/01/06050100.xhp
+++ b/helpcontent2/source/text/shared/01/06050100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06050100.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -29,42 +30,40 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0106050100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Bullets</title>
-<filename>/text/shared/01/06050100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-22T10:38:33">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="bullets">
+ <topic id="textshared0106050100xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Bullets</title>
+ <filename>/text/shared/01/06050100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="bullets">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150502"><bookmark_value>bullets;paragraphs</bookmark_value>
-<bookmark_value>paragraphs; inserting bullets</bookmark_value>
-<bookmark_value>inserting; paragraph bullets</bookmark_value>
+ <bookmark_value>paragraphs; inserting bullets</bookmark_value>
+ <bookmark_value>inserting; paragraph bullets</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3150502" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050100.xhp" name="Bullets">Bullets</link></paragraph>
-<paragraph role="paragraph" id="par_id3155069" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Displays the different bullet styles that you can apply.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#numbullets"/>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3150502" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050100.xhp" name="Bullets">Bullets</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155069" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Displays the different bullet styles that you can apply.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0202200910514673" role="note" l10n="NEW">Bullets and Numbering of paragraphs is supported only in Writer, Impress and Draw.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040500.xhp#numbullets"/>
+ </section>
<bookmark xml-lang="en-US" branch="hid/HID_VALUESET_BULLET" id="bm_id3145629" localize="false"/>
-<paragraph role="heading" id="hd_id3153255" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3155364" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_BULLET">Click the bullet style that you want to use.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3149549" xml-lang="en-US" l10n="CHG"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153255" role="heading" level="2" l10n="U" oldref="3">Selection</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155364" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_BULLET">Click the bullet style that you want to use.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3149549" role="paragraph" l10n="CHG"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
<switch select="appl">
<case select="IMPRESS">
-<paragraph role="paragraph" id="par_id3156042" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030100.xhp" name="Indents &amp; Spacing tab (Numbering/Bullets dialog)">Indents &amp; Spacing tab (Bullets and Numbering dialog)</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id3156042" role="paragraph" l10n="C"><link href="text/shared/01/05030100.xhp" name="Indents &amp; Spacing tab (Numbering/Bullets dialog)">Indents &amp; Spacing tab (Bullets and Numbering dialog)</link></paragraph>
</case>
</switch>
-<paragraph role="paragraph" id="par_id3154317" xml-lang="en-US" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3154317" role="paragraph" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/08060100.xhp b/helpcontent2/source/text/shared/01/08060100.xhp
index 87f86a8bf8..e097062654 100644
--- a/helpcontent2/source/text/shared/01/08060100.xhp
+++ b/helpcontent2/source/text/shared/01/08060100.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 08060100.xhp,v $
- * $Revision: 1.7.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -35,39 +35,43 @@
<meta>
-<topic id="textshared0108060100xml" indexer="include">
-<title id="tit" xml-lang="en-US">Registration</title>
-<filename>/text/shared/01/08060100.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="paragraph" id="par_id3152876" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
-<section id="registrierung">
+ <topic id="textshared0108060100xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Registration</title>
+ <filename>/text/shared/01/08060100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <paragraph xml-lang="en-US" id="par_id3152876" role="paragraph" l10n="E" oldref="1"
+ localize="false"/>
+ <section id="registrierung">
<bookmark xml-lang="en-US" branch="index" id="bm_id8190557"><bookmark_value>online registration</bookmark_value>
-<bookmark_value>registering; %PRODUCTNAME</bookmark_value>
+ <bookmark_value>registering; %PRODUCTNAME</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_ONLINE_REGISTRATION" id="bm_id3640231" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:OnlineRegistrationDlg" id="bm_id3147617" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_REGISTRATION" id="bm_id2025818" localize="false"/>
-<paragraph role="heading" id="hd_id3147477" xml-lang="en-US" level="1" l10n="U" oldref="2"><link href="text/shared/01/08060100.xhp" name="Registration">Registration</link></paragraph>
-<paragraph role="paragraph" id="par_id3153882" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid=".uno:OnlineRegistrationDlg">Connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000408.xhp#online"/>
-</section>
-<paragraph role="heading" id="hd_id3153624" xml-lang="en-US" level="2" l10n="U" oldref="4">Registration Dialog</paragraph>
-<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="5">The <emph>Registration</emph> dialog appears after you install $[officename].</paragraph>
-<paragraph role="heading" id="hd_id3145629" xml-lang="en-US" level="3" l10n="U" oldref="10">Register Now</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3147477" role="heading" level="1" l10n="U" oldref="2"><link href="text/shared/01/08060100.xhp" name="Registration">Registration</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153882" role="paragraph" l10n="U" oldref="3"><ahelp hid=".uno:OnlineRegistrationDlg">Connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000408.xhp#online"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3153624" role="heading" level="2" l10n="U" oldref="4">Registration Dialog</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150445" role="paragraph" l10n="U" oldref="5">The <emph>Registration</emph> dialog appears after you install $[officename].</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3145629" role="heading" level="3" l10n="U"
+ oldref="10">I want to register now</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NOW" id="bm_id3150902" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW" id="bm_id4082461" localize="false"/>
-<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NOW">Launches your default Web browser and connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149760" xml-lang="en-US" level="3" l10n="U" oldref="11">Remind me to register later</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149999" role="paragraph" l10n="U" oldref="6"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NOW">Launches your default Web browser and connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149760" role="heading" level="3" l10n="U"
+ oldref="11">I want to register later</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_LATER" id="bm_id3156302" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER" id="bm_id5322122" localize="false"/>
-<paragraph role="paragraph" id="par_id3151234" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_LATER">Hides the <emph>Registration</emph> dialog for the next seven days.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147557" xml-lang="en-US" level="3" l10n="U" oldref="12">Never register</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151234" role="paragraph" l10n="U" oldref="7"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_LATER">Hides the <emph>Registration</emph> dialog for the next seven days.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147557" role="heading" level="3" l10n="U"
+ oldref="12">I do not want to register</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NEVER" id="bm_id3152425" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER" id="bm_id9121677" localize="false"/>
-<paragraph role="paragraph" id="par_id3148548" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NEVER">Permanently hides the <emph>Registration</emph> dialog. To register at a later time, choose <emph>Help - Registration</emph>.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3148548" role="paragraph" l10n="U" oldref="8"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NEVER">Permanently hides the <emph>Registration</emph> dialog. To register at a later time, choose <emph>Help - Registration</emph>.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/formatting_mark.xhp b/helpcontent2/source/text/shared/01/formatting_mark.xhp
index c39e62b982..e8f1074c1b 100755
--- a/helpcontent2/source/text/shared/01/formatting_mark.xhp
+++ b/helpcontent2/source/text/shared/01/formatting_mark.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: formatting_mark.xhp,v $
- * $Revision: 1.5 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -33,59 +32,44 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared01formatting_markxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Formatting Mark</title>
-<filename>text/shared/01/formatting_mark.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
- <section id="formatting_mark">
-
-
+ <topic id="textshared01formatting_markxhp" indexer="include">
+ <title xml-lang="en-US" id="tit">Formatting Mark </title>
+ <filename/>
+ </topic>
+ </meta>
+ <body>
+ <section id="formatting_mark">
<bookmark xml-lang="en-US" branch="hid/.uno:FormattingMarkMenu" id="bm_id7235023" localize="false"/>
-
<bookmark xml-lang="en-US" branch="index" id="bm_id9930722"><bookmark_value>CTL;(not) wrapping words</bookmark_value>
-<bookmark_value>words;wrapping in CTL</bookmark_value>
-</bookmark>
- <comment>MW added 2 index entries because of issue 86750</comment>
- <paragraph xml-lang="en-US" id="hd_id126651" role="heading" level="1" l10n="NEW"><variable id="formattingmark"><link href="text/shared/01/formatting_mark.xhp">Formatting Mark</link>
+ <bookmark_value>words;wrapping in CTL</bookmark_value>
+</bookmark><comment>MW added 2 index entries because of issue 86750</comment><comment>tried to fix i86464 by creating a new file, copy everything over, then save &amp; overwrite as formatting_mark.xhp</comment>
+<paragraph xml-lang="en-US" id="hd_id030220091035120" role="heading" level="1" l10n="NEW"><variable id="formattingmark"><link href="text/shared/01/formatting_mark.xhp">Formatting Mark</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id9305398" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a submenu to insert special formatting marks.</ahelp></paragraph>
-
- </section>
-
+ <paragraph xml-lang="en-US" id="par_id0302200910351248" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a submenu to insert special formatting marks. Enable CTL for more commands.</ahelp></paragraph>
+ </section>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertNonBreakingSpace" id="bm_id2567217" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id9996948" role="heading" level="2" l10n="NEW">Non-breaking space</paragraph>
- <paragraph xml-lang="en-US" id="par_id8326975" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a space that will keep bordering characters together on line breaks.</ahelp></paragraph>
-
+<paragraph xml-lang="en-US" id="hd_id9996948" role="heading" level="2" l10n="NEW">Non-breaking space</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8326975" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a space that will keep bordering characters together on line breaks.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertHardHyphen" id="bm_id6757713" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id6383556" role="heading" level="2" l10n="NEW">Non-breaking hyphen</paragraph>
- <paragraph xml-lang="en-US" id="par_id8469191" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a hyphen that will keep bordering characters together on line breaks.</ahelp></paragraph>
-
+<paragraph xml-lang="en-US" id="hd_id6383556" role="heading" level="2" l10n="NEW">Non-breaking hyphen</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8469191" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a hyphen that will keep bordering characters together on line breaks.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertSoftHyphen" id="bm_id8669698" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3306680" role="heading" level="2" l10n="NEW">Optional hyphen</paragraph>
- <paragraph xml-lang="en-US" id="par_id9407330" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible hyphen within a word that will appear and create a line break once it becomes the last character in a line.</ahelp></paragraph>
-
+<paragraph xml-lang="en-US" id="hd_id3306680" role="heading" level="2" l10n="NEW">Optional hyphen</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9407330" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible hyphen within a word that will appear and create a line break once it becomes the last character in a line.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertZWSP" id="bm_id1068758" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id2295907" role="heading" level="2" l10n="NEW">No-width optional break</paragraph>
- <paragraph xml-lang="en-US" id="par_id1536301" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible space within a word that will insert a line break once it becomes the last character in a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
-
+<paragraph xml-lang="en-US" id="hd_id2295907" role="heading" level="2" l10n="NEW">No-width optional break</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1536301" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible space within a word that will insert a line break once it becomes the last character in a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertZWNBSP" id="bm_id8484450" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3245643" role="heading" level="2" l10n="NEW">No-width no break</paragraph>
- <paragraph xml-lang="en-US" id="par_id1085238" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible space within a word that will keep the word together at the end of a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
-
+<paragraph xml-lang="en-US" id="hd_id3245643" role="heading" level="2" l10n="NEW">No-width no break</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1085238" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible space within a word that will keep the word together at the end of a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertLRM" id="bm_id714743" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id4634540" role="heading" level="2" l10n="NEW">Left-to-right mark</paragraph>
- <paragraph xml-lang="en-US" id="par_id6690878" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
-
+<paragraph xml-lang="en-US" id="hd_id4634540" role="heading" level="2" l10n="NEW">Left-to-right mark</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6690878" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertRLM" id="bm_id3938413" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id9420148" role="heading" level="2" l10n="NEW">Right-to-left mark</paragraph>
- <paragraph xml-lang="en-US" id="par_id923184" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
- </body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id9420148" role="heading" level="2" l10n="NEW">Right-to-left mark</paragraph>
+ <paragraph xml-lang="en-US" id="par_id923184" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/makefile.mk b/helpcontent2/source/text/shared/01/makefile.mk
index 684ee2a8a4..fd665cd49b 100644
--- a/helpcontent2/source/text/shared/01/makefile.mk
+++ b/helpcontent2/source/text/shared/01/makefile.mk
@@ -6,9 +6,9 @@
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
+# $RCSfile: makefile.template,v $
#
-# $Revision: 1.21.4.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/01/mediaplayer.xhp b/helpcontent2/source/text/shared/01/mediaplayer.xhp
index 84f4d1fee2..96bbda6e87 100755
--- a/helpcontent2/source/text/shared/01/mediaplayer.xhp
+++ b/helpcontent2/source/text/shared/01/mediaplayer.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +10,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: mediaplayer.xhp,v $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
* $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
@@ -33,57 +32,58 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared01mediaplayerxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Media Player</title>
-<filename>/text/shared/01/mediaplayer.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="mediaplayer">
+ <topic id="textshared01mediaplayerxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Media Player</title>
+ <filename>/text/shared/01/mediaplayer.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="mediaplayer">
<bookmark xml-lang="en-US" branch="index" id="bm_id8659321"><bookmark_value>Media Player window</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_AVMEDIA_PLAYER" id="bm_id8777733" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AVMediaPlayer" id="bm_id3334452" localize="false"/><paragraph role="heading" id="par_idN10550" xml-lang="en-US" level="1" l10n="NEW"><variable id="mediaplayertitle"><link href="text/shared/01/mediaplayer.xhp">Media Player</link>
+<bookmark xml-lang="en-US" branch="hid/.uno:AVMediaPlayer" id="bm_id3334452" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10550" role="heading" level="1" l10n="NEW"><variable id="mediaplayertitle"><link href="text/shared/01/mediaplayer.xhp">Media Player</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US" l10n="NEW"><ahelp hid="6694">Opens the Media Player window where you can preview movie and sound files as well as insert these files into the current document.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#mediaplayer"/>
-</section>
-<paragraph role="paragraph" id="par_idN10577" xml-lang="en-US" 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>
+ <paragraph xml-lang="en-US" id="par_idN10560" role="paragraph" l10n="NEW"><ahelp hid="6694">Opens the Media Player window where you can preview movie and sound files as well as insert these files into the current document.</ahelp></paragraph>
+ </section>
+ <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 role="note" id="par_idN105EF" xml-lang="en-US" l10n="NEW">On UNIX systems, the Media Player requires the Java Media Framework API (JMF). Download and install the JMF files, and add the path to the installed jmf.jar to the class path in Tools - Options - %PRODUCTNAME - Java.</paragraph>
+<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 Tools - Options - %PRODUCTNAME - Java.</paragraph>
</case>
-<case select="WIN"><paragraph role="note" id="par_idN1064F" xml-lang="en-US" l10n="NEW">On Windows systems, the Media Player uses DirectShow, which should be installed on your system by default.</paragraph>
+<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 role="heading" id="par_idN1057A" xml-lang="en-US" level="2" l10n="NEW">Open</paragraph>
-<paragraph role="paragraph" id="par_idN1057E" xml-lang="en-US" l10n="NEW">Opens a movie file or a sound file that you want to preview.</paragraph>
-<paragraph role="heading" id="par_idN10581" xml-lang="en-US" level="2" l10n="CHG">Apply<comment>spec says "Insert"</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10585" xml-lang="en-US" l10n="NEW">Inserts the current movie file or sound file as a media object into the current document. </paragraph>
-<paragraph role="note" id="par_idN10605" xml-lang="en-US" l10n="NEW">Only a link to the media file is inserted into the current document.</paragraph>
-<paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Play</paragraph>
-<paragraph role="paragraph" id="par_idN1058C" xml-lang="en-US" l10n="NEW">Plays the current file.</paragraph>
-<paragraph role="heading" id="par_idN1058F" xml-lang="en-US" level="2" l10n="NEW">Pause</paragraph>
-<paragraph role="paragraph" id="par_idN10593" xml-lang="en-US" l10n="NEW">Pauses or resumes the playback of the current file.</paragraph>
-<paragraph role="heading" id="par_idN10596" xml-lang="en-US" level="2" l10n="NEW">Stop</paragraph>
-<paragraph role="paragraph" id="par_idN1059A" xml-lang="en-US" l10n="NEW">Stops the playback of the current file.</paragraph>
-<paragraph role="heading" id="par_idN1059D" xml-lang="en-US" level="2" l10n="NEW">Repeat</paragraph>
-<paragraph role="paragraph" id="par_idN105A1" xml-lang="en-US" l10n="NEW">Plays the file repeatedly.</paragraph>
-<paragraph role="heading" id="par_idN105A4" xml-lang="en-US" level="2" l10n="NEW">Mute</paragraph>
-<paragraph role="paragraph" id="par_idN105A8" xml-lang="en-US" l10n="NEW">Turns sound off and on.</paragraph>
-<paragraph role="heading" id="par_idN105AB" xml-lang="en-US" level="2" l10n="NEW">Volume slider</paragraph>
-<paragraph role="paragraph" id="par_idN105AF" xml-lang="en-US" l10n="NEW">Adjusts the volume.</paragraph>
-<paragraph role="heading" id="par_idN105B2" xml-lang="en-US" level="2" l10n="NEW">Zoom</paragraph>
-<paragraph role="paragraph" id="par_idN105B6" xml-lang="en-US" l10n="NEW">Adjusts the size of the movie playback.</paragraph>
-<paragraph role="heading" id="par_idN105B9" xml-lang="en-US" level="2" l10n="NEW">Position slider</paragraph>
-<paragraph role="paragraph" id="par_idN105BD" xml-lang="en-US" l10n="NEW">Moves to a different position in the file.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/01/moviesound.xhp#moviesoundtitle"/>
-</section>
-</body>
-</helpdocument>
+<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>
+ <paragraph xml-lang="en-US" id="par_idN10585" role="paragraph" l10n="NEW">Inserts the current movie file or sound file as a media object into the current document. </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10588" role="heading" level="2" l10n="NEW">Play</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1058C" role="paragraph" l10n="NEW">Plays the current file.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1058F" role="heading" level="2" l10n="NEW">Pause</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10593" role="paragraph" l10n="NEW">Pauses or resumes the playback of the current file.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10596" role="heading" level="2" l10n="NEW">Stop</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1059A" role="paragraph" l10n="NEW">Stops the playback of the current file.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1059D" role="heading" level="2" l10n="NEW">Repeat</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105A1" role="paragraph" l10n="NEW">Plays the file repeatedly.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105A4" role="heading" level="2" l10n="NEW">Mute</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105A8" role="paragraph" l10n="NEW">Turns sound off and on.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105AB" role="heading" level="2" l10n="NEW">Volume slider</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105AF" role="paragraph" l10n="NEW">Adjusts the volume.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105B2" role="heading" level="2" l10n="NEW">Zoom</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105B6" role="paragraph" l10n="NEW">Adjusts the size of the movie playback.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105B9" role="heading" level="2" l10n="NEW">Position slider</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105BD" role="paragraph" l10n="NEW">Moves to a different position in the file.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/01/moviesound.xhp#moviesoundtitle"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/moviesound.xhp b/helpcontent2/source/text/shared/01/moviesound.xhp
index 1f54227221..323b21b5db 100755
--- a/helpcontent2/source/text/shared/01/moviesound.xhp
+++ b/helpcontent2/source/text/shared/01/moviesound.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: moviesound.xhp,v $
- * $Revision: 1.15 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -33,72 +32,65 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared01moviesoundxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Movie and Sound</title>
-<filename>/text/shared/01/moviesound.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="moviesound">
+ <topic id="textshared01moviesoundxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Movie and Sound</title>
+ <filename>/text/shared/01/moviesound.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="moviesound">
<bookmark xml-lang="en-US" branch="index" id="bm_id1907712"><bookmark_value>inserting;movies/sounds</bookmark_value>
-<bookmark_value>sounds;inserting and playing</bookmark_value>
-<bookmark_value>playing movies and sound files</bookmark_value>
-<bookmark_value>videos</bookmark_value>
-<bookmark_value>audio; inserting</bookmark_value>
-<bookmark_value>music;inserting</bookmark_value>
-</bookmark><comment>UFI: added "music;inserting"</comment>
+ <bookmark_value>sound files</bookmark_value>
+ <bookmark_value>playing movies and sound files</bookmark_value>
+ <bookmark_value>videos</bookmark_value>
+ <bookmark_value>movies</bookmark_value>
+ <bookmark_value>audio</bookmark_value>
+ <bookmark_value>music</bookmark_value>
+</bookmark><comment>UFI: added "music;inserting"</comment><comment>MW made "sounds;", "audio;", "music;" one level entries and added "movies"</comment>
<bookmark xml-lang="en-US" branch="hid/SID_INSERT_AVMEDIA" id="bm_id6085699" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertAVMedia" id="bm_id6890774" localize="false"/><paragraph role="heading" id="par_idN1065C" xml-lang="en-US" level="1" l10n="NEW"><variable id="moviesoundtitle"><link href="text/shared/01/moviesound.xhp">Movie and Sound</link>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertAVMedia" id="bm_id6890774" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1065C" role="heading" level="1" l10n="NEW"><variable id="moviesoundtitle"><link href="text/shared/01/moviesound.xhp">Movie and Sound</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN1066C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts a video or sound file into your document.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000404.xhp#moviesound"/>
-</section>
-<paragraph role="heading" id="par_idN10683" xml-lang="en-US" level="2" l10n="NEW">To insert a movie or sound file into your document</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1068A" xml-lang="en-US" l10n="NEW">Click where you want to insert the file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1068E" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Movie and Sound</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10696" xml-lang="en-US" l10n="NEW">In the File Open dialog, select the file that you want to insert.</paragraph>
-<paragraph role="note" id="par_idN10699" xml-lang="en-US" l10n="NEW">The file types that are listed in this dialog are not supported by all operating systems.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106D7" xml-lang="en-US" l10n="NEW">Click <emph>Open</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1069C" xml-lang="en-US" level="2" l10n="NEW">To play a movie or sound file in an Impress presentation</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106A3" xml-lang="en-US" l10n="NEW">Open the slide that contains the movie or sound file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106A7" xml-lang="en-US" l10n="NEW">Click the object icon for the movie or sound file on the slide.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10788" xml-lang="en-US" l10n="NEW">Click <emph>Play</emph> on the <emph>Media Playback</emph> toolbar.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN106BF" xml-lang="en-US" level="2" l10n="NEW">To play a movie or sound file in a Writer, Calc, or Draw document</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106C6" xml-lang="en-US" l10n="NEW">Open the document that contains the movie or sound file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106CD" xml-lang="en-US" l10n="CHG">Click Play on the Media Playback toolbar.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_idN106D0" xml-lang="en-US" l10n="CHG">You can also use the Media Playback Bar to pause, to stop, to loop, as well as to adjust the volume or to mute the playback of the file. The current playback position in the file is indicated on the left slider. Use the right slider to adjust the playback volume. For movie files, the bar also contains a list box where you can select the zoom factor for the playback.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/01/mediaplayer.xhp#mediaplayertitle"/>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN1066C" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a video or sound file into your document.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000404.xhp#moviesound"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_idN10683" role="heading" level="2" l10n="NEW">To insert a movie or sound file into your document</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1068A" role="paragraph" l10n="NEW">Click where you want to insert the file.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1068E" role="paragraph" l10n="NEW">Choose <emph>Insert - Movie and Sound</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10696" role="paragraph" l10n="NEW">In the File Open dialog, select the file that you want to insert.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10699" role="note" l10n="NEW">The file types that are listed in this dialog are not supported by all operating systems.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106D7" role="paragraph" l10n="NEW">Click <emph>Open</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id0120200912190948" role="paragraph" l10n="NEW">Alternatively, you can choose <item type="menuitem">Tools - Media Player</item> to open the Media Player. Use the Media Player to preview all supported media files. Click the Apply button in the Media Player window to insert the current media file into your document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1069C" role="heading" level="2" l10n="NEW">To play a movie or sound file</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106A7" role="paragraph" l10n="NEW">Click the object icon for the movie or sound file in your document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0120200912190940" role="paragraph" l10n="NEW">If the icon is arranged on the background, hold down Ctrl while you click.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0120200912062096" role="paragraph" l10n="NEW">The Media Playback toolbar is shown.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10788" role="paragraph" l10n="NEW">Click <emph>Play</emph> on the <emph>Media Playback</emph> toolbar.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id0120200912062064" role="note" l10n="NEW">When you show an Impress presentation, the embedded sound or video on the current slide plays automatically until it's over or until you leave the slide.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106D0" role="paragraph" l10n="CHG">You can also use the Media Playback Bar to pause, to stop, to loop, as well as to adjust the volume or to mute the playback of the file. The current playback position in the file is indicated on the left slider. Use the right slider to adjust the playback volume. For movie files, the bar also contains a list box where you can select the zoom factor for the playback.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/01/mediaplayer.xhp#mediaplayertitle"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/online_update.xhp b/helpcontent2/source/text/shared/01/online_update.xhp
index f0c527c6ea..16f167c6dd 100644
--- a/helpcontent2/source/text/shared/01/online_update.xhp
+++ b/helpcontent2/source/text/shared/01/online_update.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: online_update.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -33,58 +32,61 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared01online_updatexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Check for Updates </title>
-<filename>/text/shared/01/online_update.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared01online_updatexml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Check for Updates </title>
+ <filename>/text/shared/01/online_update.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id7647328"><bookmark_value>updates;checking manually</bookmark_value>
-<bookmark_value>online updates;checking manually</bookmark_value>
+ <bookmark_value>online updates;checking manually</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id315256" xml-lang="en-US" level="1" l10n="CHG"><variable id="online_update"><link href="text/shared/01/online_update.xhp">Check for Updates</link>
-</variable></paragraph><comment>UFI: changed name of page, see i76016</comment>
-<bookmark xml-lang="en-US" branch="hid/desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK" id="bm_id6052125" localize="false"/><paragraph role="paragraph" id="par_id6797082" xml-lang="en-US" l10n="CHG"><ahelp hid=".">You can check for updates manually or automatically.</ahelp></paragraph>
-<paragraph role="note" id="par_id4218878" xml-lang="en-US" l10n="NEW">Checking for updates will also look for updates of all installed extensions.</paragraph>
-<paragraph role="paragraph" id="par_id8132267" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Help - Check for Updates</item> to check manually.</paragraph>
-<paragraph role="paragraph" id="par_id702230" xml-lang="en-US" l10n="NEW">You can disable or enable the automatic check in Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/online_update.xhp">Online Update</link>.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3422345" xml-lang="en-US" l10n="NEW">If an update is available, an icon
-<image id="img_id3155415" src="extensions/source/update/ui/onlineupdate_16.png" width="0.4598inch" height="0.1402inch"><alt id="alt_id3155415" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id315256" role="heading" level="1" l10n="CHG"><variable id="online_update"><link href="text/shared/01/online_update.xhp">Check for Updates</link>
+</variable></paragraph><comment>UFI: changed name of page, see i76016</comment><comment>Next time start download automatically</comment>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD" id="bm_id1509140" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3174230" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Mark to enable the automatic check for updates. Choose Tools - Options - %PRODUCTNAME - Online Update to disable or enable this feature.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_ONLINEUPDATE_PB_CHANGEPATH" id="bm_id0116200901051320" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0116200901063996" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to select a folder to download the files.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK" id="bm_id6052125" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id6797082" role="paragraph" l10n="CHG"><ahelp hid=".">You can check for updates manually or automatically.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id4218878" role="note" l10n="NEW">Checking for updates will also look for updates of all installed extensions.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8132267" role="paragraph" l10n="NEW">Choose <item type="menuitem">Help - Check for Updates</item> to check manually.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id702230" role="paragraph" l10n="NEW">You can disable or enable the automatic check in Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/online_update.xhp">Online Update</link>.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3422345" role="paragraph" l10n="NEW">If an update is available, an icon
+<image id="img_id3155415" src="extensions/source/update/ui/onlineupdate_16.png" width="0.4583in" height="0.1354in"><alt xml-lang="en-US" id="alt_id3155415">Icon</alt>
</image> on the menu bar will notify you of the update. Click the icon to open a dialog with more information.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id9313638" xml-lang="en-US" l10n="CHG">You will see the <link href="text/shared/01/online_update_dialog.xhp">Check for Updates</link> dialog with some information about the online update of %PRODUCTNAME.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id9951780" xml-lang="en-US" l10n="NEW">Enable an Internet connection for %PRODUCTNAME.</paragraph>
-<paragraph role="paragraph" id="par_id6479384" xml-lang="en-US" l10n="CHG">If you need a proxy server, enter the proxy settings in Tools - Options - Internet - Proxy.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3639027" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Check for Updates</item> to check for the availability of a newer version of your office suite.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3722342" xml-lang="en-US" l10n="NEW">If a newer version is available and %PRODUCTNAME is not set up for automatic downloading, then you can select any of the following actions:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5106662" xml-lang="en-US" l10n="CHG">Download the new version.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4931485" xml-lang="en-US" l10n="CHG">Install the downloaded files.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9168980" xml-lang="en-US" l10n="NEW">Abort this check for updates for now.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id9766533" xml-lang="en-US" l10n="NEW">If %PRODUCTNAME is configured to download the files automatically, the download starts immediately. A download continues even when you minimize the dialog.</paragraph>
-<paragraph role="paragraph" id="par_id927152" xml-lang="en-US" l10n="NEW">For StarOffice, automatic downloads are currently disabled. Start the download manually.</paragraph>
-<paragraph role="paragraph" id="par_id6081728" xml-lang="en-US" l10n="NEW">If no update was found, you can close the dialog.</paragraph>
-<paragraph role="warning" id="par_id9219641" xml-lang="en-US" l10n="NEW">You need Administrator rights to update %PRODUCTNAME.</paragraph><comment>Next time start download automatically</comment>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD" id="bm_id1509140" localize="false"/><paragraph role="paragraph" id="par_id3174230" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Mark to enable the automatic check for updates. Choose Tools - Options - %PRODUCTNAME - Online Update to disable or enable this feature.</ahelp></paragraph>
-</body>
-</helpdocument>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id9313638" role="paragraph" l10n="CHG">You will see the <link href="text/shared/01/online_update_dialog.xhp">Check for Updates</link> dialog with some information about the online update of %PRODUCTNAME.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9951780" role="paragraph" l10n="NEW">Enable an Internet connection for %PRODUCTNAME.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6479384" role="paragraph" l10n="CHG">If you need a proxy server, enter the proxy settings in Tools - Options - Internet - Proxy.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3639027" role="paragraph" l10n="NEW">Choose <item type="menuitem">Check for Updates</item> to check for the availability of a newer version of your office suite.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3722342" role="paragraph" l10n="NEW">If a newer version is available and %PRODUCTNAME is not set up for automatic downloading, then you can select any of the following actions:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id5106662" role="paragraph" l10n="CHG">Download the new version.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id4931485" role="paragraph" l10n="CHG">Install the downloaded files.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9168980" role="paragraph" l10n="NEW">Abort this check for updates for now.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id9766533" role="paragraph" l10n="NEW">If %PRODUCTNAME is configured to download the files automatically, the download starts immediately. A download continues even when you minimize the dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id927152" role="paragraph" l10n="NEW">For StarOffice, automatic downloads are currently disabled. Start the download manually.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6081728" role="paragraph" l10n="NEW">If no update was found, you can close the dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9219641" role="warning" l10n="NEW">You need Administrator rights to update %PRODUCTNAME.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/xformsdata.xhp b/helpcontent2/source/text/shared/01/xformsdata.xhp
index 507976dfa6..75e8b2e76f 100644
--- a/helpcontent2/source/text/shared/01/xformsdata.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdata.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xformsdata.xhp,v $
- * $Revision: 1.15.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -35,77 +35,81 @@
<meta>
-<topic id="textshared01xformsdataxhp" indexer="include">
-<title id="tit" xml-lang="en-US">Data Navigator</title>
-<filename>/text/shared/01/xformsdata.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="datanavigator">
+ <topic id="textshared01xformsdataxhp" indexer="include">
+ <title xml-lang="en-US" id="tit">Data Navigator</title>
+ <filename>/text/shared/01/xformsdata.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="datanavigator">
<bookmark xml-lang="en-US" branch="index" id="bm_id6823023"><bookmark_value>data structure of XForms</bookmark_value>
-<bookmark_value>deleting;models/instances</bookmark_value>
-<bookmark_value>models in XForms</bookmark_value>
-<bookmark_value>Data Navigator;display options</bookmark_value>
+ <bookmark_value>deleting;models/instances</bookmark_value>
+ <bookmark_value>models in XForms</bookmark_value>
+ <bookmark_value>Data Navigator;display options</bookmark_value>
</bookmark><comment>MW made "Data Navigator.." a two level entry</comment>
<bookmark xml-lang="en-US" branch="hid/SID_FM_SHOW_DATANAVIGATOR" id="bm_id7463799" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ShowDataNavigator" id="bm_id7677236" localize="false"/>
-<paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="1" l10n="NEW"><variable id="xformsdata"><link href="text/shared/01/xformsdata.xhp">Data Navigator</link>
+<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX" id="bm_id0130200901571189" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TAB_CONTROL" id="bm_id0130200901573014" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1054E" role="heading" level="1" l10n="NEW"><variable id="xformsdata"><link href="text/shared/01/xformsdata.xhp">Data Navigator</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Specifies the data structure of the current XForms document.</ahelp></paragraph>
-</section>
+ <paragraph xml-lang="en-US" id="par_idN1056C" role="paragraph" l10n="CHG"><ahelp hid=".">Specifies the data structure of the current XForms document.</ahelp></paragraph>
+ </section>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_MODELS_LIST" id="bm_id759300" localize="false"/>
-<paragraph role="heading" id="par_idN1056F" xml-lang="en-US" level="2" l10n="NEW">Model name</paragraph>
-<paragraph role="paragraph" id="par_idN10573" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects the XForms model that you want to use.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN1056F" role="heading" level="2" l10n="NEW">Model name</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10573" role="paragraph" l10n="NEW"><ahelp hid=".">Selects the XForms model that you want to use.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_MODELS_MENUBTN" id="bm_id6110721" localize="false"/>
-<paragraph role="heading" id="par_idN10576" xml-lang="en-US" level="2" l10n="NEW">Models</paragraph>
-<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds, renames, and removes XForms models.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10576" role="heading" level="2" l10n="NEW">Models</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1057A" role="paragraph" l10n="NEW"><ahelp hid=".">Adds, renames, and removes XForms models.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_MODELS_ADD" id="bm_id6934415" localize="false"/>
-<paragraph role="heading" id="par_idN10604" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN10608" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the Add Model dialog where you can add an XForm model.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10604" role="heading" level="3" l10n="NEW">Add</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10608" role="paragraph" l10n="CHG"><ahelp hid=".">Opens the Add Model dialog where you can add an XForm model.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXDLG_ADD_MODEL_ED_INST_NAME" id="bm_id0130200901582112" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0130200901590878" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the name.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_ADD_MODEL_CB_MODIFIES_DOCUMENT" id="bm_id0910200811130823" localize="false"/>
-<paragraph role="heading" id="hd_id0910200811173295" xml-lang="en-US" level="3" l10n="NEW">Model data updates change document's modification status</paragraph>
-<paragraph role="paragraph" id="par_id0910200811173255" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When enabled, the document status will be set to "modified" when you change any form control that is bound to any data in the model. When not enabled, such a change does not set the document status to "modified".</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id0910200811173295" role="heading" level="3" l10n="NEW">Model data updates change document's modification status</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0910200811173255" role="paragraph" l10n="NEW"><ahelp hid=".">When enabled, the document status will be set to "modified" when you change any form control that is bound to any data in the model. When not enabled, such a change does not set the document status to "modified".</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_MODELS_REMOVE" id="bm_id5671559" localize="false"/>
-<paragraph role="heading" id="par_idN10612" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
-<paragraph role="paragraph" id="par_idN10616" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected XForm model. You cannot delete the last model.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10612" role="heading" level="3" l10n="NEW">Remove</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10616" role="paragraph" l10n="NEW"><ahelp hid=".">Deletes the selected XForm model. You cannot delete the last model.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_MODELS_EDIT" id="bm_id8617816" localize="false"/>
-<paragraph role="heading" id="par_idN10743" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
-<paragraph role="paragraph" id="par_idN10749" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Renames the selected Xform model.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10743" role="heading" level="3" l10n="NEW">Rename</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10749" role="paragraph" l10n="NEW"><ahelp hid=".">Renames the selected Xform model.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_SHOW_DETAILS" id="bm_id5646229" localize="false"/>
-<paragraph role="heading" id="par_idN10619" xml-lang="en-US" level="3" l10n="NEW">Show Details</paragraph>
-<paragraph role="paragraph" id="par_idN1061D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the display to show or hide details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10619" role="heading" level="3" l10n="NEW">Show Details</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1061D" role="paragraph" l10n="NEW"><ahelp hid=".">Switches the display to show or hide details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_ITEMS_LIST" id="bm_id2524491" localize="false"/>
-<paragraph role="heading" id="par_idN1057D" xml-lang="en-US" level="2" l10n="NEW">Instance</paragraph>
-<paragraph role="paragraph" id="par_idN10682" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the items that belong to the current instance.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN1057D" role="heading" level="2" l10n="NEW">Instance</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10682" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the items that belong to the current instance.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD" id="bm_id4040955" localize="false"/>
-<paragraph role="heading" id="par_idN1058B" xml-lang="en-US" level="2" l10n="NEW">Submissions</paragraph>
-<paragraph role="paragraph" id="par_idN1058F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the submissions.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
-<paragraph role="heading" id="par_idN10592" xml-lang="en-US" level="2" l10n="NEW">Bindings</paragraph>
-<paragraph role="paragraph" id="par_idN10596" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the bindings for the XForm.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_idN1058B" role="heading" level="2" l10n="NEW">Submissions</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1058F" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the submissions.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10592" role="heading" level="2" l10n="NEW">Bindings</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10596" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the bindings for the XForm.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_INSTANCES_MENUBTN" id="bm_id3339335" localize="false"/>
-<paragraph role="heading" id="par_idN10599" xml-lang="en-US" level="2" l10n="NEW">Instances</paragraph>
-<paragraph role="paragraph" id="par_idN1059D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">This button has submenus to add, edit or remove instances.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10599" role="heading" level="2" l10n="NEW">Instances</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1059D" role="paragraph" l10n="NEW"><ahelp hid=".">This button has submenus to add, edit or remove instances.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_ADD" id="bm_id9214148" localize="false"/>
-<paragraph role="heading" id="par_idN10649" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN1064D" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog where you can add a new instance.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10649" role="heading" level="3" l10n="NEW">Add</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1064D" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog where you can add a new instance.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_EDIT" id="bm_id4229255" localize="false"/>
-<paragraph role="heading" id="par_idN10650" xml-lang="en-US" level="3" l10n="NEW">Edit</paragraph>
-<paragraph role="paragraph" id="par_idN10654" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog where you can modify the current instance.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10650" role="heading" level="3" l10n="NEW">Edit</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10654" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog where you can modify the current instance.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_REMOVE" id="bm_id1858882" localize="false"/>
-<paragraph role="heading" id="par_idN10657" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
-<paragraph role="paragraph" id="par_idN1065B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the current instance. You cannot delete the last instance.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN1065E" xml-lang="en-US" level="3" l10n="NEW">Show data types</paragraph>
-<paragraph role="paragraph" id="par_idN10662" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the display to show more or less details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10657" role="heading" level="3" l10n="NEW">Remove</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1065B" role="paragraph" l10n="NEW"><ahelp hid=".">Deletes the current instance. You cannot delete the last instance.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1065E" role="heading" level="3" l10n="NEW">Show data types</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10662" role="paragraph" l10n="NEW"><ahelp hid=".">Switches the display to show more or less details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT" id="bm_id2156132" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE" id="bm_id9931943" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD" id="bm_id1840876" localize="false"/>
-<paragraph role="heading" id="par_idN10584" xml-lang="en-US" level="3" l10n="CHG">Add</paragraph>
-<paragraph role="paragraph" id="par_idN10588" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog to add a new item (element, attribute, submission, or binding) as a sub-item of the current item.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10584" role="heading" level="3" l10n="CHG">Add</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10588" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog to add a new item (element, attribute, submission, or binding) as a sub-item of the current item.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_EDIT" id="bm_id1051362" localize="false"/>
-<paragraph role="heading" id="par_idN10624" xml-lang="en-US" level="3" l10n="CHG">Edit</paragraph>
-<paragraph role="paragraph" id="par_idN10628" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog to edit the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10624" role="heading" level="3" l10n="CHG">Edit</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10628" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog to edit the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_REMOVE" id="bm_id3862117" localize="false"/>
-<paragraph role="heading" id="par_idN1062B" xml-lang="en-US" level="3" l10n="CHG">Delete</paragraph>
-<paragraph role="paragraph" id="par_idN1062F" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Deletes the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN1062B" role="heading" level="3" l10n="CHG">Delete</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1062F" role="paragraph" l10n="CHG"><ahelp hid=".">Deletes the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/01170000.xhp b/helpcontent2/source/text/shared/02/01170000.xhp
index 12c4979e14..0932ade91b 100644
--- a/helpcontent2/source/text/shared/02/01170000.xhp
+++ b/helpcontent2/source/text/shared/02/01170000.xhp
@@ -75,7 +75,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="E">
-<image id="img_id3150943" src="res/commandimagelist/sc_config.png" width="0.1665in" height="0.1665in"><alt id="alt_id3150943" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150943" src="res/commandimagelist/sc_config.png" width="0.1665in" height="0.1665in"><alt id="alt_id3150943" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -120,7 +120,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3156106" xml-lang="en-US" l10n="E">
-<image id="img_id3153516" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153516" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153516" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153516" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -143,7 +143,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3148483" xml-lang="en-US" l10n="E">
-<image id="img_id3156380" src="res/commandimagelist/sc_checkbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156380" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3156380" src="res/commandimagelist/sc_checkbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156380" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -161,7 +161,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3163665" xml-lang="en-US" l10n="E">
-<image id="img_id3153266" src="res/commandimagelist/sc_edit.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153266" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153266" src="res/commandimagelist/sc_edit.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153266" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -179,7 +179,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3154836" xml-lang="en-US" l10n="E">
-<image id="img_id3143277" src="res/commandimagelist/sc_formattedfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3143277" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3143277" src="res/commandimagelist/sc_formattedfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3143277" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -198,7 +198,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3145801" xml-lang="en-US" l10n="E">
-<image id="img_id3151073" src="res/commandimagelist/sc_insertpushbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151073" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3151073" src="res/commandimagelist/sc_insertpushbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151073" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -217,7 +217,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3152971" xml-lang="en-US" l10n="E">
-<image id="img_id3152999" src="res/commandimagelist/sc_radiobutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152999" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3152999" src="res/commandimagelist/sc_radiobutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152999" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -236,7 +236,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3154326" xml-lang="en-US" l10n="E">
-<image id="img_id3154135" src="res/commandimagelist/sc_listbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154135" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154135" src="res/commandimagelist/sc_listbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154135" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -254,7 +254,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3149981" xml-lang="en-US" l10n="E">
-<image id="img_id3148817" src="res/commandimagelist/sc_combobox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148817" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3148817" src="res/commandimagelist/sc_combobox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148817" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -272,7 +272,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3145295" xml-lang="en-US" l10n="E">
-<image id="img_id3151017" src="res/commandimagelist/sc_insertfixedtext.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151017" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3151017" src="res/commandimagelist/sc_insertfixedtext.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151017" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -296,7 +296,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_idN11B65" xml-lang="en-US" l10n="NEW">
-<image id="img_id6128727" src="res/commandimagelist/sc_usewizards.png" width="0.2228in" height="0.2228in"><alt id="alt_id6128727" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id6128727" src="res/commandimagelist/sc_usewizards.png" width="0.2228in" height="0.2228in"><alt id="alt_id6128727" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -319,7 +319,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_idN11A64" xml-lang="en-US" l10n="NEW">
-<image id="img_id7816400" src="res/commandimagelist/sc_spinbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id7816400" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id7816400" src="res/commandimagelist/sc_spinbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id7816400" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -338,7 +338,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_idN11ACA" xml-lang="en-US" l10n="NEW">
-<image id="img_id8203985" src="res/commandimagelist/sc_scrollbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id8203985" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id8203985" src="res/commandimagelist/sc_scrollbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id8203985" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -442,7 +442,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3159622" xml-lang="en-US" l10n="E">
-<image id="img_id3154378" src="res/commandimagelist/sc_imagebutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154378" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154378" src="res/commandimagelist/sc_imagebutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154378" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -460,7 +460,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3155869" xml-lang="en-US" l10n="E">
-<image id="img_id3152381" src="res/commandimagelist/sc_objectcatalog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152381" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3152381" src="res/commandimagelist/sc_objectcatalog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152381" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -479,7 +479,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3149423" xml-lang="en-US" l10n="E">
-<image id="img_id3150096" src="res/commandimagelist/sc_adddatefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150096" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150096" src="res/commandimagelist/sc_adddatefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150096" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -500,7 +500,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3153687" xml-lang="en-US" l10n="E">
-<image id="img_id3155949" src="res/commandimagelist/sc_timefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155949" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155949" src="res/commandimagelist/sc_timefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155949" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -519,7 +519,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150531" xml-lang="en-US" l10n="E">
-<image id="img_id3154344" src="res/commandimagelist/sc_filecontrol.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154344" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154344" src="res/commandimagelist/sc_filecontrol.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154344" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -537,7 +537,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3149396" xml-lang="en-US" l10n="E">
-<image id="img_id3153012" src="res/commandimagelist/sc_insertnumericfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153012" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153012" src="res/commandimagelist/sc_insertnumericfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153012" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -555,7 +555,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3145324" xml-lang="en-US" l10n="E">
-<image id="img_id3152866" src="res/commandimagelist/sc_currencyfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152866" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3152866" src="res/commandimagelist/sc_currencyfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152866" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -573,7 +573,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3149742" xml-lang="en-US" l10n="E">
-<image id="img_id3148924" src="res/commandimagelist/sc_insertpatternfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148924" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3148924" src="res/commandimagelist/sc_insertpatternfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148924" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -592,7 +592,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3159334" xml-lang="en-US" l10n="E">
-<image id="img_id3153790" src="res/commandimagelist/sc_groupbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153790" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153790" src="res/commandimagelist/sc_groupbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153790" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -615,7 +615,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3156402" xml-lang="en-US" l10n="E">
-<image id="img_id3146324" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146324" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3146324" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146324" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -634,7 +634,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_idN11B2C" xml-lang="en-US" l10n="NEW">
-<image id="img_id5074922" src="res/commandimagelist/sc_navigationbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id5074922" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id5074922" src="res/commandimagelist/sc_navigationbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id5074922" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -658,7 +658,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150261" xml-lang="en-US" l10n="E">
-<image id="img_id3149351" src="res/commandimagelist/sc_autocontrolfocus.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149351" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149351" src="res/commandimagelist/sc_autocontrolfocus.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149351" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/02/02010000.xhp b/helpcontent2/source/text/shared/02/02010000.xhp
index 817d01798b..0ee4ae2262 100644
--- a/helpcontent2/source/text/shared/02/02010000.xhp
+++ b/helpcontent2/source/text/shared/02/02010000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02010000.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -29,44 +30,41 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0202010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Apply Style</title>
-<filename>/text/shared/02/02010000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-26T08:12:45">UFI fix to #i21144# - FPE: added missing section
-DEDR: Reviewed</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textshared0202010000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Apply Style</title>
+ <filename>/text/shared/02/02010000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="hid/HID_STYLE_LISTBOX" id="bm_id3154232" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_STYLE_APPLY" id="bm_id3361219" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_STYLE_APPLY" id="bm_id3361219" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:StyleApply" id="bm_id3154863" localize="false"/>
<section id="benvor">
-<paragraph role="heading" id="hd_id3148520" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/02010000.xhp" name="Apply Style">Apply Style</link></paragraph>
-<section id="benvortext">
-<paragraph role="paragraph" id="par_id3155351" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:StyleApply">Assigns a style to the current paragraph, selected paragraphs, or to a selected object.</ahelp></paragraph>
-</section>
-</section>
-<paragraph role="paragraph" id="par_idN10621" xml-lang="en-US" l10n="NEW">To reset the selected objects to the default paragraph style , select <item type="literal">Clear formatting</item>. Select <item type="literal">More</item> to open the <emph>Styles and Formatting</emph> window.</paragraph>
-<section id="sylistenfeld">
-<table id="tbl_id3156042">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="E">
-<image id="img_id3152801" src="res/helpimg/zellvor.png" width="4.471cm" height="1.244cm" localize="true"><alt id="alt_id3152801" xml-lang="en-US">Cell Styles</alt>
+ <paragraph xml-lang="en-US" id="hd_id3148520" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/02010000.xhp" name="Apply Style">Apply Style</link></paragraph>
+ <section id="benvortext">
+ <paragraph xml-lang="en-US" id="par_id3155351" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".uno:StyleApply">Assigns a style to the current paragraph, selected paragraphs, or to a selected object.</ahelp></paragraph>
+ </section>
+ </section>
+ <paragraph xml-lang="en-US" id="par_idN10621" role="paragraph" l10n="NEW">To reset the selected objects to the default paragraph style, select Clear formatting. Select More to open the Styles and Formatting window.</paragraph>
+ <section id="sylistenfeld">
+ <table id="tbl_id3156042">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155552" role="paragraph" l10n="E">
+<image id="img_id3152801" src="res/helpimg/zellvor.png" width="1.0402in" height="0.2098in" localize="true"><alt xml-lang="en-US" id="alt_id3152801">Apply Style</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="3">Apply Style</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
-</body>
-</helpdocument>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145345" role="paragraph" l10n="U" oldref="3">Apply Style</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/02020000.xhp b/helpcontent2/source/text/shared/02/02020000.xhp
index 76100b9eaf..c798dee171 100644
--- a/helpcontent2/source/text/shared/02/02020000.xhp
+++ b/helpcontent2/source/text/shared/02/02020000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02020000.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -29,60 +30,56 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0202020000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Font Name</title>
-<filename>/text/shared/02/02020000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-13T09:30:43">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="schriftart">
+ <topic id="textshared0202020000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Font Name</title>
+ <filename>/text/shared/02/02020000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="schriftart">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148983"><bookmark_value>fonts; specifying several</bookmark_value>
-<bookmark_value>alternative fonts</bookmark_value>
-<bookmark_value>characters; alternative fonts</bookmark_value>
+ <bookmark_value>alternative fonts</bookmark_value>
+ <bookmark_value>characters; alternative fonts</bookmark_value>
</bookmark>
-<paragraph role="paragraph" id="par_id3148983" xml-lang="en-US" l10n="E" oldref="9" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3148983" role="paragraph" l10n="E" oldref="9"
+ localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_FONT" id="bm_id4814517" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:CharFontName" id="bm_id3150789" localize="false"/>
-<paragraph role="heading" id="hd_id3150808" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/02020000.xhp" name="Font Name">Font Name</link></paragraph>
-<paragraph role="paragraph" id="par_id3156414" xml-lang="en-US" l10n="U" oldref="2"><variable id="schriftarttext"><ahelp hid=".uno:CharFontName">Allows you to select a font name from the list or enter a font name directly.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3150808" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/02020000.xhp" name="Font Name">Font Name</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156414" role="paragraph" l10n="U" oldref="2"><variable id="schriftarttext"><ahelp hid=".uno:CharFontName">Allows you to select a font name from the list or enter a font name directly.</ahelp>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153750" xml-lang="en-US" l10n="U" oldref="10">You can enter several fonts, separated by semicolons. $[officename] uses each named font in succession if the previous fonts are not available.</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="11">Any font changes apply to the selected text or word in which the cursor is positioned. If no text has been selected, the font applies to text typed afterwards.</paragraph>
-<paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="U" oldref="8">The last five font names that have been selected are shown in the top part of the combo box, if you have marked the <emph>Font history</emph> field in <emph>Tools - Options - $[officename] - View</emph>. As soon as you close your document, the normal alphabetic numbering of the installed fonts will be recreated.</paragraph>
-<section id="syschriftart">
-<table id="tbl_id3159399">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="E">
-<image id="img_id3154810" src="res/helpimg/swh00055.png" width="31.75mm" height="6.09mm"><alt id="alt_id3154810" xml-lang="en-US">Icon</alt>
+ <paragraph xml-lang="en-US" id="par_id3153750" role="paragraph" l10n="U" oldref="10">You can enter several fonts, separated by semicolons. $[officename] uses each named font in succession if the previous fonts are not available.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="11">Any font changes apply to the selected text or word in which the cursor is positioned. If no text has been selected, the font applies to text typed afterwards.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155941" role="paragraph" l10n="U" oldref="8">The last five font names that have been selected are shown in the top part of the combo box, if you have marked the <emph>Font history</emph> field in <emph>Tools - Options - $[officename] - View</emph>. As soon as you close your document, the normal alphabetic numbering of the installed fonts will be recreated.</paragraph>
+ <section id="syschriftart">
+ <table id="tbl_id3159399">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145315" role="paragraph" l10n="E">
+<image id="img_id3154810" src="res/helpimg/swh00055.png" width="1.25in" height="0.2398in"><alt xml-lang="en-US" id="alt_id3154810">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="3">Font Name</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150085" role="paragraph" l10n="U" oldref="3">Font Name</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-<paragraph role="note" id="par_id3156024" xml-lang="en-US" l10n="U" oldref="4">In $[officename] you see the available fonts only if a printer is installed as the default printer in your system. <switchinline select="sys"><caseinline select="UNIX">With the <link href="text/shared/guide/spadmin.xhp" name="spadmin">spadmin</link> program you can define a printer as the default printer.
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3156024" role="note" l10n="U" oldref="4">In $[officename] you see the available fonts only if a printer is installed as the default printer in your system. <switchinline select="sys"><caseinline select="UNIX">With the <link href="text/shared/guide/spadmin.xhp" name="spadmin">spadmin</link> program you can define a printer as the default printer.
</caseinline><defaultinline>In order to install a printer as the default printer please refer to your operating system documentation.</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="7"><variable id="vorschautext">You can see the name of the fonts formatted in their respective font if you mark the <emph>Preview in fonts lists</emph> field in <link href="text/shared/optionen/01010800.xhp" name="Tools - Options - $[officename] - View">Tools - Options - $[officename] - View</link>.
+ <paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="7"><variable id="vorschautext">You can see the name of the fonts formatted in their respective font if you mark the <emph>Preview in fonts lists</emph> field in <link href="text/shared/optionen/01010800.xhp" name="Tools - Options - $[officename] - View">Tools - Options - $[officename] - View</link>.
</variable></paragraph>
<switch select="sys">
<case select="WIN">
-<paragraph role="warning" id="par_id3154125" xml-lang="en-US" l10n="U" oldref="6">If you receive an error message that states that certain fonts have not been found, you can install them with <emph>$[officename] Setup</emph> in the <emph>Repair</emph> mode if it is a $[officename] font.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154125" role="warning" l10n="U" oldref="6">If you receive an error message that states that certain fonts have not been found, you can install them with <emph>$[officename] Setup</emph> in the <emph>Repair</emph> mode if it is a $[officename] font.</paragraph>
</case>
</switch>
</body>
-</helpdocument>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/02140000.xhp b/helpcontent2/source/text/shared/02/02140000.xhp
index 18f60c0ecb..6e58a86a2b 100644
--- a/helpcontent2/source/text/shared/02/02140000.xhp
+++ b/helpcontent2/source/text/shared/02/02140000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02140000.xhp,v $
- * $Revision: 1.7.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -33,84 +32,88 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0202140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Increase Indent</title>
-<filename>/text/shared/02/02140000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="einzerhoehen">
+ <topic id="textshared0202140000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Increase Indent</title>
+ <filename>/text/shared/02/02140000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="einzerhoehen">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148520"><bookmark_value>paragraphs; increasing indents of</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_INC_INDENT" id="bm_id636827" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:IncrementIndent" id="bm_id3151100" localize="false"/><paragraph role="heading" id="hd_id3148520" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/02140000.xhp" name="Increase Indent">Increase Indent</link></paragraph>
-<paragraph role="paragraph" id="par_id3151330" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:IncrementIndent"><switchinline select="appl"><caseinline select="WRITER">Increases the left indent of the current paragraph and sets it to the next tab stop.
-</caseinline><caseinline select="CALC">Click the<emph> Increase Indent </emph>icon to increase the indentation of the cell content of the selected cells.
-</caseinline></switchinline></ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149798" xml-lang="en-US" l10n="CHG" oldref="17"><switchinline select="appl"><caseinline select="WRITER">If several paragraphs are selected, the indentation of all selected paragraphs is increased.
+<bookmark xml-lang="en-US" branch="hid/.uno:IncrementIndent" id="bm_id3151100" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148520" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/02140000.xhp" name="Increase Indent">Increase Indent</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151330" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Click the Increase Indent icon to increase the left indent of the current paragraph or cell content and set it to the next tab position.</ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3149798" role="paragraph" l10n="CHG" oldref="17"><switchinline select="appl"><caseinline select="WRITER">If several paragraphs are selected, the indentation of all selected paragraphs is increased.
</caseinline><caseinline select="CALC">The cell content refers to the current value under <link href="text/shared/01/05340300.xhp" name="Format - Cell - Alignment"><emph>Format - Cell - Alignment</emph></link>.
</caseinline></switchinline></paragraph>
-<section id="syeinzerhoehen">
-<table id="tbl_id3155535">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="E">
-<image id="img_id3149388" src="res/commandimagelist/sc_incrementindent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149388" xml-lang="en-US">Icon</alt>
+ <section id="syeinzerhoehen">
+ <table id="tbl_id3155535">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="E">
+<image id="img_id3149388" src="res/commandimagelist/sc_incrementindent.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149388">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="4">Increase Indent</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
-<paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="CHG" oldref="5"><switchinline select="appl"><caseinline select="WRITER">Click the <emph>Increase Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key to move the indenting of the selected paragraph by the default tab distance set under <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General"><emph>Tools - Options - %PRODUCTNAME Writer - General</emph></link>.
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="U" oldref="4">Increase Indent</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3152996" role="paragraph" l10n="CHG" oldref="5"><switchinline select="appl"><caseinline select="WRITER">Click the <emph>Increase Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl </defaultinline></switchinline>key to move the indenting of the selected paragraph by the default tab distance set under <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General"><emph>Tools - Options - %PRODUCTNAME Writer - General</emph></link>.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3157910" xml-lang="en-US" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="WRITER">Example:
+ <paragraph xml-lang="en-US" id="par_id3157910" role="paragraph" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="WRITER">Example:
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153698" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="WRITER">The indents of two paragraphs are moved with the <emph>Increase Indent</emph> function to a standard tab distance of 2 cm:
+ <paragraph xml-lang="en-US" id="par_id3153698" role="paragraph" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="WRITER">The indents of two paragraphs are moved with the <emph>Increase Indent</emph> function to a standard tab distance of 2 cm:
</caseinline></switchinline></paragraph>
<switch select="appl">
-<case select="WRITER"><table id="tbl_id3150943">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154047" xml-lang="en-US" l10n="U" oldref="8">Original indent</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148492" xml-lang="en-US" l10n="U" oldref="9">Indent increased</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="10">Indent increased by the amount with the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key</defaultinline></switchinline></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="11">0.25 cm</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147265" xml-lang="en-US" l10n="U" oldref="12">2 cm</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="13">2.25 cm</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3161657" xml-lang="en-US" l10n="U" oldref="14">0.5 cm</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="U" oldref="15">2 cm</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="16">2.5 cm</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<case select="WRITER">
+<table id="tbl_id3150943">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154047" role="paragraph" l10n="U" oldref="8">Original indent</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148492" role="paragraph" l10n="U" oldref="9">Indent increased</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153126" role="paragraph" l10n="U" oldref="10">Indent increased by the amount with the <switchinline select="sys"><caseinline select="MAC">Command key
+</caseinline><defaultinline>Ctrl key</defaultinline></switchinline></paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="11">0.25 cm</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147265" role="paragraph" l10n="U" oldref="12">2 cm</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149669" role="paragraph" l10n="U" oldref="13">2.25 cm</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3161657" role="paragraph" l10n="U" oldref="14">0.5 cm</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150791" role="paragraph" l10n="U" oldref="15">2 cm</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154138" role="paragraph" l10n="U" oldref="16">2.5 cm</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
</case>
-</switch></body>
-</helpdocument>
+</switch>
+</body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/09070000.xhp b/helpcontent2/source/text/shared/02/09070000.xhp
index 8ddd24ce4c..6e45cffa5c 100644
--- a/helpcontent2/source/text/shared/02/09070000.xhp
+++ b/helpcontent2/source/text/shared/02/09070000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 09070000.xhp,v $
- * $Revision: 1.11 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -29,69 +30,73 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0209070000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Hyperlink Dialog</title>
-<filename>/text/shared/02/09070000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-02T12:01:26">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="hyperlink">
+ <topic id="textshared0209070000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Hyperlink Dialog</title>
+ <filename>/text/shared/02/09070000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="hyperlink">
<bookmark xml-lang="en-US" branch="hid/SID_HYPERLINK_DIALOG" id="bm_id4087126" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HyperlinkDialog" id="bm_id3149748" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_EDIT_HYPERLINK" id="bm_id6121214" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:EditHyperlink" id="bm_id3151097" localize="false"/>
-<paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="hyperdia"><link href="text/shared/02/09070000.xhp" name="Hyperlink Dialog">Hyperlink</link>
+<paragraph xml-lang="en-US" id="hd_id3145759" role="heading" level="1" l10n="U" oldref="1"><variable id="hyperdia"><link href="text/shared/02/09070000.xhp" name="Hyperlink Dialog">Hyperlink</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156183" xml-lang="en-US" l10n="U" oldref="2"><variable id="hyperdiatext"><ahelp hid=".uno:EditHyperlink">Opens a dialog that enables you to create and edit hyperlinks.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3156183" role="paragraph" l10n="U" oldref="2"><variable id="hyperdiatext"><ahelp hid=".uno:EditHyperlink">Opens a dialog that enables you to create and edit hyperlinks.</ahelp>
</variable></paragraph>
-</section>
-<section id="syhyperdia">
-<table id="tbl_id3158405">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154927" xml-lang="en-US" l10n="E">
-<image id="img_id3093440" src="res/commandimagelist/sc_hyperlinkdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3093440" xml-lang="en-US">Icon</alt>
+ </section>
+ <section id="syhyperdia">
+ <table id="tbl_id3158405">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154927" role="paragraph" l10n="E">
+<image id="img_id3093440" src="res/commandimagelist/sc_hyperlinkdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3093440">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="U" oldref="3">Hyperlink Dialog</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155552" role="paragraph" l10n="U" oldref="3">Hyperlink Dialog</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
+ </section>
<bookmark xml-lang="en-US" branch="hid/HID_ICCDIALOG_CHOICECTRL" id="bm_id3149177" localize="false"/>
-<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_ICCDIALOG_CHOICECTRL">Select the type of hyperlink to be inserted.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3155391" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_ICCDIALOG_CHOICECTRL">Select the type of hyperlink to be inserted.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_OPEN_HYPERLINK" id="bm_id7868083" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:OpenHyperlinkOnCursor" id="bm_id3145345" localize="false"/>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".uno:OpenHyperlinkOnCursor" visibility="hidden">Opens the hyperlink at the cursor position.</ahelp></paragraph>
-<embed href="text/shared/02/09070100.xhp#internet"/>
-<embed href="text/shared/02/09070200.xhp#mailnews"/>
-<embed href="text/shared/02/09070300.xhp#dokument"/>
-<embed href="text/shared/02/09070400.xhp#neuesdokument"/>
+<paragraph xml-lang="en-US" id="par_id3153683" role="paragraph" l10n="CHG" oldref="16"><ahelp hid=".uno:OpenHyperlinkOnCursor" visibility="hidden">Opens the hyperlink in your default web browser.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_EDIT_HYPERLINK" id="bm_id0122200902201484" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:EditHyperlink" id="bm_id0122200902201587" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0122200902231573" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Hyperlink dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_COPY_HYPERLINK_LOCATION" id="bm_id0122200902224858" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0122200902231660" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Copies the URL to the clipboard.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_REMOVE_HYPERLINK" id="bm_id0122200902230774" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0122200902231630" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Removes the hyperlink, leaving plain text.</ahelp></paragraph>
+ <embed href="text/shared/02/09070100.xhp#internet"/>
+ <embed href="text/shared/02/09070200.xhp#mailnews"/>
+ <embed href="text/shared/02/09070300.xhp#dokument"/>
+ <embed href="text/shared/02/09070400.xhp#neuesdokument"/>
<bookmark xml-lang="en-US" branch="hid/HID_ICCDIALOG_OK_BTN" id="bm_id3149811" localize="false"/>
-<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="7">Apply</paragraph>
-<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_ICCDIALOG_OK_BTN">Applies the data to your document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3166410" role="heading" level="3" l10n="U" oldref="7">Apply</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147209" role="paragraph" l10n="U" oldref="8"><ahelp hid="HID_ICCDIALOG_OK_BTN">Applies the data to your document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_ICCDIALOG_CANCEL_BTN" id="bm_id3159166" localize="false"/>
-<paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="3" l10n="U" oldref="9">Close</paragraph>
-<paragraph role="paragraph" id="par_id3149734" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_ICCDIALOG_CANCEL_BTN">Closes the dialog without saving.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153700" xml-lang="en-US" level="3" l10n="U" oldref="11">Help</paragraph>
-<paragraph role="paragraph" id="par_id3150943" xml-lang="en-US" l10n="U" oldref="12">Opens the Help.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149398" role="heading" level="3" l10n="U" oldref="9">Close</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149734" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_ICCDIALOG_CANCEL_BTN">Closes the dialog without saving.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153700" role="heading" level="3" l10n="U"
+ oldref="11">Help</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150943" role="paragraph" l10n="U" oldref="12">Opens the Help.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_ICCDIALOG_RESET_BTN" id="bm_id3155434" localize="false"/>
-<paragraph role="heading" id="hd_id3156192" xml-lang="en-US" level="3" l10n="U" oldref="13">Back</paragraph>
-<paragraph role="paragraph" id="par_id3149234" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_ICCDIALOG_RESET_BTN">Resets the entries in the dialog to their original state.</ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/hyperlink_insert.xhp#hyperlink_insert"/>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3156192" role="heading" level="3" l10n="U"
+ oldref="13">Back</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149234" role="paragraph" l10n="U" oldref="14"><ahelp hid="HID_ICCDIALOG_RESET_BTN">Resets the entries in the dialog to their original state.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/hyperlink_insert.xhp#hyperlink_insert"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/14020100.xhp b/helpcontent2/source/text/shared/02/14020100.xhp
index b49029ba74..856f55fcf4 100644
--- a/helpcontent2/source/text/shared/02/14020100.xhp
+++ b/helpcontent2/source/text/shared/02/14020100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 14020100.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -29,40 +30,43 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0214020100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Add Tables</title>
-<filename>/text/shared/02/14020100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-10T15:05:14">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textshared0214020100xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Add Tables</title>
+ <filename>/text/shared/02/14020100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154788"><bookmark_value>tables in databases; adding to queries</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SID_FM_ADDTABLE" id="bm_id8385907" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_FM_ADDTABLE" id="bm_id8385907" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AddTable" id="bm_id3143284" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_JOINSH_ADDTAB_TABLELIST" id="bm_id3159224" localize="false"/>
-<paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="1" l10n="U" oldref="1">Add Tables</paragraph>
-<paragraph role="paragraph" id="par_id3152821" xml-lang="en-US" l10n="U" oldref="2"><variable id="tabellehinzufuegentext"><ahelp hid="HID_JOINSH_ADDTAB_TABLELIST" visibility="hidden">Specifies the tables to be inserted into the design window.</ahelp> In the<emph> Add Tables </emph>dialog, select the tables you need for your current task.
+<paragraph xml-lang="en-US" id="hd_id3154788" role="heading" level="1" l10n="U" oldref="1">Add Tables</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152821" role="paragraph" l10n="U" oldref="2"><variable id="tabellehinzufuegentext"><ahelp hid="HID_JOINSH_ADDTAB_TABLELIST" visibility="hidden">Specifies the tables to be inserted into the design window.</ahelp> In the<emph> Add Tables </emph>dialog, select the tables you need for your current task.
</variable> When creating a query or a new table presentation, select the corresponding table to which the query or table presentation should refer. When working with relational databases, select the tables between which you want to build relationships.</paragraph>
-<paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="U" oldref="15">The inserted tables appear in a separate window in the query design or relational windows, along with a list of the fields contained in the table. You can determine the size and order of this window.</paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000450.xhp#tabellehinzu"/>
-</section>
-<paragraph role="heading" id="hd_id3154927" xml-lang="en-US" level="2" l10n="U" oldref="5">Table</paragraph>
-<paragraph role="heading" id="hd_id3150713" xml-lang="en-US" level="3" l10n="U" oldref="9">Table name</paragraph>
-<paragraph role="paragraph" id="par_id3156042" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_JOINSH_ADDTAB_TABLELIST">Lists the available tables.</ahelp> To insert a table, select one from the list and click <emph>Add</emph>. You can also double-click the table name, and a window will be displayed containing the table fields at the top of the query design or the relational window.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149760" role="paragraph" l10n="U" oldref="15">The inserted tables appear in a separate window in the query design or relational windows, along with a list of the fields contained in the table. You can determine the size and order of this window.</paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000450.xhp#tabellehinzu"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3154927" role="heading" level="2" l10n="U" oldref="5">Table</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess_RadioButton_DLG_JOIN_TABADD_RB_CASE_TABLES" id="bm_id0305200912070094" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id030520091208059" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Shows only tables.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess_RadioButton_DLG_JOIN_TABADD_RB_CASE_QUERIES" id="bm_id0305200912074475" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0305200912080616" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Shows only queries.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150713" role="heading" level="3" l10n="U" oldref="9">Table name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156042" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_JOINSH_ADDTAB_TABLELIST">Lists the available tables.</ahelp> To insert a table, select one from the list and click <emph>Add</emph>. You can also double-click the table name, and a window will be displayed containing the table fields at the top of the query design or the relational window.</paragraph>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_DLG_JOIN_TABADD_PB_ADDTABLE" id="bm_id3155941" localize="false"/>
-<paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="2" l10n="U" oldref="11">Add</paragraph>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBACCESS_PUSHBUTTON_DLG_JOIN_TABADD_PB_ADDTABLE">Inserts the currently selected table.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3151226" role="heading" level="2" l10n="U"
+ oldref="11">Add</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153683" role="paragraph" l10n="U" oldref="12"><ahelp hid="DBACCESS_PUSHBUTTON_DLG_JOIN_TABADD_PB_ADDTABLE">Inserts the currently selected table.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_JOINSH_ADDTAB_CLOSE" id="bm_id3153311" localize="false"/>
-<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="U" oldref="13">Close</paragraph>
-<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_JOINSH_ADDTAB_CLOSE">Closes the <emph>Add Tables</emph> dialog.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3153527" role="heading" level="2" l10n="U"
+ oldref="13">Close</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="U" oldref="14"><ahelp hid="HID_JOINSH_ADDTAB_CLOSE">Closes the <emph>Add Tables</emph> dialog.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/makefile.mk b/helpcontent2/source/text/shared/02/makefile.mk
index 73c361ee7c..d98125fe5e 100644
--- a/helpcontent2/source/text/shared/02/makefile.mk
+++ b/helpcontent2/source/text/shared/02/makefile.mk
@@ -6,9 +6,9 @@
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
+# $RCSfile: makefile.template,v $
#
-# $Revision: 1.11.4.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/02/paintbrush.xhp b/helpcontent2/source/text/shared/02/paintbrush.xhp
index 57ac1e1dd8..64f11fc419 100755
--- a/helpcontent2/source/text/shared/02/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/02/paintbrush.xhp
@@ -48,7 +48,7 @@
<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US" l10n="CHG"><ahelp hid=".">First select some text or an object, then click this icon. Then click on or drag across other text or click an object to apply the same formatting.</ahelp><comment>i93691</comment></paragraph>
<section id="howtoget">
<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW">Click the <emph>Format Paintbrush</emph> icon
-<image id="img_id3610034" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id3610034" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3610034" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id3610034" xml-lang="en-US">Icon</alt>
</image> on the <emph>Standard</emph> toolbar. </paragraph>
</section>
<section id="sypaintbrush">
@@ -56,7 +56,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_idN10639" xml-lang="en-US" l10n="NEW">
-<image id="img_id5406964" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id5406964" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id5406964" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id5406964" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/04/makefile.mk b/helpcontent2/source/text/shared/04/makefile.mk
index 59727b800e..38242a7ea1 100644
--- a/helpcontent2/source/text/shared/04/makefile.mk
+++ b/helpcontent2/source/text/shared/04/makefile.mk
@@ -6,9 +6,9 @@
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
+# $RCSfile: makefile.template,v $
#
-# $Revision: 1.8.4.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/05/00000001.xhp b/helpcontent2/source/text/shared/05/00000001.xhp
index b4028ba58e..f7217c5de5 100755
--- a/helpcontent2/source/text/shared/05/00000001.xhp
+++ b/helpcontent2/source/text/shared/05/00000001.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000001.xhp,v $
- * $Revision: 1.10.4.2 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -35,36 +35,39 @@
<meta>
-<topic id="textshared0500000001xml" indexer="include">
-<title id="tit" xml-lang="en-US">Getting Support</title>
-<filename>/text/shared/05/00000001.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="support">
+ <topic id="textshared0500000001xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Getting Support</title>
+ <filename>/text/shared/05/00000001.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="support">
<bookmark xml-lang="en-US" branch="index" id="bm_id3143272"><bookmark_value>support on the Web</bookmark_value>
-<bookmark_value>getting support</bookmark_value>
-<bookmark_value>forums and support</bookmark_value>
-<bookmark_value>Web support</bookmark_value>
+ <bookmark_value>getting support</bookmark_value>
+ <bookmark_value>forums and support</bookmark_value>
+ <bookmark_value>Web support</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3146873" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="00000001"><link href="text/shared/05/00000001.xhp" name="Getting Support">Getting Support</link>
+<paragraph xml-lang="en-US" id="hd_id3146873" role="heading" level="1" l10n="U" oldref="1"><variable id="00000001"><link href="text/shared/05/00000001.xhp" name="Getting Support">Getting Support</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id9173253" xml-lang="en-US" l10n="NEW">Many questions and answers are the same for OpenOffice.org software and for the commercial StarOffice or StarSuite software by Sun Microsystems, Inc. </paragraph>
-<paragraph role="paragraph" id="par_id3150667" xml-lang="en-US" l10n="CHG" oldref="8">You can find support on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
-<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="CHG" oldref="4">Visit <link href="http://www.sun.com/star/support">www.sun.com/star/support</link> to get an overview of additional support offerings by Sun Microsystems and other parties.</paragraph>
-<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph><comment>some new paras from i61933</comment>
-<paragraph role="heading" id="hd_id26327" xml-lang="en-US" level="2" l10n="NEW">Local language support pages</paragraph>
-<paragraph role="paragraph" id="par_id1318380" xml-lang="en-US" l10n="CHG">The OpenOffice.org localization projects offer support pages in local languages. Find an overview of the native language projects at <link href="http://projects.openoffice.org/native-lang.html">projects.openoffice.org/native-lang.html</link>. You can find help and support in English language on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
-<paragraph role="heading" id="hd_id2611386" xml-lang="en-US" level="2" l10n="NEW">Mailing lists</paragraph>
-<paragraph role="paragraph" id="par_id3166335" xml-lang="en-US" l10n="NEW">Ask about OpenOffice.org, find help by volunteers, and discuss topics on the public mailing lists. You can find many general and specialized mailing lists on the OpenOffice.org website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
-<paragraph role="heading" id="hd_id0915200811081722" xml-lang="en-US" level="2" l10n="NEW">Forum</paragraph>
-<paragraph role="paragraph" id="par_id0915200811081778" xml-lang="en-US" l10n="NEW">You can access web forums to ask and answer questions about OpenOffice.org. A list of web forums hosted by Sun Microsystems can be found at <link href="http://user.services.openoffice.org/en/forum/listforums.php">http://user.services.openoffice.org/en/forum/listforums.php</link>.</paragraph>
-<paragraph role="heading" id="hd_id0804200803314150" xml-lang="en-US" level="2" l10n="NEW">Security</paragraph>
-<paragraph role="paragraph" id="par_id0804200803314235" xml-lang="en-US" l10n="NEW">In case you are concerned about any security issue with using this software, you can contact the developers on the public mail list dev@openoffice.org. If you want to discuss any issue with other users, send an email to the public mail list discuss@openoffice.org.</paragraph>
-<paragraph role="heading" id="hd_id3168534" xml-lang="en-US" level="2" l10n="NEW">Downloads</paragraph>
-<paragraph role="paragraph" id="par_id3028143" xml-lang="en-US" l10n="CHG">You can download the latest version of OpenOffice.org at <link href="http://download.openoffice.org/">download.openoffice.org</link>.</paragraph>
-<paragraph role="heading" id="hd_id2602967" xml-lang="en-US" level="2" l10n="NEW">Documentation</paragraph>
-<paragraph role="paragraph" id="par_id3497211" xml-lang="en-US" l10n="NEW">You can download documentation as PDF files, how-tos, and guides from the OpenOffice.org website at <link href="http://documentation.openoffice.org">documentation.openoffice.org</link>.</paragraph>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id9173253" role="paragraph" l10n="NEW">Many questions and answers are the same for OpenOffice.org software and for the commercial StarOffice or StarSuite software by Sun Microsystems, Inc. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150667" role="paragraph" l10n="CHG" oldref="8">You can find support on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149140" role="paragraph" l10n="CHG" oldref="4">Visit <link href="http://www.sun.com/star/support">www.sun.com/star/support</link> to get an overview of additional support offerings by Sun Microsystems and other parties.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154230" role="paragraph" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph><comment>some new paras from i61933</comment>
+<paragraph xml-lang="en-US" id="hd_id26327" role="heading" level="2" l10n="NEW">Local language support pages</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1318380" role="paragraph" l10n="CHG">The OpenOffice.org localization projects offer support pages in local languages. Find an overview of the native language projects at <link href="http://projects.openoffice.org/native-lang.html">projects.openoffice.org/native-lang.html</link>. You can find help and support in English language on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id2611386" role="heading" level="2" l10n="NEW">Mailing lists</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166335" role="paragraph" l10n="NEW">Ask about OpenOffice.org, find help by volunteers, and discuss topics on the public mailing lists. You can find many general and specialized mailing lists on the OpenOffice.org website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id0915200811081722" role="heading" level="2" l10n="NEW">Forum</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0915200811081778" role="paragraph" l10n="NEW">You can access web forums to ask and answer questions about OpenOffice.org. A list of web forums hosted by Sun Microsystems can be found at <link href="http://user.services.openoffice.org/en/forum/listforums.php">http://user.services.openoffice.org/en/forum/listforums.php</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id0804200803314150" role="heading" level="2" l10n="NEW">Security</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0804200803314235" role="paragraph" l10n="NEW">In case you are concerned about any security issue with using this software, you can contact the developers on the public mail list dev@openoffice.org. If you want to discuss any issue with other users, send an email to the public mail list discuss@openoffice.org.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3168534" role="heading" level="2" l10n="NEW">Downloads</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3028143" role="paragraph" l10n="CHG">You can download the latest version of OpenOffice.org at <link href="http://download.openoffice.org/">download.openoffice.org</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id2602967" role="heading" level="2" l10n="NEW">Documentation</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3497211" role="paragraph" l10n="NEW">You can download documentation as PDF files, how-tos, and guides from the OpenOffice.org website at <link href="http://documentation.openoffice.org">documentation.openoffice.org</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id0120200910361765" role="heading" level="2" l10n="NEW">Participate and give back</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0120200910361848" role="paragraph" l10n="NEW">If you want to take an active role in the worldwide OpenOffice.org community, you are very welcome to give feedback, discuss features, propose enhancements, write your own article in an FAQ, how-to, manual, create a video tutorial, etc.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0120200910361874" role="paragraph" l10n="NEW">Visit the <link href="http://documentation.openoffice.org/">documentation web site</link> or the <link href="http://wiki.services.openoffice.org/wiki/Documentation">Wiki starting page</link> and follow the links for contributors.</paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/05/makefile.mk b/helpcontent2/source/text/shared/05/makefile.mk
index b53847959e..5e21e8ef4f 100644
--- a/helpcontent2/source/text/shared/05/makefile.mk
+++ b/helpcontent2/source/text/shared/05/makefile.mk
@@ -6,9 +6,9 @@
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
+# $RCSfile: makefile.template,v $
#
-# $Revision: 1.8.4.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/07/makefile.mk b/helpcontent2/source/text/shared/07/makefile.mk
index c080f0760b..a804cb09cd 100644
--- a/helpcontent2/source/text/shared/07/makefile.mk
+++ b/helpcontent2/source/text/shared/07/makefile.mk
@@ -6,9 +6,9 @@
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
+# $RCSfile: makefile.template,v $
#
-# $Revision: 1.8.4.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/autokorr/makefile.mk b/helpcontent2/source/text/shared/autokorr/makefile.mk
index 1f89e18dc9..2390d5a85d 100644
--- a/helpcontent2/source/text/shared/autokorr/makefile.mk
+++ b/helpcontent2/source/text/shared/autokorr/makefile.mk
@@ -6,9 +6,9 @@
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
+# $RCSfile: makefile.template,v $
#
-# $Revision: 1.8.4.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/autopi/makefile.mk b/helpcontent2/source/text/shared/autopi/makefile.mk
index c0c61ff588..ff32f73dbd 100644
--- a/helpcontent2/source/text/shared/autopi/makefile.mk
+++ b/helpcontent2/source/text/shared/autopi/makefile.mk
@@ -6,9 +6,9 @@
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
+# $RCSfile: makefile.template,v $
#
-# $Revision: 1.8.4.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/explorer/database/02010101.xhp b/helpcontent2/source/text/shared/explorer/database/02010101.xhp
index 35352548a5..bc2a0c1f3c 100755
--- a/helpcontent2/source/text/shared/explorer/database/02010101.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02010101.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02010101.xhp,v $
- * $Revision: 1.15 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -33,41 +32,52 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabase02010101xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Relations</title>
-<filename>/text/shared/explorer/database/02010101.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedexplorerdatabase02010101xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Join Properties</title>
+ <filename>/text/shared/explorer/database/02010101.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154015"><bookmark_value>links;relational databases (Base)</bookmark_value>
-<bookmark_value>inner joins (Base)</bookmark_value>
-<bookmark_value>joins in databases (Base)</bookmark_value>
-<bookmark_value>left joins (Base)</bookmark_value>
-<bookmark_value>right joins (Base)</bookmark_value>
-<bookmark_value>full joins (Base)</bookmark_value>
-</bookmark><comment>mw deleted "join properties" and changed "link properties..." to "links;"</comment><paragraph role="heading" id="hd_id3154015" xml-lang="en-US" level="1" l10n="U" oldref="1">Relations</paragraph>
-<paragraph role="paragraph" id="par_id3151205" xml-lang="en-US" l10n="U" oldref="2">If you double-click a connection between two linked fields in the query design, or if you choose <emph>Insert - New Relation</emph>, the <emph>Relations</emph> dialog appears. These properties will be used in all queries created in the future.</paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000450.xhp#Joins"/>
-</section>
+ <bookmark_value>inner joins (Base)</bookmark_value>
+ <bookmark_value>joins in databases (Base)</bookmark_value>
+ <bookmark_value>left joins (Base)</bookmark_value>
+ <bookmark_value>right joins (Base)</bookmark_value>
+ <bookmark_value>full joins (Base)</bookmark_value>
+</bookmark><comment>mw deleted "join properties" and changed "link properties..." to "links;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3154015" role="heading" level="1" l10n="CHG"
+ oldref="1">Join Properties</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151205" role="paragraph" l10n="U" oldref="2">If you double-click a connection between two linked fields in the query design, or if you choose <emph>Insert - New Relation</emph>, the <emph>Join Properties</emph> dialog appears. These properties will be used in all queries created in the future.</paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000450.xhp#Joins"/>
+ </section>
<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_LEFT_TABLE" id="bm_id3150749" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_RIGHT_TABLE" id="bm_id3150752" localize="false"/><paragraph role="heading" id="hd_id3155066" xml-lang="en-US" level="2" l10n="U" oldref="17">Tables involved</paragraph>
-<paragraph role="paragraph" id="par_id3153924" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_DLG_QRY_RIGHT_TABLE">Specifies two different tables that you want to join.</ahelp></paragraph><comment>UFI: removed a help id</comment><paragraph role="heading" id="hd_id3155766" xml-lang="en-US" level="2" l10n="U" oldref="15">Fields involved</paragraph>
-<paragraph role="paragraph" id="par_id3148994" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid=".">Specifies two data fields that will be joined by a relation.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159267" xml-lang="en-US" level="2" l10n="U" oldref="3">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOINTYPE" id="bm_id3147321" localize="false"/><paragraph role="heading" id="hd_id3147340" xml-lang="en-US" level="3" l10n="U" oldref="13">Type</paragraph>
-<paragraph role="paragraph" id="par_id3152482" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="HID_DLG_QRY_JOINTYPE">Specifies the link type of the selected link.</ahelp> Some databases support only a subset of the possible types.</paragraph>
-<paragraph role="heading" id="hd_id3155334" xml-lang="en-US" level="3" l10n="U" oldref="5">Inner Join</paragraph>
-<paragraph role="paragraph" id="par_id3155936" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the internal join, the results table contains only the records for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link is created by a corresponding WHERE clause.</paragraph>
-<paragraph role="heading" id="hd_id3156372" xml-lang="en-US" level="3" l10n="U" oldref="7">Left Join</paragraph>
-<paragraph role="paragraph" id="par_id3166450" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the left join, the results table contains all fields of the left table and only those fields of the right table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the LEFT OUTER JOIN command.</paragraph>
-<paragraph role="heading" id="hd_id3155607" xml-lang="en-US" level="3" l10n="U" oldref="9">Right Join</paragraph>
-<paragraph role="paragraph" id="par_id3150647" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the right join, the results table contains all fields of the right table and only those fields of the left table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN command.</paragraph>
-<paragraph role="heading" id="hd_id3158215" xml-lang="en-US" level="3" l10n="U" oldref="11">Full Join</paragraph>
-<paragraph role="paragraph" id="par_id3163665" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_DLG_QRY_JOINTYPE">For a full join, the results table contains all fields of the left and right tables.</ahelp> In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command.</paragraph>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_RIGHT_TABLE" id="bm_id3150752" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155066" role="heading" level="2" l10n="U"
+ oldref="17">Tables involved</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153924" role="paragraph" l10n="U" oldref="16"><ahelp hid="HID_DLG_QRY_RIGHT_TABLE">Specifies two different tables that you want to join.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155766" role="heading" level="2" l10n="U"
+ oldref="15">Fields involved</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148994" role="paragraph" l10n="CHG" oldref="14"><ahelp hid=".">Specifies two data fields that will be joined by a relation.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3159267" role="heading" level="2" l10n="U" oldref="3">Options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOINTYPE" id="bm_id3147321" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147340" role="heading" level="3" l10n="U"
+ oldref="13">Type</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152482" role="paragraph" l10n="CHG" oldref="4"><ahelp hid="HID_DLG_QRY_JOINTYPE">Specifies the link type of the selected link.</ahelp> Some databases support only a subset of the possible types.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155334" role="heading" level="3" l10n="U" oldref="5">Inner Join</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155936" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the internal join, the results table contains only the records for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link is created by a corresponding WHERE clause.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156372" role="heading" level="3" l10n="U" oldref="7">Left Join</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166450" role="paragraph" l10n="U" oldref="8"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the left join, the results table contains all fields of the left table and only those fields of the right table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the LEFT OUTER JOIN command.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155607" role="heading" level="3" l10n="U" oldref="9">Right Join</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150647" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the right join, the results table contains all fields of the right table and only those fields of the left table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN command.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3158215" role="heading" level="3" l10n="U"
+ oldref="11">Full Join</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3163665" role="paragraph" l10n="U" oldref="12"><ahelp hid="HID_DLG_QRY_JOINTYPE">For a full join, the results table contains all fields of the left and right tables.</ahelp> In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOIN_CONTROL" id="bm_id0305200912022930" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0305200912031976" role="heading" level="3" l10n="NEW">Natural</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0305200912031977" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts the keyword NATURAL into the SQL statement that defines the relation. The relation joins all columns that have the same column name in both tables. The resulting joined table contains only one column for each pair of equally named columns.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/makefile.mk b/helpcontent2/source/text/shared/explorer/database/makefile.mk
index 3492dd4323..f2d85e7594 100644
--- a/helpcontent2/source/text/shared/explorer/database/makefile.mk
+++ b/helpcontent2/source/text/shared/explorer/database/makefile.mk
@@ -6,9 +6,9 @@
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
+# $RCSfile: makefile.template,v $
#
-# $Revision: 1.13.4.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
@@ -112,6 +112,7 @@ XHPFILES = \
menuinsert.xhp \
menutools.xhp \
menuview.xhp \
+ migrate_macros.xhp \
password.xhp \
querywizard00.xhp \
querywizard01.xhp \
diff --git a/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp b/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
new file mode 100755
index 0000000000..b90fc54ea4
--- /dev/null
+++ b/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+ <topic id="textsharedexplorerdatabasemigrate_macrosxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Migrate Macros</title>
+ <filename>/text/shared/explorer/database/migrate_macros.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="migrate_macros">
+<bookmark xml-lang="en-US" branch="index" id="bm_id6009095"><bookmark_value>wizards;macros (Base)</bookmark_value>
+ <bookmark_value>Macro Wizard (Base)</bookmark_value>
+ <bookmark_value>macros;attaching new (Base)</bookmark_value>
+ <bookmark_value>migrating macros (Base)</bookmark_value>
+</bookmark><comment>MW added 2 index entries</comment>
+<paragraph xml-lang="en-US" id="hd_id0112200902353472" role="heading" level="1" l10n="NEW"><link href="text/shared/explorer/database/migrate_macros.xhp">Migrate Macros</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DBMigrateScripts" id="bm_id0224200911384751" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0112200902353466" role="paragraph" l10n="NEW"><ahelp hid=".">The Database Document Macro Migration Wizard moves existing macros from sub-documents of an old Base file into the new Base file's macro storage area.</ahelp></paragraph>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_TP_SAVE_DBDOC_AS_PB_BROWSE_SAVE_AS_LOCATION" id="bm_id022420091141368" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0224200911454780" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose a location and file name to save the new database file. By default, the new file gets the same name as the old file, while the old file gets renamed with the string "backup" in the name.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess_MultiLineEdit_TP_SUMMARY_ED_CHANGES" id="bm_id0224200911450172" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id022420091145472" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The list shows all changes that were applied to the database file.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0112200902353542" role="paragraph" l10n="NEW">Previously, macros have been allowed to reside only in the text sub-documents of forms and reports. Starting with OpenOffice.org 3.1 or StarOffice 9.1, macros can also be stored in the Base file itself. This means that macros in Base files can be called now from any of its sub-components: forms, reports, table design, query design, relation design, table data view.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0112200903075865" role="paragraph" l10n="NEW">However, it is technically not possible to store macros both in a Base file and in its sub-documents at the same time. So, if you want to attach some new macros to the Base file, while retaining any existing old macros that were stored in the sub-documents, you must move the existing old macros up to the Base file's macro storage area. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id0112200903075830" role="paragraph" l10n="NEW">The Database Document Macro Migration Wizard can move the macros up into the Base file's storage area. You can then examine the macros and edit them as needed. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id0112200903075951" role="paragraph" l10n="NEW">For example, it is possible that macros from the sub-documents had the same module names and macro names. After you moved the macros into one common macro storage area, you must edit the macros to make the names unique. The wizard cannot do this.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0112200903075915" role="paragraph" l10n="NEW">The wizard can backup the Base file to another folder of your choice. The wizard changes the original Base file. The backup remains unchanged.</paragraph>
+ <embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+ <embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+ <embed href="text/shared/00/00000001.xhp#finish"/>
+ <embed href="text/shared/00/00000001.xhp#abbrechen"/>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id0112200902353554" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Macros_in_Database_Documents">An in depth explanation by the developers (Wiki).</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/autocorr_url.xhp b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
index 851d823829..e51712df3d 100755
--- a/helpcontent2/source/text/shared/guide/autocorr_url.xhp
+++ b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: autocorr_url.xhp,v $
- * $Revision: 1.10.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -35,52 +35,53 @@
<meta>
-<topic id="textsharedguideautocorr_urlxml" indexer="include">
-<title id="tit" xml-lang="en-US">Turning off Automatic URL Recognition</title>
-<filename>/text/shared/guide/autocorr_url.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguideautocorr_urlxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Turning off Automatic URL Recognition</title>
+ <filename>/text/shared/guide/autocorr_url.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149346"><bookmark_value>AutoCorrect function; URL recognition</bookmark_value>
-<bookmark_value>recognizing URLs automatically</bookmark_value>
-<bookmark_value>Internet; turning off recognition of addresses</bookmark_value>
-<bookmark_value>automatic hyperlink formatting</bookmark_value>
-<bookmark_value>URL;turning off URL recognition</bookmark_value>
-<bookmark_value>hyperlinks;turning off automatic recognition</bookmark_value>
-<bookmark_value>links;turning off automatic recognition</bookmark_value>
+ <bookmark_value>recognizing URLs automatically</bookmark_value>
+ <bookmark_value>automatic hyperlink formatting</bookmark_value>
+ <bookmark_value>URL;turning off URL recognition</bookmark_value>
+ <bookmark_value>hyperlinks;turning off automatic recognition</bookmark_value>
+ <bookmark_value>links;turning off automatic recognition</bookmark_value>
+ <bookmark_value>predictive text, see also AutoCorrect function/AutoFill function/AutoInput function/word completion/text completion</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="1" l10n="U" oldref="6"><variable id="autocorr_url"><link href="text/shared/guide/autocorr_url.xhp" name="Turning off Automatic URL Recognition">Turning off Automatic URL Recognition</link>
+<paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1" l10n="U" oldref="6"><variable id="autocorr_url"><link href="text/shared/guide/autocorr_url.xhp" name="Turning off Automatic URL Recognition">Turning off Automatic URL Recognition</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="7">When you enter text, $[officename] automatically recognizes a word that may be a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> and replaces the word with a hyperlink. $[officename] formats the hyperlink with direct font attributes (color and underline) the properties of which are obtained from certain Character Styles.</paragraph>
-<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="2">If you do not want $[officename] to automatically recognize URLs as you are typing, there are several ways of turning off this feature.</paragraph>
-<paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="2" l10n="U" oldref="8">Undo URL Recognition</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149233" xml-lang="en-US" l10n="U" oldref="3">When you are typing and notice that a text has just been automatically converted into a hyperlink, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z to undo this formatting.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149235" xml-lang="en-US" l10n="CHG" oldref="4">If you do not notice this conversion until later, select the hyperlink and choose the menu command <emph>Format - Default Formatting</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3152350" xml-lang="en-US" level="2" l10n="U" oldref="9">Turn off URL Recognition</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="10">Load a document of the type for which you want to modify the URL recognition.</paragraph>
-<paragraph role="listitem" id="par_id3151246" xml-lang="en-US" l10n="U" oldref="11">If you want to modify the URL recognition for text documents, open a text document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Tools - AutoCorrect Options</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="13">In the <emph>AutoCorrect</emph> dialog, select the <emph>Options</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="14">If you unmark <emph>URL Recognition</emph>, words will no longer be automatically replaced with hyperlinks.</paragraph>
-<paragraph role="listitem" id="par_id3156423" xml-lang="en-US" l10n="U" oldref="15">In $[officename] Writer there are two check boxes in front of <emph>URL Recognition</emph>. The box in the first column is for later post-editing and the box in the second column is for AutoCorrect as you type.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3166410" role="paragraph" l10n="U" oldref="7">When you enter text, $[officename] automatically recognizes a word that may be a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> and replaces the word with a hyperlink. $[officename] formats the hyperlink with direct font attributes (color and underline) the properties of which are obtained from certain Character Styles.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153561" role="paragraph" l10n="U" oldref="2">If you do not want $[officename] to automatically recognize URLs as you are typing, there are several ways of turning off this feature.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154306" role="heading" level="2" l10n="U" oldref="8">Undo URL Recognition</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149233" role="listitem" l10n="U" oldref="3">When you are typing and notice that a text has just been automatically converted into a hyperlink, press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z to undo this formatting.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149235" role="listitem" l10n="CHG" oldref="4">If you do not notice this conversion until later, select the hyperlink and choose the menu command <emph>Format - Default Formatting</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3152350" role="heading" level="2" l10n="U" oldref="9">Turn off URL Recognition</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149514" role="listitem" l10n="U" oldref="10">Load a document of the type for which you want to modify the URL recognition.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151246" role="listitem" l10n="U" oldref="11">If you want to modify the URL recognition for text documents, open a text document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3159413" role="listitem" l10n="U" oldref="12">Choose <emph>Tools - AutoCorrect Options</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148550" role="listitem" l10n="U" oldref="13">In the <emph>AutoCorrect</emph> dialog, select the <emph>Options</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153360" role="listitem" l10n="U" oldref="14">If you unmark <emph>URL Recognition</emph>, words will no longer be automatically replaced with hyperlinks.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156423" role="listitem" l10n="U" oldref="15">In $[officename] Writer there are two check boxes in front of <emph>URL Recognition</emph>. The box in the first column is for later post-editing and the box in the second column is for AutoCorrect as you type.</paragraph>
+ </listitem>
+ </list>
+ <section id="relatedtopics">
+ <embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/data_enter_sql.xhp b/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
index 4708c94732..ba09c7e664 100644
--- a/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
+++ b/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_enter_sql.xhp,v $
- * $Revision: 1.16 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -33,60 +33,57 @@
************************************************************************
-->
-<helpdocument version="1.0">
+
<meta>
-<topic id="textsharedguidedata_enter_sqlxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Executing SQL Commands</title>
-<filename>/text/shared/guide/data_enter_sql.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-06-14T15:10:58">fpe: changed to match new database interface</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguidedata_enter_sqlxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Executing SQL Commands</title>
+ <filename>/text/shared/guide/data_enter_sql.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3152801"><bookmark_value>SQL; executing SQL commands</bookmark_value>
-<bookmark_value>queries;creating in SQL view</bookmark_value>
-<bookmark_value>commands;SQL</bookmark_value>
-<bookmark_value>executing;SQL commands</bookmark_value>
-</bookmark><comment>mw changed "SQL;executing commands"</comment>
-<paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="1" l10n="U" oldref="67"><variable id="data_enter_sql"><link href="text/shared/guide/data_enter_sql.xhp" name="Executing SQL Commands">Executing SQL Commands</link>
+ <bookmark_value>queries;creating in SQL view</bookmark_value>
+ <bookmark_value>commands;SQL</bookmark_value>
+ <bookmark_value>executing SQL commands</bookmark_value>
+</bookmark><comment>mw changed "SQL;executing commands"</comment><comment>mw made "executing;" a one level entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3152801" role="heading" level="1" l10n="U"
+ oldref="67"><variable id="data_enter_sql"><link href="text/shared/guide/data_enter_sql.xhp" name="Executing SQL Commands">Executing SQL Commands</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="68">With the help of SQL commands you can control the database directly, and can also create and edit tables and queries.</paragraph>
-<paragraph role="note" id="par_id3153562" xml-lang="en-US" l10n="U" oldref="72">Not all database types support all SQL instructions. If necessary, find out which SQL commands are supported by your database system.</paragraph>
-<paragraph role="heading" id="hd_id9577929" xml-lang="en-US" level="2" l10n="NEW">To execute an SQL statement directly</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7923825" xml-lang="en-US" l10n="NEW">Choose <emph>File - Open</emph> to open a database file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9448530" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - SQL</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="91">Click the <emph>Create Query in SQL View</emph> icon
-<image id="img_id3154071" src="res/commandimagelist/sc_dbnewquerysql.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154071" xml-lang="en-US">Icon</alt>
+ <paragraph xml-lang="en-US" id="par_id3147008" role="paragraph" l10n="U" oldref="68">With the help of SQL commands you can control the database directly, and can also create and edit tables and queries.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153562" role="note" l10n="U" oldref="72">Not all database types support all SQL instructions. If necessary, find out which SQL commands are supported by your database system.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id9577929" role="heading" level="2" l10n="NEW">To execute an SQL statement directly</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7923825" role="paragraph" l10n="NEW">Choose <emph>File - Open</emph> to open a database file.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9448530" role="paragraph" l10n="NEW">Choose <emph>Tools - SQL</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="91">Click the <emph>Create Query in SQL View</emph> icon
+<image id="img_id3154071" src="res/commandimagelist/sc_dbnewquerysql.png" width="0.1862in" height="0.1862in"><alt xml-lang="en-US" id="alt_id3154071">Icon</alt>
</image> or</paragraph>
-<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="92">Select an existing query from the list and click the <emph>Edit</emph> icon
-<image id="img_id3156212" src="res/commandimagelist/sc_dbqueryedit.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156212" xml-lang="en-US">Icon</alt>
+ <paragraph xml-lang="en-US" id="par_id3145786" role="paragraph" l10n="U" oldref="92">Select an existing query from the list and click the <emph>Edit</emph> icon
+<image id="img_id3156212" src="res/commandimagelist/sc_dbqueryedit.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3156212">Icon</alt>
</image>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="94">In the <emph>Query</emph> window, choose <emph>View - Switch Design View On/Off</emph>. Edit the SQL command.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3152460" xml-lang="en-US" l10n="U" oldref="96">Click the <emph>Run</emph> icon
-<image id="img_id3152886" src="res/commandimagelist/sc_sbanativesql.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152886" xml-lang="en-US">Icon</alt>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3083443" role="paragraph" l10n="U" oldref="94">In the <emph>Query</emph> window, choose <emph>View - Switch Design View On/Off</emph>. Edit the SQL command.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152460" role="paragraph" l10n="U" oldref="96">Click the <emph>Run</emph> icon
+<image id="img_id3152886" src="res/commandimagelist/sc_sbanativesql.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152886">Icon</alt>
</image>. The result of the query is displayed in the upper window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3149298" xml-lang="en-US" l10n="U" oldref="98">Click the <emph>Save</emph> or <emph>Save As</emph> icon
-<image id="img_id3153159" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153159" xml-lang="en-US">Icon</alt>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149298" role="paragraph" l10n="U" oldref="98">Click the <emph>Save</emph> or <emph>Save As</emph> icon
+<image id="img_id3153159" src="res/commandimagelist/sc_save.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3153159">Icon</alt>
</image> to save the query.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153223" xml-lang="en-US" l10n="U" oldref="105"><link href="text/shared/explorer/database/02010100.xhp" name="Query Design">Query Design</link></paragraph>
-<embed href="text/shared/guide/database_main.xhp#database_main"/>
-</section>
-</body>
-</helpdocument>
+ </listitem>
+ </list>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3153223" role="paragraph" l10n="U" oldref="105"><link href="text/shared/explorer/database/02010100.xhp" name="Query Design">Query Design</link></paragraph>
+ <embed href="text/shared/guide/database_main.xhp#database_main"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/data_tabledefine.xhp b/helpcontent2/source/text/shared/guide/data_tabledefine.xhp
index 4fb9917c12..4fd7733d66 100644
--- a/helpcontent2/source/text/shared/guide/data_tabledefine.xhp
+++ b/helpcontent2/source/text/shared/guide/data_tabledefine.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_tabledefine.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -33,47 +32,50 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidedata_tabledefinexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Table Design</title>
-<filename>/text/shared/guide/data_tabledefine.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3155448"><bookmark_value>tables in databases; creating in design view</bookmark_value>
-<bookmark_value>designing; database tables</bookmark_value>
-<bookmark_value>properties;fields in databases</bookmark_value>
-<bookmark_value>fields;database tables</bookmark_value>
-<bookmark_value>AutoValue;database tables</bookmark_value>
-<bookmark_value>primary key;database tables</bookmark_value>
-</bookmark><comment>MW deleted "database tables;" and changed "tables in databases;"</comment><comment>UFI added AutoValue and Primary Key entry - i48831</comment><paragraph role="paragraph" id="par_id3155448" xml-lang="en-US" l10n="E" oldref="103" localize="false"/>
-<paragraph role="heading" id="hd_id3149798" xml-lang="en-US" level="1" l10n="U" oldref="104"><variable id="data_tabledefine"><link href="text/shared/guide/data_tabledefine.xhp" name="Table Design">Table Design</link>
+ <topic id="textsharedguidedata_tabledefinexml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Table Design</title>
+ <filename>/text/shared/guide/data_tabledefine.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3155448"><bookmark_value>tables in databases; creating in design view (manually)</bookmark_value>
+ <bookmark_value>designing; database tables</bookmark_value>
+ <bookmark_value>properties;fields in databases</bookmark_value>
+ <bookmark_value>fields;database tables</bookmark_value>
+ <bookmark_value>AutoValue (Base)</bookmark_value>
+ <bookmark_value>primary keys;design view</bookmark_value>
+</bookmark><comment>MW deleted "database tables;" and changed "tables in databases;"</comment><comment>UFI added AutoValue and Primary Key entry - i48831</comment><comment>MW changed Tables in databases, AutoValue and Primary Key entries</comment>
+<paragraph xml-lang="en-US" id="par_id3155448" role="paragraph" l10n="E" oldref="103"
+ localize="false"/>
+ <paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U"
+ oldref="104"><variable id="data_tabledefine"><link href="text/shared/guide/data_tabledefine.xhp" name="Table Design">Table Design</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="U" oldref="2">This section contains information about how to create a new database table in the <link href="text/shared/explorer/database/05010000.xhp" name="design view">design view</link>.</paragraph>
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="CHG" oldref="3">Open the database file of the database where you want a new table. Click the <emph>Tables</emph> icon. Choose <emph>Create Table in Design View</emph> to create a new table.</paragraph>
-<paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="4">In the Design view, you can now create the fields for your table.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153349" xml-lang="en-US" l10n="U" oldref="5">Enter new fields in rows from top to bottom. Click the <emph>Field Name</emph> cell and enter a field name for each data field.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id1595507" xml-lang="en-US" l10n="NEW">Include a "primary key" data field. Base needs a primary key to be able to edit the table contents. A primary key has unique contents for each data record. For example, insert a numerical field, right-click the first column, and choose <emph>Primary Key</emph> from the context menu. Set <emph>AutoValue</emph> to "Yes", so Base can automatically increment the value for each new record.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="6">In the next cell to the right, define the <emph>Field Type</emph>. When you click in the cell, you can select a field type in the combo box.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="38">Each field can only accept data corresponding to the specified field type. For example, it is not possible to enter text in a number field. Memo fields in dBASE III format are references to internally-managed text files which can hold up to 64KB text.</paragraph>
-<paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="41">You can enter an optional <emph>Description</emph> for each field. The text of the description will appear as a tip on the column headings in the table view.</paragraph>
-<paragraph role="heading" id="hd_id3153379" xml-lang="en-US" level="2" l10n="U" oldref="42">Field Properties</paragraph>
-<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="45">Enter properties for each selected data field. Depending on the database type, some input facilities may not be available.</paragraph>
-<paragraph role="paragraph" id="par_id3144762" xml-lang="en-US" l10n="U" oldref="46">In the <emph>Default value</emph> box, enter the default contents for every new record. This contents can be edited later.</paragraph>
-<paragraph role="paragraph" id="par_id3150869" xml-lang="en-US" l10n="U" oldref="47">In the <emph>Entry required</emph> box, specify whether or not the field may remain empty.</paragraph>
-<paragraph role="paragraph" id="par_id3154908" xml-lang="en-US" l10n="U" oldref="7">For the <emph>Length</emph> box, a combo box may be shown that provides the available choices.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/database_main.xhp#database_main"/>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3155535" role="paragraph" l10n="U" oldref="2">This section contains information about how to create a new database table in the <link href="text/shared/explorer/database/05010000.xhp" name="design view">design view</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="CHG" oldref="3">Open the database file of the database where you want a new table. Click the <emph>Tables</emph> icon. Choose <emph>Create Table in Design View</emph> to create a new table.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146798" role="paragraph" l10n="U" oldref="4">In the Design view, you can now create the fields for your table.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153349" role="listitem" l10n="U" oldref="5">Enter new fields in rows from top to bottom. Click the <emph>Field Name</emph> cell and enter a field name for each data field.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id1595507" role="listitem" l10n="NEW">Include a "primary key" data field. Base needs a primary key to be able to edit the table contents. A primary key has unique contents for each data record. For example, insert a numerical field, right-click the first column, and choose <emph>Primary Key</emph> from the context menu. Set <emph>AutoValue</emph> to "Yes", so Base can automatically increment the value for each new record.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150084" role="listitem" l10n="U" oldref="6">In the next cell to the right, define the <emph>Field Type</emph>. When you click in the cell, you can select a field type in the combo box.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3154760" role="note" l10n="U" oldref="38">Each field can only accept data corresponding to the specified field type. For example, it is not possible to enter text in a number field. Memo fields in dBASE III format are references to internally-managed text files which can hold up to 64KB text.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149456" role="paragraph" l10n="U" oldref="41">You can enter an optional <emph>Description</emph> for each field. The text of the description will appear as a tip on the column headings in the table view.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153379" role="heading" level="2" l10n="U"
+ oldref="42">Field Properties</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148798" role="paragraph" l10n="U" oldref="45">Enter properties for each selected data field. Depending on the database type, some input facilities may not be available.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144762" role="paragraph" l10n="U" oldref="46">In the <emph>Default value</emph> box, enter the default contents for every new record. This contents can be edited later.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150869" role="paragraph" l10n="U" oldref="47">In the <emph>Entry required</emph> box, specify whether or not the field may remain empty.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154908" role="paragraph" l10n="U" oldref="7">For the <emph>Length</emph> box, a combo box may be shown that provides the available choices.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <embed href="text/shared/guide/database_main.xhp#database_main"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/fontwork.xhp b/helpcontent2/source/text/shared/guide/fontwork.xhp
index d7f5a07157..3cdaf2c2d4 100755
--- a/helpcontent2/source/text/shared/guide/fontwork.xhp
+++ b/helpcontent2/source/text/shared/guide/fontwork.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: fontwork.xhp,v $
- * $Revision: 1.14 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -33,99 +32,95 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidefontworkxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Fontwork For Graphical Text Art</title>
-<filename>/text/shared/guide/fontwork.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
+ <topic id="textsharedguidefontworkxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Fontwork For Graphical Text Art</title>
+ <filename>/text/shared/guide/fontwork.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3696707"><bookmark_value>graphical text art</bookmark_value>
-<bookmark_value>designing; fonts</bookmark_value>
-<bookmark_value>TextArt, see Fontwork</bookmark_value>
-<bookmark_value>WordArt, see Fontwork</bookmark_value>
-<bookmark_value>Fontwork icons</bookmark_value>
-<bookmark_value>text effects</bookmark_value>
-<bookmark_value>effects; Fontwork icons</bookmark_value>
-<bookmark_value>text; Fontwork icons</bookmark_value>
-<bookmark_value>3D text creation</bookmark_value>
-<bookmark_value>rotating;3D text</bookmark_value>
-<bookmark_value>editing;Fontwork objects</bookmark_value>
-<bookmark_value>inserting;Fontwork objects</bookmark_value>
-</bookmark>
- <comment>MW changed "adding;" to "inserting;"</comment>
- <paragraph xml-lang="en-US" id="par_idN1066D" role="heading" level="1" l10n="NEW"><variable id="fontwork"><link href="text/shared/guide/fontwork.xhp">Fontwork For Graphical Text Art</link>
+ <bookmark_value>designing; fonts</bookmark_value>
+ <bookmark_value>TextArt, see Fontwork</bookmark_value>
+ <bookmark_value>WordArt, see Fontwork</bookmark_value>
+ <bookmark_value>Fontwork icons</bookmark_value>
+ <bookmark_value>text effects</bookmark_value>
+ <bookmark_value>effects; Fontwork icons</bookmark_value>
+ <bookmark_value>text; Fontwork icons</bookmark_value>
+ <bookmark_value>3D text creation</bookmark_value>
+ <bookmark_value>rotating;3D text</bookmark_value>
+ <bookmark_value>editing;Fontwork objects</bookmark_value>
+ <bookmark_value>inserting;Fontwork objects</bookmark_value>
+</bookmark><comment>MW changed "adding;" to "inserting;"</comment>
+<paragraph xml-lang="en-US" id="par_idN1066D" role="heading" level="1" l10n="NEW"><variable id="fontwork"><link href="text/shared/guide/fontwork.xhp">Fontwork For Graphical Text Art</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN1068B" role="paragraph" l10n="NEW">You can use Fontwork to create graphical text art objects.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10691" role="heading" level="2" l10n="NEW">To create a Fontwork object</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN1069C" role="paragraph" l10n="CHG">On the <emph>Drawing</emph> toolbar, click the <emph>Fontwork Gallery</emph> icon.
-<image id="img_id7040009" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.1701inch" height="0.1701inch"><alt xml-lang="en-US" id="alt_id7040009">Fontwork icon</alt>
+ <paragraph xml-lang="en-US" id="par_idN1068B" role="paragraph" l10n="NEW">You can use Fontwork to create graphical text art objects.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10691" role="heading" level="2" l10n="NEW">To create a Fontwork object</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0202200911373965" role="paragraph" l10n="NEW">If you don't see the Drawing toolbar or the Fontwork toolbar, choose <item type="menuitem">View - Toolbars</item> to enable the toolbar.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1069C" role="paragraph" l10n="CHG">On the <emph>Drawing</emph> toolbar or on the <emph>Fontwork</emph> toolbar, click the <emph>Fontwork Gallery</emph> icon.
+<image id="img_id7040009" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id7040009">Icon</alt>
</image></paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">In the <emph>Fontwork Gallery</emph> dialog, select a Fontwork style and click OK.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106A4" role="paragraph" l10n="NEW">Double-click the object to enter text edit mode.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN107D5" role="paragraph" l10n="NEW">Replace the default Fontwork text with your own text.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106A8" role="paragraph" l10n="NEW">Press Esc to exit text edit mode.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_idN106AE" role="heading" level="2" l10n="NEW">To edit a Fontwork object</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106B5" role="paragraph" l10n="NEW">Click the Fontwork object.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106B8" role="paragraph" l10n="NEW">The <link href="text/shared/fontwork_toolbar.xhp"><emph>Fontwork</emph></link> toolbar is displayed. If you do not see the <emph>Fontwork</emph> toolbar, choose <emph>View - Toolbars - Fontwork</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106BC" role="paragraph" l10n="NEW">Click an icon in the <emph>Fontwork</emph> toolbar.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10839" role="paragraph" l10n="NEW">The following icons are available:</paragraph>
- </listitem>
- </list>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106C5" role="paragraph" l10n="CHG">Fontwork Gallery - adds another Fontwork object</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106C9" role="paragraph" l10n="NEW">Fontwork Shape - edits the shape</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106CD" role="paragraph" l10n="NEW">Fontwork Same Letter Heights - changes the height of characters</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106D5" role="paragraph" l10n="NEW">Fontwork Alignment - aligns the text</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106D9" role="paragraph" l10n="NEW">Fontwork Character Spacing - changes the character spacing and kerning</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_idN108CA" role="heading" level="2" l10n="NEW">To edit more Fontwork attributes</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN108D1" role="paragraph" l10n="NEW">Click the Fontwork object to select it.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN108D5" role="paragraph" l10n="NEW">Select the properties from the <emph>Drawing Object Properties</emph> toolbar. You can change the line width, line color, fill color, fill style, and more.</paragraph>
- </listitem>
- </list>
- <section id="relatedtopics">
-
- <paragraph xml-lang="en-US" id="par_idN108E7" role="paragraph" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph>
- <embed href="text/shared/01/05280000.xhp#hd_id3146959"/>
-
- </section>
- </body>
-</helpdocument>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">In the <emph>Fontwork Gallery</emph> dialog, select a Fontwork style and click OK.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106A4" role="paragraph" l10n="NEW">Double-click the object to enter text edit mode.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107D5" role="paragraph" l10n="NEW">Replace the default Fontwork text with your own text.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106A8" role="paragraph" l10n="NEW">Press Esc to exit text edit mode.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN106AE" role="heading" level="2" l10n="NEW">To edit a Fontwork object</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106B5" role="paragraph" l10n="CHG">Click the Fontwork object. If the Fontwork object is inserted in the background, hold down the Ctrl key while you click.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106B8" role="paragraph" l10n="NEW">The <link href="text/shared/fontwork_toolbar.xhp"><emph>Fontwork</emph></link> toolbar is displayed. If you do not see the <emph>Fontwork</emph> toolbar, choose <emph>View - Toolbars - Fontwork</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106BC" role="paragraph" l10n="NEW">Click an icon in the <emph>Fontwork</emph> toolbar.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10839" role="paragraph" l10n="NEW">The following icons are available:</paragraph>
+ </listitem>
+ </list>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106C5" role="paragraph" l10n="CHG">Fontwork Gallery - adds another Fontwork object</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106C9" role="paragraph" l10n="NEW">Fontwork Shape - edits the shape</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106CD" role="paragraph" l10n="NEW">Fontwork Same Letter Heights - changes the height of characters</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106D5" role="paragraph" l10n="NEW">Fontwork Alignment - aligns the text</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106D9" role="paragraph" l10n="NEW">Fontwork Character Spacing - changes the character spacing and kerning</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN108CA" role="heading" level="2" l10n="NEW">To edit more Fontwork attributes</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN108D1" role="paragraph" l10n="CHG">Click the Fontwork object. If the Fontwork object is inserted in the background, hold down the Ctrl key while you click.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN108D5" role="paragraph" l10n="NEW">Select the properties from the <emph>Drawing Object Properties</emph> toolbar. You can change the line width, line color, fill color, fill style, and more.</paragraph>
+ </listitem>
+ </list>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_idN108E7" role="paragraph" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph>
+ <embed href="text/shared/01/05280000.xhp#hd_id3146959"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
index 1a69bdf849..6c37196df9 100644
--- a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: insert_graphic_drawit.xhp,v $
- * $Revision: 1.17.4.3 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -35,70 +35,71 @@
<meta>
-<topic id="textsharedguideinsert_graphic_drawitxml" indexer="include">
-<title id="tit" xml-lang="en-US">Editing Graphic Objects </title>
-<filename>/text/shared/guide/insert_graphic_drawit.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguideinsert_graphic_drawitxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Editing Graphic Objects </title>
+ <filename>/text/shared/guide/insert_graphic_drawit.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3145136"><bookmark_value>resizing, see also scaling/zooming</bookmark_value>
-<bookmark_value>scaling, see also zooming</bookmark_value>
-<bookmark_value>drawings, see also draw objects</bookmark_value>
-<bookmark_value>graphic objects, see also draw objects</bookmark_value>
-<bookmark_value>text; drawing pictures</bookmark_value>
-<bookmark_value>inserting; drawings</bookmark_value>
-<bookmark_value>pictures; drawing</bookmark_value>
-<bookmark_value>objects; copying when moving in presentations</bookmark_value>
-<bookmark_value>draw objects; adding/editing/copying</bookmark_value>
-<bookmark_value>circle drawings</bookmark_value>
-<bookmark_value>square drawings</bookmark_value>
-<bookmark_value>handles; scaling</bookmark_value>
-<bookmark_value>scaling; objects</bookmark_value>
-<bookmark_value>objects;moving and resizing with mouse</bookmark_value>
-<bookmark_value>resizing;objects, by mouse</bookmark_value>
-<bookmark_value>copying; draw objects</bookmark_value>
-<bookmark_value>pasting;draw objects</bookmark_value>
-<bookmark_value>editing;draw objects</bookmark_value>
-<bookmark_value>pictures;scaling/resizing</bookmark_value>
+ <bookmark_value>scaling, see also zooming</bookmark_value>
+ <bookmark_value>drawings, see also draw objects</bookmark_value>
+ <bookmark_value>graphic objects, see draw objects</bookmark_value>
+ <bookmark_value>text; drawing pictures</bookmark_value>
+ <bookmark_value>inserting; drawings</bookmark_value>
+ <bookmark_value>pictures; drawing</bookmark_value>
+ <bookmark_value>objects; copying when moving in presentations</bookmark_value>
+ <bookmark_value>draw objects; adding/editing/copying</bookmark_value>
+ <bookmark_value>circle drawings</bookmark_value>
+ <bookmark_value>square drawings</bookmark_value>
+ <bookmark_value>handles; scaling</bookmark_value>
+ <bookmark_value>scaling; objects</bookmark_value>
+ <bookmark_value>objects;moving and resizing with mouse</bookmark_value>
+ <bookmark_value>resizing;objects, by mouse</bookmark_value>
+ <bookmark_value>copying; draw objects</bookmark_value>
+ <bookmark_value>pasting;draw objects</bookmark_value>
+ <bookmark_value>editing;draw objects</bookmark_value>
+ <bookmark_value>pictures;scaling/resizing</bookmark_value>
</bookmark><comment>MW added "graphic objects, see also..."</comment>
-<paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="1" l10n="U" oldref="11"><variable id="insert_graphic_drawit"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Editing Graphic Objects">Editing Graphic Objects</link>
+<paragraph xml-lang="en-US" id="hd_id3145136" role="heading" level="1" l10n="U"
+ oldref="11"><variable id="insert_graphic_drawit"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Editing Graphic Objects">Editing Graphic Objects</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph>View - Toolbars - Drawing</emph> to open the <emph>Drawing</emph> toolbar, if it is not already open.</paragraph>
-<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="CHG" oldref="2">Drawing objects can be subsequently edited and modified. Drawing objects created in this way are vector graphics, which you can scale freely without any loss of quality.</paragraph>
-<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="3">To create a rectangle, click the rectangle icon and move your cursor to the place in the document where you want one corner of the rectangle to be. Press the mouse button and hold it down while dragging to the opposite corner of the rectangle. When you release the mouse button, the rectangle is inserted in the document. It is selected, and you can edit its properties through the context menu.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149164" xml-lang="en-US" l10n="CHG" oldref="13"><switchinline select="appl"><caseinline select="DRAW">To draw multiple objects of the same type, double-click the icon.
+ <paragraph xml-lang="en-US" id="par_id3153345" role="paragraph" l10n="CHG" oldref="9">Choose <emph>View - Toolbars - Drawing</emph> to open the <emph>Drawing</emph> toolbar, if it is not already open.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="CHG" oldref="2">Drawing objects can be subsequently edited and modified. Drawing objects created in this way are vector graphics, which you can scale freely without any loss of quality.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph" l10n="U" oldref="3">To create a rectangle, click the rectangle icon and move your cursor to the place in the document where you want one corner of the rectangle to be. Press the mouse button and hold it down while dragging to the opposite corner of the rectangle. When you release the mouse button, the rectangle is inserted in the document. It is selected, and you can edit its properties through the context menu.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149164" role="listitem" l10n="CHG" oldref="13"><switchinline select="appl"><caseinline select="DRAW">To draw multiple objects of the same type, double-click the icon.
</caseinline><caseinline select="IMPRESS">To draw multiple objects of the same type, double-click the icon.
</caseinline><defaultinline>Draw multiple objects of the same type. Click the document without moving the mouse to stop drawing objects.</defaultinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="4">If you want to open up draw objects from the center instead of dragging from one corner to the other, hold down the <switchinline select="sys"><caseinline select="MAC">Option
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148473" role="listitem" l10n="U" oldref="4">If you want to open up draw objects from the center instead of dragging from one corner to the other, hold down the <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> key while dragging. <switchinline select="sys"><caseinline select="UNIX">With some window managers, you may need to hold down also the meta key.
</caseinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id9448225" xml-lang="en-US" l10n="CHG">Holding down the Shift key while dragging restricts the created object. For example, instead of a rectangle you get a square, instead of an ellipse you get a circle. When you drag a handle of an existing object with Shift held down, the aspect ratio of the object is retained.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153626" xml-lang="en-US" l10n="U" oldref="5">To scale the objects, first select them by clicking on them with the selection tool. You then see eight handles around the object. When you drag one of the four corner handles, the opposite corner remains fixed while the other three corners move. When you drag one of the side handles, the opposite side remains fixed.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id224616" xml-lang="en-US" l10n="NEW">To scale a draw object using the keyboard, first select the object, then press <switchinline select="sys"><caseinline select="MAC">Command
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9448225" role="listitem" l10n="CHG">Holding down the Shift key while dragging restricts the created object. For example, instead of a rectangle you get a square, instead of an ellipse you get a circle. When you drag a handle of an existing object with Shift held down, the aspect ratio of the object is retained.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153626" role="listitem" l10n="U" oldref="5">To scale the objects, first select them by clicking on them with the selection tool. You then see eight handles around the object. When you drag one of the four corner handles, the opposite corner remains fixed while the other three corners move. When you drag one of the side handles, the opposite side remains fixed.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id224616" role="listitem" l10n="NEW">To scale a draw object using the keyboard, first select the object, then press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab repeatedly to highlight one of the handles. Then press an arrow key. To scale in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> key while pressing an arrow key. Press Esc to leave the point edit mode.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149669" xml-lang="en-US" l10n="CHG" oldref="6">To move draw objects, first select them. To select more than one object, press the Shift key while clicking. Select text objects by clicking exactly on their edge. While holding down the mouse button, drag the objects to the new location.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id7199316" xml-lang="en-US" l10n="NEW">To move a draw object using the keyboard, first select the object, then press an arrow key. To move in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149669" role="listitem" l10n="CHG" oldref="6">To move draw objects, first select them. To select more than one object, press the Shift key while clicking. Select text objects by clicking exactly on their edge. While holding down the mouse button, drag the objects to the new location.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7199316" role="listitem" l10n="NEW">To move a draw object using the keyboard, first select the object, then press an arrow key. To move in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> key while pressing an arrow key.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3156422" xml-lang="en-US" l10n="CHG" oldref="8">To revert to normal text mode after creating and editing draw objects, click in an area of the document containing no draw or other objects. If you see a drawing cursor, first exit this mode by clicking the <emph>Select</emph> icon.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/02/01140000.xhp" name="Information about the individual icons">Information about the individual icons</link></paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3156422" role="note" l10n="CHG" oldref="8">To revert to normal text mode after creating and editing draw objects, click in an area of the document containing no draw or other objects. If you see a drawing cursor, first exit this mode by clicking the <emph>Select</emph> icon.</paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" l10n="U" oldref="10"><link href="text/shared/02/01140000.xhp" name="Information about the individual icons">Information about the individual icons</link></paragraph>
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
</case>
@@ -124,5 +125,5 @@
</case>
</switch>
</section>
-</body>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/labels_database.xhp b/helpcontent2/source/text/shared/guide/labels_database.xhp
index ea304c8e66..0c47b78704 100644
--- a/helpcontent2/source/text/shared/guide/labels_database.xhp
+++ b/helpcontent2/source/text/shared/guide/labels_database.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: labels_database.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -33,67 +32,53 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidelabels_databasexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Printing Address Labels</title>
-<filename>/text/shared/guide/labels_database.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidelabels_databasexml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Printing Address Labels</title>
+ <filename>/text/shared/guide/labels_database.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3147399"><bookmark_value>address labels from databases</bookmark_value>
-<bookmark_value>labels; from databases</bookmark_value>
-<bookmark_value>stickers</bookmark_value>
-<bookmark_value>databases;creating labels</bookmark_value>
-</bookmark><comment>mw deleted "creating;"</comment><paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="1" l10n="U" oldref="34"><variable id="labels_database"><link href="text/shared/guide/labels_database.xhp" name="Printing Address Labels">Printing Address Labels</link>
+ <bookmark_value>labels; from databases</bookmark_value>
+ <bookmark_value>stickers</bookmark_value>
+ <bookmark_value>databases;creating labels</bookmark_value>
+</bookmark><comment>mw deleted "creating;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3147399" role="heading" level="1" l10n="U"
+ oldref="34"><variable id="labels_database"><link href="text/shared/guide/labels_database.xhp" name="Printing Address Labels">Printing Address Labels</link>
</variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="36">Choose <emph>File - New - Labels</emph> to open the <emph>Labels</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="CHG" oldref="37">Select the format of the label sheets you want to print on. Remember to mark <emph>Synchronize contents</emph> on the <emph>Options</emph> tab. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10687" xml-lang="en-US" l10n="NEW">Click <emph>New Document</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="CHG" oldref="38">When you see the label document, open the data source view by choosing <emph>View - Data Sources</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="58">In the data source view, select your address data source table.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="U" oldref="39">Drag the data fields needed for the Address individually into the top left label. For example, click on the column header NAME and, keeping the mouse button depressed, drag it into the label. This inserts a field. Put the fields in order to complete the address in the first label at top left.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3151382" xml-lang="en-US" l10n="U" oldref="40">Place the cursor at the last text position (after the last field) in the first label.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3150447" xml-lang="en-US" l10n="CHG" oldref="41">Choose <emph>Insert - Fields - Other</emph>, and go to the <emph>Database</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="42">Select the type <emph>Next record</emph>, click on <emph>Insert</emph> and then on <emph>Close</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="43">You can now synchronize the labels. Click on the <emph>Synchronize</emph>
-<emph>Labels</emph> button in the small window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3154791" xml-lang="en-US" l10n="U" oldref="44">In the data source view, select the records for which you would like address stickers, by clicking on the row headers to the left. Use the <item type="keycode">Shift</item> or <item type="keycode">Ctrl</item> key in the usual way to select several records at the same time.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3146972" xml-lang="en-US" l10n="CHG" oldref="45">On the Table Data bar, click the <emph>Data to Fields</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3148484" xml-lang="en-US" l10n="CHG" oldref="25">You can then save and/or print the label document.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id8476821" xml-lang="en-US" l10n="NEW">When you choose to print the document, you will be asked if you want to print a form letter. Answer Yes to open the <link href="text/swriter/01/01150000.xhp">Mail Merge</link> dialog.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/labels.xhp#labels"/>
-</section>
-</body>
-</helpdocument>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="36">Choose <emph>File - New - Labels</emph> to open the <emph>Labels</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="CHG" oldref="37">On the <emph>Labels</emph> tab page, select the format of the label sheets you want to print on. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0130200903370863" role="paragraph" l10n="NEW">Choose the database and table from which to get the data.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id013020090337089" role="paragraph" l10n="NEW">Select a database field of which you want to print the contents. Click the button that shows a left arrow to insert the database field into the Label Text box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0130200903370930" role="paragraph" l10n="NEW">Continue to select and insert database fields if you want more fields on every label. You can press Enter to insert a new line, and you can type any character to insert fixed text.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0130200903370924" role="paragraph" l10n="NEW">Optionally, if you want to type more text, apply formatting, or insert images and line art, you should enable <emph>Synchronize contents</emph> on the <emph>Options</emph> tab. If you enable this, once you leave the Labels dialog box a small window opens with a Synchronize button. Now you only need to work on the first label on the labels document, then click the Synchronize button to copy your work to every label of the document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10687" role="paragraph" l10n="NEW">Click <emph>New Document</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148685" role="paragraph" l10n="CHG" oldref="38">When you see the label document, you might want to temporarily enable <item type="menuitem">View - Field Names</item>. This displays the fields in a more visible manner, so that you can arrange and edit label contents more easily.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148484" role="paragraph" l10n="CHG" oldref="25">You can save and/or print the label document.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id8476821" role="paragraph" l10n="NEW">When you choose to print the document, you will be asked if you want to print a form letter. Answer Yes to open the <link href="text/swriter/01/01150000.xhp">Mail Merge</link> dialog. In the Mail Merge dialog, you can select the records for which you want to print labels.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/labels.xhp#labels"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/language_select.xhp b/helpcontent2/source/text/shared/guide/language_select.xhp
index 67297ff33f..098ffc45c1 100755
--- a/helpcontent2/source/text/shared/guide/language_select.xhp
+++ b/helpcontent2/source/text/shared/guide/language_select.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: language_select.xhp,v $
- * $Revision: 1.14 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -33,163 +32,154 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidelanguage_selectxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Selecting the Document Language</title>
-<filename>/text/shared/guide/language_select.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidelanguage_selectxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Selecting the Document Language</title>
+ <filename>/text/shared/guide/language_select.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3083278"><bookmark_value>languages; selecting for text</bookmark_value>
-<bookmark_value>documents; languages</bookmark_value>
-<bookmark_value>characters; language selection</bookmark_value>
-<bookmark_value>character styles;language selection</bookmark_value>
-<bookmark_value>text; language selection</bookmark_value>
-<bookmark_value>paragraph styles; languages</bookmark_value>
-<bookmark_value>drawings; languages</bookmark_value>
-<bookmark_value>defaults;languages</bookmark_value>
-<bookmark_value>spellcheck; default languages</bookmark_value>
-<bookmark_value>dictionaries, see also languages</bookmark_value>
-</bookmark><comment>mw deleted "applying;" and changed "languages;"</comment><paragraph role="heading" id="hd_id3083278" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="language_select"><link href="text/shared/guide/language_select.xhp" name="Selecting the Document Language">Selecting the Document Language</link>
+ <bookmark_value>documents; languages</bookmark_value>
+ <bookmark_value>characters; language selection</bookmark_value>
+ <bookmark_value>character styles;language selection</bookmark_value>
+ <bookmark_value>text; language selection</bookmark_value>
+ <bookmark_value>paragraph styles; languages</bookmark_value>
+ <bookmark_value>drawings; languages</bookmark_value>
+ <bookmark_value>defaults;languages</bookmark_value>
+ <bookmark_value>spellcheck; default languages</bookmark_value>
+ <bookmark_value>dictionaries, see also languages</bookmark_value>
+</bookmark><comment>mw deleted "applying;" and changed "languages;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3083278" role="heading" level="1" l10n="U" oldref="1"><variable id="language_select"><link href="text/shared/guide/language_select.xhp" name="Selecting the Document Language">Selecting the Document Language</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US" l10n="U" oldref="2">The language you select for your document determines the dictionary used for spellcheck, thesaurus and hyphenation, the decimal and thousands delimiter used and the default currency format.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153093" xml-lang="en-US" l10n="U" oldref="3">The language you select applies to the whole document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152578" xml-lang="en-US" l10n="U" oldref="4">Within the document, you can apply a separate language to any paragraph style. This has priority over the language of the whole document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152886" xml-lang="en-US" l10n="U" oldref="5">You can assign a language to selected pieces of text in a paragraph, either by direct formatting or with a character style. This assignment has priority over the paragraph style and document language.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3146121" xml-lang="en-US" level="2" l10n="U" oldref="6">Selecting a language for the whole document</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>Tools - Options</emph>. Go to <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages"><emph>Language Settings - Languages</emph></link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="8">Under <emph>Default languages for documents</emph>, select the document language for all newly created documents. If you mark <emph>For the current document only</emph>, your choice will only apply to the current document. Close the dialog with <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3152938" xml-lang="en-US" level="2" l10n="U" oldref="9">Selecting a language for a Paragraph Style</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150872" xml-lang="en-US" l10n="U" oldref="10">Place the cursor in the paragraph whose paragraph style you want to edit.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145367" xml-lang="en-US" l10n="U" oldref="11">Open the context menu and select <emph>Edit Paragraph Style</emph>. This opens the <emph>Paragraph Style</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166413" xml-lang="en-US" l10n="U" oldref="12">Select the <emph>Font</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="13">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3154942" xml-lang="en-US" l10n="U" oldref="14">All paragraphs formatted with the current paragraph style will have the selected language.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3145801" xml-lang="en-US" level="2" l10n="U" oldref="15">Applying a language directly to selected text</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="16">Select the text to which you want to apply a language.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159348" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Format - Character</emph>. This opens the <emph>Character</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155600" xml-lang="en-US" l10n="U" oldref="18">Select the <emph>Font</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="19">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3154164" xml-lang="en-US" l10n="U" oldref="20">In <item type="productname">%PRODUCTNAME</item> Calc, choose <emph>Format - Cells</emph> and proceed accordingly.</paragraph>
-<paragraph role="heading" id="hd_id3154272" xml-lang="en-US" level="2" l10n="U" oldref="21">Selecting a language for a Character Style</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145649" xml-lang="en-US" l10n="U" oldref="22">Open the Styles and Formatting window and click on the <emph>Character Styles</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146792" xml-lang="en-US" l10n="U" oldref="23">Click on the name of the character style to which you want to apply a different language.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150753" xml-lang="en-US" l10n="U" oldref="24">Then open the context menu in the Styles and Formatting window and select <emph>Modify</emph>. This opens the <emph>Character Style</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150321" xml-lang="en-US" l10n="U" oldref="25">Select the <emph>Font</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154756" xml-lang="en-US" l10n="U" oldref="26">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3155766" xml-lang="en-US" l10n="U" oldref="27">Now you can apply the character style to your selected text.</paragraph>
-</listitem>
-</list><comment>UFI: see i76182</comment><paragraph role="heading" id="hd_id8703268" xml-lang="en-US" level="2" l10n="NEW">Adding More Text Languages</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7919248" xml-lang="en-US" l10n="CHG">In OpenOffice.org software, you can choose <item type="menuitem">File - Wizards - Install new dictionaries</item> to open a Writer document which helps you to install more languages.<comment>this document is only available with OOo, not SO</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id5174108" xml-lang="en-US" l10n="NEW">The document contains pages in many different languages. Click your own language on the first page to see the following instructions in your own language.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id2897427" xml-lang="en-US" l10n="NEW">Click the big button in the middle of the document page. This starts a macro to display more info and download the dictionary files.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3906979" xml-lang="en-US" l10n="NEW">Select to install the new files for the current user only or for all users (which requires write permission to the shared folder).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3998535" xml-lang="en-US" l10n="NEW">Click Next.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6273995" xml-lang="en-US" l10n="NEW">Click <item type="menuitem">Retrieve the list</item> button. After some short delay, you see a list of available Spelling dictionaries.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4401684" xml-lang="en-US" l10n="NEW">Select the languages for Spelling and click Next.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7082430" xml-lang="en-US" l10n="NEW">Click <item type="menuitem">Retrieve the list</item> and select languages for Hyphenation and for Thesaurus.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7718741" xml-lang="en-US" l10n="CHG">The macro downloads the files to the appropriate folder. After you click Finish, you must close OpenOffice.org software (including the Quickstarter), and restart.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id9100924" xml-lang="en-US" level="2" l10n="NEW">Setting UI Language</paragraph>
-<paragraph role="paragraph" id="par_id2761314" xml-lang="en-US" l10n="NEW">A standard installation of OpenOffice.org software will give you a user interface (UI) of your chosen language.</paragraph>
-<paragraph role="paragraph" id="par_id3912778" xml-lang="en-US" l10n="CHG">Most users download the American English version, which gives you English menu commands and English application help. If you want another language for the menus (and for the application help, if available in that language), change the UI language as follows.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3163853" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Tools - Options - Language Settings - Languages</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id121158" xml-lang="en-US" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3806878" xml-lang="en-US" l10n="NEW">Click OK and restart the OpenOffice.org software.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id130619" xml-lang="en-US" l10n="NEW">If the listbox doesn't list the language that you want, see "Adding More UI Languages".</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id9999694" xml-lang="en-US" level="2" l10n="NEW">Adding More UI Languages</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id2216559" xml-lang="en-US" l10n="NEW">Open your Web browser and enter <link href="http://oootranslation.services.openoffice.org/pub/OpenOffice.org/">http://oootranslation.services.openoffice.org/pub/OpenOffice.org/</link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7869502" xml-lang="en-US" l10n="CHG">Select and download the correct language pack for your version of OpenOffice.org software.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9852900" xml-lang="en-US" l10n="CHG">Close OpenOffice.org software (also close the Quickstarter, if you enabled it).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3791924" xml-lang="en-US" l10n="NEW">Install the language pack. Either double-click the exe file, or unpack the tar.gz file according to standard practice on your platform.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3150043" xml-lang="en-US" l10n="U" oldref="28"><link href="text/shared/optionen/01140000.xhp" name="Tools - Options - Language Settings - Languages">Tools - Options - Language Settings - Languages</link></paragraph>
-<paragraph role="paragraph" id="par_id3152483" xml-lang="en-US" l10n="U" oldref="29"><link href="text/shared/01/05020100.xhp" name="Format - Character - Font">Format - Character - Font</link></paragraph>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3150040" role="paragraph" l10n="U" oldref="2">The language you select for your document determines the dictionary used for spellcheck, thesaurus and hyphenation, the decimal and thousands delimiter used and the default currency format.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153093" role="listitem" l10n="U" oldref="3">The language you select applies to the whole document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152578" role="listitem" l10n="U" oldref="4">Within the document, you can apply a separate language to any paragraph style. This has priority over the language of the whole document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152886" role="listitem" l10n="U" oldref="5">You can assign a language to selected pieces of text in a paragraph, either by direct formatting or with a character style. This assignment has priority over the paragraph style and document language.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3146121" role="heading" level="2" l10n="U" oldref="6">Selecting a language for the whole document</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3083443" role="listitem" l10n="U" oldref="7">Choose <emph>Tools - Options</emph>. Go to <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages"><emph>Language Settings - Languages</emph></link>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="8">Under <emph>Default languages for documents</emph>, select the document language for all newly created documents. If you mark <emph>For the current document only</emph>, your choice will only apply to the current document. Close the dialog with <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3152938" role="heading" level="2" l10n="U" oldref="9">Selecting a language for a Paragraph Style</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150872" role="listitem" l10n="U" oldref="10">Place the cursor in the paragraph whose paragraph style you want to edit.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145367" role="listitem" l10n="U" oldref="11">Open the context menu and select <emph>Edit Paragraph Style</emph>. This opens the <emph>Paragraph Style</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3166413" role="listitem" l10n="U" oldref="12">Select the <emph>Font</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156283" role="listitem" l10n="U" oldref="13">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154942" role="listitem" l10n="U" oldref="14">All paragraphs formatted with the current paragraph style will have the selected language.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3145801" role="heading" level="2" l10n="U"
+ oldref="15">Applying a language directly to selected text</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148455" role="listitem" l10n="U" oldref="16">Select the text to which you want to apply a language.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3159348" role="listitem" l10n="U" oldref="17">Choose <emph>Format - Character</emph>. This opens the <emph>Character</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155600" role="listitem" l10n="U" oldref="18">Select the <emph>Font</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154510" role="listitem" l10n="U" oldref="19">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3154164" role="paragraph" l10n="U" oldref="20">In <item type="productname">%PRODUCTNAME</item> Calc, choose <emph>Format - Cells</emph> and proceed accordingly.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154272" role="heading" level="2" l10n="U"
+ oldref="21">Selecting a language for a Character Style</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145649" role="listitem" l10n="U" oldref="22">Open the Styles and Formatting window and click on the <emph>Character Styles</emph> icon.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3146792" role="listitem" l10n="U" oldref="23">Click on the name of the character style to which you want to apply a different language.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150753" role="listitem" l10n="U" oldref="24">Then open the context menu in the Styles and Formatting window and select <emph>Modify</emph>. This opens the <emph>Character Style</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150321" role="listitem" l10n="U" oldref="25">Select the <emph>Font</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154756" role="listitem" l10n="U" oldref="26">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155766" role="listitem" l10n="U" oldref="27">Now you can apply the character style to your selected text.</paragraph>
+ </listitem>
+ </list><comment>UFI: see i76182</comment>
+<paragraph xml-lang="en-US" id="hd_id8703268" role="heading" level="2" l10n="NEW">Adding More Text Languages</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7919248" role="paragraph" l10n="CHG">Dictionaries are supplied and installed as extensions. Choose <item type="menuitem">Tools - Language - More Dictionaries Online</item> to open the dictionaries page in your default web browser.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id5174108" role="paragraph" l10n="NEW">Select a dictionary in the list of descriptions. Click the heading in a dictionary description that you want to get.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id2897427" role="paragraph" l10n="NEW">In the next page, click the Get It icon to download the dictionary extension. Note the folder name to which your browser downloads the file. Download additional dictionaries as you like.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3906979" role="paragraph" l10n="NEW">In %PRODUCTNAME, choose <item type="menuitem">Tools - Extension Manager</item> and click Add to install the downloaded extensions.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0220200911174493" role="paragraph" l10n="NEW">After you installed the extensions, you should close %PRODUCTNAME (including the Quickstarter), and restart.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id9100924" role="heading" level="2" l10n="NEW">Setting UI Language</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2761314" role="paragraph" l10n="NEW">A standard installation of %PRODUCTNAME software will give you a user interface (UI) of your chosen language.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3912778" role="paragraph" l10n="CHG">Most users download the American English version, which gives you English menu commands and English application help. If you want another language for the menus (and for the application help, if available in that language), change the UI language as follows.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3163853" role="paragraph" l10n="NEW">Choose <item type="menuitem">Tools - Options - Language Settings - Languages</item>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id121158" role="paragraph" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3806878" role="paragraph" l10n="NEW">Click OK and restart the OpenOffice.org software.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id130619" role="paragraph" l10n="NEW">If the listbox doesn't list the language that you want, see "Adding More UI Languages".</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id9999694" role="heading" level="2" l10n="NEW">Adding More UI Languages</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id2216559" role="paragraph" l10n="NEW">Open your Web browser and enter <link href="http://wiki.services.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks">http://wiki.services.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks</link></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7869502" role="paragraph" l10n="CHG">Select and download the correct language pack for your version of %PRODUCTNAME software.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9852900" role="paragraph" l10n="CHG">Close %PRODUCTNAME software (also close the Quickstarter, if you enabled it).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3791924" role="paragraph" l10n="NEW">Install the language pack. Either double-click the exe file, or unpack the tar.gz file according to standard practice on your platform.</paragraph>
+ </listitem>
+ </list>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <paragraph xml-lang="en-US" id="par_id3150043" role="paragraph" l10n="U" oldref="28"><link href="text/shared/optionen/01140000.xhp" name="Tools - Options - Language Settings - Languages">Tools - Options - Language Settings - Languages</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152483" role="paragraph" l10n="U" oldref="29"><link href="text/shared/01/05020100.xhp" name="Format - Character - Font">Format - Character - Font</link></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/makefile.mk b/helpcontent2/source/text/shared/guide/makefile.mk
index 3bfdd7593b..ff84521cbb 100644
--- a/helpcontent2/source/text/shared/guide/makefile.mk
+++ b/helpcontent2/source/text/shared/guide/makefile.mk
@@ -6,9 +6,9 @@
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
+# $RCSfile: makefile.template,v $
#
-# $Revision: 1.14.4.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/guide/numbering_stop.xhp b/helpcontent2/source/text/shared/guide/numbering_stop.xhp
index 05d81143f9..023707e4b2 100644
--- a/helpcontent2/source/text/shared/guide/numbering_stop.xhp
+++ b/helpcontent2/source/text/shared/guide/numbering_stop.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: numbering_stop.xhp,v $
- * $Revision: 1.8 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -32,84 +32,86 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguidenumbering_stopxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Turning off Bullets and Numbering for Individual Paragraphs</title>
-<filename>/text/shared/guide/numbering_stop.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-28T08:14:55">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguidenumbering_stopxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Turning off Bullets and Numbering for Individual Paragraphs</title>
+ <filename>/text/shared/guide/numbering_stop.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154186"><bookmark_value>numbering; turning off</bookmark_value>
-<bookmark_value>bullets; turning off</bookmark_value>
-<bookmark_value>removing, see also deleting</bookmark_value>
-<bookmark_value>removing;bullets and numbering</bookmark_value>
-<bookmark_value>keyboard;removing numbering</bookmark_value>
+ <bookmark_value>bullets; turning off</bookmark_value>
+ <bookmark_value>removing, see also deleting</bookmark_value>
+ <bookmark_value>removing;bullets and numbering</bookmark_value>
+ <bookmark_value>keyboard;removing numbering</bookmark_value>
</bookmark><comment>MW added "removing, see also deleting"</comment>
-<paragraph role="heading" id="hd_id3154186" xml-lang="en-US" level="1" l10n="U" oldref="10"><variable id="numbering_stop"><link href="text/shared/guide/numbering_stop.xhp" name="Turning off Bullets and Numbering for Individual Paragraphs">Turning off Bullets and Numbering for Individual Paragraphs</link>
+<paragraph xml-lang="en-US" id="hd_id3154186" role="heading" level="1" l10n="U"
+ oldref="10"><variable id="numbering_stop"><link href="text/shared/guide/numbering_stop.xhp" name="Turning off Bullets and Numbering for Individual Paragraphs">Turning off Bullets and Numbering for Individual Paragraphs</link>
</variable></paragraph>
<switch select="appl">
+<case select="CALC"><comment>no bullets for Calc</comment>
+<paragraph xml-lang="en-US" id="par_id0202200910470118" role="note" l10n="NEW">Bullets and Numbering of paragraphs is supported only in Writer, Impress and Draw.</paragraph>
+</case>
+<case select="MATH"><comment>no bullets for Math</comment><comment>don't care for Math by now. Issue 98726</comment>
+</case>
<case select="WRITER">
<table id="tbl_id3155338">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="E">
-<image id="img_id3153527" src="res/commandimagelist/sc_removebullets.png" width="5.64mm" height="5.64mm"><alt id="alt_id3153527" xml-lang="en-US">Icon</alt>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="E">
+<image id="img_id3153527" src="res/commandimagelist/sc_removebullets.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153527">Icon</alt>
</image></paragraph>
-<paragraph role="paragraph" id="par_id3150443" xml-lang="en-US" l10n="E">
-<image id="img_id3163802" src="res/commandimagelist/sc_defaultbullet.png" width="5.64mm" height="5.64mm"><alt id="alt_id3163802" xml-lang="en-US">Icon</alt>
+ <paragraph xml-lang="en-US" id="par_id3150443" role="paragraph" l10n="E">
+<image id="img_id3163802" src="res/commandimagelist/sc_defaultbullet.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3163802">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="11">For the current paragraph or selected paragraphs you can switch off the automatic numbering or listing. Click the <emph>Numbering Off</emph> icon in the <emph>Bullets and Numbering</emph> bar.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147618" role="paragraph" l10n="U" oldref="11">For the current paragraph or selected paragraphs you can switch off the automatic numbering or listing. Click the <emph>Numbering Off</emph> icon in the <emph>Bullets and Numbering</emph> bar.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
</case>
-<default>
+<default><comment>Impress, Draw</comment>
<table id="tbl_id3159157">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="E">
-<image id="img_id3158432" src="res/commandimagelist/sc_defaultbullet.png" width="5.64mm" height="5.64mm"><alt id="alt_id3158432" xml-lang="en-US">Icon</alt>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155449" role="paragraph" l10n="E">
+<image id="img_id3158432" src="res/commandimagelist/sc_defaultbullet.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3158432">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3144511" xml-lang="en-US" l10n="CHG" oldref="31">If the cursor is located within a numbered or bulleted list, you can turn off automatic numbers or bullets for the current paragraph or selected paragraphs by clicking the <emph>Bullets On/Off </emph>icon on the <emph>Text Formatting</emph> bar.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3144511" role="paragraph" l10n="CHG" oldref="31">If the cursor is located within a numbered or bulleted list, you can turn off automatic numbers or bullets for the current paragraph or selected paragraphs by clicking the <emph>Bullets On/Off </emph>icon on the <emph>Text Formatting</emph> bar.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
</default>
</switch>
-<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER">To remove numbering from a paragraph using the keyboard:
+<paragraph xml-lang="en-US" id="par_id3148946" role="paragraph" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER">To remove numbering from a paragraph using the keyboard:
</caseinline></switchinline></paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148663" xml-lang="en-US" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">Place the cursor at the beginning of a numbered paragraph and press the Backspace key.
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148663" role="listitem" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">Place the cursor at the beginning of a numbered paragraph and press the Backspace key.
</caseinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150543" xml-lang="en-US" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER">The numbering of the paragraph disappears and is removed from the numbering sequence. Numbering resumes in the following paragraph.
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150543" role="listitem" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER">The numbering of the paragraph disappears and is removed from the numbering sequence. Numbering resumes in the following paragraph.
</caseinline></switchinline></paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="WRITER">If you press the Enter key in an empty numbered paragraph, the numbering stops.
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="WRITER">If you press the Enter key in an empty numbered paragraph, the numbering stops.
</caseinline></switchinline></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3151043" xml-lang="en-US" l10n="CHG" oldref="32"><link href="text/shared/01/06050000.xhp" name="Format - Bullets/Numbering">Format - Bullets and Numbering</link></paragraph>
-<embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
-<embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
-<embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
-<embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
-<embed href="text/swriter/guide/captions.xhp#captions"/>
-<embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
-</section>
-</body>
-</helpdocument>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3151043" role="paragraph" l10n="CHG" oldref="32"><link href="text/shared/01/06050000.xhp" name="Format - Bullets/Numbering">Format - Bullets and Numbering</link></paragraph>
+ <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+ <embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
+ <embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
+ <embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
+ <embed href="text/swriter/guide/captions.xhp#captions"/>
+ <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index bbd77b9aba..b04d3b4ad5 100755
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp
@@ -60,7 +60,7 @@
<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
<paragraph role="tip" id="par_idN10663" xml-lang="en-US" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
-<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.2228in" height="0.2228in"><alt id="alt_id209967" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt id="alt_id209967" xml-lang="en-US">Icon</alt>
</image>. After you apply all the formatting, click the icon again.</paragraph>
</listitem>
<listitem>
diff --git a/helpcontent2/source/text/shared/makefile.mk b/helpcontent2/source/text/shared/makefile.mk
index 8f5dba7586..7b2246ad9f 100644
--- a/helpcontent2/source/text/shared/makefile.mk
+++ b/helpcontent2/source/text/shared/makefile.mk
@@ -6,9 +6,9 @@
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
+# $RCSfile: makefile.template,v $
#
-# $Revision: 1.11.4.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/optionen/01040400.xhp b/helpcontent2/source/text/shared/optionen/01040400.xhp
index 0be229b14a..cbb14aa02f 100644
--- a/helpcontent2/source/text/shared/optionen/01040400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040400.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040400.xhp,v $
- * $Revision: 1.17 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -33,96 +32,134 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedoptionen01040400xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Print</title>
-<filename>/text/shared/optionen/01040400.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="drucken">
+ <topic id="textsharedoptionen01040400xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Print</title>
+ <filename>/text/shared/optionen/01040400.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="drucken">
<bookmark xml-lang="en-US" branch="index" id="bm_id3156156"><bookmark_value>pictures; printing</bookmark_value>
-<bookmark_value>tables in text; printing</bookmark_value>
-<bookmark_value>drawings; printing in text documents </bookmark_value>
-<bookmark_value>controls; printing</bookmark_value>
-<bookmark_value>backgrounds; printing</bookmark_value>
-<bookmark_value>printing; elements in text documents</bookmark_value>
-<bookmark_value>text documents; print settings</bookmark_value>
-<bookmark_value>printing; text always in black</bookmark_value>
-<bookmark_value>black printing in Calc</bookmark_value>
-<bookmark_value>printing; left/right pages</bookmark_value>
-<bookmark_value>even/odd pages;printing</bookmark_value>
-<bookmark_value>printing; text in reverse order</bookmark_value>
-<bookmark_value>reversing printing order</bookmark_value>
-<bookmark_value>brochures; printing several</bookmark_value>
-<bookmark_value>printing; brochures</bookmark_value>
-<bookmark_value>notes; printing in text</bookmark_value>
-<bookmark_value>printing; creating individual jobs</bookmark_value>
-<bookmark_value>faxes;selecting a fax machine</bookmark_value>
+ <bookmark_value>tables in text; printing</bookmark_value>
+ <bookmark_value>drawings; printing in text documents </bookmark_value>
+ <bookmark_value>controls; printing</bookmark_value>
+ <bookmark_value>backgrounds; printing</bookmark_value>
+ <bookmark_value>printing; elements in text documents</bookmark_value>
+ <bookmark_value>text documents; print settings</bookmark_value>
+ <bookmark_value>printing; text always in black</bookmark_value>
+ <bookmark_value>black printing in Calc</bookmark_value>
+ <bookmark_value>printing; left/right pages</bookmark_value>
+ <bookmark_value>even/odd pages;printing</bookmark_value>
+ <bookmark_value>printing; text in reverse order</bookmark_value>
+ <bookmark_value>reversing printing order</bookmark_value>
+ <bookmark_value>brochures; printing several</bookmark_value>
+ <bookmark_value>printing; brochures</bookmark_value>
+ <bookmark_value>notes; printing in text</bookmark_value>
+ <bookmark_value>printing; creating individual jobs</bookmark_value>
+ <bookmark_value>faxes;selecting a fax machine</bookmark_value>
</bookmark><comment>mw made "fax machine selection" a two level entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTPRINT_PAGE" id="bm_id3153750" localize="false"/><paragraph role="heading" id="hd_id3156414" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040400.xhp" name="Print">Print</link></paragraph>
-<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTPRINT_PAGE">Specifies print settings within a text or HTML document.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#drucken1"/>
-</section>
-<paragraph role="note" id="par_id3153542" xml-lang="en-US" l10n="CHG" oldref="44">The print settings defined on this tab page apply to all subsequent documents. If you only want to change the settings for the current document, use the <emph>Options</emph> button in the<emph> File - Print</emph> dialog.</paragraph>
-<paragraph role="heading" id="hd_id3156330" xml-lang="en-US" level="2" l10n="U" oldref="3">Contents</paragraph>
-<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="4">Specifies which document contents are to be printed. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF" id="bm_id3145674" localize="false"/><paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="3" l10n="U" oldref="5">Graphics</paragraph>
-<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF">Specifies whether the graphics of your text document are printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="7">Tables</paragraph>
-<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB">Specifies whether the tables of the text document are printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3149294" xml-lang="en-US" level="3" l10n="U" oldref="9">Drawings (not for HTML documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW">Specifies whether graphics created with $[officename] drawing functions are printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD" id="bm_id3151210" localize="false"/><paragraph role="heading" id="hd_id3153525" xml-lang="en-US" level="3" l10n="U" oldref="11">Controls</paragraph>
-<paragraph role="paragraph" id="par_id3158408" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="U" oldref="13">Background</paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND">Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.</ahelp><comment>UFI: fixes #i21977#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT" id="bm_id3144760" localize="false"/><paragraph role="heading" id="hd_id3150868" xml-lang="en-US" level="3" l10n="U" oldref="40">Print black</paragraph>
-<paragraph role="paragraph" id="par_id3149562" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT">Specifies whether to always print text in black.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_HIDDEN_TEXT" id="bm_id342722" localize="false"/><paragraph role="heading" id="hd_id8004394" xml-lang="en-US" level="3" l10n="NEW">Hidden text</paragraph>
-<paragraph role="paragraph" id="par_id2021546" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable this option to print text that is marked as hidden.</ahelp> The following hidden text is printed: text that is formatted as hidden by <link href="text/shared/01/05020200.xhp">Format - Character - Font Effects - Hidden</link>, and the text fields <link href="text/swriter/01/04090003.xhp">Hidden text and Hidden paragraphs</link>.<comment>UFI: sorry, due to a bug no links allowed in extended help text</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_TEXT_PLACEHOLDER" id="bm_id5788750" localize="false"/><paragraph role="heading" id="hd_id2623981" xml-lang="en-US" level="3" l10n="NEW">Text placeholder</paragraph>
-<paragraph role="paragraph" id="par_id7242042" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</ahelp><link href="text/swriter/01/04090003.xhp">Text placeholders</link> are fields.</paragraph>
-<paragraph role="heading" id="hd_id3151115" xml-lang="en-US" level="2" l10n="U" oldref="15">Pages</paragraph>
-<paragraph role="paragraph" id="par_id3145365" xml-lang="en-US" l10n="U" oldref="16">Defines the print order for $[officename] Writer documents with multiple pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP" id="bm_id3148618" localize="false"/><paragraph role="heading" id="hd_id3150874" xml-lang="en-US" level="3" l10n="U" oldref="17">Left pages (not for HTML documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149665" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP">Specifies whether to print all left pages of the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP" id="bm_id3147213" localize="false"/><paragraph role="heading" id="hd_id3152885" xml-lang="en-US" level="3" l10n="U" oldref="19">Right pages (not for HTML documents)</paragraph>
-<paragraph role="paragraph" id="par_id3150103" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP">Specifies whether to print all right pages of the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE" id="bm_id3153142" localize="false"/><paragraph role="heading" id="hd_id3148577" xml-lang="en-US" level="3" l10n="U" oldref="21">Reversed</paragraph>
-<paragraph role="paragraph" id="par_id3150486" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE">Specifies whether to reverse the printing order.</ahelp> The last page of the document will then be the first one printed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT" id="bm_id3155306" localize="false"/><paragraph role="heading" id="hd_id3147318" xml-lang="en-US" level="3" l10n="U" oldref="23">Brochure</paragraph>
-<paragraph role="paragraph" id="par_id3155417" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT">Select the<emph> Brochure </emph>option to print your document in brochure format.</ahelp> The brochure format is as follows in $[officename] Writer:</paragraph>
-<section id="brochure">
-<paragraph role="paragraph" id="par_id3149410" xml-lang="en-US" l10n="CHG" oldref="25">If you print a document in portrait on a landscape page, two opposing sides in a brochure will be printed next to each other. If you have a printer with double-sided printing capability, you can create an entire brochure from your document without having to collate the pages later. If you have a printer that only has single-sided printing capability, you can achieve this effect by first printing the front pages with the <emph>Right pages</emph> option marked, then re-inserting the entire paper stack in your printer and printing all the back pages with the <emph>Left pages</emph> option marked.</paragraph>
-</section>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PROSPECT_RTL" id="bm_id8632770" localize="false"/><paragraph role="heading" id="hd_id9475386" xml-lang="en-US" level="3" l10n="NEW">Right to left</paragraph>
-<paragraph role="paragraph" id="par_id7894222" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Check to print the pages of the brochure in the correct order for a right-to-left script.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149300" xml-lang="en-US" level="2" l10n="U" oldref="26">Notes</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO" id="bm_id3157847" localize="false"/><paragraph role="heading" id="hd_id3150095" xml-lang="en-US" level="3" l10n="U" oldref="28">None</paragraph>
-<paragraph role="paragraph" id="par_id3151320" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO">Specifies that notes in your document are not printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY" id="bm_id3153948" localize="false"/><paragraph role="heading" id="hd_id3155601" xml-lang="en-US" level="3" l10n="U" oldref="30">Notes only</paragraph>
-<paragraph role="paragraph" id="par_id3146988" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY">Specifies that notes in your document are printed, but not the actual text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END" id="bm_id3154272" localize="false"/><paragraph role="heading" id="hd_id3153839" xml-lang="en-US" level="3" l10n="U" oldref="32">End of document</paragraph>
-<paragraph role="paragraph" id="par_id3146789" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END">Specifies that notes are printed at the end of the document, after the actual text. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND" id="bm_id3157868" localize="false"/><paragraph role="heading" id="hd_id3155066" xml-lang="en-US" level="3" l10n="U" oldref="34">End of page</paragraph>
-<paragraph role="paragraph" id="par_id3154360" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND">Specifies that notes are printed on an extra page that follows each page containing notes.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3148916" xml-lang="en-US" level="2" l10n="U" oldref="45">Other</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PRINTEMPTYPAGES" id="bm_id2646870" localize="false"/><paragraph role="heading" id="hd_id4188055" xml-lang="en-US" level="3" l10n="NEW">Print automatically inserted blank pages</paragraph>
-<paragraph role="paragraph" id="par_id8295541" xml-lang="en-US" l10n="CHG"><ahelp hid=".">If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS" id="bm_id3153713" localize="false"/><paragraph role="heading" id="hd_id3145642" xml-lang="en-US" level="3" l10n="CHG" oldref="47">Create single print jobs</paragraph>
-<paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS">Specifies that each new print job will begin on a new page even if you are using a duplex printer.</ahelp> If this field is not checked then it is possible that the first page of the second copy is printed on the reverse side of the last page of the first copy, especially if there are an odd number of pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP" id="bm_id3149107" localize="false"/><paragraph role="heading" id="hd_id3156384" xml-lang="en-US" level="3" l10n="U" oldref="41">Paper tray from printer settings</paragraph>
-<paragraph role="paragraph" id="par_id3146316" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP">For printers with multiple trays, the <emph>Paper tray from printer settings </emph>option specifies whether the paper tray used is specified by the system settings of the printer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX" id="bm_id3155336" localize="false"/><paragraph role="heading" id="hd_id3147362" xml-lang="en-US" level="3" l10n="U" oldref="38">Fax</paragraph>
-<paragraph role="paragraph" id="par_id3154703" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/HID_OPTPRINT_PAGE" id="bm_id3153750" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156414" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040400.xhp" name="Print">Print</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTPRINT_PAGE">Specifies print settings within a text or HTML document.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#drucken1"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3153542" role="note" l10n="CHG" oldref="44">The print settings defined on this tab page apply to all subsequent documents. If you only want to change the settings for the current document, use the <emph>Options</emph> button in the<emph> File - Print</emph> dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156330" role="heading" level="2" l10n="U" oldref="3">Contents</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155628" role="paragraph" l10n="U" oldref="4">Specifies which document contents are to be printed. </paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF" id="bm_id3145674" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156156" role="heading" level="3" l10n="U" oldref="5">Graphics</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF">Specifies whether the graphics of your text document are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB" id="bm_id3148564" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150771" role="heading" level="3" l10n="U" oldref="7">Tables</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148943" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB">Specifies whether the tables of the text document are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW" id="bm_id3154923" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="3" l10n="U" oldref="9">Drawings (not for HTML documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149457" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW">Specifies whether graphics created with $[officename] drawing functions are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD" id="bm_id3151210" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153525" role="heading" level="3" l10n="U"
+ oldref="11">Controls</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158408" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND" id="bm_id3154684" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="3" l10n="U"
+ oldref="13">Background</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="14"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND">Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.</ahelp><comment>UFI: fixes #i21977#</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT" id="bm_id3144760" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150868" role="heading" level="3" l10n="U"
+ oldref="40">Print black</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149562" role="paragraph" l10n="U" oldref="42"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT">Specifies whether to always print text in black.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_HIDDEN_TEXT" id="bm_id342722" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8004394" role="heading" level="3" l10n="NEW">Hidden text</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2021546" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text that is marked as hidden.</ahelp> The following hidden text is printed: text that is formatted as hidden by <link href="text/shared/01/05020200.xhp">Format - Character - Font Effects - Hidden</link>, and the text fields <link href="text/swriter/01/04090003.xhp">Hidden text and Hidden paragraphs</link>.<comment>UFI: sorry, due to a bug no links allowed in extended help text</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_TEXT_PLACEHOLDER" id="bm_id5788750" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2623981" role="heading" level="3" l10n="NEW">Text placeholder</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7242042" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</ahelp><link href="text/swriter/01/04090003.xhp">Text placeholders</link> are fields.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3151115" role="heading" level="2" l10n="U"
+ oldref="15">Pages</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145365" role="paragraph" l10n="U" oldref="16">Defines the print order for $[officename] Writer documents with multiple pages.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP" id="bm_id3148618" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150874" role="heading" level="3" l10n="U"
+ oldref="17">Left pages (not for HTML documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149665" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP">Specifies whether to print all left (even numbered) pages of the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP" id="bm_id3147213" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152885" role="heading" level="3" l10n="U"
+ oldref="19">Right pages (not for HTML documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150103" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP">Specifies whether to print all right (odd numbered) pages of the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE" id="bm_id3153142" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148577" role="heading" level="3" l10n="U"
+ oldref="21">Reversed</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150486" role="paragraph" l10n="U" oldref="22"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE">Specifies whether to reverse the printing order. The last page of the document will then be the first one printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT" id="bm_id3155306" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147318" role="heading" level="3" l10n="U"
+ oldref="23">Brochure</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="24"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT">Select the<emph> Brochure </emph>option to print your document in brochure format.</ahelp> The brochure format is as follows in $[officename] Writer:</paragraph>
+ <section id="brochure">
+ <paragraph xml-lang="en-US" id="par_id3149410" role="paragraph" l10n="CHG" oldref="25">If you print a document in portrait on a landscape page, two opposing sides in a brochure will be printed next to each other. If you have a printer with double-sided printing capability, you can create an entire brochure from your document without having to collate the pages later. If you have a printer that only has single-sided printing capability, you can achieve this effect by first printing the front pages with the <emph>Right pages</emph> option marked, then re-inserting the entire paper stack in your printer and printing all the back pages with the <emph>Left pages</emph> option marked.</paragraph>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PROSPECT_RTL" id="bm_id8632770" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9475386" role="heading" level="3" l10n="NEW">Right to left</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7894222" role="paragraph" l10n="NEW"><ahelp hid=".">Check to print the pages of the brochure in the correct order for a right-to-left script.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149300" role="heading" level="2" l10n="U"
+ oldref="26">Notes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO" id="bm_id3157847" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150095" role="heading" level="3" l10n="U"
+ oldref="28">None</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="U" oldref="29"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO">Specifies that notes in your document are not printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY" id="bm_id3153948" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155601" role="heading" level="3" l10n="U"
+ oldref="30">Notes only</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146988" role="paragraph" l10n="U" oldref="31"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY">Specifies that notes in your document are printed, but not the actual text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END" id="bm_id3154272" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153839" role="heading" level="3" l10n="U"
+ oldref="32">End of document</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146789" role="paragraph" l10n="U" oldref="33"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END">Specifies that notes are printed at the end of the document, after the actual text. </ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND" id="bm_id3157868" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155066" role="heading" level="3" l10n="U"
+ oldref="34">End of page</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154360" role="paragraph" l10n="U" oldref="35"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND">Specifies that notes are printed on an extra page that follows each page containing notes.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148916" role="heading" level="2" l10n="U"
+ oldref="45">Other</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PRINTEMPTYPAGES" id="bm_id2646870" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id4188055" role="heading" level="3" l10n="NEW">Print automatically inserted blank pages</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8295541" role="paragraph" l10n="CHG"><ahelp hid=".">If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS" id="bm_id3153713" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145642" role="heading" level="3" l10n="CHG"
+ oldref="47">Create single print jobs</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147338" role="paragraph" l10n="U" oldref="48"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS">Specifies that each new print job will begin on a new page even if you are using a duplex printer.</ahelp> If this field is not checked then it is possible that the first page of the second copy is printed on the reverse side of the last page of the first copy, especially if there are an odd number of pages.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP" id="bm_id3149107" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156384" role="heading" level="3" l10n="U"
+ oldref="41">Paper tray from printer settings</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="37"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP">For printers with multiple trays, the "Paper tray from printer settings" option specifies whether the paper tray used is specified by the system settings of the printer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX" id="bm_id3155336" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147362" role="heading" level="3" l10n="U"
+ oldref="38">Fax</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154703" role="paragraph" l10n="U" oldref="39"><ahelp hid="SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01130200.xhp b/helpcontent2/source/text/shared/optionen/01130200.xhp
index 2fa1eb0190..8d17cf6967 100755
--- a/helpcontent2/source/text/shared/optionen/01130200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01130200.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01130200.xhp,v $
- * $Revision: 1.5 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -29,31 +30,31 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textsharedoptionen01130200xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Microsoft Office</title>
-<filename>/text/shared/optionen/01130200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-
-
- <section id="office1">
- <paragraph id="hd_id3156410" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/optionen/01130200.xhp" name="Microsoft Office">Microsoft Office</link></paragraph>
- <paragraph role="paragraph" id="par_id3149095" l10n="U" xml-lang="en-US" oldref="2">Specifies the settings for importing and exporting Microsoft Office OLE objects.</paragraph>
- </section>
- <paragraph role="paragraph" id="par_id3159233" l10n="U" xml-lang="en-US" oldref="7">These settings are valid when no Microsoft OLE server exists (for example, in UNIX) or when there is no $[officename] OLE server ready for editing the OLE objects.</paragraph>
- <section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#etsofi2"/>
-</section>
- <bookmark branch="hid/HID_OFAPAGE_MSFLTR2_CLB" xml-lang="en-US" id="bm_id3158430"/><paragraph role="heading" level="2" id="hd_id3146798" l10n="U" xml-lang="en-US" oldref="3">List Box</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150670" xml-lang="en-US" oldref="4"><ahelp visibility="visible" hid="HID_OFAPAGE_MSFLTR2_CLB">The<emph> List Box </emph>field displays the entries for the pair of OLE objects that can be converted when loading into $[officename] (L) and/or when saving into a Microsoft format (S). </ahelp></paragraph>
- <paragraph role="paragraph" id="par_id3154286" l10n="U" xml-lang="en-US" oldref="5">Mark the box in the [L] column in front of the entry if a Microsoft OLE object is to be converted into the specified $[officename] OLE object when a Microsoft document is loaded into $[officename].</paragraph>
- <paragraph role="paragraph" id="par_id3153880" l10n="U" xml-lang="en-US" oldref="6">Mark the box in the [S] column in front of the entry if a $[officename] OLE object is to be converted into the specified Microsoft OLE object when a document is saved in a Microsoft file format.</paragraph>
- </body>
-</helpdocument>
+ <topic id="textsharedoptionen01130200xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Microsoft Office</title>
+ <filename>/text/shared/optionen/01130200.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="office1">
+ <paragraph xml-lang="en-US" id="hd_id3156410" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01130200.xhp" name="Microsoft Office">Microsoft Office</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="U" oldref="2">Specifies the settings for importing and exporting Microsoft Office OLE objects.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3159233" role="paragraph" l10n="U" oldref="7">These settings are valid when no Microsoft OLE server exists (for example, in UNIX) or when there is no $[officename] OLE server ready for editing the OLE objects.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0107200910364795" role="paragraph" l10n="NEW">If an OLE server is active for the embedded object, then the OLE server will be used to handle the object.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0107200910364725" role="paragraph" l10n="NEW">If no OLE server is active for MathType objects, then embedded MathType objects can be converted to %PRODUCTNAME Math objects. For this conversion, the embedded MathType objects must not exceed the MathType 3.1 specifications.<comment>mail answer by Thomas Lange re i97686</comment></paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#etsofi2"/>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_MSFLTR2_CLB" id="bm_id3158430" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146798" role="heading" level="2" l10n="U" oldref="3">List Box</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150670" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_OFAPAGE_MSFLTR2_CLB">The<emph> List Box </emph>field displays the entries for the pair of OLE objects that can be converted when loading into $[officename] (L) and/or when saving into a Microsoft format (S). </ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="5">Mark the box in the [L] column in front of the entry if a Microsoft OLE object is to be converted into the specified $[officename] OLE object when a Microsoft document is loaded into $[officename].</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153880" role="paragraph" l10n="U" oldref="6">Mark the box in the [S] column in front of the entry if a $[officename] OLE object is to be converted into the specified Microsoft OLE object when a document is saved in a Microsoft file format.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/makefile.mk b/helpcontent2/source/text/shared/optionen/makefile.mk
index 88d6249ab3..4226bd978d 100644
--- a/helpcontent2/source/text/shared/optionen/makefile.mk
+++ b/helpcontent2/source/text/shared/optionen/makefile.mk
@@ -6,9 +6,9 @@
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
+# $RCSfile: makefile.template,v $
#
-# $Revision: 1.13.4.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/optionen/online_update.xhp b/helpcontent2/source/text/shared/optionen/online_update.xhp
index 7e4398329d..29519ff604 100644
--- a/helpcontent2/source/text/shared/optionen/online_update.xhp
+++ b/helpcontent2/source/text/shared/optionen/online_update.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: online_update.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -33,46 +32,52 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedoptionenonlineupdatexhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Online Update</title>
-<filename>/text/shared/optionen/online_update.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="online_update">
+ <topic id="textsharedoptionenonlineupdatexhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Online Update</title>
+ <filename>/text/shared/optionen/online_update.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="online_update">
<bookmark xml-lang="en-US" branch="index" id="bm_id7657094"><bookmark_value>update options</bookmark_value>
-<bookmark_value>online update options</bookmark_value>
-<bookmark_value>options;online update</bookmark_value>
-<bookmark_value>online updates; checking automatically</bookmark_value>
-<bookmark_value>updates; checking automatically</bookmark_value>
+ <bookmark_value>online update options</bookmark_value>
+ <bookmark_value>options;online update</bookmark_value>
+ <bookmark_value>online updates; checking automatically</bookmark_value>
+ <bookmark_value>updates; checking automatically</bookmark_value>
+ <bookmark_value>Internet; checking for updates</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id29297" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/optionen/online_update.xhp">Online Update</link></paragraph>
-<paragraph role="paragraph" id="par_id8754844" xml-lang="en-US" l10n="NEW">Specifies some options for the automatic notification and downloading of online updates to %PRODUCTNAME.</paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#online_update"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_ONLINEUPDATE_CB_AUTOCHECK" id="bm_id877101" localize="false"/><paragraph role="heading" id="hd_id2189397" xml-lang="en-US" level="2" l10n="NEW">Check for updates automatically</paragraph>
-<paragraph role="paragraph" id="par_id7523728" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <item type="menuitem">Tools - Options - Internet - Proxy</item>.</paragraph>
-<paragraph role="paragraph" id="par_id8994109" xml-lang="en-US" l10n="NEW">When an update is available, an icon in the menu bar displays some explaining text. Click the icon to proceed.</paragraph>
-<paragraph role="paragraph" id="par_id476699" xml-lang="en-US" l10n="NEW">If you disable the check, the icon is removed from the menu bar.</paragraph>
-<paragraph role="note" id="par_id4057130" xml-lang="en-US" l10n="CHG">Online Update is a module that can be selected or deselected to be installed. Choose the customized installation in the Setup of %PRODUCTNAME.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYDAY" id="bm_id3116855" localize="false"/><paragraph role="heading" id="hd_id266426" xml-lang="en-US" level="3" l10n="NEW">Every Day</paragraph>
-<paragraph role="paragraph" id="par_id3031098" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A check will be performed once a day.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYWEEK" id="bm_id9302041" localize="false"/><paragraph role="heading" id="hd_id8276619" xml-lang="en-US" level="3" l10n="NEW">Every Week</paragraph>
-<paragraph role="paragraph" id="par_id7824030" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A check will be performed once a week. This is the default setting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYMONTH" id="bm_id5097201" localize="false"/><paragraph role="heading" id="hd_id7534104" xml-lang="en-US" level="3" l10n="NEW">Every Month</paragraph>
-<paragraph role="paragraph" id="par_id209051" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A check will be performed once a month.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_ONLINEUPDATE_PB_CHECKNOW" id="bm_id5540025" localize="false"/><paragraph role="heading" id="hd_id1418805" xml-lang="en-US" level="3" l10n="NEW">Check now</paragraph>
-<paragraph role="paragraph" id="par_id1743522" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A check will be performed now.</ahelp></paragraph><comment>Autodownload help id is in shared/01/online_update.xhp</comment><paragraph role="heading" id="hd_id5994140" xml-lang="en-US" level="2" l10n="NEW">Download updates automatically</paragraph>
-<paragraph role="paragraph" id="par_id7870113" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to download an available online update file automatically to the specified folder.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3051545" xml-lang="en-US" level="3" l10n="NEW">Download destination</paragraph>
-<paragraph role="paragraph" id="par_id3061311" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the selected folder to store the downloaded files.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id4814905" xml-lang="en-US" level="3" l10n="NEW">Change</paragraph>
-<paragraph role="paragraph" id="par_id2143925" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to show a dialog box where you can select another folder.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id29297" role="heading" level="1" l10n="NEW"><link href="text/shared/optionen/online_update.xhp">Online Update</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id8754844" role="paragraph" l10n="NEW">Specifies some options for the automatic notification and downloading of online updates to %PRODUCTNAME.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#online_update"/>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_ONLINEUPDATE_CB_AUTOCHECK" id="bm_id877101" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2189397" role="heading" level="2" l10n="NEW">Check for updates automatically</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7523728" role="paragraph" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <item type="menuitem">Tools - Options - Internet - Proxy</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8994109" role="paragraph" l10n="NEW">When an update is available, an icon in the menu bar displays some explaining text. Click the icon to proceed.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id476699" role="paragraph" l10n="NEW">If you disable the check, the icon is removed from the menu bar.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4057130" role="note" l10n="CHG">Online Update is a module that can be selected or deselected to be installed. Choose the customized installation in the Setup of %PRODUCTNAME.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYDAY" id="bm_id3116855" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id266426" role="heading" level="3" l10n="NEW">Every Day</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3031098" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a day.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYWEEK" id="bm_id9302041" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8276619" role="heading" level="3" l10n="NEW">Every Week</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7824030" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a week. This is the default setting.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYMONTH" id="bm_id5097201" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7534104" role="heading" level="3" l10n="NEW">Every Month</paragraph>
+ <paragraph xml-lang="en-US" id="par_id209051" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a month.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_ONLINEUPDATE_PB_CHECKNOW" id="bm_id5540025" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1418805" role="heading" level="3" l10n="NEW">Check now</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1743522" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed now.</ahelp></paragraph><comment>Autodownload help id is in shared/01/online_update.xhp</comment>
+<paragraph xml-lang="en-US" id="hd_id5994140" role="heading" level="2" l10n="NEW">Download updates automatically</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7870113" role="paragraph" l10n="NEW"><ahelp hid=".">Select to download an available online update file automatically to the specified folder.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3051545" role="heading" level="3" l10n="NEW">Download destination</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3061311" role="paragraph" l10n="NEW"><ahelp hid=".">Displays the selected folder to store the downloaded files.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id4814905" role="heading" level="3" l10n="NEW">Change</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2143925" role="paragraph" l10n="NEW"><ahelp hid=".">Click to show a dialog box where you can select another folder.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file