summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--helpcontent2/source/text/scalc/01/03070000.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060101.xhp2
-rw-r--r--helpcontent2/source/text/scalc/01/04060106.xhp2
-rw-r--r--helpcontent2/source/text/scalc/01/12030100.xhp15
-rwxr-xr-xhelpcontent2/source/text/scalc/01/12030200.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/01/12050200.xhp6
-rwxr-xr-xhelpcontent2/source/text/scalc/01/12090101.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/cellreferences_url.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/csv_files.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/csv_formula.xhp2
-rw-r--r--helpcontent2/source/text/scalc/guide/formula_enter.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/formula_value.xhp2
-rw-r--r--helpcontent2/source/text/shared/00/00000001.xhp2
-rw-r--r--helpcontent2/source/text/shared/00/00000020.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000021.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000099.xhp2
-rw-r--r--helpcontent2/source/text/shared/00/00000406.xhp3
-rw-r--r--helpcontent2/source/text/shared/01/01010100.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/01010201.xhp6
-rw-r--r--helpcontent2/source/text/shared/01/01020000.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/01070000.xhp6
-rw-r--r--helpcontent2/source/text/shared/01/01070001.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/01110100.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/01130000.xhp18
-rw-r--r--helpcontent2/source/text/shared/01/01160200.xhp3
-rw-r--r--helpcontent2/source/text/shared/01/02230100.xhp6
-rw-r--r--helpcontent2/source/text/shared/01/02230200.xhp16
-rw-r--r--helpcontent2/source/text/shared/01/05020200.xhp8
-rwxr-xr-xhelpcontent2/source/text/shared/01/05020700.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/01/05210200.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/mediaplayer.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/online_update.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/online_update_dialog.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/ref_pdf_export.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/securitywarning.xhp2
-rw-r--r--helpcontent2/source/text/shared/02/01170000.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170003.xhp16
-rw-r--r--helpcontent2/source/text/shared/02/02020000.xhp32
-rw-r--r--helpcontent2/source/text/shared/02/02130000.xhp6
-rw-r--r--helpcontent2/source/text/shared/02/02140000.xhp23
-rw-r--r--helpcontent2/source/text/shared/02/09050000.xhp17
-rw-r--r--helpcontent2/source/text/shared/02/12000000.xhp15
-rw-r--r--helpcontent2/source/text/shared/autopi/01010400.xhp2
-rw-r--r--helpcontent2/source/text/shared/autopi/01050000.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01050100.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/accessibility.xhp13
-rw-r--r--helpcontent2/source/text/shared/guide/assistive.xhp6
-rw-r--r--helpcontent2/source/text/shared/guide/collab.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ctl.xhp9
-rw-r--r--helpcontent2/source/text/shared/guide/data_register.xhp7
-rw-r--r--helpcontent2/source/text/shared/guide/digitalsign_receive.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/doc_autosave.xhp6
-rw-r--r--helpcontent2/source/text/shared/guide/doc_save.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/guide/email.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/guide/fax.xhp2
-rw-r--r--helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/hyperlink_search.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/language_select.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/measurement_units.xhp2
-rw-r--r--helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ms_user.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/guide/print_blackwhite.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/spadmin.xhp9
-rw-r--r--helpcontent2/source/text/shared/guide/tabs.xhp10
-rw-r--r--helpcontent2/source/text/shared/main0108.xhp6
-rw-r--r--helpcontent2/source/text/shared/main0227.xhp4
-rw-r--r--helpcontent2/source/text/shared/main0650.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01000000.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01010200.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01030500.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01060100.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/macrosecurity.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/serverauthentication.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/testaccount.xhp6
-rw-r--r--helpcontent2/source/text/simpress/01/04030000.xhp4
-rw-r--r--helpcontent2/source/text/simpress/01/04990600.xhp8
-rw-r--r--helpcontent2/source/text/simpress/02/08020000.xhp6
-rw-r--r--helpcontent2/source/text/swriter/01/03050000.xhp6
-rw-r--r--helpcontent2/source/text/swriter/01/03090000.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/03100000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/03140000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/04060000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/04090001.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/04090003.xhp4
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04130100.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/04150000.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05040800.xhp6
-rw-r--r--helpcontent2/source/text/swriter/01/05090201.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/06030000.xhp6
-rw-r--r--helpcontent2/source/text/swriter/02/18030700.xhp2
-rw-r--r--helpcontent2/source/text/swriter/02/18130000.xhp6
-rw-r--r--helpcontent2/source/text/swriter/guide/fields.xhp3
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/number_date_conv.xhp4
-rw-r--r--helpcontent2/source/text/swriter/guide/ruler.xhp24
-rw-r--r--helpcontent2/source/text/swriter/guide/select_language.xhp18
-rw-r--r--helpcontent2/source/text/swriter/guide/smarttags.xhp8
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/tablemode.xhp32
-rw-r--r--helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp17
98 files changed, 218 insertions, 383 deletions
diff --git a/helpcontent2/source/text/scalc/01/03070000.xhp b/helpcontent2/source/text/scalc/01/03070000.xhp
index 7962e49bf5..8db2537c1b 100644
--- a/helpcontent2/source/text/scalc/01/03070000.xhp
+++ b/helpcontent2/source/text/scalc/01/03070000.xhp
@@ -64,7 +64,7 @@
</section>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3156441" xml-lang="en-US" l10n="U" oldref="3">You can also set the view of the column and row headers in <link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View"><emph>Tools - Options - %PRODUCTNAME Calc - View</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3156441" xml-lang="en-US" l10n="U" oldref="3">You can also set the view of the column and row headers in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</emph></link>.</paragraph>
</listitem>
</list>
</body>
diff --git a/helpcontent2/source/text/scalc/01/04060101.xhp b/helpcontent2/source/text/scalc/01/04060101.xhp
index 30bbd09e1c..23879e04be 100755
--- a/helpcontent2/source/text/scalc/01/04060101.xhp
+++ b/helpcontent2/source/text/scalc/01/04060101.xhp
@@ -503,7 +503,7 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3147083" role="paragraph" l10n="U" oldref="87">
<emph>SearchCriteria</emph> is the cell range containing search criteria. If you write several criteria in one row they are connected by AND. If you write the criteria in different rows they are connected by OR. Empty cells in the search criteria range will be ignored.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3151188" role="paragraph" l10n="U" oldref="188">Choose <link href="text/shared/optionen/01060500.xhp" name="Tools - Options - Spreadsheet - Calculate">Tools - Options - %PRODUCTNAME Calc - Calculate</link> to define how $[officename] Calc acts when searching for identical entries.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151188" role="paragraph" l10n="U" oldref="188">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060500.xhp" name="Spreadsheet - Calculate">%PRODUCTNAME Calc - Calculate</link> to define how $[officename] Calc acts when searching for identical entries.</paragraph>
<paragraph xml-lang="en-US" id="par_id3882869" role="paragraph" l10n="NEW">See also the Wiki page about <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Conditional_Counting_and_Summation">Conditional Counting and Summation</link>.</paragraph>
<sort order="asc">
<section id="Section1">
diff --git a/helpcontent2/source/text/scalc/01/04060106.xhp b/helpcontent2/source/text/scalc/01/04060106.xhp
index 0774564c79..ea197a360e 100644
--- a/helpcontent2/source/text/scalc/01/04060106.xhp
+++ b/helpcontent2/source/text/scalc/01/04060106.xhp
@@ -613,7 +613,7 @@ oldref="293">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3150796" role="paragraph" l10n="CHG" oldref="295">Returns <emph>Number</emph> with at most <emph>Count</emph> decimal places. Excess decimal places are simply removed, irrespective of sign.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150816" role="paragraph" l10n="CHG" oldref="296">
<item type="literal">TRUNC(Number; 0)</item> behaves as <item type="literal">INT(Number)</item> for positive numbers, but effectively rounds towards zero for negative numbers.</paragraph>
-<paragraph xml-lang="en-US" id="par_id3148548" role="warning" l10n="CHG" oldref="557">The <emph>visible</emph> decimal places of the result are specified in <link href="text/shared/optionen/01060500.xhp">Tools - Options - %PRODUCTNAME Calc - Calculate</link>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148548" role="warning" l10n="CHG" oldref="557">The <emph>visible</emph> decimal places of the result are specified in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060500.xhp">%PRODUCTNAME Calc - Calculate</link>.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3152555" role="heading" level="3" l10n="U"
oldref="297">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3152569" role="paragraph" l10n="CHG" oldref="298">
diff --git a/helpcontent2/source/text/scalc/01/12030100.xhp b/helpcontent2/source/text/scalc/01/12030100.xhp
index ba70970927..68852f11b4 100644
--- a/helpcontent2/source/text/scalc/01/12030100.xhp
+++ b/helpcontent2/source/text/scalc/01/12030100.xhp
@@ -56,27 +56,26 @@
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT1" id="bm_id3147434" localize="false"/><paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="2" l10n="U" oldref="3">Sort by</paragraph>
<paragraph role="paragraph" id="par_id3155854" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT1">Select the column that you want to use as the primary sort key.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP1" id="bm_id3153142" localize="false"/><paragraph role="heading" id="hd_id3146121" xml-lang="en-US" level="3" l10n="U" oldref="5">Ascending</paragraph>
-<paragraph role="paragraph" id="par_id3148645" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP1">Sorts the selection from the lowest value to the highest value. The sorting rules are given by the locale. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language Settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3148645" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP1">Sorts the selection from the lowest value to the highest value. The sorting rules are given by the locale. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN1" id="bm_id3149377" localize="false"/><paragraph role="heading" id="hd_id3155411" xml-lang="en-US" level="3" l10n="U" oldref="7">Descending</paragraph>
-<paragraph role="paragraph" id="par_id3151075" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN1">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language Settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151075" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN1">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT2" id="bm_id3153876" localize="false"/><paragraph role="heading" id="hd_id3154492" xml-lang="en-US" level="2" l10n="U" oldref="9">Then by</paragraph>
<paragraph role="paragraph" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT2">Select the column that you want to use as the secondary sort key.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP2" id="bm_id3150715" localize="false"/><paragraph role="heading" id="hd_id3149413" xml-lang="en-US" level="3" l10n="U" oldref="11">Ascending</paragraph>
-<paragraph role="paragraph" id="par_id3154018" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP2">Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154018" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP2">Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN2" id="bm_id3153709" localize="false"/><paragraph role="heading" id="hd_id3146972" xml-lang="en-US" level="3" l10n="U" oldref="13">Descending</paragraph>
-<paragraph role="paragraph" id="par_id3145640" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN2">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145640" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN2">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT3" id="bm_id3156384" localize="false"/><paragraph role="heading" id="hd_id3154756" xml-lang="en-US" level="2" l10n="U" oldref="15">Then by</paragraph>
<paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT3">Select the column that you want to use as the third sort key.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP3" id="bm_id3155960" localize="false"/><paragraph role="heading" id="hd_id3163808" xml-lang="en-US" level="3" l10n="U" oldref="17">Ascending</paragraph>
-<paragraph role="paragraph" id="par_id3155336" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP3">Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155336" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP3">Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN3" id="bm_id3147344" localize="false"/><paragraph role="heading" id="hd_id3147364" xml-lang="en-US" level="3" l10n="U" oldref="19">Descending</paragraph>
-<paragraph role="paragraph" id="par_id3149258" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN3">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149258" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN3">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_SORT_ASCENDING" id="bm_id1196545" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SortAscending" id="bm_id3149207" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_SORT_DESCENDING" id="bm_id1104741" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SortDescending" id="bm_id3149211" localize="false"/><paragraph role="heading" id="hd_id3150300" xml-lang="en-US" level="2" l10n="U" oldref="21">Sort Ascending/Descending</paragraph>
-<paragraph role="paragraph" id="par_id3158212" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid=".uno:SortDescending"><variable id="sytext">Sorts the selection from the highest to the lowest value, or from the lowest to the highest value. Number fields are sorted by size and text fields by the order of the characters. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.
-</variable></ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3158212" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid=".uno:SortDescending"><variable id="sytext">Sorts the selection from the highest to the lowest value, or from the lowest to the highest value. Number fields are sorted by size and text fields by the order of the characters. You can define the sort rules on Data - Sort - Options.</variable></ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
<paragraph role="paragraph" id="par_id3159236" xml-lang="en-US" l10n="CHG" oldref="25">Icons on the <emph>Standard</emph> toolbar</paragraph>
<embed href="text/scalc/00/00000412.xhp#sysortieren"/>
</body>
diff --git a/helpcontent2/source/text/scalc/01/12030200.xhp b/helpcontent2/source/text/scalc/01/12030200.xhp
index 58c4eecc8c..0d2ad0c9cb 100755
--- a/helpcontent2/source/text/scalc/01/12030200.xhp
+++ b/helpcontent2/source/text/scalc/01/12030200.xhp
@@ -86,7 +86,7 @@ YJ: checked again</lastedited>
<paragraph role="paragraph" id="par_id3156385" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_SORT_USER"> Click here and then select the custom sort order that you want.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER" id="bm_id3146917" localize="false"/>
<paragraph role="heading" id="hd_id3154704" xml-lang="en-US" level="3" l10n="U" oldref="18"> Custom sort order</paragraph>
-<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER"> Select the custom sort order that you want to apply. To define a custom sort order, choose <link href="text/shared/optionen/01060400.xhp" name="Tools - Options - %PRODUCTNAME Calc - Sort Lists"> Tools - Options - %PRODUCTNAME Calc - Sort Lists</link> .</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER"> Select the custom sort order that you want to apply. To define a custom sort order, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060400.xhp" name="%PRODUCTNAME Calc - Sort Lists">%PRODUCTNAME Calc - Sort Lists</link> .</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149257" xml-lang="en-US" level="2" l10n="U" oldref="28"> Language</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_SORT_OPTIONS_LB_LANGUAGE" id="bm_id3150299" localize="false"/>
<paragraph role="heading" id="hd_id3147004" xml-lang="en-US" level="3" l10n="U" oldref="29"> Language</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12050200.xhp b/helpcontent2/source/text/scalc/01/12050200.xhp
index eb6adb83f7..9ce3f6e0d0 100755
--- a/helpcontent2/source/text/scalc/01/12050200.xhp
+++ b/helpcontent2/source/text/scalc/01/12050200.xhp
@@ -63,10 +63,10 @@
<paragraph role="paragraph" id="par_id3147125" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SUBT_OPTIONS:BTN_FORMATS">Considers formatting attributes when sorting.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_SUBT_OPTIONS:BTN_USERDEF" id="bm_id3154729" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF" id="bm_id3153877" localize="false"/><paragraph role="heading" id="hd_id3155418" xml-lang="en-US" level="3" l10n="U" oldref="13">Custom sort order</paragraph>
-<paragraph role="paragraph" id="par_id3149400" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF">Uses a custom sorting order that you defined under <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149400" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF">Uses a custom sorting order that you defined in the Options dialog box at <emph>%PRODUCTNAME Calc - Sort Lists</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING" id="bm_id3150327" localize="false"/><paragraph role="heading" id="hd_id3149121" xml-lang="en-US" level="3" l10n="U" oldref="15">Ascending</paragraph>
-<paragraph role="paragraph" id="par_id3155068" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING">Sorts beginning with the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155068" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING">Sorts beginning with the lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on Tools - Options - Language settings - Languages.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING" id="bm_id3150324" localize="false"/><paragraph role="heading" id="hd_id3155443" xml-lang="en-US" level="3" l10n="U" oldref="17">Descending</paragraph>
-<paragraph role="paragraph" id="par_id3153766" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING">Sorts beginning with the highest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153766" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING">Sorts beginning with the highest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on Tools - Options - Language settings - Languages.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/12090101.xhp b/helpcontent2/source/text/scalc/01/12090101.xhp
index 4dcf167040..14e2da8b2e 100755
--- a/helpcontent2/source/text/scalc/01/12090101.xhp
+++ b/helpcontent2/source/text/scalc/01/12090101.xhp
@@ -51,7 +51,7 @@
<embed href="text/scalc/00/00000412.xhp#dndq"/>
</section>
<paragraph role="heading" id="hd_id3154140" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid=".">You can only select databases that are registered in %PRODUCTNAME. To register a data source, choose <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid=".">You can only select databases that are registered in %PRODUCTNAME.</ahelp> To register a data source, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base - Databases</emph>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_DAPIDATA:LB_DATABASE" id="bm_id3154684" localize="false"/>
<paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="3" l10n="U" oldref="5">Database</paragraph>
<paragraph role="paragraph" id="par_id3156424" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:LISTBOX:RID_SCDLG_DAPIDATA:LB_DATABASE">Select the database that contains the data source that you want to use.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp b/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
index a11288e033..6e56ae6ef5 100755
--- a/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
@@ -69,7 +69,7 @@ oldref="15"><variable id="cellreferences_url"><link href="text/scalc/guide/cellr
<paragraph xml-lang="en-US" id="par_id3144768" role="listitem" l10n="U" oldref="30">Save your spreadsheet. When you open it again later, $[officename] Calc will update the linked cells following an inquiry.</paragraph>
</listitem>
<listitem>
-<paragraph xml-lang="en-US" id="par_id3159204" role="listitem" l10n="U" oldref="38">Under <link href="text/shared/optionen/01040900.xhp" name="Tools - Options - Spreadsheet - General"><item type="menuitem">Tools - Options - %PRODUCTNAME Calc - General</item></link> you can choose to have the update, when opened, automatically carried out either always, upon request or never. The update can be started manually in the dialog under <item type="menuitem">Edit - Links</item>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159204" role="listitem" l10n="U" oldref="38">Under <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040900.xhp" name="Spreadsheet - General"><item type="menuitem">%PRODUCTNAME Calc - General</item></link> you can choose to have the update, when opened, automatically carried out either always, upon request or never. The update can be started manually in the dialog under <item type="menuitem">Edit - Links</item>.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/scalc/guide/csv_files.xhp b/helpcontent2/source/text/scalc/guide/csv_files.xhp
index 9fc1d70b89..f88d612664 100755
--- a/helpcontent2/source/text/scalc/guide/csv_files.xhp
+++ b/helpcontent2/source/text/scalc/guide/csv_files.xhp
@@ -110,7 +110,7 @@
<section id="relatedtopics">
<embed href="text/scalc/guide/csv_formula.xhp#csv_formula"/>
<embed href="text/shared/guide/data_im_export.xhp#data_im_export"/>
-<paragraph xml-lang="en-US" id="par_id3153487" role="paragraph" l10n="U" oldref="20"><link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id3153487" role="paragraph" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3153008" role="paragraph" l10n="U" oldref="21"><link href="text/shared/00/00000207.xhp" name="Export text files">Export text files</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3155595" role="paragraph" l10n="U" oldref="22"><link href="text/shared/00/00000208.xhp" name="Import text files">Import text files</link></paragraph>
</section>
diff --git a/helpcontent2/source/text/scalc/guide/csv_formula.xhp b/helpcontent2/source/text/scalc/guide/csv_formula.xhp
index cc869dec44..4e776f2cfa 100755
--- a/helpcontent2/source/text/scalc/guide/csv_formula.xhp
+++ b/helpcontent2/source/text/scalc/guide/csv_formula.xhp
@@ -94,7 +94,7 @@
</list>
<section id="relatedtopics">
<embed href="text/scalc/guide/csv_files.xhp#csv_files"/>
- <paragraph xml-lang="en-US" id="par_id3153487" role="paragraph" l10n="U" oldref="20"><link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153487" role="paragraph" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3153008" role="paragraph" l10n="U" oldref="21"><link href="text/shared/00/00000207.xhp" name="Export text files">Export text files</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3155595" role="paragraph" l10n="U" oldref="22"><link href="text/shared/00/00000208.xhp" name="Import text files">Import text files</link></paragraph>
</section>
diff --git a/helpcontent2/source/text/scalc/guide/formula_enter.xhp b/helpcontent2/source/text/scalc/guide/formula_enter.xhp
index 5c3a77bc8e..ff16d5406d 100644
--- a/helpcontent2/source/text/scalc/guide/formula_enter.xhp
+++ b/helpcontent2/source/text/scalc/guide/formula_enter.xhp
@@ -67,7 +67,7 @@
<paragraph role="paragraph" id="par_id4206976" xml-lang="en-US" l10n="NEW">You can also press the + or - key on the numerical keyboard to start a formula. NumLock must be "on". For example, press the following keys in succession:</paragraph>
<paragraph role="code" id="par_id1836909" xml-lang="en-US" l10n="NEW">+ 5 0 - 8 Enter</paragraph>
<paragraph role="paragraph" id="par_id8171330" xml-lang="en-US" l10n="NEW">You see the result <item type="literal">42</item> in the cell. The cell contains the formula <item type="literal">=+50-8</item>.</paragraph>
-<paragraph role="note" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="6">If you are editing a formula with references, the references and the associated cells will be highlighted with the same color. You can now resize the reference border using the mouse, and the reference in the formula displayed in the input line also changes. <emph>Show references in color </emph>can be deactivated under <link href="text/shared/optionen/01060300.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link>.</paragraph>
+<paragraph role="note" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="6">If you are editing a formula with references, the references and the associated cells will be highlighted with the same color. You can now resize the reference border using the mouse, and the reference in the formula displayed in the input line also changes. <emph>Show references in color</emph> can be deactivated under <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060300.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link>.</paragraph>
<paragraph role="tip" id="par_id3149210" xml-lang="en-US" l10n="U" oldref="7"><variable id="tip">If you would like to view the calculation of individual elements of a formula, select the respective elements and press F9. For example, in the formula =SUM(A1:B12)*SUM(C1:D12) select the section SUM(C1:D12) and press F9 to view the subtotal for this area.
</variable></paragraph>
<paragraph role="paragraph" id="par_id3150304" xml-lang="en-US" l10n="U" oldref="5">If an error occurs when creating the formula, an <link href="text/scalc/05/02140000.xhp" name="error message">error message</link> appears in the active cell.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/formula_value.xhp b/helpcontent2/source/text/scalc/guide/formula_value.xhp
index d536fcee6d..ac87c5fb2b 100755
--- a/helpcontent2/source/text/scalc/guide/formula_value.xhp
+++ b/helpcontent2/source/text/scalc/guide/formula_value.xhp
@@ -64,7 +64,7 @@
</list>
<paragraph role="paragraph" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="5">If you want to view the calculation results instead of the formula, do not mark the Formulas box.</paragraph>
<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153157" xml-lang="en-US" l10n="U" oldref="6"><link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link></paragraph>
+<paragraph role="paragraph" id="par_id3153157" xml-lang="en-US" l10n="U" oldref="6"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000001.xhp b/helpcontent2/source/text/shared/00/00000001.xhp
index ae61dc49ec..8a141cf0a7 100644
--- a/helpcontent2/source/text/shared/00/00000001.xhp
+++ b/helpcontent2/source/text/shared/00/00000001.xhp
@@ -276,7 +276,7 @@
</section>
<paragraph xml-lang="en-US" id="par_id3161659" role="paragraph" l10n="U" oldref="41"><variable id="siehe">See also the following functions:
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147418" role="paragraph" l10n="CHG" oldref="55"><variable id="regulaer">The search supports <link href="text/shared/01/02100001.xhp" name="regular expressions">regular expressions</link>. You can enter "all.*", for example to find the first location of "all" followed by any characters. If you want to search for a text that is also a regular expression, you must precede every character with a \ character. You can switch the automatic evaluation of regular expression on and off in <link href="text/shared/optionen/01060500.xhp">Tools - Options - %PRODUCTNAME Calc - Calculate</link>.
+ <paragraph xml-lang="en-US" id="par_id3147418" role="paragraph" l10n="CHG" oldref="55"><variable id="regulaer">The search supports <link href="text/shared/01/02100001.xhp" name="regular expressions">regular expressions</link>. You can enter "all.*", for example to find the first location of "all" followed by any characters. If you want to search for a text that is also a regular expression, you must precede every character with a \ character. You can switch the automatic evaluation of regular expression on and off in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060500.xhp">%PRODUCTNAME Calc - Calculate</link>.
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3163714" role="paragraph" l10n="U" oldref="56"><variable id="wahr">If an error occurs, the function returns a logical or numerical value.
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000020.xhp b/helpcontent2/source/text/shared/00/00000020.xhp
index 0bc577bb47..63bd54a391 100644
--- a/helpcontent2/source/text/shared/00/00000020.xhp
+++ b/helpcontent2/source/text/shared/00/00000020.xhp
@@ -62,7 +62,7 @@
<paragraph role="paragraph" id="par_id3152414" xml-lang="en-US" l10n="U" oldref="3"><switchinline select="sys"><caseinline select="UNIX">In UNIX, certain file formats cannot be recognized automatically.
</caseinline><defaultinline>$[officename] normally recognizes the correct file type automatically on opening a file.</defaultinline></switchinline> There may be cases where you have to select the file type yourself in the <emph>Open</emph> dialog. For example, if you have a database table in text format that you want to open as a database table, you need to specify the file type "Text CSV" after selecting the file.</paragraph>
<paragraph role="heading" id="hd_id3148668" xml-lang="en-US" level="2" l10n="U" oldref="238">Basic Macros in MS Office Documents</paragraph>
-<paragraph role="paragraph" id="par_id3156211" xml-lang="en-US" l10n="U" oldref="239">In <link href="text/shared/optionen/01130100.xhp" name="Tools - Options - Load/Save - VBA Properties">Tools - Options - Load/Save - VBA Properties</link> you can specify the settings for the VBA macro codes in MS Office documents. VBA macros are unable to run in $[officename]; they must first be converted and adapted. Often you only want to use $[officename] to change the visible content of a Word, Excel or PowerPoint file and then save the file again in Microsoft Office format without changing the macros they contain. You can set the behavior of $[officename] as desired: Either the VBA macros are saved in commented form as a subroutine of $[officename] and when the document is saved in MS Office format are written back correctly again, or you can select the Microsoft Office macros to be removed when loading. The last option is an effective protection against viruses within the Microsoft Office documents.</paragraph>
+<paragraph role="paragraph" id="par_id3156211" xml-lang="en-US" l10n="U" oldref="239">In <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01130100.xhp" name="Load/Save - VBA Properties">Load/Save - VBA Properties</link> you can specify the settings for the VBA macro codes in MS Office documents. VBA macros are unable to run in $[officename]; they must first be converted and adapted. Often you only want to use $[officename] to change the visible content of a Word, Excel or PowerPoint file and then save the file again in Microsoft Office format without changing the macros they contain. You can set the behavior of $[officename] as desired: Either the VBA macros are saved in commented form as a subroutine of $[officename] and when the document is saved in MS Office format are written back correctly again, or you can select the Microsoft Office macros to be removed when loading. The last option is an effective protection against viruses within the Microsoft Office documents.</paragraph>
<paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="2" l10n="U" oldref="5">Notes regarding external formats and file types</paragraph>
<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="226">Even if they are not installed, some filters can be selected in the <emph>Open</emph> and <emph>Save</emph> dialogs. If you select such a filter, a message will appear saying that you can still install the filter if you require.</paragraph>
<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="200"><switchinline select="sys"><caseinline select="WIN">If you want to install additional filters or remove individual filters from the installation, close %PRODUCTNAME, start the Setup program and select the <emph>Modify</emph> option. Then you will see a dialog in which you can add or remove individual components of %PRODUCTNAME. Graphic filters can be found in "Optional Components".
diff --git a/helpcontent2/source/text/shared/00/00000021.xhp b/helpcontent2/source/text/shared/00/00000021.xhp
index 672cc7e127..66e0a105e0 100755
--- a/helpcontent2/source/text/shared/00/00000021.xhp
+++ b/helpcontent2/source/text/shared/00/00000021.xhp
@@ -237,7 +237,7 @@
<paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US" l10n="NEW">In OpenOffice.org 3 and StarOffice 9, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</item> and select the ODF format version.</paragraph>
<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="CHG">If you want to exchange documents with users that still use OpenOffice.org 1 or StarOffice 7, save the document using the respectively named filter in the <emph>File type</emph> listbox.</paragraph>
-<paragraph role="tip" id="par_id3146907" xml-lang="en-US" l10n="CHG" oldref="1">If you want to define another file format as the default, choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link> to find alternative file formats for each $[officename] document type.</paragraph>
+<paragraph role="tip" id="par_id3146907" xml-lang="en-US" l10n="CHG" oldref="1">If you want to define another file format as the default, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General"><emph>Load/Save - General</emph></link> to find alternative file formats for each $[officename] document type.</paragraph>
<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="28">XML file structure</paragraph>
<paragraph role="paragraph" id="par_id3149649" xml-lang="en-US" l10n="CHG" oldref="29">Documents in OpenDocument file format are stored as compressed zip archives that contain XML files. To view these XML files, you can open the OpenDocument file with an unzip program. The following files and directories are contained within the OpenDocument files:</paragraph>
<list type="ordered">
diff --git a/helpcontent2/source/text/shared/00/00000099.xhp b/helpcontent2/source/text/shared/00/00000099.xhp
index d2b2be4611..ccb225cd3f 100755
--- a/helpcontent2/source/text/shared/00/00000099.xhp
+++ b/helpcontent2/source/text/shared/00/00000099.xhp
@@ -61,7 +61,7 @@
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_HELP_PI" id="bm_id562099" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HelperDialog" id="bm_id3153681" localize="false"/>
-<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW"><ahelp hid=".uno:HelperDialog">Allows you to activate the automatic Help Agent. You can also activate the Help Agent through <emph>Tools - Options - $[officename] - General - Help Agent</emph>.</ahelp><comment>UFI: moved here from shared/main0108.xhp - the slot is used in customize dialog, so we need the Help-ID.</comment></paragraph>
+<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW"><ahelp hid=".uno:HelperDialog">Allows you to activate the automatic Help Agent. You can also activate the Help Agent through <emph>$[officename] - General - Help Agent</emph> in the Options dialog box.</ahelp><comment>UFI: moved here from shared/main0108.xhp - the slot is used in customize dialog, so we need the Help-ID.</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_HELPTIPS" id="bm_id2449436" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HelpTip" id="bm_id3148491" localize="false"/>
<paragraph role="paragraph" id="par_idN10665" xml-lang="en-US" l10n="CHG"><ahelp hid=".uno:HelpTip">Enables the display of icon names at the mouse pointer and other Help contents.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index aa485a6ceb..fd988fb6e1 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.xhp
@@ -169,8 +169,7 @@
</variable></paragraph>
<section id="verzeichnis">
<paragraph xml-lang="en-US" id="par_id3145112" role="paragraph" l10n="U" oldref="125">Path selection button in various wizards</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153953" role="paragraph" l10n="U" oldref="126">Click <emph>Edit</emph> button for a few entries under <emph>Tools - Options - $[officename] - Paths</emph>
-</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153953" role="paragraph" l10n="U" oldref="126">Click <emph>Edit</emph> button for a few entries under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph></paragraph>
</section>
<paragraph xml-lang="en-US" id="par_id3147295" role="paragraph" l10n="U" oldref="23"><variable id="optionen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01010100.xhp b/helpcontent2/source/text/shared/01/01010100.xhp
index ea9b5c99c3..dfabc71f71 100644
--- a/helpcontent2/source/text/shared/01/01010100.xhp
+++ b/helpcontent2/source/text/shared/01/01010100.xhp
@@ -151,7 +151,7 @@
<paragraph role="paragraph" id="par_id3154470" xml-lang="en-US" l10n="U" oldref="114"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_DOCTEMPLATE_BTN_DOCTEMPLATE_EDIT">Opens the selected template for editing.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="2" l10n="U" oldref="115">Open</paragraph>
<paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="116"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_DOCTEMPLATE_BTN_DOCTEMPLATE_EDIT">Opens the selected document or creates a document based on the selected template.</ahelp></paragraph>
-<paragraph role="note" id="par_id3155306" xml-lang="en-US" l10n="CHG" oldref="98">To add another folder to the template path, choose <link href="text/shared/optionen/01010300.xhp" name="Tools - Options - $[officename] - Paths"><emph>Tools - Options - $[officename] - Paths</emph></link>, and then enter the path.</paragraph>
+<paragraph role="note" id="par_id3155306" xml-lang="en-US" l10n="CHG" oldref="98">To add another folder to the template path, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010300.xhp" name="$[officename] - Paths"><emph>$[officename] - Paths</emph></link>, and then enter the path.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/aaa_start.xhp#aaa_start"/>
<paragraph role="paragraph" id="par_id3149379" xml-lang="en-US" l10n="C"><link href="text/shared/01/01100000.xhp" name="File properties">File properties</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01010201.xhp b/helpcontent2/source/text/shared/01/01010201.xhp
index 301ab4365a..12ae69f4ed 100644
--- a/helpcontent2/source/text/shared/01/01010201.xhp
+++ b/helpcontent2/source/text/shared/01/01010201.xhp
@@ -58,11 +58,7 @@
<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_LAB_LAB_BOX_ADDR" id="bm_id3154682" localize="false"/>
<paragraph role="heading" id="hd_id3150603" xml-lang="en-US" level="3" l10n="U" oldref="7">Address</paragraph>
<paragraph role="paragraph" id="par_id3153089" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW_CHECKBOX_TP_LAB_LAB_BOX_ADDR">Creates a label with your return address. Text that is currently in the <emph>Label text</emph> box is overwritten.</ahelp></paragraph>
-<paragraph role="note" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="9">To change your return address, choose <link href="text/shared/optionen/01010100.xhp" name="Tools - Options - %PRODUCTNAME"><emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph></link>, and then click on the <emph>User Data</emph> tab.</paragraph>
-
+<paragraph role="note" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="9">To change your return address, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="%PRODUCTNAME">%PRODUCTNAME</emph></link>, and then click on the <emph>User Data</emph> tab.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_LAB_LAB_LB_DATABASE" id="bm_id3153748" localize="false"/>
<paragraph role="heading" id="hd_id3147557" xml-lang="en-US" level="3" l10n="U" oldref="10">Database</paragraph>
<paragraph role="paragraph" id="par_id3148620" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW_LISTBOX_TP_LAB_LAB_LB_DATABASE">Select the database that you want to use as the data source for your label. </ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01020000.xhp b/helpcontent2/source/text/shared/01/01020000.xhp
index ecaa6f6d49..4cc9d6f99d 100644
--- a/helpcontent2/source/text/shared/01/01020000.xhp
+++ b/helpcontent2/source/text/shared/01/01020000.xhp
@@ -67,11 +67,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#oeffnen"/>
</section>
-<paragraph role="paragraph" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="109">The following sections describe the <item type="productname">%PRODUCTNAME</item>
-<emph>Open </emph>dialog. To activate the <item type="productname">%PRODUCTNAME</item>
-<emph>Open</emph> and<emph> Save </emph>dialogs, choose <link href="text/shared/optionen/01010600.xhp" name="Tools - Options - %PRODUCTNAME - General"><emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- General</emph></link>, and then select the <emph>Use %PRODUCTNAME</emph>
-<emph>dialogs</emph> in the<emph> Open/Save dialogs</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="109">The following sections describe the <item type="productname">%PRODUCTNAME</item><emph>Open </emph>dialog. To activate the <item type="productname">%PRODUCTNAME</item><emph>Open</emph> and <emph>Save</emph> dialogs, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="%PRODUCTNAME - General">%PRODUCTNAME- General</emph></link>, and then select the <emph>Use %PRODUCTNAME dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
<paragraph role="note" id="par_id3150713" xml-lang="en-US" l10n="U" oldref="52">If the file that you want to open contains Styles, <link href="text/shared/01/01020000.xhp#vorlagen" name="special rules">special rules</link> apply.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP" id="bm_id3153394" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP" id="bm_id1104770" localize="false"/><paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="2" l10n="U" oldref="11">Up One Level</paragraph>
@@ -141,8 +137,7 @@
</caseinline><defaultinline>in the Documents and Settings directory</defaultinline></switchinline></paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3146905" xml-lang="en-US" l10n="U" oldref="122">all template folders as defined in <link href="text/shared/optionen/01010300.xhp" name="Tools - Options - %PRODUCTNAME - Paths"><emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- Paths</emph></link></paragraph>
+<paragraph role="listitem" id="par_id3146905" xml-lang="en-US" l10n="U" oldref="122">all template folders as defined in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010300.xhp" name="%PRODUCTNAME - Paths">%PRODUCTNAME - Paths</emph></link></paragraph>
</listitem>
</list>
<paragraph role="note" id="par_id7375713" xml-lang="en-US" l10n="NEW">When you use <item type="menuitem">File - Template - Save</item> to save a template, the template will be stored in your user template directory. When you open a document that is based on such a template, the document will be checked for a changed template as decribed below. The template is associated with the document, it may be called a "sticky template".</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01070000.xhp b/helpcontent2/source/text/shared/01/01070000.xhp
index c71ee41858..dcc3b987a6 100644
--- a/helpcontent2/source/text/shared/01/01070000.xhp
+++ b/helpcontent2/source/text/shared/01/01070000.xhp
@@ -53,11 +53,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#saveas"/>
</section>
-<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="64">The following sections describe the <item type="productname">%PRODUCTNAME</item>
-<emph>Save as </emph>dialog. To activate the <item type="productname">%PRODUCTNAME</item>
-<emph>Open</emph> and<emph> Save </emph>dialogs, choose <link href="text/shared/optionen/01010600.xhp" name="Tools - Options - %PRODUCTNAME - General"><emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- General</emph></link>, and then select the <emph>Use %PRODUCTNAME</emph>
-<emph>dialogs</emph> in the<emph> Open/Save dialogs</emph> area.<comment>UFI: using system dialogs works in Windows and Gnome 2.6</comment></paragraph>
+<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="64">The following sections describe the <emph><item type="productname">%PRODUCTNAME</item>Save as</emph> dialog. To activate the <emph><item type="productname">%PRODUCTNAME</item>Open</emph> and <emph>Save</emph> dialogs, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="%PRODUCTNAME - General">%PRODUCTNAME- General</emph></link>, and then select the <emph>Use %PRODUCTNAME dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
<paragraph role="note" id="par_id3147654" xml-lang="en-US" l10n="U" oldref="59">To save a document as a template, use the command <emph>File - Templates - Save</emph>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_FILESAVE_LEVELUP" id="bm_id3154380" localize="false"/><paragraph role="heading" id="hd_id3146775" xml-lang="en-US" level="2" l10n="U" oldref="19">Up One Level</paragraph>
<section id="levelup">
diff --git a/helpcontent2/source/text/shared/01/01070001.xhp b/helpcontent2/source/text/shared/01/01070001.xhp
index f07a693f74..de0bafdee0 100644
--- a/helpcontent2/source/text/shared/01/01070001.xhp
+++ b/helpcontent2/source/text/shared/01/01070001.xhp
@@ -56,7 +56,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#export"/>
</section>
-<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="2">The following sections describe the <emph>$[officename] Export </emph>dialog. To activate the <emph>$[officename] Open</emph> and<emph> Save </emph>dialogs, choose <link href="text/shared/optionen/01010600.xhp" name="Tools - Options - $[officename] - General"><emph>Tools - Options - $[officename] - General</emph></link>, and then select the <emph>Use $[officename] dialogs</emph> in the<emph> Open/Save dialogs</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="2">The following sections describe the <emph>$[officename] Export</emph> dialog. To activate the <emph>$[officename] Open</emph> and <emph>Save</emph> dialogs, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="$[officename] - General">$[officename] - General</emph></link>, and then select the <emph>Use $[officename] dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
<paragraph role="heading" id="hd_id3150693" xml-lang="en-US" level="2" l10n="U" oldref="4">Up One Level</paragraph>
<embed href="text/shared/01/01070000.xhp#levelup"/>
<paragraph role="heading" id="hd_id3153312" xml-lang="en-US" level="2" l10n="U" oldref="5">Create New Directory</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01110100.xhp b/helpcontent2/source/text/shared/01/01110100.xhp
index 4dd423bc76..6c9c8823a5 100644
--- a/helpcontent2/source/text/shared/01/01110100.xhp
+++ b/helpcontent2/source/text/shared/01/01110100.xhp
@@ -69,7 +69,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_CTL_ORGANIZER_RIGHT" id="bm_id3149346" localize="false"/>
<paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="2" l10n="U" oldref="3">Left and Right Selection List (Templates / Documents)</paragraph>
<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="C"><ahelp hid="HID_CTL_ORGANIZER_RIGHT">Displays the available template categories or opened $[officename] files. To change the contents of the list, select <emph>Templates</emph> or <emph>Documents</emph> in the box below.</ahelp></paragraph>
-<paragraph role="note" id="par_id3166410" xml-lang="en-US" l10n="CHG" oldref="34">To change the default template path, choose <link href="text/shared/optionen/01010300.xhp" name="Tools - Options - $[officename] - Paths"><emph>Tools - Options - $[officename] - Paths</emph></link>.</paragraph>
+<paragraph role="note" id="par_id3166410" xml-lang="en-US" l10n="CHG" oldref="34">To change the default template path, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010300.xhp" name="$[officename] - Paths">$[officename] - Paths</emph></link>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:DLG_ORGANIZE:LB_LEFT_TYP" id="bm_id3145120" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:DLG_ORGANIZE:LB_RIGHT_TYP" id="bm_id3154307" localize="false"/>
<paragraph role="paragraph" id="par_id3154810" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2:LISTBOX:DLG_ORGANIZE:LB_RIGHT_TYP">Select <emph>Templates</emph> or <emph>Documents</emph> to change the contents that are displayed in the list above.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01130000.xhp b/helpcontent2/source/text/shared/01/01130000.xhp
index d5913556c9..3a35753e00 100644
--- a/helpcontent2/source/text/shared/01/01130000.xhp
+++ b/helpcontent2/source/text/shared/01/01130000.xhp
@@ -148,18 +148,12 @@ This is the reason for continuos failure of i83561</comment>
<bookmark xml-lang="en-US" branch="hid/svtools_PushButton_DLG_SVT_PRNDLG_PRNSETUPDLG_BTN_OPTIONS" id="bm_id7177037" localize="false"/>
<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="38">Options</paragraph>
<paragraph role="paragraph" id="par_id3159086" xml-lang="en-US" l10n="CHG" oldref="39"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_OPTIONS" visibility="hidden">Changes the printer settings for the current document.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3156080" xml-lang="en-US" l10n="CHG" oldref="41"><switchinline select="appl"><caseinline select="WRITER">To set the default <item type="productname">%PRODUCTNAME</item> printer options for text documents, choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_idN1099E" xml-lang="en-US" l10n="NEW"><switchinline select="appl"><caseinline select="CALC">To set the default <item type="productname">%PRODUCTNAME</item> printer options for spreadsheet documents, choose <link href="text/shared/optionen/01060700.xhp" name="Tools - Options - Calc - Print"><emph>Tools - Options - %PRODUCTNAME Calc - Print</emph></link>.
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_idN109CD" xml-lang="en-US" l10n="NEW"><switchinline select="appl"><caseinline select="IMPRESS">To set the default <item type="productname">%PRODUCTNAME</item> printer options for presentation documents, choose <link href="text/shared/optionen/01070400.xhp" name="Tools - Options - Impress - Print"><emph>Tools - Options - %PRODUCTNAME Impress - Print</emph></link>.
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3157320" xml-lang="en-US" l10n="U" oldref="47"><switchinline select="sys"><caseinline select="UNIX">If you want, you can use the STAR_SPOOL_DIR environment variable to specify the directory where the Xprinter spoolfiles are saved. For example:
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154330" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="UNIX">setenv STAR_SPOOL_DIR /usr/local/tmp (in the csh/tcsh) or
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="UNIX">export STAR_SPOOL_DIR=/usr/local/tmp (in the sh/bash)
-</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3156080" xml-lang="en-US" l10n="CHG" oldref="41"><switchinline select="appl"><caseinline select="WRITER">To set the default <item type="productname">%PRODUCTNAME</item> printer options for text documents, choose <link href="text/shared/optionen/01040400.xhp" name="Writer - Print"><emph>%PRODUCTNAME Writer - Print</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_idN1099E" xml-lang="en-US" l10n="NEW"><switchinline select="appl"><caseinline select="CALC">To set the default <item type="productname">%PRODUCTNAME</item> printer options for spreadsheet documents, choose <link href="text/shared/optionen/01060700.xhp" name="Calc - Print"><emph>%PRODUCTNAME Calc - Print</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_idN109CD" xml-lang="en-US" l10n="NEW"><switchinline select="appl"><caseinline select="IMPRESS">To set the default <item type="productname">%PRODUCTNAME</item> printer options for presentation documents, choose <link href="text/shared/optionen/01070400.xhp" name="Impress - Print"><emph>%PRODUCTNAME Impress - Print</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3157320" xml-lang="en-US" l10n="U" oldref="47"><switchinline select="sys"><caseinline select="UNIX">If you want, you can use the STAR_SPOOL_DIR environment variable to specify the directory where the Xprinter spoolfiles are saved. For example: </caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3154330" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="UNIX">setenv STAR_SPOOL_DIR /usr/local/tmp (in the csh/tcsh) or </caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="UNIX">export STAR_SPOOL_DIR=/usr/local/tmp (in the sh/bash) </caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="UNIX">You can also use the <link href="text/shared/guide/spadmin.xhp" name="spadmin printer setup program">spadmin printer setup program</link> to specify additional printer options.
</caseinline></switchinline></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/01160200.xhp b/helpcontent2/source/text/shared/01/01160200.xhp
index a6cb2f44b9..c34c8243b9 100644
--- a/helpcontent2/source/text/shared/01/01160200.xhp
+++ b/helpcontent2/source/text/shared/01/01160200.xhp
@@ -45,8 +45,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_MAIL_SENDDOC" id="bm_id1274021" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SendMail" id="bm_id3155619" localize="false"/>
<paragraph role="heading" id="hd_id3150702" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/01160200.xhp">Document as E-mail</link></paragraph>
-<paragraph role="paragraph" id="par_id3152823" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="versendentext"><ahelp hid=".uno:SendMail">Opens a new window in your default e-mail program with the current document as an attachment. The current file format is used. If the document is new and unsaved, the format specified in Tools - Options - Load/Save - General is used.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3152823" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="versendentext"><ahelp hid=".uno:SendMail">Opens a new window in your default e-mail program with the current document as an attachment. The current file format is used.</ahelp></variable> If the document is new and unsaved, the format specified in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General is used.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#dokument"/>
diff --git a/helpcontent2/source/text/shared/01/02230100.xhp b/helpcontent2/source/text/shared/01/02230100.xhp
index 7018963477..10deeae6e5 100644
--- a/helpcontent2/source/text/shared/01/02230100.xhp
+++ b/helpcontent2/source/text/shared/01/02230100.xhp
@@ -54,11 +54,9 @@
<embed href="text/shared/00/00000402.xhp#aufzeichnen"/>
</section>
<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="26"><switchinline select="appl">
-<caseinline select="WRITER">If you choose <emph>Record - Show</emph>, the lines containing changed text passages are indicated by a vertical line in the left page margin. You can set the properties of the vertical line and the other markup elements by choosing <link href="text/shared/optionen/01040700.xhp" name="Tools - Options - Writer - Changes"><emph>Tools - Options - %PRODUCTNAME Writer - Changes</emph></link>.
-</caseinline></switchinline></paragraph>
+<caseinline select="WRITER">If you choose <emph>Record - Show</emph>, the lines containing changed text passages are indicated by a vertical line in the left page margin. You can set the properties of the vertical line and the other markup elements by choosing <emph><link href="text/shared/optionen/01040700.xhp" name="Writer - Changes">%PRODUCTNAME Writer - Changes</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="appl">
-<caseinline select="CALC">You can set the properties of the markup elements by choosing <link href="text/shared/optionen/01060600.xhp" name="Tools - Options - Calc - Changes"><emph>Tools - Options - %PRODUCTNAME Calc - Changes</emph></link>.
-</caseinline></switchinline></paragraph>
+<caseinline select="CALC">You can set the properties of the markup elements by choosing <link href="text/shared/optionen/01060600.xhp" name="Calc - Changes"><emph>%PRODUCTNAME Calc - Changes</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="7">The following changes are tracked when the record changes command is active:</paragraph>
<switch select="appl">
<case select="WRITER"><list type="unordered">
diff --git a/helpcontent2/source/text/shared/01/02230200.xhp b/helpcontent2/source/text/shared/01/02230200.xhp
index 4af15f460a..6fc76ea157 100644
--- a/helpcontent2/source/text/shared/01/02230200.xhp
+++ b/helpcontent2/source/text/shared/01/02230200.xhp
@@ -57,23 +57,17 @@
<section id="howtoget">
<embed href="text/shared/00/00000402.xhp#anzeigen"/>
</section>
-<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="7">You can change the display properties of the markup elements by choosing<switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01060600.xhp" name="Tools - Options - Writer - Changes"><emph>Tools - Options - %PRODUCTNAME Writer - Changes</emph></link>.
-</caseinline></switchinline><switchinline select="appl"><caseinline select="CALC"><link href="text/shared/optionen/01060600.xhp" name="Tools - Options - Calc - Changes"><emph>Tools - Options - %PRODUCTNAME Calc - Changes</emph></link>.
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3155356" xml-lang="en-US" l10n="U" oldref="6">When you rest the mouse pointer over a change markup in the document, a <emph>Tip</emph> displays the author and the date and time that the change was made.<switchinline select="appl"><caseinline select="CALC"> If the <emph>Extended Tips</emph> are activated, the type of change and any attached comments are also displayed.
-</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="7">You can change the display properties of the markup elements by choosing <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01060600.xhp" name="Writer - Changes"><emph>%PRODUCTNAME Writer - Changes</emph></link> in the Options dialog box.</caseinline></switchinline><switchinline select="appl"><caseinline select="CALC"><link href="text/shared/optionen/01060600.xhp" name="Calc - Changes"><emph>%PRODUCTNAME Calc - Changes</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3155356" xml-lang="en-US" l10n="U" oldref="6">When you rest the mouse pointer over a change markup in the document, a <emph>Tip</emph> displays the author and the date and time that the change was made.<switchinline select="appl"><caseinline select="CALC"> If the <emph>Extended Tips</emph> are activated, the type of change and any attached comments are also displayed.</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT" id="bm_id3152551" localize="false"/>
-<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="CALC">Show changes in spreadsheet
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149150" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT">Shows or hides recorded changes.</ahelp>
-</caseinline></switchinline></paragraph>
+<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="CALC">Show changes in spreadsheet</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3149150" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT">Shows or hides recorded changes.</ahelp></caseinline></switchinline></paragraph>
<switch select="appl">
<case select="CALC"><embed href="text/shared/01/02230402.xhp#calc"/>
</case>
</switch>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT" id="bm_id3154810" localize="false"/>
-<paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="2" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Show accepted changes
-</caseinline></switchinline></paragraph>
+<paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="2" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Show accepted changes</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="11"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT">Shows or hides the changes that were accepted.</ahelp>
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_REJECT" id="bm_id3155829" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/05020200.xhp b/helpcontent2/source/text/shared/01/05020200.xhp
index 8ca2f4b37c..e479c90178 100644
--- a/helpcontent2/source/text/shared/01/05020200.xhp
+++ b/helpcontent2/source/text/shared/01/05020200.xhp
@@ -90,10 +90,10 @@
</list>
<switch select="appl">
<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>
+<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 <emph><link href="text/shared/optionen/01040400.xhp" name="Writer - Print">%PRODUCTNAME Writer - Print</emph></link> in the Options dialog box.</paragraph>
</case>
</switch>
-<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>
+<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 <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01013000.xhp">%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"/>
@@ -158,7 +158,7 @@
<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>
+ <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>
@@ -170,7 +170,7 @@
<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_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"/>
diff --git a/helpcontent2/source/text/shared/01/05020700.xhp b/helpcontent2/source/text/shared/01/05020700.xhp
index 97105ab067..d1a6817000 100755
--- a/helpcontent2/source/text/shared/01/05020700.xhp
+++ b/helpcontent2/source/text/shared/01/05020700.xhp
@@ -49,7 +49,7 @@
<bookmark_value>paragraphs; Asian typography</bookmark_value>
<bookmark_value>typography; Asian</bookmark_value>
</bookmark><comment>MW changed "formats;" to "formatting;"</comment><paragraph role="heading" id="hd_id3155620" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05020700.xhp" name="Asian Typography">Asian Typography</link></paragraph>
-<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Set the typographic options for cells or paragraphs in Asian language files. To enable Asian language support, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>, and then select the <emph>Enabled</emph> box in the <emph>Asian language support </emph>area.</ahelp> The Asian typography options are ignored in HTML documents.</paragraph>
+<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Set the typographic options for cells or paragraphs in Asian language files. To enable Asian language support, choose <emph>Language Settings - Languages</emph> in the Options dialog box, and then select the <emph>Enabled</emph> box in the <emph>Asian language support</emph> area.</ahelp> The Asian typography options are ignored in HTML documents.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00040500.xhp#asitypo"/>
@@ -57,7 +57,7 @@
<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="3">Line change</paragraph>
<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="4">Set the options for line breaks in Asian language documents.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_FORBIDDEN" id="bm_id3155355" localize="false"/><paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="9">Apply list of forbidden characters to the beginning and end of line</paragraph>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_FORBIDDEN">Prevents the characters in the list from starting or ending a line. The characters are relocated to either the previous or the next line. To edit the list of restricted characters, choose <emph>Tools - Options - Language Settings - </emph><link href="text/shared/optionen/01150100.xhp" name="Asian Layout"><emph>Asian Layout</emph></link>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_FORBIDDEN">Prevents the characters in the list from starting or ending a line. The characters are relocated to either the previous or the next line.</ahelp> To edit the list of restricted characters, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - <link href="text/shared/optionen/01150100.xhp" name="Asian Layout">Asian Layout</emph></link>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_HANG_PUNC" id="bm_id3156410" localize="false"/><paragraph role="heading" id="hd_id3149751" xml-lang="en-US" level="3" l10n="U" oldref="5">Allow hanging punctuation</paragraph>
<paragraph role="paragraph" id="par_id3149096" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_HANG_PUNC">Prevents commas and periods from breaking the line. Instead, these characters are added to the end of the line, even in the page margin.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_SCRIPT_SPACE" id="bm_id3149811" localize="false"/><paragraph role="heading" id="par_id3147275" xml-lang="en-US" level="3" l10n="U" oldref="7">
diff --git a/helpcontent2/source/text/shared/01/05210200.xhp b/helpcontent2/source/text/shared/01/05210200.xhp
index cf965a771b..3c98bf74a1 100755
--- a/helpcontent2/source/text/shared/01/05210200.xhp
+++ b/helpcontent2/source/text/shared/01/05210200.xhp
@@ -49,7 +49,7 @@
<embed href="text/shared/00/00040502.xhp#farben"/>
</section>
<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="C"><link href="text/shared/optionen/01010500.xhp" name="Tools - Options - $[officename] - Colors">Tools - Options - $[officename] - Colors</link></paragraph>
+<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="C"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010500.xhp" name="$[officename] - Colors">$[officename] - Colors</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/mediaplayer.xhp b/helpcontent2/source/text/shared/01/mediaplayer.xhp
index b2ef7c3658..04c1e0b814 100755
--- a/helpcontent2/source/text/shared/01/mediaplayer.xhp
+++ b/helpcontent2/source/text/shared/01/mediaplayer.xhp
@@ -56,7 +56,7 @@
<paragraph xml-lang="en-US" id="par_idN10577" role="paragraph" l10n="NEW">The Media Player supports many different media formats. You can also insert media files from the Media Player into your document.<comment>UFI: add a list of keyboard shortcuts to /04/ file when available</comment></paragraph>
<switch select="sys">
<case select="UNIX">
-<paragraph xml-lang="en-US" id="par_idN105EF" role="note" l10n="NEW">On Linux or Solaris systems, the Media Player requires the Java Media Framework API (JMF). Download and install the JMF files from http://java.sun.com/javase/technologies/desktop/media/jmf/index.jsp and add the path to the installed jmf.jar to the class path in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Java.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN105EF" role="note" l10n="NEW">On Linux or Solaris systems, the Media Player requires the Java Media Framework API (JMF). Download and install the JMF files from http://java.sun.com/javase/technologies/desktop/media/jmf/index.jsp and add the path to the installed jmf.jar to the class path in the Options dialog box in %PRODUCTNAME - Java.</paragraph>
</case>
<case select="WIN">
<paragraph xml-lang="en-US" id="par_idN1064F" role="note" l10n="NEW">On Windows systems, the Media Player uses DirectShow, which should be installed on your system by default.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/online_update.xhp b/helpcontent2/source/text/shared/01/online_update.xhp
index 85290b0b35..843e0c227c 100644
--- a/helpcontent2/source/text/shared/01/online_update.xhp
+++ b/helpcontent2/source/text/shared/01/online_update.xhp
@@ -47,7 +47,7 @@
<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>
+<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 %PRODUCTNAME - Online Update in the Options dialog box 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"/>
diff --git a/helpcontent2/source/text/shared/01/online_update_dialog.xhp b/helpcontent2/source/text/shared/01/online_update_dialog.xhp
index 8e15c1d231..8b8b20d3d7 100644
--- a/helpcontent2/source/text/shared/01/online_update_dialog.xhp
+++ b/helpcontent2/source/text/shared/01/online_update_dialog.xhp
@@ -51,7 +51,7 @@
<paragraph role="note" id="par_id2871181" xml-lang="en-US" l10n="NEW">Under some operation systems, it may be required to manually go to the download folder, unzip the download file, and start the setup script.</paragraph>
<paragraph role="paragraph" id="par_id2733542" xml-lang="en-US" l10n="NEW">After installation of the update you can delete the download file to save space.</paragraph><comment>Download</comment>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DOWNLOAD2" id="bm_id2517777" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DOWNLOAD" id="bm_id4208807" localize="false"/><paragraph role="paragraph" id="par_id4238715" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Downloads and saves the update files to the desktop or a folder of your choice. Select the folder in Tools - Options - %PRODUCTNAME - Online Update.</ahelp></paragraph><comment>Install</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DOWNLOAD" id="bm_id4208807" localize="false"/><paragraph role="paragraph" id="par_id4238715" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Downloads and saves the update files to the desktop or a folder of your choice. Select the folder in %PRODUCTNAME - Online Update in the Options dialog box.</ahelp></paragraph><comment>Install</comment>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_INSTALL" id="bm_id1738639" localize="false"/><paragraph role="paragraph" id="par_id8277230" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Installs the downloaded update.</ahelp></paragraph><comment>Pause</comment>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_PAUSE" id="bm_id6081728" localize="false"/><paragraph role="paragraph" id="par_id4086428" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Pauses the download. Later click Resume to continue downloading.</ahelp></paragraph><comment>Resume</comment>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_RESUME" id="bm_id9219641" localize="false"/><paragraph role="paragraph" id="par_id9024628" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Continues a paused download.</ahelp></paragraph><comment>Cancel</comment>
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
index 5d47d0c2a8..7226efe320 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
@@ -178,7 +178,7 @@
<paragraph xml-lang="en-US" id="par_id5318765" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the right.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_OPNFTR_CB_PGLY_FIRSTLEFT" id="bm_id9036835" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id1416364" role="heading" level="2" l10n="NEW">First page is left</paragraph>
- <paragraph xml-lang="en-US" id="par_id9596850" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the left. You must enable support for complex text layout on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id9596850" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the left. You must enable support for complex text layout on Language settings - Languages in the Options dialog box.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id18005" role="heading" level="2" l10n="NEW">User Interface</paragraph>
<paragraph xml-lang="en-US" id="hd_id6676839" role="heading" level="2" l10n="NEW">Window options</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_RESINIT" id="bm_id4184392" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/securitywarning.xhp b/helpcontent2/source/text/shared/01/securitywarning.xhp
index 668de9a5f9..1c3a9227c7 100644
--- a/helpcontent2/source/text/shared/01/securitywarning.xhp
+++ b/helpcontent2/source/text/shared/01/securitywarning.xhp
@@ -54,7 +54,7 @@
<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><variable id="securitywarning"><link href="text/shared/01/securitywarning.xhp">Security Warning</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" l10n="NEW">When you open a document that contains an unsigned macro, or a signed macro from an unknown source, the <emph>Security Warning</emph> dialog opens.</paragraph>
-<paragraph role="paragraph" id="par_idN105FC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable or disable the macros. Choose <emph>Tools - Options - %PRODUCTNAME - Security</emph> to set the options.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105FC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable or disable the macros. Choose <emph>%PRODUCTNAME - Security</emph> in the Options dialog box to set the options.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1056E" xml-lang="en-US" level="2" l10n="NEW">View Signature</paragraph>
<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a dialog where you can view the signature.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10587" xml-lang="en-US" level="2" l10n="NEW">Always trust macros from this source</paragraph>
diff --git a/helpcontent2/source/text/shared/02/01170000.xhp b/helpcontent2/source/text/shared/02/01170000.xhp
index be8b685c1a..6092487d5c 100644
--- a/helpcontent2/source/text/shared/02/01170000.xhp
+++ b/helpcontent2/source/text/shared/02/01170000.xhp
@@ -75,15 +75,13 @@
<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">Icon</alt>
- </image></paragraph>
+<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>
<paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="CHG" oldref="3">Form Controls</paragraph>
</tablecell>
</tablerow>
</table>
-
</section>
</section>
<paragraph role="note" id="par_idN10B21" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/xforms.xhp">XML Form documents</link> (XForms) use the same controls.</paragraph>
@@ -120,8 +118,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">Icon</alt>
- </image></paragraph>
+<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>
<paragraph role="paragraph" id="par_id3150470" xml-lang="en-US" l10n="U" oldref="25">This icon switches the mouse pointer to the select mode, or deactivates this mode. The select mode is used to select the controls of the current form.</paragraph>
@@ -143,15 +140,13 @@
<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">Icon</alt>
- </image></paragraph>
+<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>
<paragraph role="paragraph" id="par_id3153927" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid=".uno:CheckBox">Creates a check box.</ahelp> Check boxes allow you to activate or deactivate a function in a form.</paragraph>
</tablecell>
</tablerow>
</table>
-
</section>
<section id="Section16">
<bookmark xml-lang="en-US" branch="hid/SID_FM_EDIT" id="bm_id7355178" localize="false"/>
@@ -161,15 +156,13 @@
<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">Icon</alt>
- </image></paragraph>
+<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>
<paragraph role="paragraph" id="par_id3158444" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".uno:Edit">Creates a text box.</ahelp> Text boxes are fields in which the user can enter text. In a form, text boxes display data or allow for new data input.</paragraph>
</tablecell>
</tablerow>
</table>
-
</section>
<section id="Section7">
<bookmark xml-lang="en-US" branch="hid/SID_FM_FORMATTEDFIELD" id="bm_id6606960" localize="false"/>
diff --git a/helpcontent2/source/text/shared/02/01170003.xhp b/helpcontent2/source/text/shared/02/01170003.xhp
index e22f0e1953..0830d78a5b 100755
--- a/helpcontent2/source/text/shared/02/01170003.xhp
+++ b/helpcontent2/source/text/shared/02/01170003.xhp
@@ -35,17 +35,11 @@
<title xml-lang="en-US" id="tit">Special Tips for Date Fields</title>
<filename>/text/shared/02/01170003.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>
-
-
- <bookmark xml-lang="en-US" branch="index" id="bm_id3150445"><bookmark_value>date fields; properties</bookmark_value></bookmark><paragraph role="heading" level="1" id="hd_id3150445" l10n="U" xml-lang="en-US" oldref="77">Special Tips for Date Fields</paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3154230" l10n="U" oldref="75">When you enter a year using two digits, the corresponding four digit value is determined by a setting in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph>. For example, if 1935 is set as the lower limiting value and you enter 34 as a date value, then the result is 2034 instead of 1934.</paragraph>
- <paragraph role="paragraph" id="par_id3149205" l10n="U" xml-lang="en-US" oldref="76">The pre-set limit value will be saved for each document. If you want to open a document in an older version of StarOffice, in which the limit of 1930 could not be changed, then you must also select the limit value 1930 in your current version of $[officename].</paragraph>
- <embed href="text/shared/optionen/01010600.xhp#jahreszahlen"/>
- </body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3150445"><bookmark_value>date fields; properties</bookmark_value></bookmark><paragraph role="heading" level="1" id="hd_id3150445" l10n="U" xml-lang="en-US" oldref="77">Special Tips for Date Fields</paragraph>
+<paragraph xml-lang="en-US" role="paragraph" id="par_id3154230" l10n="U" oldref="75">When you enter a year using two digits, the corresponding four digit value is determined by a setting in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph>. For example, if 1935 is set as the lower limiting value and you enter 34 as a date value, then the result is 2034 instead of 1934.</paragraph>
+<paragraph role="paragraph" id="par_id3149205" l10n="U" xml-lang="en-US" oldref="76">The pre-set limit value will be saved for each document. If you want to open a document in an older version of StarOffice, in which the limit of 1930 could not be changed, then you must also select the limit value 1930 in your current version of $[officename].</paragraph>
+<embed href="text/shared/optionen/01010600.xhp#jahreszahlen"/>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/02020000.xhp b/helpcontent2/source/text/shared/02/02020000.xhp
index dbc69fef91..77e48ebe1a 100644
--- a/helpcontent2/source/text/shared/02/02020000.xhp
+++ b/helpcontent2/source/text/shared/02/02020000.xhp
@@ -32,8 +32,7 @@
*
************************************************************************
-->
-
-
+
<meta>
<topic id="textshared0202020000xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Font Name</title>
@@ -41,23 +40,21 @@
</topic>
</meta>
<body>
- <section id="schriftart">
+<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 xml-lang="en-US" id="par_id3148983" role="paragraph" 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 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 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><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[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">
+<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 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><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[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>
@@ -70,12 +67,9 @@
</tablecell>
</tablerow>
</table>
-
</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 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>
+ <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 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="$[officename] - View">$[officename] - View</link> in the Options dialog box.</variable></paragraph>
<switch select="sys">
<case select="WIN">
<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>
diff --git a/helpcontent2/source/text/shared/02/02130000.xhp b/helpcontent2/source/text/shared/02/02130000.xhp
index 9bd966ebbb..f1d582e7b0 100644
--- a/helpcontent2/source/text/shared/02/02130000.xhp
+++ b/helpcontent2/source/text/shared/02/02130000.xhp
@@ -56,8 +56,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="E">
-<image id="img_id3150506" src="res/commandimagelist/sc_decrementindent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150506" xml-lang="en-US">Icon</alt>
- </image></paragraph>
+<image id="img_id3150506" src="res/commandimagelist/sc_decrementindent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150506" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3155942" xml-lang="en-US" l10n="U" oldref="4">Decrease Indent</paragraph>
@@ -65,7 +64,6 @@
</tablerow>
</table>
</section>
-<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="6"><switchinline select="appl"><caseinline select="WRITER">If you click the <emph>Decrease Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key, the indent for the selected paragraph is moved by the default tab stop that has been 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_id3153031" xml-lang="en-US" l10n="CHG" oldref="6"><switchinline select="appl"><caseinline select="WRITER">If you click the <emph>Decrease Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key, the indent for the selected paragraph is moved by the default tab stop that has been set under <link href="text/shared/optionen/01040200.xhp" name="Writer - General"><emph>%PRODUCTNAME Writer - General</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/02140000.xhp b/helpcontent2/source/text/shared/02/02140000.xhp
index 6e58a86a2b..67949a1e71 100644
--- a/helpcontent2/source/text/shared/02/02140000.xhp
+++ b/helpcontent2/source/text/shared/02/02140000.xhp
@@ -42,14 +42,13 @@
</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="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 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.
+<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">
@@ -57,23 +56,17 @@
<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>
+<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>
<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 xml-lang="en-US" id="par_id3157910" role="paragraph" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="WRITER">Example:
-</caseinline></switchinline></paragraph>
- <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>
+ <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="Writer - General"><emph>%PRODUCTNAME Writer - General</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
+ <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 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">
@@ -85,8 +78,7 @@
<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>
+ <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>
@@ -112,7 +104,6 @@
</tablecell>
</tablerow>
</table>
-
</case>
</switch>
</body>
diff --git a/helpcontent2/source/text/shared/02/09050000.xhp b/helpcontent2/source/text/shared/02/09050000.xhp
index 5db8b89a3c..eabf0ae826 100644
--- a/helpcontent2/source/text/shared/02/09050000.xhp
+++ b/helpcontent2/source/text/shared/02/09050000.xhp
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,29 +28,21 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************-->
+<helpdocument version="1.0">
<meta>
<topic id="textshared0209050000xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Find</title>
<filename>/text/shared/02/09050000.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="search">
<bookmark branch="hid/HID_OFA_HYPERLINK_SEARCH" xml-lang="en-US" id="bm_id3156211"/><paragraph id="hd_id3154228" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/02/09050000.xhp" name="Find">Find</link></paragraph>
- <paragraph l10n="U" xml-lang="en-US" oldref="2" role="paragraph" id="par_id3159224"><ahelp visibility="visible" hid="HID_OFA_HYPERLINK_SEARCH">Click and choose one of the Internet search engines from the submenu. The search term is entered in the <emph>URL Name</emph> box.</ahelp> The list of search engines in the <emph>Find </emph>submenu is defined in <link href="text/shared/optionen/01020200.xhp" name="Tools - Options - Internet - Search"><emph>Tools - Options - Internet - Search</emph></link>.</paragraph>
+<paragraph l10n="U" xml-lang="en-US" oldref="2" role="paragraph" id="par_id3159224"><ahelp visibility="visible" hid="HID_OFA_HYPERLINK_SEARCH">Click and choose one of the Internet search engines from the submenu. The search term is entered in the <emph>URL Name</emph> box.</ahelp> The list of search engines in the <emph>Find</emph> submenu is defined in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01020200.xhp" name="Internet - Search">Internet - Search</emph></link>.</paragraph>
</section>
<section id="sysearch">
<table id="tbl_id3147261">
-
-
-
<tablerow>
<tablecell>
<paragraph l10n="E" role="paragraph" id="par_id3152801" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_recsearch.png" id="img_id3153750"><alt xml-lang="en-US" id="alt_id3153750">Icon</alt></image></paragraph>
@@ -60,11 +51,9 @@
<paragraph role="paragraph" id="par_id3147008" l10n="U" xml-lang="en-US" oldref="3">Find</paragraph>
</tablecell>
</tablerow>
-
</table>
</section>
<paragraph role="heading" level="2" id="hd_id3153683" l10n="U" xml-lang="en-US" oldref="4">List of search engines</paragraph>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3147576" l10n="U" oldref="5">When you have selected a search engine, $[officename] transfers the search request to your standard web browser, which then establishes an Internet connection to the search engine and displays the result. See also <link href="text/shared/02/09010000.xhp" name="URL Name">URL Name</link>.</paragraph>
-
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/12000000.xhp b/helpcontent2/source/text/shared/02/12000000.xhp
index 7e50fc04b7..90e2d4445b 100644
--- a/helpcontent2/source/text/shared/02/12000000.xhp
+++ b/helpcontent2/source/text/shared/02/12000000.xhp
@@ -39,25 +39,20 @@
<title id="tit" xml-lang="en-US">Explorer On/Off</title>
<filename>/text/shared/02/12000000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-15T12:33:43">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="explorer">
<bookmark xml-lang="en-US" branch="hid/SID_DSBROWSER_EXPLORER" id="bm_id6761446" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DSBrowserExplorer" id="bm_id3154682" localize="false"/>
<paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/12000000.xhp" name="Explorer On/Off">Explorer On/Off</link></paragraph>
-<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DSBrowserExplorer">Turns on and off the view of the data source explorer.</ahelp> The <emph>Explorer On/Off </emph>icon is visible on the <link href="text/shared/main0212.xhp" name="Database Bar">Table Data bar</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DSBrowserExplorer">Turns on and off the view of the data source explorer.</ahelp> The <emph>Explorer On/Off</emph> icon is visible on the <link href="text/shared/main0212.xhp" name="Database Bar">Table Data bar</link>.</paragraph>
</section>
<section id="syexplorer">
<table id="tbl_id3153894">
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="E">
-<image id="img_id3150710" src="res/commandimagelist/sc_dsbrowserexplorer.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150710" xml-lang="en-US">Icon</alt>
- </image></paragraph>
+<image id="img_id3150710" src="res/commandimagelist/sc_dsbrowserexplorer.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150710" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="3">Explorer On/Off</paragraph>
@@ -72,15 +67,15 @@
<emph>Establishing a connection</emph> - As soon as you select an individual table or query, a connection to the data source is established. Once the connection is opened, the name of the data source, the Queries or Tables entry, and the name of the query or table selected is shown in bold type.</paragraph>
<section id="kontextmenue">
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_CLOSECONN" id="bm_id3155135" localize="false"/>
-<paragraph role="paragraph" id="par_id3154860" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Closes the connection to the data source. See <emph>Tools - Options - %PRODUCTNAME Base - Connections</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154860" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Closes the connection to the data source. See <emph>%PRODUCTNAME Base - Connections</emph> in the Options dialog box.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_RENAME_ENTRY" id="bm_id3156192" localize="false"/>
-<paragraph role="paragraph" id="par_id3151379" xml-lang="en-US" l10n="CHG" oldref="52"><ahelp hid="." visibility="hidden">To rename an entry, call this command and enter the new name.. You can also do this by selecting the entry and pressing F2. The database must support renaming, otherwise this command is not enabled.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151379" xml-lang="en-US" l10n="CHG" oldref="52"><ahelp hid="." visibility="hidden">To rename an entry, call this command and enter the new name. You can also do this by selecting the entry and pressing F2. The database must support renaming, otherwise this command is not enabled.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_DSADMINISTRATE" id="bm_id189825" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_EDIT_DATABASE" id="bm_id189826" localize="false"/>
<paragraph role="paragraph" id="par_id273445" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the selected database file for editing.</ahelp></paragraph><comment>i66574 new command "Database Registrations" / but name in UI is "Registered databases"</comment>
<bookmark xml-lang="en-US" branch="hid/39064" id="bm_id321665" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_ADMINISTRATE" id="bm_id5135044" localize="false"/>
-<paragraph role="paragraph" id="par_id5943479" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog to add/edit/remove a database file from the list of registered databases. The same dialog opens by choosing <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id5943479" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog to add/edit/remove a database file from the list of registered databases. The same dialog opens by choosing <emph>%PRODUCTNAME Base - Databases</emph> in the Options dialog box.</ahelp></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01010400.xhp b/helpcontent2/source/text/shared/autopi/01010400.xhp
index 70057ed3d4..9462bd50f3 100644
--- a/helpcontent2/source/text/shared/autopi/01010400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010400.xhp
@@ -58,7 +58,7 @@ YJ: checked</lastedited>
<paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies your address information.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZ_OPTSENDERPLACEHOLDER" id="bm_id1062044" localize="false"/>
<paragraph role="heading" id="par_idN105E9" xml-lang="en-US" level="3" l10n="NEW">Use user data for return address</paragraph>
-<paragraph role="paragraph" id="par_idN105EC" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERPLACEHOLDER">Use the address data from Tools - Options - %PRODUCTNAME - User data.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105EC" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERPLACEHOLDER">Use the address data from %PRODUCTNAME - User Data in the Options dialog box.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZ_OPTSENDERDEFINE" id="bm_id1482589" localize="false"/>
<paragraph role="heading" id="par_idN10603" xml-lang="en-US" level="3" l10n="NEW">New sender address</paragraph>
<paragraph role="paragraph" id="par_idN10606" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERDEFINE">Use the address data from the following text boxes.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01050000.xhp b/helpcontent2/source/text/shared/autopi/01050000.xhp
index 9aa087918d..f8b0328d05 100644
--- a/helpcontent2/source/text/shared/autopi/01050000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050000.xhp
@@ -37,15 +37,10 @@
<title id="tit" xml-lang="en-US">Presentation Wizard</title>
<filename>/text/shared/autopi/01050000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-07-05T11:02:05">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3159224"><bookmark_value>wizards; presentations</bookmark_value>
-<bookmark_value>presentations; wizards</bookmark_value>
-</bookmark>
+<bookmark_value>presentations; wizards</bookmark_value></bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_AUTOPILOT" id="bm_id3154894" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/slot:10425" id="bm_id7406537" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotPresentations" id="bm_id3928952" localize="false"/>
@@ -56,7 +51,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#dtapt"/>
</section>
-<paragraph role="tip" id="par_id3154289" xml-lang="en-US" l10n="U" oldref="11">The Presentation Wizard starts automatically when you open a new presentation. You can deactivate this function if you choose <link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Presentation - General"><emph>Tools - Options - %PRODUCTNAME Impress - General</emph></link> and deselect the <emph>Start with Wizard</emph> check box.</paragraph>
+<paragraph role="tip" id="par_id3154289" xml-lang="en-US" l10n="U" oldref="11">The Presentation Wizard starts automatically when you open a new presentation. You can deactivate this function if you choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01070500.xhp" name="Presentation - General">%PRODUCTNAME Impress - General</emph></link> and deselect the <emph>Start with Wizard</emph> check box.</paragraph>
<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="3">Within each wizard page, you can undo, modify, or skip altogether the editing steps. If you decide to skip over one of the pages, the wizard uses the default settings.</paragraph>
<embed href="text/shared/autopi/01050100.xhp#autopilotseite1"/>
<embed href="text/shared/autopi/01050200.xhp#autopilotseite2"/>
diff --git a/helpcontent2/source/text/shared/autopi/01050100.xhp b/helpcontent2/source/text/shared/autopi/01050100.xhp
index 8880d6792d..80493d7ee0 100755
--- a/helpcontent2/source/text/shared/autopi/01050100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050100.xhp
@@ -71,13 +71,13 @@ dedr: fixed #i31165#</lastedited>
<paragraph role="paragraph" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="HID_SD_AUTOPILOT_TEMPLATES">Lists the available template categories for presentations.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SD_AUTOPILOT_OPEN" id="bm_id3153665" localize="false"/>
<paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="3" l10n="U" oldref="20">List of existing presentations (only available when you select the Open existing presentation option)</paragraph>
-<paragraph role="paragraph" id="par_id3145317" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_SD_AUTOPILOT_OPEN">Lists the presentations that you created and saved to the Templates directory that is specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph>. To edit the layout and formatting of a presentation with the wizard, select the presentation, and then click <emph>Next</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145317" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_SD_AUTOPILOT_OPEN">Lists the presentations that you created and saved to the Templates directory that is specified under <emph>%PRODUCTNAME - Paths</emph> in the Options dialog box. To edit the layout and formatting of a presentation with the wizard, select the presentation, and then click <emph>Next</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_ASS:CB_PREVIEW" id="bm_id3156192" localize="false"/>
<paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="3" l10n="U" oldref="21">Preview</paragraph>
<paragraph role="paragraph" id="par_id3150256" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_PREVIEW">Specifies that templates appear in the preview window.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_ASS:CB_STARTWITH" id="bm_id3145609" localize="false"/>
<paragraph role="heading" id="hd_id3153561" xml-lang="en-US" level="3" l10n="U" oldref="22">Do not show this dialog again</paragraph>
-<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_STARTWITH">Specifies that you only want the Wizard to start when you expressly request it with <emph>File - Wizard - Presentation</emph>.</ahelp> This field is only visible when you create a presentation by choosing <emph>File - New - Presentation</emph>. You can also specify whether to show the dialog with the <emph>Start with Wizard</emph> check box in <emph>Tools - Options - %PRODUCTNAME Impress - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_STARTWITH">Specifies that you only want the Wizard to start when you expressly request it with <emph>File - Wizard - Presentation</emph>.</ahelp> This field is only visible when you create a presentation by choosing <emph>File - New - Presentation</emph>. You can also specify whether to show the dialog with the <emph>Start with Wizard</emph> check box in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - General</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3159414" xml-lang="en-US" l10n="U" oldref="13">Continue here to <link href="text/shared/autopi/01050200.xhp" name="Wizard Page 2">Wizard Page 2</link>.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/accessibility.xhp b/helpcontent2/source/text/shared/guide/accessibility.xhp
index 8386b205a7..5e3f3f15c2 100644
--- a/helpcontent2/source/text/shared/guide/accessibility.xhp
+++ b/helpcontent2/source/text/shared/guide/accessibility.xhp
@@ -36,15 +36,8 @@
<title xml-lang="en-US" id="tit">Accessibility in %PRODUCTNAME</title>
<filename>/text/shared/guide/accessibility.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>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id3150502"><bookmark_value>accessibility; %PRODUCTNAME features</bookmark_value></bookmark><paragraph id="hd_id3150502" role="heading" level="1" oldref="7" l10n="U" xml-lang="en-US"><variable id="accessibility"><link name="Accessibility in %PRODUCTNAME" href="text/shared/guide/accessibility.xhp">Accessibility in <item type="productname">%PRODUCTNAME</item></link></variable></paragraph>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3154894" l10n="U" oldref="6">The following accessibility features are part of <item type="productname">%PRODUCTNAME</item>:</paragraph>
<list type="unordered">
@@ -65,9 +58,9 @@
<paragraph role="note" id="par_id3152349" l10n="U" xml-lang="en-US" oldref="2">Please note that accessibility support relies on Sun Microsystems Java technology for communications with assistive technology tools. This means that the first program startup may take a few seconds longer, because the Java runtime environment has to be started as well.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/assistive.xhp#assistive"/>
- <paragraph l10n="U" role="paragraph" id="par_id3149578" xml-lang="en-US" oldref="9"><link name="Tools - Options - %PRODUCTNAME - View" href="text/shared/optionen/01010800.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - View</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150084" xml-lang="en-US" oldref="10"><link name="Tools - Options - %PRODUCTNAME - Appearance" href="text/shared/optionen/01012000.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - Appearance</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150771" xml-lang="en-US" oldref="11"><link name="Tools - Options - %PRODUCTNAME - Accessibility" href="text/shared/optionen/01013000.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - Accessibility</link></paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3149578" xml-lang="en-US" oldref="9"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - View" href="text/shared/optionen/01010800.xhp"><item type="productname">%PRODUCTNAME</item> - View</link></paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3150084" xml-lang="en-US" oldref="10"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - Appearance" href="text/shared/optionen/01012000.xhp"><item type="productname">%PRODUCTNAME</item> - Appearance</link></paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3150771" xml-lang="en-US" oldref="11"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - Accessibility" href="text/shared/optionen/01013000.xhp"><item type="productname">%PRODUCTNAME</item> - Accessibility</link></paragraph>
<embed href="text/shared/guide/keyboard.xhp#keyboard"/>
<embed href="text/shared/04/01010000.xhp#common_keys"/>
</section>
diff --git a/helpcontent2/source/text/shared/guide/assistive.xhp b/helpcontent2/source/text/shared/guide/assistive.xhp
index dabe745c9a..83ba42366f 100644
--- a/helpcontent2/source/text/shared/guide/assistive.xhp
+++ b/helpcontent2/source/text/shared/guide/assistive.xhp
@@ -98,9 +98,9 @@
<paragraph role="note" id="par_id3149808" xml-lang="en-US" l10n="U" oldref="11">When accessibility support in $[officename] is enabled, the Java Runtime Environment is loaded, and increases the startup time for $[officename].</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/accessibility.xhp#accessibility"/>
-<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="18"><link href="text/shared/optionen/01010800.xhp" name="Tools - Options - $[officename] - View">Tools - Options - $[officename] - View</link></paragraph>
-<paragraph role="paragraph" id="par_id3155430" xml-lang="en-US" l10n="U" oldref="19"><link href="text/shared/optionen/01012000.xhp" name="Tools - Options - $[officename] - Appearance">Tools - Options - $[officename] - Appearance</link></paragraph>
-<paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="20"><link href="text/shared/optionen/01013000.xhp" name="Tools - Options - $[officename] - Accessibility">Tools - Options - $[officename] - Accessibility</link></paragraph>
+<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="18"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010800.xhp" name="$[officename] - View">$[officename] - View</link></paragraph>
+<paragraph role="paragraph" id="par_id3155430" xml-lang="en-US" l10n="U" oldref="19"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01012000.xhp" name="$[officename] - Appearance">$[officename] - Appearance</link></paragraph>
+<paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01013000.xhp" name="$[officename] - Accessibility">$[officename] - Accessibility</link></paragraph>
<embed href="text/shared/guide/keyboard.xhp#keyboard"/>
<embed href="text/shared/04/01010000.xhp#common_keys"/>
</section>
diff --git a/helpcontent2/source/text/shared/guide/collab.xhp b/helpcontent2/source/text/shared/guide/collab.xhp
index 386f9e6a8e..5611fbcb06 100644
--- a/helpcontent2/source/text/shared/guide/collab.xhp
+++ b/helpcontent2/source/text/shared/guide/collab.xhp
@@ -43,9 +43,6 @@
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id4459669"><bookmark_value>sharing documents</bookmark_value>
<bookmark_value>collaboration</bookmark_value>
</bookmark>
@@ -58,7 +55,6 @@
<bookmark xml-lang="en-US" branch="hid/.uno:ShareDocument" id="bm_id8779564" localize="false"/>
<paragraph xml-lang="en-US" id="par_id9590136" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Share Document dialog where you can enable or disable collaborative sharing of the document.</ahelp></paragraph>
<comment>Share Document dialog - Share this spreadsheet with other users</comment>
-
<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SHAREDOCUMENT:CB_SHARE" id="bm_id7900021" localize="false"/>
<paragraph xml-lang="en-US" id="par_id2519913" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable to share the current document with other users. Disable to use the document unshared. This will invalidate the not yet saved edits that other users applied in the time since you last opened or saved this document.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id6917020" role="heading" level="2" l10n="NEW">Collaboration in Calc</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/ctl.xhp b/helpcontent2/source/text/shared/guide/ctl.xhp
index a539c61509..f467ae6683 100755
--- a/helpcontent2/source/text/shared/guide/ctl.xhp
+++ b/helpcontent2/source/text/shared/guide/ctl.xhp
@@ -32,17 +32,12 @@
*
************************************************************************
-->
-
<helpdocument version="1.0">
<meta>
<topic id="textsharedguidectlxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Languages Using Complex Text Layout</title>
<filename>/text/shared/guide/ctl.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-22T14:43:30">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153662"><bookmark_value>CTL;complex text layout languages</bookmark_value>
@@ -88,7 +83,7 @@
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/language_select.xhp#language_select"/>
-<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="12"><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_id3153770" xml-lang="en-US" l10n="U" oldref="14"><link href="text/shared/optionen/01150300.xhp" name="Tools - Options - Language Settings - Complex Text Layout">Tools - Options - Language Settings - Complex Text Layout</link></paragraph>
+<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="12"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages">Language Settings - Languages</link></paragraph>
+<paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="14"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01150300.xhp" name="Language Settings - Complex Text Layout">Language Settings - Complex Text Layout</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/data_register.xhp b/helpcontent2/source/text/shared/guide/data_register.xhp
index 313003ed0b..bad39860a7 100644
--- a/helpcontent2/source/text/shared/guide/data_register.xhp
+++ b/helpcontent2/source/text/shared/guide/data_register.xhp
@@ -34,8 +34,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedguidedata_registerxhp" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Registering and Deleting a Database </title>
@@ -54,7 +53,7 @@
<paragraph role="heading" id="par_idN105C8" xml-lang="en-US" level="3" l10n="NEW">To register an existing database file:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN105CF" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01160200.xhp">Tools - Options - %PRODUCTNAME Base - Databases</link>.</paragraph>
+<paragraph role="paragraph" id="par_idN105CF" xml-lang="en-US" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01160200.xhp">%PRODUCTNAME Base - Databases</link>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN105E1" xml-lang="en-US" l10n="CHG">Click <emph>New</emph> and select the database file.<comment>i60224</comment></paragraph>
@@ -63,7 +62,7 @@
<paragraph role="heading" id="par_idN10700" xml-lang="en-US" level="3" l10n="NEW">To remove a registered database from %PRODUCTNAME</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN10707" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01160200.xhp">Tools - Options - %PRODUCTNAME Base - Databases</link>.</paragraph>
+<paragraph role="paragraph" id="par_idN10707" xml-lang="en-US" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01160200.xhp">%PRODUCTNAME Base - Databases</link>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN10719" xml-lang="en-US" l10n="NEW">Select the database file and click <emph>Delete</emph>. </paragraph>
diff --git a/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp b/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
index 21fca6ab59..94d7534eaf 100644
--- a/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
+++ b/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
@@ -58,7 +58,7 @@
<paragraph xml-lang="en-US" id="par_id598162" role="paragraph" l10n="NEW">You must use the %PRODUCTNAME file dialogs to use WebDAV over HTTPS.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id7309793" role="paragraph" l10n="NEW">Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - General</item>. Ensure that <emph>Use %PRODUCTNAME dialogs</emph> is enabled. Click <emph>OK</emph> to close the dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7309793" role="paragraph" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="menuitem">%PRODUCTNAME - General</item>. Ensure that <emph>Use %PRODUCTNAME dialogs</emph> is enabled. Click <emph>OK</emph> to close the dialog box.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id1227759" role="paragraph" l10n="NEW">Choose <item type="menuitem">File - Open</item>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/doc_autosave.xhp b/helpcontent2/source/text/shared/guide/doc_autosave.xhp
index dc1ab1d09b..7c1a88a3c8 100755
--- a/helpcontent2/source/text/shared/guide/doc_autosave.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_autosave.xhp
@@ -62,7 +62,7 @@
<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="3">To create a backup file every time you save a document</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="4">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</emph></link>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3148474" xml-lang="en-US" l10n="U" oldref="5">Mark <emph>Always create backup copy</emph>.</paragraph>
@@ -80,7 +80,7 @@
<paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="2" l10n="CHG" oldref="9">To save recovery information automatically every n minutes</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="10">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="10">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</emph></link>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3154760" xml-lang="en-US" l10n="CHG" oldref="11">Mark <emph>Save AutoRecovery information every</emph> and select the time interval.</paragraph>
@@ -92,7 +92,7 @@
<embed href="text/shared/guide/export_ms.xhp#export_ms"/>
<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="U" oldref="15"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="16"><link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General">Tools - Options - Load/Save - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="16"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></paragraph>
<paragraph role="paragraph" id="par_idN10838" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/error_report.xhp">Error Report Tool</link></paragraph>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/guide/doc_save.xhp b/helpcontent2/source/text/shared/guide/doc_save.xhp
index 3a4fca1ed1..b197eae8b4 100644
--- a/helpcontent2/source/text/shared/guide/doc_save.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_save.xhp
@@ -63,8 +63,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="E">
-<image id="img_id3152349" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152349" xml-lang="en-US">This icon is for tips on how to use the program more effectively.</alt>
- </image></paragraph>
+<image id="img_id3152349" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152349" xml-lang="en-US">This icon is for tips on how to use the program more effectively.</alt></image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="8">The document is saved under its path and name on the current local data medium or network drive or on the Internet, overwriting any file of the same name.</paragraph>
@@ -72,7 +71,7 @@
</tablerow>
</table>
<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="2">When you save a new file for the first time, the <link href="text/shared/01/01070000.xhp" name="Save As">Save As</link> dialog opens, in which you can enter a name, folder and drive or volume for the file. To open this dialog, choose <emph>File - Save As</emph>.</paragraph>
-<paragraph role="note" id="par_id3152472" xml-lang="en-US" l10n="CHG" oldref="3">You can set the automatic creation of a backup copy under <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="note" id="par_id3152472" xml-lang="en-US" l10n="CHG" oldref="3">You can set the automatic creation of a backup copy under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</emph></link>.</paragraph>
<paragraph role="heading" id="hd_id7146824" xml-lang="en-US" level="2" l10n="NEW">Automatic extension to the file name</paragraph>
<paragraph role="paragraph" id="par_id9359111" xml-lang="en-US" l10n="NEW">When saving a file, %PRODUCTNAME always appends an extension to the file name, except when the file name already has an extension that matches the file type. See the list of <link href="text/shared/00/00000021.xhp">ODF extensions</link>. </paragraph>
<paragraph role="paragraph" id="par_id6709494" xml-lang="en-US" l10n="NEW">Some examples for the automatic extensions are listed in the following table:</paragraph>
@@ -139,7 +138,7 @@
<embed href="text/shared/00/00000021.xhp#xmlformat"/>
<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="U" oldref="6"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
<embed href="text/shared/guide/ms_user.xhp#ms_user"/>
-<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="7"><link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General">Tools - Options - Load/Save - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/email.xhp b/helpcontent2/source/text/shared/guide/email.xhp
index 021f2daa68..7f06963f46 100755
--- a/helpcontent2/source/text/shared/guide/email.xhp
+++ b/helpcontent2/source/text/shared/guide/email.xhp
@@ -53,14 +53,13 @@
<bookmark_value>drawings; sending as e-mail</bookmark_value>
<bookmark_value>presentations; sending as e-mail</bookmark_value>
<bookmark_value>attachments in e-mails</bookmark_value>
-</bookmark><comment>mw changed "tables;..." to "spreadsheets;..."</comment><comment>mw changed "text;" to "text documents;"</comment><paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="email"><link href="text/shared/guide/email.xhp" name="Sending Documents as E-mail">Sending Documents as E-mail</link>
-</variable></paragraph>
+</bookmark>
+<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="email"><link href="text/shared/guide/email.xhp" name="Sending Documents as E-mail">Sending Documents as E-mail</link></variable></paragraph>
<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="2">Working in $[officename], you can send the current document as an e-mail attachment.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>File - Send - Document as E-mail</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3153127" xml-lang="en-US" l10n="CHG" oldref="4">$[officename] opens your default e-mail program.<switchinline select="sys"><caseinline select="UNIX"> If you want to send the current document with another e-mail program, you can select the program to use with <emph>Tools - Options - Internet - E-mail</emph>.
-</caseinline></switchinline></paragraph>
+<paragraph role="listitem" id="par_id3153127" xml-lang="en-US" l10n="CHG" oldref="4">$[officename] opens your default e-mail program.<switchinline select="sys"><caseinline select="UNIX"> If you want to send the current document with another e-mail program, you can select the program to use with <emph>Internet - E-mail</emph> in the Options dialog box.</caseinline></switchinline></paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150986" xml-lang="en-US" l10n="U" oldref="5">In your e-mail program, enter the recipient, subject and any text you want to add, then send the e-mail.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/fax.xhp b/helpcontent2/source/text/shared/guide/fax.xhp
index aae5cd1ff7..170e21f198 100755
--- a/helpcontent2/source/text/shared/guide/fax.xhp
+++ b/helpcontent2/source/text/shared/guide/fax.xhp
@@ -65,7 +65,7 @@ checked - yj</lastedited>
<paragraph role="paragraph" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="10">You can configure $[officename] so that a single click on an icon automatically sends the current document as a fax:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="11">Choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="11">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040400.xhp" name="Writer - Print">%PRODUCTNAME Writer - Print</emph></link>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150985" xml-lang="en-US" l10n="U" oldref="12">Select the fax driver from the <emph>Fax</emph> list box and click <emph>OK</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp b/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
index 2a04b8347a..18cc181950 100644
--- a/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
@@ -53,7 +53,7 @@
<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="46">When you include hyperlinks, two factors must be taken into account: whether they are set as relative or absolute on saving, and whether or not the file is present.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="47">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link> and specify in the <emph>Save URLs relative to</emph> field if $[officename] creates <link href="text/shared/00/00000005.xhp#speichern" name="relative or absolute hyperlinks">relative or absolute hyperlinks</link>. Relative linking is only possible when the document you are working on and the link destination are on the same drive.</paragraph>
+<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="47">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General"><emph>Load/Save - General</emph></link> and specify in the <emph>Save URLs relative to</emph> field if $[officename] creates <link href="text/shared/00/00000005.xhp#speichern" name="relative or absolute hyperlinks">relative or absolute hyperlinks</link>. Relative linking is only possible when the document you are working on and the link destination are on the same drive.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="48">You should create the same directory structure on your hard disk as that which exists in the web space hosted by your Internet provider. Call the root directory for the homepage on your hard disk "homepage", for example. The start file is then "index.html", the full path being "C:\homepage\index.html" (assuming Windows operating system). The URL on your Internet provider's server might then be as follows: "http://www.myprovider.com/mypage/index.html". With relative addressing, you indicate the link relative to the location of the output document. For example, if you placed all the graphics for your homepage in a subfolder called "C:\homepage\images", you would need to give the following path to access the graphic "picture.gif": "images\picture.gif". This is the relative path, starting from the location of the file "index.html". On the provider's server, you would place the picture in the folder "mypage/images". When you transfer the document "index.html" to the provider's server through the <emph>File - Save As</emph> dialog, and if you have marked the option <emph>Copy local graphics to Internet</emph> under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>, $[officename] will automatically copy the graphic to the correct directory on the server.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_search.xhp b/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
index 7d8f67dbdd..2538f471d2 100755
--- a/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
@@ -66,7 +66,7 @@ checked - yj</lastedited>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="CHG" oldref="21">$[officename] opens your Web Browser, which calls the selected Internet search engine. After a short time you see the result of your search on screen.</paragraph>
-<paragraph role="tip" id="par_idN10657" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01020200.xhp" name="Search function in the Hyperlink Bar"><emph>Tools - Options - Internet - Search</emph></link> to define the search options.</paragraph>
+<paragraph role="tip" id="par_idN10657" xml-lang="en-US" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01020200.xhp" name="Search function in the Hyperlink Bar">Internet - Search</emph></link> to define the search options.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="24"><link href="text/shared/main0209.xhp" name="Hyperlink Bar">Hyperlink Bar</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/guide/language_select.xhp b/helpcontent2/source/text/shared/guide/language_select.xhp
index 2e5b906d50..1b248a2521 100755
--- a/helpcontent2/source/text/shared/guide/language_select.xhp
+++ b/helpcontent2/source/text/shared/guide/language_select.xhp
@@ -179,7 +179,7 @@
</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_id3150043" role="paragraph" l10n="U" oldref="28"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages">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/measurement_units.xhp b/helpcontent2/source/text/shared/guide/measurement_units.xhp
index f8ea0a0e1a..5dffce42d6 100755
--- a/helpcontent2/source/text/shared/guide/measurement_units.xhp
+++ b/helpcontent2/source/text/shared/guide/measurement_units.xhp
@@ -74,6 +74,6 @@
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="CHG" oldref="8"><link href="text/shared/00/00000003.xhp" name="Entering measurement units directly">Entering measurement units directly</link></paragraph>
-<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="9"><link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General">Tools - Options - %PRODUCTNAME Writer - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040200.xhp" name="Writer - General">%PRODUCTNAME Writer - General</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
index c5ccc9a5e6..459ce22b38 100644
--- a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
@@ -32,8 +32,7 @@
*
************************************************************************
-->
-
-
+
<meta>
<topic id="textsharedguidems_import_export_limitationsxml" indexer="include">
<title id="tit" xml-lang="en-US">About Converting Microsoft Office Documents</title>
@@ -46,8 +45,7 @@
<bookmark_value>Microsoft Office;importing password protected files</bookmark_value>
</bookmark><comment>MW moved "Microsoft Office;" from shared/guide/protection.xhp</comment>
<paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="E" oldref="32" localize="false"/>
-<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link>
-</variable></paragraph>
+<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link></variable></paragraph>
<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="2">$[officename] can automatically open Microsoft Office 97/2000/XP documents. However, some layout features and formatting attributes in more complex Microsoft Office documents are handled differently in $[officename] or are unsupported. As a result, converted files require some degree of manual reformatting. The amount of reformatting that can be expected is proportional to the complexity of the structure and formatting of the source document. $[officename] cannot run Visual Basic Scripts, but can load them for you to analyze.</paragraph>
<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load, but not save, the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - VBA Properties</item>.</paragraph>
<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="3">The following lists provide a general overview of Microsoft Office features that may cause conversion challenges. These will not affect your ability to use or work with the content of the converted document.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/ms_user.xhp b/helpcontent2/source/text/shared/guide/ms_user.xhp
index 6e77f75d76..c6a123d802 100755
--- a/helpcontent2/source/text/shared/guide/ms_user.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_user.xhp
@@ -103,7 +103,7 @@
<paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="2" l10n="CHG" oldref="15">Saving Documents by Default in Microsoft Office Formats</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</emph></link>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Default file format</emph> area, first select a document type, then select the file type for saving.</paragraph>
@@ -132,7 +132,7 @@
<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="U" oldref="28">You may delete the VBA macros from the Microsoft Office file on loading or on saving.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="29">Choose <link href="text/shared/optionen/01130100.xhp" name="Tools - Options - Load/Save - VBA Properties"><emph>Tools - Options - Load/Save - VBA Properties</emph></link> to set the VBA macro handling of $[officename].</paragraph>
+<paragraph role="listitem" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="29">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01130100.xhp" name="Load/Save - VBA Properties">Load/Save - VBA Properties</emph></link> to set the VBA macro handling of $[officename].</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
@@ -141,8 +141,7 @@
<embed href="text/shared/guide/import_ms.xhp#import_ms"/>
<embed href="text/shared/guide/export_ms.xhp#export_ms"/>
<switch select="sys">
-<case select="WIN"><embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
-</case>
+<case select="WIN"><embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/></case>
</switch>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
index d0316f3bdf..84f55832df 100755
--- a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
+++ b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
@@ -125,6 +125,6 @@
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="29"><link href="text/shared/01/01130000.xhp" name="Printing dialogs">Printing dialogs</link></paragraph>
-<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="30"><link href="text/shared/optionen/01000000.xhp" name="Tools - Options dialog">Tools - Options dialog</link></paragraph>
+<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="30"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> <link href="text/shared/optionen/01000000.xhp" name="dialog box">dialog box</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/spadmin.xhp b/helpcontent2/source/text/shared/guide/spadmin.xhp
index 7e25049336..60b10e1a2e 100755
--- a/helpcontent2/source/text/shared/guide/spadmin.xhp
+++ b/helpcontent2/source/text/shared/guide/spadmin.xhp
@@ -32,17 +32,13 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedguidespadminxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</title>
<filename>/text/shared/guide/spadmin.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-09T13:04:35">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="chapter_all">
@@ -171,8 +167,7 @@
<paragraph role="listitem" id="par_id3153963" xml-lang="en-US" l10n="U" oldref="137">To delete the selected printer, click <emph>Remove</emph>. The default printer or a printer that has been created by the system administrator in a server installation cannot be removed using this dialog.</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id3147346" xml-lang="en-US" level="3" l10n="U" oldref="140"><switchinline select="sys"><caseinline select="UNIX">Selecting a Default Printer
-</caseinline></switchinline></paragraph>
+<paragraph role="heading" id="hd_id3147346" xml-lang="en-US" level="3" l10n="U" oldref="140"><switchinline select="sys"><caseinline select="UNIX">Selecting a Default Printer </caseinline></switchinline></paragraph>
<list type="unordered">
<listitem>
<paragraph role="listitem" id="par_id3145769" xml-lang="en-US" l10n="U" oldref="31">To make the printer selected from the <emph>Installed printers</emph> list box the default printer, double-click its name or click the <emph>Default</emph> button.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/tabs.xhp b/helpcontent2/source/text/shared/guide/tabs.xhp
index 8e588d8ff2..ed26fecff2 100644
--- a/helpcontent2/source/text/shared/guide/tabs.xhp
+++ b/helpcontent2/source/text/shared/guide/tabs.xhp
@@ -154,11 +154,11 @@ FPE: Deleted screenshot.</lastedited>
</default>
</switch>
<paragraph role="heading" id="hd_id3151074" xml-lang="en-US" level="3" l10n="U" oldref="26">Changing the Defaults</paragraph>
-<paragraph role="paragraph" id="par_id3151059" xml-lang="en-US" l10n="U" oldref="14">If you want to change the settings of your default tab stops, you will find further information under <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01040900.xhp" name="Tools - Options - Text Document - General">Tools - Options - %PRODUCTNAME Writer - General</link>
-</caseinline><caseinline select="CALC"><link href="text/shared/optionen/01060300.xhp" name="Tools - Options - Spreadsheet - General">Tools - Options - %PRODUCTNAME Calc - General</link>
-</caseinline><caseinline select="DRAW"><link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Drawing - General">Tools - Options - %PRODUCTNAME Draw - General</link>
-</caseinline><caseinline select="IMPRESS"><link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Presentation - General">Tools - Options - %PRODUCTNAME Impress - General</link>
-</caseinline><defaultinline>Tools - Options - (module name) - General</defaultinline></switchinline>.</paragraph>
+<paragraph role="paragraph" id="par_id3151059" xml-lang="en-US" l10n="U" oldref="14">If you want to change the settings of your default tab stops, you will find further information under <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01040900.xhp" name="Text Document - General">%PRODUCTNAME Writer - General</link>
+</caseinline><caseinline select="CALC"><link href="text/shared/optionen/01060300.xhp" name="Spreadsheet - General">%PRODUCTNAME Calc - General</link>
+</caseinline><caseinline select="DRAW"><link href="text/shared/optionen/01070500.xhp" name="Drawing - General">%PRODUCTNAME Draw - General</link>
+</caseinline><caseinline select="IMPRESS"><link href="text/shared/optionen/01070500.xhp" name="Presentation - General">%PRODUCTNAME Impress - General</link>
+</caseinline><defaultinline>(module name) - General</defaultinline></switchinline> in the Options dialog box.</paragraph>
<switch select="appl">
<case select="CALC">
</case>
diff --git a/helpcontent2/source/text/shared/main0108.xhp b/helpcontent2/source/text/shared/main0108.xhp
index 75ae5eaf17..45321c8ebf 100644
--- a/helpcontent2/source/text/shared/main0108.xhp
+++ b/helpcontent2/source/text/shared/main0108.xhp
@@ -34,8 +34,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedmain0108xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Help</title>
@@ -58,8 +57,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_idN1064A" xml-lang="en-US" l10n="NEW">
-<image id="img_id1619006" src="res/commandimagelist/sc_helpindex.png" width="0.222inch" height="0.222inch"><alt id="alt_id1619006" xml-lang="en-US">icon</alt>
- </image></paragraph>
+<image id="img_id1619006" src="res/commandimagelist/sc_helpindex.png" width="0.222inch" height="0.222inch"><alt id="alt_id1619006" xml-lang="en-US">icon</alt></image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Help</paragraph>
diff --git a/helpcontent2/source/text/shared/main0227.xhp b/helpcontent2/source/text/shared/main0227.xhp
index c700965d17..cec80f872b 100644
--- a/helpcontent2/source/text/shared/main0227.xhp
+++ b/helpcontent2/source/text/shared/main0227.xhp
@@ -213,9 +213,7 @@
</table>
<bookmark xml-lang="en-US" branch="hid/SID_BEZIER_ELIMINATE_POINTS" id="bm_id3240924" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:BezierEliminatePoints" id="bm_id3154958" localize="false"/><paragraph role="heading" id="hd_id3156351" xml-lang="en-US" level="2" l10n="U" oldref="36">Eliminate Points</paragraph>
-<paragraph role="paragraph" id="par_id3149441" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid=".uno:BezierEliminatePoints">Marks the current point or the selected points for deletion.</ahelp> This happens in the event that the point is located on a straight line. If you convert a curve or a polygon with the <emph>Convert to Curve </emph>icon into a straight line or you change a curve with the mouse so that a point lies on the straight line, it is removed. The angle from which the point reduction is to take place <switchinline select="appl"><caseinline select="DRAW">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Drawing - Grid"><emph>Tools - Options - %PRODUCTNAME Draw - Grid</emph></link>
-</caseinline><caseinline select="IMPRESS">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Presentation - Grid"><emph>Tools - Options - %PRODUCTNAME Impress - Grid</emph></link>
-</caseinline><defaultinline>is 15° by default.</defaultinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3149441" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid=".uno:BezierEliminatePoints">Marks the current point or the selected points for deletion.</ahelp> This happens in the event that the point is located on a straight line. If you convert a curve or a polygon with the <emph>Convert to Curve </emph>icon into a straight line or you change a curve with the mouse so that a point lies on the straight line, it is removed. The angle from which the point reduction is to take place <switchinline select="appl"><caseinline select="DRAW">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Drawing - Grid"><emph>%PRODUCTNAME Draw - Grid</emph></link> in the Options dialog box</caseinline><caseinline select="IMPRESS">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Presentation - Grid"><emph>%PRODUCTNAME Impress - Grid</emph></link> in the Options dialog box</caseinline><defaultinline>is 15° by default.</defaultinline></switchinline></paragraph>
<table id="tbl_id3150892">
<tablerow>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/main0650.xhp b/helpcontent2/source/text/shared/main0650.xhp
index 2b85356a47..42287e0d84 100644
--- a/helpcontent2/source/text/shared/main0650.xhp
+++ b/helpcontent2/source/text/shared/main0650.xhp
@@ -51,7 +51,7 @@
<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="4">The Java platform support needs to be activated under $[officename] to run Java applications.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Activate Java platform support by choosing <link href="text/shared/optionen/java.xhp" name="Tools - Options - $[officename] - Java"><emph>Tools - Options - $[officename] - Java</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Activate Java platform support by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/java.xhp" name="$[officename] - Java">$[officename] - Java</emph></link>.</paragraph>
</listitem>
</list>
<paragraph role="note" id="par_id9116183" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME- Java, and click the Class Path button. After you add the path information, restart %PRODUCTNAME.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01000000.xhp b/helpcontent2/source/text/shared/optionen/01000000.xhp
index 08b307cff1..4732b0c7ae 100644
--- a/helpcontent2/source/text/shared/optionen/01000000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01000000.xhp
@@ -57,7 +57,7 @@
<paragraph xml-lang="en-US" id="par_id3125863" role="paragraph" l10n="U" oldref="13"><ahelp hid="HID_OFADLG_TREELISTBOX" visibility="hidden">Select an entry to edit.</ahelp></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#optionen"/>
- <paragraph xml-lang="en-US" id="par_id1013200911280529" role="note" l10n="NEW">Note for Mac OS X users: The Help mentions the menu path Tools - Options at numerous places. Replace this path with %PRODUCTNAME - Preferences on your Mac OS X main menu.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1013200911280529" role="note" l10n="NEW">Note for Mac OS X users: The Help mentions the menu path Tools - Options at numerous places. Replace this path with %PRODUCTNAME - Preferences on your Mac OS X main menu. Both menu entries open the Options dialog box.</paragraph>
</section>
<paragraph xml-lang="en-US" id="hd_id3159149" role="heading" level="2" l10n="U" oldref="4"><link href="text/shared/optionen/01010000.xhp" name="$[officename]">%PRODUCTNAME</link></paragraph>
<embed href="text/shared/optionen/01010000.xhp#optionenallgemein"/>
diff --git a/helpcontent2/source/text/shared/optionen/01010200.xhp b/helpcontent2/source/text/shared/optionen/01010200.xhp
index 9837e84f6c..035559b5a9 100644
--- a/helpcontent2/source/text/shared/optionen/01010200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010200.xhp
@@ -167,7 +167,7 @@
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SFXPAGE_SAVE_BTN_WARNALIENFORMAT" id="bm_id6262092" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/sfx2_CheckBox_RID_DLG_ALIEN_WARNING_CB_WARNING_OFF" id="bm_id7885982" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN1091E" role="heading" level="3" l10n="CHG">Warn when not saving in ODF or default format</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10922" role="paragraph" l10n="CHG"><ahelp hid=".">You can choose to get a warning message when you save a document in a format that is not OpenDocument or which you did not set as default format in <emph>Tools - Options - Load/Save - General</emph>.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10922" role="paragraph" l10n="CHG"><ahelp hid=".">You can choose to get a warning message when you save a document in a format that is not OpenDocument or which you did not set as default format in <emph>Load/Save - General</emph> in the Options dialog box.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3158444" role="paragraph" l10n="U" oldref="62">You can choose which file format will be applied as the default when saving documents of various document types. If you always exchange your documents with other persons who use Microsoft Office, for example, you may specify here that %PRODUCTNAME only uses the Microsoft Office file formats as a default.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_APP" id="bm_id3149207" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153270" role="heading" level="3" l10n="U"
diff --git a/helpcontent2/source/text/shared/optionen/01030500.xhp b/helpcontent2/source/text/shared/optionen/01030500.xhp
index 376a79adfa..880318a838 100644
--- a/helpcontent2/source/text/shared/optionen/01030500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030500.xhp
@@ -76,7 +76,7 @@
<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US" id="bm_id4514297" localize="false"/>
<paragraph role="heading" id="hd_id6065248" xml-lang="en-US" level="3" l10n="NEW">Use 'English (USA)' locale for numbers</paragraph>
<paragraph role="paragraph" id="par_id8023926" xml-lang="en-US" l10n="CHG">When importing numbers from an HTML page, the decimal separator and the thousands separator characters differ according to the locale of the HTML page. The clipboard however contains no information about the locale. For example, the characters "1.000" copied from a German Web page most possibly mean "one thousand" because the period is the thousands separator in a German locale. If copied from an English Web page, the same characters stand for the number 1 as in "one dot zero zero zero".</paragraph>
-<paragraph role="paragraph" id="par_id7658314" xml-lang="en-US" l10n="CHG"><ahelp hid=".">If not checked, numbers will be interpreted according to the setting in <emph>Tools - Options - Language Settings - Language of - Locale setting</emph>. If checked, numbers will be interpreted as 'English (USA)' locale.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id7658314" xml-lang="en-US" l10n="CHG"><ahelp hid=".">If not checked, numbers will be interpreted according to the setting in <emph>Language Settings - Language of - Locale setting</emph> in the Options dialog box. If checked, numbers will be interpreted as 'English (USA)' locale.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS" id="bm_id3147559" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_UNKNOWN_TAGS" id="bm_id2516251" localize="false"/>
<paragraph role="heading" id="hd_id3145068" xml-lang="en-US" level="3" l10n="U" oldref="7">Import unknown HTML tags as fields</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp
index f11be76f15..fa93fae156 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -109,7 +109,7 @@
<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL">Specifies whether to show numbers with the value of 0.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT" id="bm_id3163711" localize="false"/>
<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="9">Comment indicator</paragraph>
-<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT">Specifies that a small rectangle in the top right corner of the cell indicates that a comment exists. The comment will be shown only when you enable tips under <emph>Tools - Options - %PRODUCTNAME - General</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT">Specifies that a small rectangle in the top right corner of the cell indicates that a comment exists. The comment will be shown only when you enable tips under <emph>%PRODUCTNAME - General</emph> in the Options dialog box.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FID_NOTE_VISIBLE" id="bm_id2862651" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:NoteVisible" id="bm_id3153574" localize="false"/>
<paragraph role="paragraph" id="par_id3150487" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid=".uno:NoteVisible">To display a comment permanently, select the <emph>Show comment</emph> command from the cell's context menu.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/macrosecurity.xhp b/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
index 29036fe5ed..8c3f710733 100644
--- a/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
+++ b/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
@@ -43,9 +43,8 @@
</topic>
</meta>
<body>
-<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity"><link href="text/shared/optionen/macrosecurity.xhp">Macro Security</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">The Macro Security dialog appears when a document contains one or more macros. You can also call the dialog from the <link href="text/shared/optionen/01030300.xhp"><emph>Tools - Options - %PRODUCTNAME - Security</emph></link> page.</paragraph>
+<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity"><link href="text/shared/optionen/macrosecurity.xhp">Macro Security</link></variable></paragraph>
+<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">The Macro Security dialog appears when a document contains one or more macros. You can also call the dialog from the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01030300.xhp">%PRODUCTNAME - Security</emph></link> page.</paragraph>
<embed href="text/shared/optionen/macrosecurity_sl.xhp#macrosecurity_sl"/>
<embed href="text/shared/optionen/macrosecurity_ts.xhp#macrosecurity_ts"/>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/optionen/serverauthentication.xhp b/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
index 4114a97952..6db7362426 100755
--- a/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
+++ b/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
@@ -37,14 +37,10 @@
<title id="tit" xml-lang="en-US">Server Authentication</title>
<filename>/text/shared/optionen/serverauthentication.xhp</filename>
</topic>
-<history>
-<created date="2004-10-06T16:42:30">UFI: Server Authentication dialog from Writer Mail Merge settings</created>
-<lastedited date="2004-10-27T09:32:14">DEDR: Reviewed</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN1053E" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/optionen/serverauthentication.xhp">Server Authentication</link></paragraph>
-<paragraph role="paragraph" id="par_idN1054E" xml-lang="en-US" l10n="NEW">On the <link href="text/shared/optionen/mailmerge.xhp">Tools - Options - %PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, click the <emph>Server Authentication</emph> button to specify the server security settings.</paragraph>
+<paragraph role="paragraph" id="par_idN1054E" xml-lang="en-US" l10n="NEW">On the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, click the <emph>Server Authentication</emph> button to specify the server security settings.</paragraph>
<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_SERVERAUTHENTICATION_CB_AUTHENTICATION" id="bm_id4849085" localize="false"/>
<paragraph role="heading" id="par_idN10563" xml-lang="en-US" level="2" l10n="NEW">The outgoing mail server (SMTP) requires authentication</paragraph>
<paragraph role="paragraph" id="par_idN105BE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enables the authentication that is required to send e-mail by SMTP.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/testaccount.xhp b/helpcontent2/source/text/shared/optionen/testaccount.xhp
index 6c2fac999d..8001c46d7d 100755
--- a/helpcontent2/source/text/shared/optionen/testaccount.xhp
+++ b/helpcontent2/source/text/shared/optionen/testaccount.xhp
@@ -37,14 +37,10 @@
<title id="tit" xml-lang="en-US">Test Account Settings</title>
<filename>/text/shared/optionen/testaccount.xhp</filename>
</topic>
-<history>
-<created date="2004-10-06T16:32:57">UFI: Test Account Settings dialog from Mail Merge E-Mail tab page</created>
-<lastedited date="2004-10-15T13:08:20">YJ: checked</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/optionen/testaccount.xhp">Test Account Settings</link></paragraph>
-<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW">When you enter settings on the <link href="text/shared/optionen/mailmerge.xhp">Tools - Options - %PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, you can click the <emph>Test Settings</emph> button to test your settings.</paragraph>
+<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW">When you enter settings on the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, you can click the <emph>Test Settings</emph> button to test your settings.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MM_TESTACCOUNTSETTINGS_TLB" id="bm_id6709494" localize="false"/>
<paragraph role="heading" id="par_idN10574" xml-lang="en-US" level="2" l10n="NEW">(Results list box)</paragraph>
<paragraph role="paragraph" id="par_idN10578" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In the top list box you will see the results of the test session.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/simpress/01/04030000.xhp b/helpcontent2/source/text/simpress/01/04030000.xhp
index b1c62cfe92..d75ca2b623 100644
--- a/helpcontent2/source/text/simpress/01/04030000.xhp
+++ b/helpcontent2/source/text/simpress/01/04030000.xhp
@@ -57,8 +57,8 @@
</section>
<paragraph role="tip" id="par_id3145388" xml-lang="en-US" l10n="U" oldref="19">You can drag a snap line from the rulers and drop them on the page. To delete a snap line, drag it back to the ruler.</paragraph>
<paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="U" oldref="3">Draw or move an object near a snap point or snap line to snap it in place.</paragraph>
-<paragraph role="paragraph" id="par_id3157978" xml-lang="en-US" l10n="U" oldref="4">To set the snap range, choose <switchinline select="appl"><caseinline select="DRAW"><link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Drawing - Grid"><emph>Tools - Options - %PRODUCTNAME Draw - Grid</emph></link>
-</caseinline><defaultinline><link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Presentation - Grid"><emph>Tools - Options - %PRODUCTNAME Impress - Grid</emph></link></defaultinline></switchinline>.</paragraph>
+<paragraph role="paragraph" id="par_id3157978" xml-lang="en-US" l10n="U" oldref="4">To set the snap range, choose <switchinline select="appl"><caseinline select="DRAW"><link href="text/shared/optionen/01070300.xhp" name="Drawing - Grid"><emph>%PRODUCTNAME Draw - Grid</emph></link>
+</caseinline><defaultinline><link href="text/shared/optionen/01070300.xhp" name="Presentation - Grid"><emph>%PRODUCTNAME Impress - Grid</emph></link></defaultinline></switchinline> in the Options dialog box.</paragraph>
<paragraph role="heading" id="hd_id3147402" xml-lang="en-US" level="2" l10n="U" oldref="5">Position</paragraph>
<paragraph role="paragraph" id="par_id3150533" xml-lang="en-US" l10n="U" oldref="6">Sets the position of a selected snap point or line relative to the top left corner of the page. </paragraph>
<paragraph role="note" id="par_id3153040" xml-lang="en-US" l10n="U" oldref="24">You can also drag a snap point or snap line to a new position.</paragraph>
diff --git a/helpcontent2/source/text/simpress/01/04990600.xhp b/helpcontent2/source/text/simpress/01/04990600.xhp
index a3b0bb7d20..7d17ae864f 100644
--- a/helpcontent2/source/text/simpress/01/04990600.xhp
+++ b/helpcontent2/source/text/simpress/01/04990600.xhp
@@ -30,17 +30,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpress0104990600xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Author </title>
<filename>/text/simpress/01/04990600.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-23T15:30:35">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="autor">
@@ -52,7 +48,7 @@
<paragraph role="heading" id="hd_id3146974" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/01/04990600.xhp" name="Author">Author</link></paragraph>
<paragraph role="paragraph" id="par_id3153876" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:InsertAuthorField">Inserts the first and last names listed in the $[officename] user data into the active slide.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="U" oldref="3">To edit the name, choose <link href="text/shared/optionen/01010100.xhp" name="Tools - Options - $[officename] - User Data"><emph>Tools - Options - $[officename] - User Data</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="U" oldref="3">To edit the name, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="$[officename] - User Data"><emph>$[officename] - User Data</emph></link>.</paragraph>
<section id="howtoget">
<embed href="text/simpress/00/00000404.xhp#feldbf6"/>
</section>
diff --git a/helpcontent2/source/text/simpress/02/08020000.xhp b/helpcontent2/source/text/simpress/02/08020000.xhp
index 9a23b6f41e..207f14ea13 100644
--- a/helpcontent2/source/text/simpress/02/08020000.xhp
+++ b/helpcontent2/source/text/simpress/02/08020000.xhp
@@ -37,10 +37,6 @@
<title id="tit" xml-lang="en-US">Current Size</title>
<filename>/text/simpress/02/08020000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-27T09:25:51">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="aktuellegroesse">
@@ -49,6 +45,6 @@
<paragraph role="heading" id="hd_id3154011" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/02/08020000.xhp" name="Current Size">Current Size</link></paragraph>
<paragraph role="paragraph" id="par_id3154321" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Position">Displays the X and Y position of the cursor and the size of the selected object.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="3">This Status bar field uses the same measurement units as the rulers. You can define the units by choosing <link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Presentation - General"><emph>Tools - Options - %PRODUCTNAME Impress - General</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="3">This Status bar field uses the same measurement units as the rulers. You can define the units by choosing <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01070500.xhp" name="Presentation - General"><emph>%PRODUCTNAME Impress - General</emph></link>.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/03050000.xhp b/helpcontent2/source/text/swriter/01/03050000.xhp
index f87e6c1607..c26ac7b8df 100644
--- a/helpcontent2/source/text/swriter/01/03050000.xhp
+++ b/helpcontent2/source/text/swriter/01/03050000.xhp
@@ -37,17 +37,13 @@
<title id="tit" xml-lang="en-US">Ruler</title>
<filename>/text/swriter/01/03050000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-14T14:45:47">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="lineal">
<bookmark xml-lang="en-US" branch="hid/FN_RULER" id="bm_id8671021" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:Ruler" id="bm_id3151170" localize="false"/>
<paragraph role="heading" id="hd_id3149287" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/03050000.xhp" name="Ruler">Ruler</link></paragraph>
-<paragraph role="paragraph" id="par_id3147514" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Ruler">Shows or hides the horizontal ruler, that you can use to adjust page margins, tab stops, indents, borders, table cells, and to arrange objects on the page.</ahelp> To show the vertical ruler, choose <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - View"><emph>Tools - Options - %PRODUCTNAME Writer - View</emph></link>, and then select the <emph>Vertical ruler</emph> check box in the <emph>Ruler</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3147514" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Ruler">Shows or hides the horizontal ruler, that you can use to adjust page margins, tab stops, indents, borders, table cells, and to arrange objects on the page.</ahelp> To show the vertical ruler, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040200.xhp" name="Writer - View">%PRODUCTNAME Writer - View</emph></link>, and then select the <emph>Vertical ruler</emph> check box in the <emph>Ruler</emph> area.</paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000403.xhp#lineal"/>
diff --git a/helpcontent2/source/text/swriter/01/03090000.xhp b/helpcontent2/source/text/swriter/01/03090000.xhp
index 818cd6b14b..626a76d574 100644
--- a/helpcontent2/source/text/swriter/01/03090000.xhp
+++ b/helpcontent2/source/text/swriter/01/03090000.xhp
@@ -37,10 +37,6 @@
<title id="tit" xml-lang="en-US">Fields</title>
<filename>/text/swriter/01/03090000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-09T16:31:55">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="feldbefehle">
diff --git a/helpcontent2/source/text/swriter/01/03100000.xhp b/helpcontent2/source/text/swriter/01/03100000.xhp
index 5c91b2e1b2..9cfa630f00 100644
--- a/helpcontent2/source/text/swriter/01/03100000.xhp
+++ b/helpcontent2/source/text/swriter/01/03100000.xhp
@@ -53,6 +53,6 @@
<embed href="text/swriter/00/00000403.xhp#steuerzeichen"/>
</section>
<paragraph role="paragraph" id="par_id3145410" xml-lang="en-US" l10n="U" oldref="5">When you delete a paragraph mark, the paragraph that is merged takes on the formatting of the paragraph that the cursor is in.</paragraph>
-<paragraph role="paragraph" id="par_id3147511" xml-lang="en-US" l10n="U" oldref="6">To specify which nonprinting characters are displayed, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Writer - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>, and then select the options that you want in the <emph>Display of </emph>area.</paragraph>
+<paragraph role="paragraph" id="par_id3147511" xml-lang="en-US" l10n="U" oldref="6">To specify which nonprinting characters are displayed, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Writer - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</emph></link>, and then select the options that you want in the <emph>Display of</emph> area.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/03140000.xhp b/helpcontent2/source/text/swriter/01/03140000.xhp
index 029f189312..113b60726c 100644
--- a/helpcontent2/source/text/swriter/01/03140000.xhp
+++ b/helpcontent2/source/text/swriter/01/03140000.xhp
@@ -52,7 +52,7 @@
<section id="howtoget">
<embed href="text/swriter/00/00000403.xhp#versteckteabs"/>
</section>
-<paragraph role="note" id="par_id3157875" xml-lang="en-US" l10n="U" oldref="3">To enable this feature, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Writer - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>, and ensure that the <emph>Hidden paragraphs</emph> check box in the <emph>Display of</emph> area is selected.</paragraph>
+<paragraph role="note" id="par_id3157875" xml-lang="en-US" l10n="U" oldref="3">To enable this feature, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Writer - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</emph></link>, and ensure that the <emph>Hidden paragraphs</emph> check box in the <emph>Display of</emph> area is selected.</paragraph>
<paragraph role="paragraph" id="par_id3154501" xml-lang="en-US" l10n="U" oldref="4">Use the <link href="text/swriter/01/04090000.xhp" name="field command">field command</link> "Hidden Paragraph" to assign a <link href="text/swriter/01/04090200.xhp" name="condition">condition</link> that must be met to hide a paragraph. If the condition is not met, the paragraph is displayed.</paragraph>
<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="5">When you hide a paragraph, footnotes and frames that are anchored to characters in the paragraph are also hidden.</paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04060000.xhp b/helpcontent2/source/text/swriter/01/04060000.xhp
index 980f3fdf1a..f71392edc3 100644
--- a/helpcontent2/source/text/swriter/01/04060000.xhp
+++ b/helpcontent2/source/text/swriter/01/04060000.xhp
@@ -75,7 +75,7 @@
<embed href="text/swriter/01/04060100.xhp#optionentext"/>
<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_CAPTION_BTN_AUTOCAPTION" id="bm_id72939" localize="false"/>
<paragraph role="heading" id="par_idN10744" xml-lang="en-US" level="2" l10n="NEW">AutoCaption</paragraph>
-<paragraph role="paragraph" id="par_idN1074A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Caption dialog. It has the same information as the dialog you get by menu Tools - Options - %PRODUCTNAME Writer - AutoCaption.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1074A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Caption dialog. It has the same information as the dialog you get by menu %PRODUCTNAME Writer - AutoCaption in the Options dialog box.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/captions.xhp#captions"/>
<embed href="text/swriter/guide/captions_numbers.xhp#captions_numbers"/>
diff --git a/helpcontent2/source/text/swriter/01/04090001.xhp b/helpcontent2/source/text/swriter/01/04090001.xhp
index ad94508674..e72f90aa4c 100644
--- a/helpcontent2/source/text/swriter/01/04090001.xhp
+++ b/helpcontent2/source/text/swriter/01/04090001.xhp
@@ -109,7 +109,7 @@
<paragraph xml-lang="en-US" id="par_id3150561" role="tablecontent" l10n="U" oldref="8">Sender</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3146341" role="tablecontent" l10n="U" oldref="9">Inserts fields containing user data. You can change the user-data that is displayed by choosing<link href="text/shared/optionen/01010100.xhp" name="Tools - Options - $[officename] - User Data"><emph>Tools - Options - $[officename] - User Data</emph></link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146341" role="tablecontent" l10n="U" oldref="9">Inserts fields containing user data. You can change the user-data that is displayed by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="$[officename] - User Data">$[officename] - User Data</emph></link>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -117,7 +117,7 @@
<paragraph xml-lang="en-US" id="par_id3148863" role="tablecontent" l10n="U" oldref="22">Statistics</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3151091" role="tablecontent" l10n="U" oldref="23">Inserts document statistics, such as page and word counts, as a field. To view the statistics of a document, choose <emph>File - Properties</emph>, and then click the<emph> Statistics tab. </emph>
+ <paragraph xml-lang="en-US" id="par_id3151091" role="tablecontent" l10n="U" oldref="23">Inserts document statistics, such as page and word counts, as a field. To view the statistics of a document, choose <emph>File - Properties</emph>, and then click the <emph>Statistics</emph> tab.
</paragraph>
</tablecell>
</tablerow>
diff --git a/helpcontent2/source/text/swriter/01/04090003.xhp b/helpcontent2/source/text/swriter/01/04090003.xhp
index 5a0fbc53ff..34d8c19d98 100644
--- a/helpcontent2/source/text/swriter/01/04090003.xhp
+++ b/helpcontent2/source/text/swriter/01/04090003.xhp
@@ -109,7 +109,7 @@
<paragraph role="tablecontent" id="par_id3150973" xml-lang="en-US" l10n="U" oldref="13">Hidden text</paragraph>
</tablecell>
<tablecell>
-<paragraph role="tablecontent" id="par_id3147524" xml-lang="en-US" l10n="CHG" oldref="14">Inserts a text field that is hidden when the condition that you specify is met. To use this function, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden text</emph> check box.</paragraph>
+<paragraph role="tablecontent" id="par_id3147524" xml-lang="en-US" l10n="CHG" oldref="14">Inserts a text field that is hidden when the condition that you specify is met. To use this function, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden text</emph> check box.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -117,7 +117,7 @@
<paragraph role="tablecontent" id="par_id3154480" xml-lang="en-US" l10n="U" oldref="15">Hidden Paragraph</paragraph>
</tablecell>
<tablecell>
-<paragraph role="tablecontent" id="par_id3153677" xml-lang="en-US" l10n="CHG" oldref="16">Hides a paragraph when the condition that you specify is met. To use this function, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden paragraph</emph> check box.</paragraph>
+<paragraph role="tablecontent" id="par_id3153677" xml-lang="en-US" l10n="CHG" oldref="16">Hides a paragraph when the condition that you specify is met. To use this function, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden paragraph</emph> check box.</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/swriter/01/04130100.xhp b/helpcontent2/source/text/swriter/01/04130100.xhp
index 25bd7255e4..93a94d39e8 100755
--- a/helpcontent2/source/text/swriter/01/04130100.xhp
+++ b/helpcontent2/source/text/swriter/01/04130100.xhp
@@ -50,7 +50,7 @@
<paragraph role="paragraph" id="par_id3145248" xml-lang="en-US" l10n="U" oldref="2">You can resize and move selected frames and objects with the keyboard.</paragraph>
<paragraph role="paragraph" id="par_id3148771" xml-lang="en-US" l10n="U" oldref="4">To move a selected frame or object, press an arrow key. To move by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
<paragraph role="paragraph" id="par_id3150762" xml-lang="en-US" l10n="U" oldref="5">To resize a selected frame or object, first press Ctrl+Tab. Now one of the handles blinks to show that it is selected. To select another handle, press Ctrl+Tab again. Press an arrow key to resize the object by one grid unit. To resize by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
-<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="6">The increment by which you move an object with the keyboard is determined by the document grid. To change the properties of the document grid, choose <link href="text/shared/optionen/01050100.xhp" name="Tools - Options - Text document - Grid"><emph>Tools - Options - %PRODUCTNAME Writer - Grid</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="6">The increment by which you move an object with the keyboard is determined by the document grid. To change the properties of the document grid, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01050100.xhp" name="Text document - Grid">%PRODUCTNAME Writer - Grid</emph></link>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/keyboard.xhp#keyboard"/>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04150000.xhp b/helpcontent2/source/text/swriter/01/04150000.xhp
index 04a1f77397..a6124cf2f0 100644
--- a/helpcontent2/source/text/swriter/01/04150000.xhp
+++ b/helpcontent2/source/text/swriter/01/04150000.xhp
@@ -107,6 +107,6 @@ dedr: reviewed</lastedited>
<embed href="text/swriter/guide/keyboard.xhp#keyboard"/>
<embed href="text/shared/guide/border_table.xhp#border_table"/>
<paragraph role="paragraph" id="par_id3155912" xml-lang="en-US" l10n="U" oldref="52"><link href="text/swriter/01/05090300.xhp" name="Format - Table - Text Flow">Table - Table Properties - Text Flow</link></paragraph>
-<paragraph role="paragraph" id="par_id3150688" xml-lang="en-US" l10n="U" oldref="53"><link href="text/shared/optionen/01040500.xhp" name="Tools - Options - Writer - Table">Tools - Options - %PRODUCTNAME Writer - Table</link></paragraph>
+<paragraph role="paragraph" id="par_id3150688" xml-lang="en-US" l10n="U" oldref="53"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040500.xhp" name="Writer - Table">%PRODUCTNAME Writer - Table</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05040800.xhp b/helpcontent2/source/text/swriter/01/05040800.xhp
index bf75bf9aaa..15c0aa7e57 100755
--- a/helpcontent2/source/text/swriter/01/05040800.xhp
+++ b/helpcontent2/source/text/swriter/01/05040800.xhp
@@ -39,17 +39,13 @@
<title id="tit" xml-lang="en-US">Text Grid</title>
<filename>/text/swriter/01/05040800.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-07T10:22:55">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="textraster">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150760"><bookmark_value>text grid for Asian layout</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3150760" xml-lang="en-US" level="1" l10n="U" oldref="18"><link href="text/swriter/01/05040800.xhp" name="Text Grid">Text Grid</link></paragraph>
-<paragraph role="paragraph" id="par_id3151171" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".">Adds a text grid to the current page style. This option is only available if Asian language support is enabled under <emph>Tools - Options - Language Settings - Languages</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151171" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".">Adds a text grid to the current page style. This option is only available if Asian language support is enabled under <emph>Language Settings - Languages</emph> in the Options dialog box.</ahelp></paragraph>
</section>
<embed href="text/shared/00/00000007.xhp#asiahinweis"/>
<section id="howtoget">
diff --git a/helpcontent2/source/text/swriter/01/05090201.xhp b/helpcontent2/source/text/swriter/01/05090201.xhp
index dbf511c3ae..de7d8baee7 100644
--- a/helpcontent2/source/text/swriter/01/05090201.xhp
+++ b/helpcontent2/source/text/swriter/01/05090201.xhp
@@ -78,7 +78,7 @@
<paragraph role="listitem" id="par_id3153531" xml-lang="en-US" l10n="U" oldref="15">To delete a row, place the cursor in the row that you want to delete, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and press Delete, release, and then press the up or the down arrow.</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id3150983" xml-lang="en-US" l10n="U" oldref="10">To change the behavior of tables in a text document, choose <link href="text/shared/optionen/01040500.xhp" name="Tools - Options - Text Document - Table"><emph>Tools - Options - %PRODUCTNAME Writer - Table</emph></link>.</paragraph>
+<paragraph role="note" id="par_id3150983" xml-lang="en-US" l10n="U" oldref="10">To change the behavior of tables in a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040500.xhp" name="Text Document - Table">%PRODUCTNAME Writer - Table</emph></link>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="16"><link href="text/swriter/main0204.xhp" name="Table Bar">Table Bar</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/06030000.xhp b/helpcontent2/source/text/swriter/01/06030000.xhp
index 47259a6a3d..7d22f0ed47 100644
--- a/helpcontent2/source/text/swriter/01/06030000.xhp
+++ b/helpcontent2/source/text/swriter/01/06030000.xhp
@@ -67,13 +67,13 @@
<paragraph role="listitem" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="38">To reject the suggestion, click <emph>Remove</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="tip" id="par_id3147562" xml-lang="en-US" l10n="U" oldref="19">To exclude paragraphs from the automatic hyphenation, select the paragraphs, choose <emph>Format - Paragraph, click the Text Flow</emph> tab, and then clear the <emph>Automatically</emph> check box in the <emph>Hyphenation </emph>area.</paragraph>
-<paragraph role="note" id="par_id3154276" xml-lang="en-US" l10n="U" oldref="18">To turn off the suggestion dialogs for hyphenation, choose <link href="text/shared/optionen/01010400.xhp" name="Tools - Options - Language Settings - Writing Aids">Tools - Options - Language Settings - Writing Aids</link>, and select the <emph>Hyphenate without inquiry</emph> check box.</paragraph>
+<paragraph role="tip" id="par_id3147562" xml-lang="en-US" l10n="U" oldref="19">To exclude paragraphs from the automatic hyphenation, select the paragraphs, choose <emph>Format - Paragraph, click the Text Flow</emph> tab, and then clear the <emph>Automatically</emph> check box in the <emph>Hyphenation</emph> area.</paragraph>
+<paragraph role="note" id="par_id3154276" xml-lang="en-US" l10n="U" oldref="18">To turn off the suggestion dialogs for hyphenation, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010400.xhp" name="Language Settings - Writing Aids">Language Settings - Writing Aids</link></emph>, and select the <emph>Hyphenate without inquiry</emph> check box.</paragraph>
<paragraph role="paragraph" id="par_id3152950" xml-lang="en-US" l10n="U" oldref="17">To manually enter a hyphen, click in the word where you want to add the hyphen, and then press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Minus sign (-).</paragraph>
<paragraph role="paragraph" id="par_id3147523" xml-lang="en-US" l10n="U" oldref="32">To insert a non-breaking (protected) hyphen, click in the word that you want to hyphenate, and then press Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>+Ctrl </defaultinline></switchinline>+Minus sign(-).</paragraph>
-<paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="U" oldref="33">To hide custom hyphens, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>, and then clear the <emph>Custom hyphens</emph> check box.</paragraph>
+<paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="U" oldref="33">To hide custom hyphens, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</emph></link>, and then clear the <emph>Custom hyphens</emph> check box.</paragraph>
<paragraph role="heading" id="hd_id3150360" xml-lang="en-US" level="2" l10n="U" oldref="20">Word</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_HYPHENATE:ED_WORD" id="bm_id3155903" localize="false"/>
<paragraph role="heading" id="hd_id3153676" xml-lang="en-US" level="3" l10n="U" oldref="21">Word</paragraph>
diff --git a/helpcontent2/source/text/swriter/02/18030700.xhp b/helpcontent2/source/text/swriter/02/18030700.xhp
index 12050ea71a..fd60b0e15d 100644
--- a/helpcontent2/source/text/swriter/02/18030700.xhp
+++ b/helpcontent2/source/text/swriter/02/18030700.xhp
@@ -47,7 +47,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_INSERT_FLD_AUTHOR" id="bm_id4813138" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:InsertAuthorField" id="bm_id3154838" localize="false"/>
<paragraph role="heading" id="hd_id3154505" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/02/18030700.xhp" name="Author">Author</link></paragraph>
-<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:InsertAuthorField">Inserts the name of the person who created the document here as a field.</ahelp> The field applies the entry made under <link href="text/shared/optionen/01010100.xhp" name="Tools - Options - $[officename] - User data"><emph>Tools - Options - $[officename] - User data</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:InsertAuthorField">Inserts the name of the person who created the document here as a field.</ahelp> The field applies the entry made under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="$[officename] - User data">$[officename] - User data</emph></link>.</paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#feldbefehlautor"/>
diff --git a/helpcontent2/source/text/swriter/02/18130000.xhp b/helpcontent2/source/text/swriter/02/18130000.xhp
index 6d68f0777f..eaef344c3a 100644
--- a/helpcontent2/source/text/swriter/02/18130000.xhp
+++ b/helpcontent2/source/text/swriter/02/18130000.xhp
@@ -36,10 +36,6 @@
<title id="tit" xml-lang="en-US">Direct Cursor On/Off</title>
<filename>/text/swriter/02/18130000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-05T12:52:23">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="schacur">
@@ -48,7 +44,7 @@
<bookmark xml-lang="en-US" branch="hid/FN_SHADOWCURSOR" id="bm_id4799596" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:ShadowCursor" id="bm_id3154504" localize="false"/>
<paragraph role="heading" id="hd_id3147167" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/02/18130000.xhp" name="Direct Cursor On/Off">Direct Cursor On/Off</link></paragraph>
-<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ShadowCursor">Activates or deactivates the direct cursor.</ahelp> You can specify the behavior of the direct cursor by choosing <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ShadowCursor">Activates or deactivates the direct cursor.</ahelp> You can specify the behavior of the direct cursor by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</emph></link>.</paragraph>
</section>
<section id="syschacur">
<table id="tbl_id3151173" name="tbl_id3151173">
diff --git a/helpcontent2/source/text/swriter/guide/fields.xhp b/helpcontent2/source/text/swriter/guide/fields.xhp
index ec4889d656..d1e7f9ee3d 100644
--- a/helpcontent2/source/text/swriter/guide/fields.xhp
+++ b/helpcontent2/source/text/swriter/guide/fields.xhp
@@ -55,8 +55,7 @@
<paragraph xml-lang="en-US" id="hd_id3154262" role="heading" level="2" l10n="U" oldref="5">Viewing Fields</paragraph>
<paragraph xml-lang="en-US" id="par_id3150509" role="paragraph" l10n="U" oldref="6">Fields consist of a field name and the field content. To switch the field display between the field name or the field content, choose <link href="text/swriter/01/03090000.xhp" name="View - Fields"><emph>View - Field Names</emph></link>.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150536" role="paragraph" l10n="U" oldref="195">To display or hide field highlighting in a document, choose <emph>View - Field Shadings</emph>. To permanently disable this feature, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Appearance</emph>, and clear the check box in front of <emph>Field shadings</emph>.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3152885" role="paragraph" l10n="U" oldref="7">To change the color of field shadings, choose <link href="text/shared/optionen/01012000.xhp" name="Tools - Options - $[officename] - Appearance"><item type="menuitem">Tools - Options - $[officename] - Appearance</item></link>, locate the <item type="menuitem">Field shadings</item> option, and then select a different color in the <item type="menuitem">Color setting</item>
- <emph/>box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152885" role="paragraph" l10n="U" oldref="7">To change the color of field shadings, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01012000.xhp" name="$[officename] - Appearance"><item type="menuitem">$[officename] - Appearance</item></link></emph>, locate the <item type="menuitem">Field shadings</item> option, and then select a different color in the <item type="menuitem">Color setting</item> box.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3153166" role="heading" level="2" l10n="U" oldref="8">Field Properties</paragraph>
<paragraph xml-lang="en-US" id="par_id3153180" role="paragraph" l10n="U" oldref="181">Most field types in a document, including database fields, store and display variable values.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155533" role="paragraph" l10n="U" oldref="182">The following field types execute an action when you click the field:</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/number_date_conv.xhp b/helpcontent2/source/text/swriter/guide/number_date_conv.xhp
index 6086d36072..769e1c20a6 100755
--- a/helpcontent2/source/text/swriter/guide/number_date_conv.xhp
+++ b/helpcontent2/source/text/swriter/guide/number_date_conv.xhp
@@ -58,11 +58,11 @@
</list>
<list type="unordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3155527" role="listitem" l10n="U" oldref="11">Choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Table</item>, and select or clear the <item type="menuitem">Number recognition</item>
+ <paragraph xml-lang="en-US" id="par_id3155527" role="listitem" l10n="U" oldref="11">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="menuitem">%PRODUCTNAME Writer - Table</item>, and select or clear the <item type="menuitem">Number recognition</item>
<emph/>check box.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
- <paragraph xml-lang="en-US" id="par_id3153415" role="paragraph" l10n="U" oldref="14"><link href="text/shared/optionen/01040500.xhp" name="Tools - Options - Text Document - Table">Tools - Options - %PRODUCTNAME Writer - Table</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153415" role="paragraph" l10n="U" oldref="14"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040500.xhp" name="Text Document - Table">%PRODUCTNAME Writer - Table</link></paragraph>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/ruler.xhp b/helpcontent2/source/text/swriter/guide/ruler.xhp
index e607ffbe44..8e2e503f53 100644
--- a/helpcontent2/source/text/swriter/guide/ruler.xhp
+++ b/helpcontent2/source/text/swriter/guide/ruler.xhp
@@ -42,23 +42,21 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id8186284"><bookmark_value>rulers;using rulers</bookmark_value>
- <bookmark_value>horizontal rulers</bookmark_value>
- <bookmark_value>vertical rulers</bookmark_value>
- <bookmark_value>indents; setting on rulers</bookmark_value>
- <bookmark_value>page margins on rulers</bookmark_value>
- <bookmark_value>table cells;adjusting the width on rulers</bookmark_value>
- <bookmark_value>showing;rulers</bookmark_value>
- <bookmark_value>hiding;rulers</bookmark_value>
- <bookmark_value>adjusting page margins and cell widths</bookmark_value>
+<bookmark_value>horizontal rulers</bookmark_value>
+<bookmark_value>vertical rulers</bookmark_value>
+<bookmark_value>indents; setting on rulers</bookmark_value>
+<bookmark_value>page margins on rulers</bookmark_value>
+<bookmark_value>table cells;adjusting the width on rulers</bookmark_value>
+<bookmark_value>showing;rulers</bookmark_value>
+<bookmark_value>hiding;rulers</bookmark_value>
+<bookmark_value>adjusting page margins and cell widths</bookmark_value>
</bookmark><comment>mw made "indent settings..." a two level entry and cut "changing;indents"</comment>
<paragraph xml-lang="en-US" id="par_idN1065F" role="heading" level="1" l10n="NEW"><variable id="ruler"><link href="text/swriter/guide/ruler.xhp">Using Rulers</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN1067D" role="paragraph" l10n="NEW">To show or hide rulers, choose <emph>View - Ruler</emph>. To show the vertical ruler, choose <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - View"><emph>Tools - Options - %PRODUCTNAME Writer - View</emph></link>, and then select <emph>Vertical ruler</emph> in the <emph>Ruler</emph> area.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3149686" role="heading" level="2" l10n="U"
- oldref="20">Adjusting Page Margins</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1067D" role="paragraph" l10n="NEW">To show or hide rulers, choose <emph>View - Ruler</emph>. To show the vertical ruler, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040200.xhp" name="Writer - View"><emph>%PRODUCTNAME Writer - View</emph></link>, and then select <emph>Vertical ruler</emph> in the <emph>Ruler</emph> area.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149686" role="heading" level="2" l10n="U" oldref="20">Adjusting Page Margins</paragraph>
<paragraph xml-lang="en-US" id="par_id3155175" role="paragraph" l10n="U" oldref="3">The margins of a page are indicated by the filled areas at the ends of the rulers.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3149038" role="heading" level="2" l10n="U"
- oldref="22">Changing Indents</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149038" role="heading" level="2" l10n="U" oldref="22">Changing Indents</paragraph>
<paragraph xml-lang="en-US" id="par_id3153631" role="paragraph" l10n="U" oldref="23">Indents are adjusted with the three small triangles on the horizontal ruler.</paragraph>
<list type="ordered">
<listitem>
diff --git a/helpcontent2/source/text/swriter/guide/select_language.xhp b/helpcontent2/source/text/swriter/guide/select_language.xhp
index c0f0bd3973..7c2f68521b 100644
--- a/helpcontent2/source/text/swriter/guide/select_language.xhp
+++ b/helpcontent2/source/text/swriter/guide/select_language.xhp
@@ -42,27 +42,21 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3152443"><bookmark_value>languages; recognition of</bookmark_value>
- <bookmark_value>recognition;languages</bookmark_value>
- <bookmark_value>spellcheck;activating for all languages</bookmark_value>
- <bookmark_value>checking spelling;all languages</bookmark_value>
+<bookmark_value>recognition;languages</bookmark_value>
+<bookmark_value>spellcheck;activating for all languages</bookmark_value>
+<bookmark_value>checking spelling;all languages</bookmark_value>
</bookmark><comment>MW made a two level entry of "regognition of languages"</comment>
-<paragraph xml-lang="en-US" id="hd_id3152443" role="heading" level="1" l10n="U"
- oldref="33"><variable id="select_language"><link href="text/swriter/guide/select_language.xhp" name="Checking Spelling in Other Languages">Checking Spelling in Other Languages</link>
-</variable></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152443" role="heading" level="1" l10n="U" oldref="33"><variable id="select_language"><link href="text/swriter/guide/select_language.xhp" name="Checking Spelling in Other Languages">Checking Spelling in Other Languages</link></variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3155914" role="paragraph" l10n="U" oldref="34">$[officename] can check the spelling of words in more than one language, provided that you have installed dictionaries for the other languages.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153122" role="listitem" l10n="U" oldref="35">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</item>, and ensure that the <item type="menuitem">Check in all languages</item> check box in the <item type="menuitem">Options</item>
- <emph/>list is selected.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153122" role="listitem" l10n="U" oldref="35">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</item>, and ensure that the <item type="menuitem">Check in all languages</item> check box in the <item type="menuitem">Options</item> list is selected.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3149643" role="listitem" l10n="CHG" oldref="39">Activate the AutoSpellcheck icon in the Standard bar.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id3156257" role="note" l10n="CHG" oldref="37">If you do not enable the <item type="menuitem">Check in all languages</item>
- <emph/>feature, words that do not occur in the default language of the document are underlined by a wavy red line. To assign the underlined word to another language, right-click the word, and then choose<emph/>
- <item type="menuitem">Word is</item>
- <emph/>or <item type="menuitem">Paragraph is</item>, where the suggested language and country is shown in the command.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156257" role="note" l10n="CHG" oldref="37">If you do not enable the <item type="menuitem">Check in all languages</item> feature, words that do not occur in the default language of the document are underlined by a wavy red line. To assign the underlined word to another language, right-click the word, and then choose <item type="menuitem">Word is</item> or <item type="menuitem">Paragraph is</item>, where the suggested language and country is shown in the command.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/auto_spellcheck.xhp#auto_spellcheck"/>
<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
diff --git a/helpcontent2/source/text/swriter/guide/smarttags.xhp b/helpcontent2/source/text/swriter/guide/smarttags.xhp
index 9def14ef90..eb5f8eeee2 100644
--- a/helpcontent2/source/text/swriter/guide/smarttags.xhp
+++ b/helpcontent2/source/text/swriter/guide/smarttags.xhp
@@ -42,10 +42,10 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155622"><bookmark_value>smart tags</bookmark_value>
- <bookmark_value>AutoCorrect function; smart tags</bookmark_value>
- <bookmark_value>options;smart tags</bookmark_value>
- <bookmark_value>disabling;smart tags</bookmark_value>
- <bookmark_value>installing;smart tags</bookmark_value>
+<bookmark_value>AutoCorrect function; smart tags</bookmark_value>
+<bookmark_value>options;smart tags</bookmark_value>
+<bookmark_value>disabling;smart tags</bookmark_value>
+<bookmark_value>installing;smart tags</bookmark_value>
</bookmark><comment>MW moved 2 index entries from shared/01/06040700.xhp, inverted "smart tags;options", made "smart tags;" a one level entry and added 2 entries</comment>
<paragraph xml-lang="en-US" id="hd_id3563951" role="heading" level="1" l10n="NEW"><variable id="smarttags"><link href="text/swriter/guide/smarttags.xhp">Using Smart Tags</link>
</variable></paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/tablemode.xhp b/helpcontent2/source/text/swriter/guide/tablemode.xhp
index fbcdbf6fee..defe74d7c9 100755
--- a/helpcontent2/source/text/swriter/guide/tablemode.xhp
+++ b/helpcontent2/source/text/swriter/guide/tablemode.xhp
@@ -32,8 +32,7 @@
*
************************************************************************
-->
-
-
+
<meta>
<topic id="textswriterguidetablemodexml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Modifying Rows and Columns by Keyboard</title>
@@ -42,33 +41,26 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155856"><bookmark_value>table mode selection</bookmark_value>
- <bookmark_value>proportional distribution of tables</bookmark_value>
- <bookmark_value>relative distribution of table cells</bookmark_value>
- <bookmark_value>tables; adapting the width by keyboard</bookmark_value>
- <bookmark_value>cells; adapting the width by keyboard</bookmark_value>
- <bookmark_value>keyboard;modifying the behavior of rows/columns</bookmark_value>
- <bookmark_value>behavior of rows/columns</bookmark_value>
+<bookmark_value>proportional distribution of tables</bookmark_value>
+<bookmark_value>relative distribution of table cells</bookmark_value>
+<bookmark_value>tables; adapting the width by keyboard</bookmark_value>
+<bookmark_value>cells; adapting the width by keyboard</bookmark_value>
+<bookmark_value>keyboard;modifying the behavior of rows/columns</bookmark_value>
+<bookmark_value>behavior of rows/columns</bookmark_value>
</bookmark>
-<paragraph xml-lang="en-US" id="hd_id3155856" role="heading" level="1" l10n="CHG"
- oldref="7"><variable id="tablemode"><link href="text/swriter/guide/tablemode.xhp" name="Modifying the Behavior of Rows and Columns for Table">Modifying Rows and Columns by Keyboard</link>
-</variable></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155856" role="heading" level="1" l10n="CHG" oldref="7"><variable id="tablemode"><link href="text/swriter/guide/tablemode.xhp" name="Modifying the Behavior of Rows and Columns for Table">Modifying Rows and Columns by Keyboard</link></variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3149835" role="paragraph" l10n="U" oldref="12">When you insert or delete cells, rows or columns in a table, the <item type="menuitem">Behavior of rows/columns</item> options determine how the neighboring elements are affected. For example, you can only insert new rows and columns into a table with fixed row and column dimensions if space permits.</paragraph>
<paragraph xml-lang="en-US" id="par_id7344279" role="note" l10n="NEW">Note that these properties are valid only for changes to the column width that are made using the keyboard. Using the mouse, you are free to make any column width changes.<comment>UFI: fixes bugtraq 4971582</comment></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156110" role="paragraph" l10n="U" oldref="8">To set the <item type="menuitem">Behavior of rows/columns</item>
- <emph/>options for tables in text documents, choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Table</item>, or use the <item type="menuitem">Fixed</item>, <item type="menuitem">Fixed/Proportional</item>, and <item type="menuitem">Variable</item> icons on the <item type="menuitem">Table</item>
- <emph/>Bar. There are three display modes for tables:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156110" role="paragraph" l10n="U" oldref="8">To set the <item type="menuitem">Behavior of rows/columns</item> options for tables in text documents, choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Table</item>, or use the <item type="menuitem">Fixed</item>, <item type="menuitem">Fixed/Proportional</item>, and <item type="menuitem">Variable</item> icons on the <item type="menuitem">Table</item> Bar. There are three display modes for tables:</paragraph>
<list type="unordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149638" role="listitem" l10n="U" oldref="9">
-<emph>Fixed</emph> - changes only affect the adjacent cell, and not the entire table. For example, when you widen a cell, the adjacent cell becomes narrower, but the width of the table remains constant.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149638" role="listitem" l10n="U" oldref="9"><emph>Fixed</emph> - changes only affect the adjacent cell, and not the entire table. For example, when you widen a cell, the adjacent cell becomes narrower, but the width of the table remains constant.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149613" role="listitem" l10n="U" oldref="10">
-<emph>Fixed, proportional</emph> - changes affect the entire table, and wide cells shrink more than narrow cells. For example, when you widen a cell, the adjacent cells become proportionally narrower, but the width of the table remains constant.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149613" role="listitem" l10n="U" oldref="10"><emph>Fixed, proportional</emph> - changes affect the entire table, and wide cells shrink more than narrow cells. For example, when you widen a cell, the adjacent cells become proportionally narrower, but the width of the table remains constant.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149864" role="listitem" l10n="U" oldref="11">
-<emph>Variable</emph> - changes affect the table size. For example, when you widen a cell, the width of the table increases.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149864" role="listitem" l10n="U" oldref="11"><emph>Variable</emph> - changes affect the table size. For example, when you widen a cell, the width of the table increases.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp b/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp
index 46c60dd2ca..841316728e 100644
--- a/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp
@@ -42,22 +42,19 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155178"><bookmark_value>text; cursor</bookmark_value>
- <bookmark_value>entering text with direct cursor</bookmark_value>
- <bookmark_value>direct cursor; settings</bookmark_value>
- <bookmark_value>writing with direct cursor</bookmark_value>
- <bookmark_value>cursor;direct cursor</bookmark_value>
- <bookmark_value>settings;direct cursor</bookmark_value>
+<bookmark_value>entering text with direct cursor</bookmark_value>
+<bookmark_value>direct cursor; settings</bookmark_value>
+<bookmark_value>writing with direct cursor</bookmark_value>
+<bookmark_value>cursor;direct cursor</bookmark_value>
+<bookmark_value>settings;direct cursor</bookmark_value>
</bookmark>
-<paragraph xml-lang="en-US" id="hd_id3155178" role="heading" level="1" l10n="U"
- oldref="24"><variable id="text_direct_cursor"><link href="text/swriter/guide/text_direct_cursor.xhp" name="Using the Direct Cursor">Using the Direct Cursor</link>
-</variable></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155178" role="heading" level="1" l10n="U" oldref="24"><variable id="text_direct_cursor"><link href="text/swriter/guide/text_direct_cursor.xhp" name="Using the Direct Cursor">Using the Direct Cursor</link></variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3155908" role="paragraph" l10n="U" oldref="25">The direct cursor allows you to enter text anywhere on a page.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155921" role="paragraph" l10n="U" oldref="41">To set the behavior of the direct cursor, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph>.</paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_idN106A3" role="listitem" l10n="NEW">On the <item type="menuitem">Tools</item> bar, click the <item type="menuitem">Direct Cursor</item> icon
-<image id="img_id3149846" src="res/commandimagelist/sc_shadowcursor.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149846">Icon</alt>
- </image>.</paragraph>
+<image id="img_id3149846" src="res/commandimagelist/sc_shadowcursor.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149846">Icon</alt></image>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_idN106C5" role="listitem" l10n="NEW">Click in a free space in the text document. The mouse pointer changes to reflect the alignment that will be applied to the text that you type:</paragraph>