summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared/optionen
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-10-20 12:17:42 +0200
committerMathias Bauer <mba@openoffice.org>2010-10-20 12:17:42 +0200
commit1cd4436d3fce3a22f52bd33de5dd8530861288f9 (patch)
tree643db6e47786e63058e9414080f5aaada310e98a /helpcontent2/source/text/shared/optionen
parent3f4a745747ece2de9222cb01a9a723f293ea0fdf (diff)
CWS changehid: #i115137#: adjust help content to changed HIDs
Diffstat (limited to 'helpcontent2/source/text/shared/optionen')
-rw-r--r--helpcontent2/source/text/shared/optionen/01000000.xhp4
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01010100.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01010200.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01010300.xhp4
-rw-r--r--helpcontent2/source/text/shared/optionen/01010400.xhp16
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01010401.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01010500.xhp8
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01010501.xhp6
-rw-r--r--helpcontent2/source/text/shared/optionen/01010700.xhp8
-rw-r--r--helpcontent2/source/text/shared/optionen/01010800.xhp4
-rw-r--r--helpcontent2/source/text/shared/optionen/01012000.xhp4
-rw-r--r--helpcontent2/source/text/shared/optionen/01020100.xhp2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01020200.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01040000.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01040200.xhp2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01040300.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01040400.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01040500.xhp4
-rw-r--r--helpcontent2/source/text/shared/optionen/01040600.xhp2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01040700.xhp2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01040900.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01041000.xhp2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01041100.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01050100.xhp8
-rw-r--r--helpcontent2/source/text/shared/optionen/01060000.xhp4
-rw-r--r--helpcontent2/source/text/shared/optionen/01060100.xhp4
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01060400.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01060500.xhp2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01060600.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01070000.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01070100.xhp6
-rw-r--r--helpcontent2/source/text/shared/optionen/01070300.xhp10
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01070400.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01070500.xhp6
-rw-r--r--helpcontent2/source/text/shared/optionen/01080000.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01090000.xhp2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01090100.xhp2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01130200.xhp2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01160100.xhp2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01160200.xhp2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/java.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/testaccount.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp4
-rw-r--r--helpcontent2/source/text/shared/optionen/viewcertificate_d.xhp4
-rw-r--r--helpcontent2/source/text/shared/optionen/viewcertificate_g.xhp2
46 files changed, 81 insertions, 81 deletions
diff --git a/helpcontent2/source/text/shared/optionen/01000000.xhp b/helpcontent2/source/text/shared/optionen/01000000.xhp
index 4ccc1298ca..e020752a30 100644
--- a/helpcontent2/source/text/shared/optionen/01000000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01000000.xhp
@@ -43,14 +43,14 @@
<bookmark_value>defaults; program configuration</bookmark_value>
<bookmark_value>settings; program configuration</bookmark_value>
</bookmark><comment>mw changed "settings;options" and "defaults;..."</comment>
-<bookmark xml-lang="en-US" branch="hid/SID_OPTIONS_TREEDIALOG" id="bm_id8304653" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:OptionsTreeDialog" id="bm_id8304653" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:OptionsTreeDialog" id="bm_id3147335" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153665" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01000000.xhp" name="Options">Options</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3151384" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:OptionsTreeDialog">This command opens a dialog for a customized program configuration.</ahelp></paragraph>
</section>
<paragraph xml-lang="en-US" id="par_id3156344" role="paragraph" l10n="CHG" oldref="18">All your settings are saved automatically. To expand an entry either double click this entry or click the plus sign. To collapse the entry, click the minus sign or double click the entry.</paragraph>
<paragraph xml-lang="en-US" id="par_idN10607" role="note" l10n="CHG">You see only the entries that are applicable to the current document. If the current document is a text document, you see the %PRODUCTNAME Writer entry, and so on for all modules of %PRODUCTNAME. %PRODUCTNAME Impress and %PRODUCTNAME Draw are treated as the same in this dialog. The common entries are always visible.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_OFADLG_TREELISTBOX" id="bm_id3158409" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OFADLG_TREELISTBOX" id="bm_id3158409" localize="false"/>
<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"/>
diff --git a/helpcontent2/source/text/shared/optionen/01010100.xhp b/helpcontent2/source/text/shared/optionen/01010100.xhp
index 0502e05ea8..282ab7f7b2 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01010100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010100.xhp
@@ -47,7 +47,7 @@
<bookmark_value>user data; input</bookmark_value>
<bookmark_value>personal data input</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_GENERAL" id="bm_id3152801" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_GENERAL" id="bm_id3152801" localize="false"/>
<paragraph role="heading" id="hd_id3155805" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01010100.xhp" name="User Data">User Data</link></paragraph>
<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_GENERAL">Use this tab page to enter or edit user data.</ahelp> Some of the data may have already been entered by the user when installing $[officename].</paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01010200.xhp b/helpcontent2/source/text/shared/optionen/01010200.xhp
index 7c8ca591d0..20c1115709 100644
--- a/helpcontent2/source/text/shared/optionen/01010200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010200.xhp
@@ -45,7 +45,7 @@
<bookmark_value>relative saving of URLs</bookmark_value>
<bookmark_value>absolute saving of URLs</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_SAVE" id="bm_id3109850" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_SAVE" id="bm_id3109850" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3143284" role="head1" l10n="U" oldref="1"><link href="text/shared/optionen/01010200.xhp" name="General">General</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3145669" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_SAVE">In the<emph> General</emph> section, you can select default settings for saving documents, and can select default file formats.</ahelp></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01010300.xhp b/helpcontent2/source/text/shared/optionen/01010300.xhp
index bb29952bc0..57cc039fba 100644
--- a/helpcontent2/source/text/shared/optionen/01010300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010300.xhp
@@ -46,13 +46,13 @@
<bookmark_value>directories;directory structure</bookmark_value>
<bookmark_value>files and folders in $[officename]</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_PATH" id="bm_id3159399" localize="false"/><paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01010300.xhp" name="Paths">Paths</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_PATH" id="bm_id3159399" localize="false"/><paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01010300.xhp" name="Paths">Paths</link></paragraph>
<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_PATH">This section contains the default paths to important folders in $[officename]. These paths can be edited by the user.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#pfade"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTPATH_CTL_PATH" id="bm_id3146795" localize="false"/><paragraph role="heading" id="hd_id3149810" xml-lang="en-US" level="2" l10n="CHG" oldref="13">Paths used by %PRODUCTNAME</paragraph>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTPATH_CTL_PATH" id="bm_id3146795" localize="false"/><paragraph role="heading" id="hd_id3149810" xml-lang="en-US" level="2" l10n="CHG" oldref="13">Paths used by %PRODUCTNAME</paragraph>
<paragraph role="paragraph" id="par_id3154923" xml-lang="en-US" l10n="CHG" oldref="5"><ahelp hid="HID_OPTPATH_CTL_PATH">To modify an entry in this list, click the entry and click <emph>Edit</emph>. You can also double click the entry.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD" id="bm_id3154216" localize="false"/><paragraph role="heading" id="hd_id3151210" xml-lang="en-US" level="2" l10n="U" oldref="160">Default</paragraph>
<paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="161"><ahelp hid="SVX:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_STANDARD">The<emph> Default </emph>button resets the predefined paths for all selected entries.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01010400.xhp b/helpcontent2/source/text/shared/optionen/01010400.xhp
index fb3da1d4fd..443cbe74ae 100644
--- a/helpcontent2/source/text/shared/optionen/01010400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010400.xhp
@@ -50,14 +50,14 @@
<bookmark_value>spellcheck; ignore list</bookmark_value>
<bookmark_value>hyphenation; minimal number of characters</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_LINGU" id="bm_id3147291" localize="false"/><comment>removed "german" references, i78879</comment>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_LINGU" id="bm_id3147291" localize="false"/><comment>removed "german" references, i78879</comment>
<paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01010400.xhp" name="Writing Aids">Writing Aids</link></paragraph>
<paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_LINGU">Specifies the properties of the spellcheck, thesaurus and hyphenation.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#writingaids"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_CLB_LINGU_MODULES" id="bm_id3147653" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_CLB_LINGU_MODULES" id="bm_id3147653" localize="false"/>
<paragraph role="heading" id="hd_id3149096" xml-lang="en-US" level="2" l10n="U" oldref="33">Available Language Modules</paragraph>
<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_CLB_LINGU_MODULES">Contains the installed language modules.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="35">A language module can contain one, two or three submodules: Spellcheck, hyphenation and thesaurus. Each sub-module can be available in one or more languages. If you click in front of the name of the module, you activate all the available sub-modules simultaneously. If you remove a set mark, you deactivate all the available sub-modules simultaneously. If you wish to activate or deactivate individual sub-modules, click the<emph> Edit button </emph>to open the <link href="text/shared/optionen/01010401.xhp" name="Edit Modules"><emph>Edit Modules</emph></link> dialog.</paragraph>
@@ -67,10 +67,10 @@
<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_MODULES_EDIT">To edit a language module, select it and click <emph>Edit</emph>.</ahelp> The <link href="text/shared/optionen/01010401.xhp" name="Edit Modules"><emph>Edit </emph>
<emph>Modules</emph></link> dialog appears.</paragraph>
<section id="benutzerwb">
-<bookmark xml-lang="en-US" branch="hid/HID_CLB_EDIT_MODULES_DICS" id="bm_id3150503" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_CLB_EDIT_MODULES_DICS" id="bm_id3150503" localize="false"/>
<paragraph role="heading" id="hd_id3153348" xml-lang="en-US" level="2" l10n="U" oldref="60">User-defined dictionaries</paragraph>
<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="HID_CLB_EDIT_MODULES_DICS">Lists the available user dictionaries.</ahelp> Mark the user dictionaries that you want to use for spellcheck and hyphenation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_DICT_NEW" id="bm_id3149670" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_DICT_NEW" id="bm_id3149670" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC" id="bm_id3154923" localize="false"/>
<paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="3" l10n="U" oldref="63">New</paragraph>
<paragraph role="paragraph" id="par_id3146794" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_NEW_DIC">Opens the <emph>New Dictionary</emph> dialog, in which you can name a new user-defined dictionary or dictionary of exceptions and specify the language.</ahelp></paragraph>
@@ -85,7 +85,7 @@
<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT" id="bm_id3145606" localize="false"/>
<paragraph role="heading" id="hd_id3153106" xml-lang="en-US" level="3" l10n="U" oldref="71">Exceptions (-)</paragraph>
<paragraph role="paragraph" id="par_id3149561" xml-lang="en-US" l10n="CHG" oldref="72"><ahelp hid="SVX:CHECKBOX:RID_SFXDLG_NEWDICT:BTN_EXCEPT">Specifies whether you wish to avoid certain words in your documents.</ahelp> In this way, you can create a custom dictionary of all the words to be avoided. If this exception dictionary is activated, during spellchecking you receive a corresponding note about any words which should be avoided.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_DICT_EDIT" id="bm_id3147213" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_DICT_EDIT" id="bm_id3147213" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_EDIT_DIC" id="bm_id3155411" localize="false"/>
<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="3" l10n="U" oldref="73">Edit</paragraph>
<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="74"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_EDIT_DIC">Opens the <emph>Edit custom dictionary</emph> dialog, in which you can add to your custom dictionary or edit existing entries.</ahelp></paragraph>
@@ -115,7 +115,7 @@
<paragraph role="paragraph" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="93"><ahelp hid="." visibility="hidden">Deletes the selected dictionary after a confirmation, provided it is not write-protected.</ahelp></paragraph>
</section>
<section id="optionen">
-<bookmark xml-lang="en-US" branch="hid/HID_CLB_LINGU_OPTIONS" id="bm_id3153703" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_CLB_LINGU_OPTIONS" id="bm_id3153703" localize="false"/>
<paragraph role="heading" id="hd_id3149032" xml-lang="en-US" level="2" l10n="U" oldref="39">Options</paragraph>
<paragraph role="paragraph" id="par_id3145259" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="HID_CLB_LINGU_OPTIONS">Defines the options for the spellcheck and hyphenation.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_OPTIONS_EDIT" id="bm_id3147131" localize="false"/>
@@ -129,7 +129,7 @@
<paragraph role="paragraph" id="par_id3154200" xml-lang="en-US" l10n="CHG" oldref="48">Checks for the correct use of capitals at the start of words during spellcheck.</paragraph>
<paragraph role="heading" id="hd_id3166424" xml-lang="en-US" level="3" l10n="U" oldref="49">Check special regions</paragraph>
<paragraph role="paragraph" id="par_id3150345" xml-lang="en-US" l10n="CHG" oldref="50">Specifies that special regions, such as drawing text, are checked during spellcheck.<comment>UFI: doesn't work in versions up to OOo 2.4</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_AUTOSPELL_CHECK" id="bm_id5188694" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SpellOnline" id="bm_id5188694" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SpellOnline" id="bm_id3166435" localize="false"/>
<paragraph role="heading" id="hd_id3166429" xml-lang="en-US" level="3" l10n="U" oldref="21">Check spelling as you type</paragraph>
<paragraph role="paragraph" id="par_id3155531" xml-lang="en-US" l10n="U" oldref="6"><variable id="automatisch"><ahelp hid=".uno:SpellOnline">Automatically checks spelling as you type, and underlines errors.</ahelp>
@@ -139,7 +139,7 @@
<paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="U" oldref="23">To place the word pair in the <link href="text/shared/01/06040200.xhp" name="AutoCorrect replacement table">AutoCorrect replacement table</link>, open the <link href="text/shared/01/06040500.xhp" name="AutoCorrect context menu">AutoCorrect context menu</link> and choose <emph>AutoCorrect</emph>. Make your selection from the submenu. The word is replaced and at the same time the word pair is placed in the replacement table.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK" id="bm_id3148607" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_LNGDLG_NUM_PREBREAK" id="bm_id3159095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_LNGDLG_NUM_PREBREAK" id="bm_id3159095" localize="false"/>
<paragraph role="heading" id="hd_id3150111" xml-lang="en-US" level="3" l10n="U" oldref="53">Minimal number of characters for hyphenation </paragraph>
<paragraph role="paragraph" id="par_id3150316" xml-lang="en-US" l10n="U" oldref="54">Specifies the minimum number of characters required for automatic hyphenation to be applied. <ahelp hid="HID_LNGDLG_NUM_PREBREAK" visibility="hidden"> Type the minimum number of characters that must come before or after the hyphen.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148823" xml-lang="en-US" level="3" l10n="U" oldref="11">Characters before line break</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01010401.xhp b/helpcontent2/source/text/shared/optionen/01010401.xhp
index 2172cf19dc..f76c5a5808 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01010401.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010401.xhp
@@ -54,7 +54,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#linguistikmodule"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_CLB_EDIT_MODULES_MODULES" id="bm_id3156329" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_CLB_EDIT_MODULES_MODULES" id="bm_id3156329" localize="false"/>
<paragraph role="heading" id="hd_id3148685" xml-lang="en-US" level="2" l10n="U" oldref="3">Options</paragraph>
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_CLB_EDIT_MODULES_MODULES">Specifies the language and the available spelling, hyphenation and Thesaurus sub-modules for the selected module.</ahelp> You can arrange the sub-modules by priority.</paragraph>
<list type="ordered">
diff --git a/helpcontent2/source/text/shared/optionen/01010500.xhp b/helpcontent2/source/text/shared/optionen/01010500.xhp
index 5006d4cb30..ad07cc7d59 100644
--- a/helpcontent2/source/text/shared/optionen/01010500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010500.xhp
@@ -39,7 +39,7 @@
</meta>
<body>
<section id="farben">
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_COLOR" id="bm_id3151211" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_COLOR" id="bm_id3151211" localize="false"/>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155132"><bookmark_value>colors; models</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3150543" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01010500.xhp" name="Colors">Colors</link></paragraph>
@@ -60,13 +60,13 @@
<paragraph role="paragraph" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_COLOR:LB_COLORMODEL">To modify, select the color model: Red-Green-Blue (RGB) or Cyan-Magenta-Yellow-BlacK (CMYK).</ahelp></paragraph>
<paragraph role="note" id="par_id1527756" xml-lang="en-US" l10n="NEW">%PRODUCTNAME uses only the RGB color model for printing in color. The CMYK controls are provided only to ease the input of color values using CMYK notation.</paragraph>
<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="40">If you select RGB, the initials of the three colors will appear and you can set the color from 0 to 255 with the spin button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TPCOLOR_RGB_1" id="bm_id3146976" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_TPCOLOR_RGB_1" id="bm_id3146976" localize="false"/>
<paragraph role="heading" id="hd_id3150103" xml-lang="en-US" level="3" l10n="U" oldref="13">R</paragraph>
<paragraph role="paragraph" id="par_id3152462" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_TPCOLOR_RGB_1">Red</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TPCOLOR_RGB_2" id="bm_id3159156" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_TPCOLOR_RGB_2" id="bm_id3159156" localize="false"/>
<paragraph role="heading" id="hd_id3145366" xml-lang="en-US" level="3" l10n="U" oldref="15">G</paragraph>
<paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_TPCOLOR_RGB_2">Green</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TPCOLOR_RGB_3" id="bm_id3154319" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_TPCOLOR_RGB_3" id="bm_id3154319" localize="false"/>
<paragraph role="heading" id="hd_id3153573" xml-lang="en-US" level="3" l10n="U" oldref="17">B</paragraph>
<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_TPCOLOR_RGB_3">Blue</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="41">If you select CMYK, the initials of the four colors will appear and you can set the color from 0 to 255 with the spin button.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01010501.xhp b/helpcontent2/source/text/shared/optionen/01010501.xhp
index 52d43bf041..d719b04ade 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01010501.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010501.xhp
@@ -75,15 +75,15 @@
<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_COLOR:BTN_2" id="bm_id3145608" localize="false"/>
<paragraph role="heading" id="hd_id3158409" xml-lang="en-US" level="2" l10n="U" oldref="13">--&gt;</paragraph>
<paragraph role="paragraph" id="par_id3151043" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVTOOLS:PUSHBUTTON:DLG_COLOR:BTN_2">Sets the small selection cursor in the right window on the color, which corresponds to the selected color in the left window and updates the respective values in the numerical fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TPCOLOR_CMYK_1" id="bm_id3159152" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_TPCOLOR_CMYK_1" id="bm_id3159152" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_CYAN" id="bm_id3153367" localize="false"/>
<paragraph role="heading" id="hd_id3149203" xml-lang="en-US" level="2" l10n="U" oldref="15">Cyan</paragraph>
<paragraph role="paragraph" id="par_id3159252" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_CYAN">Sets the Cyan color value in the CMYK color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TPCOLOR_CMYK_2" id="bm_id3159155" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_TPCOLOR_CMYK_2" id="bm_id3159155" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_MAGENTA" id="bm_id3150486" localize="false"/>
<paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="2" l10n="U" oldref="17">Magenta</paragraph>
<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_MAGENTA">Sets the Magenta color value in the CMYK color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TPCOLOR_CMYK_3" id="bm_id3147443" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_TPCOLOR_CMYK_3" id="bm_id3147443" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_YELLOW" id="bm_id3152576" localize="false"/>
<paragraph role="heading" id="hd_id3154147" xml-lang="en-US" level="2" l10n="U" oldref="19">Yellow</paragraph>
<paragraph role="paragraph" id="par_id3155306" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_YELLOW">Sets the Yellow color value in the CMYK color model.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01010700.xhp b/helpcontent2/source/text/shared/optionen/01010700.xhp
index e972a9aa23..e3d6c98f4b 100644
--- a/helpcontent2/source/text/shared/optionen/01010700.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010700.xhp
@@ -44,7 +44,7 @@
<bookmark_value>Basic; fonts for source display</bookmark_value>
<bookmark_value>fonts;for HTML and Basic</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OFA_FONT_SUBSTITUTION" id="bm_id3147209" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OFA_FONT_SUBSTITUTION" id="bm_id3147209" localize="false"/>
<paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01010700.xhp" name="Fonts">Fonts</link></paragraph>
<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_OFA_FONT_SUBSTITUTION">Substitutes a font with a font of your choice. The substitution replaces a font only when it is displayed on screen, or on screen and when printing. The replacement does not change the font settings that are saved in the document.</ahelp></paragraph>
</section>
@@ -57,7 +57,7 @@
<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE" id="bm_id1615039" localize="false"/>
<paragraph role="heading" id="hd_id3149295" xml-lang="en-US" level="2" l10n="U" oldref="3">Apply replacement table</paragraph>
<paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="OFFMGR:CHECKBOX:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE">Enables the font replacement settings that you define.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_OFA_FONT_SUBST_CLB" id="bm_id3150360" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OFA_FONT_SUBST_CLB" id="bm_id3150360" localize="false"/>
<paragraph role="heading" id="hd_id3148664" xml-lang="en-US" level="2" l10n="U" oldref="4">Replacement table</paragraph>
<paragraph role="paragraph" id="par_id3154073" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="HID_OFA_FONT_SUBST_CLB">Lists the original font and the font that will replace it. Select <emph>Always</emph> to replace the font, even if the original font is installed on your system. Select <emph>Screen only </emph>to replace the screen font only and never replace the font for printing.</ahelp></paragraph>
<table id="tbl_id0520200803425582">
@@ -126,7 +126,7 @@
<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2" id="bm_id1337321" localize="false"/>
<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="2" l10n="U" oldref="10">Replace with</paragraph>
<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT2">Enter or select the name of the replacement font.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_OFA_SUBST_APPLY" id="bm_id3150010" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OFA_SUBST_APPLY" id="bm_id3150010" localize="false"/>
<paragraph role="heading" id="hd_id3153363" xml-lang="en-US" level="2" l10n="U" oldref="11">Apply</paragraph>
<paragraph role="paragraph" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_OFA_SUBST_APPLY">Applies the selected font replacement.</ahelp></paragraph>
<table id="tbl_id3151116">
@@ -142,7 +142,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/HID_OFA_SUBST_DELETE" id="bm_id3148647" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OFA_SUBST_DELETE" id="bm_id3148647" localize="false"/>
<paragraph role="heading" id="hd_id3147443" xml-lang="en-US" level="2" l10n="U" oldref="12">Delete</paragraph>
<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_OFA_SUBST_DELETE">Deletes the selected font replacement.</ahelp></paragraph>
<table id="tbl_id3148456">
diff --git a/helpcontent2/source/text/shared/optionen/01010800.xhp b/helpcontent2/source/text/shared/optionen/01010800.xhp
index 6728fcb870..e27a49acd9 100644
--- a/helpcontent2/source/text/shared/optionen/01010800.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010800.xhp
@@ -52,7 +52,7 @@
<bookmark_value>clipboard; selection clipboard</bookmark_value>
<bookmark_value>selection clipboard</bookmark_value>
</bookmark><comment>mw corrected a typo in font lists</comment><comment>ufi: removed index entries for 3d view &amp; dithering &amp; optimized output, in cws aw059</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_OFA_TP_VIEW" id="bm_id3156330" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OFA_TP_VIEW" id="bm_id3156330" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155341" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01010800.xhp" name="View">View</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3155630" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OFA_TP_VIEW">Specifies view options.</ahelp></paragraph>
</section>
@@ -108,7 +108,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:RestoreEditingView" id="bm_id555742" localize="false"/><comment>UFI: i53104. This is still in Customize dialog</comment>
<paragraph xml-lang="en-US" id="par_idN10962" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to restore the last used document view. Many view properties valid when the document was last saved will be restored.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN10AC8" role="heading" level="2" l10n="NEW">Graphics output</paragraph>
-<bookmark xml-lang="en-US" branch="hid/FN_REFRESH_VIEW" id="bm_id6835216" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:RefreshView" id="bm_id6835216" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:RefreshView" id="bm_id9305703" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10A1D" role="tip" l10n="NEW"><ahelp hid="20201">Press Shift+Ctrl+R to restore or refresh the view of the current document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL" id="bm_id4084902" localize="false"/>
diff --git a/helpcontent2/source/text/shared/optionen/01012000.xhp b/helpcontent2/source/text/shared/optionen/01012000.xhp
index 96df387895..1ecb2c86e9 100644
--- a/helpcontent2/source/text/shared/optionen/01012000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01012000.xhp
@@ -60,13 +60,13 @@
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME" id="bm_id3153088" localize="false"/>
<paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="3" l10n="U" oldref="7">Save</paragraph>
<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_COLORCONFIG_PB_SAVESCHEME">Saves the current settings as a color scheme that you can reload later.</ahelp> The name is added to the <emph>Scheme</emph> box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_COLORCONFIG_NAME_SCHEME" id="bm_id3148552" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME" id="bm_id3148552" localize="false"/>
<paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="3" l10n="U" oldref="9">Name of color scheme</paragraph>
<paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_OPTIONS_COLORCONFIG_NAME_SCHEME">Enter a name for the color scheme.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME" id="bm_id3154071" localize="false"/>
<paragraph role="heading" id="hd_id3152811" xml-lang="en-US" level="3" l10n="U" oldref="11">Delete</paragraph>
<paragraph role="paragraph" id="par_id3150400" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_COLORCONFIG_PB_DELETESCHEME">Deletes the color scheme shown in the <emph>Scheme</emph> box. You cannot delete the Default scheme.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_COLORCONFIG_COLORLIST_WIN" id="bm_id3151380" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_COLORCONFIG_COLORLIST_WIN" id="bm_id3151380" localize="false"/>
<paragraph role="heading" id="hd_id3148672" xml-lang="en-US" level="2" l10n="U" oldref="13">Scheme</paragraph>
<paragraph role="paragraph" id="par_id3149204" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_OPTIONS_COLORCONFIG_COLORLIST_WIN">Select the colors for the user interface elements.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3150769" xml-lang="en-US" l10n="U" oldref="15">To apply a color to a user interface element, ensure that the checkbox in front of the name is marked. To hide a user interface element, clear the check box.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01020100.xhp b/helpcontent2/source/text/shared/optionen/01020100.xhp
index 331d2aa45c..dd8226724c 100644
--- a/helpcontent2/source/text/shared/optionen/01020100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020100.xhp
@@ -44,7 +44,7 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3147577"><bookmark_value>settings; proxies</bookmark_value>
<bookmark_value>proxy settings</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_PROXY" id="bm_id3154927" localize="false"/><paragraph role="heading" id="hd_id3156414" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01020100.xhp" name="Proxy">Proxy</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_PROXY" id="bm_id3154927" localize="false"/><paragraph role="heading" id="hd_id3156414" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01020100.xhp" name="Proxy">Proxy</link></paragraph>
</section>
<paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="32"><link href="text/shared/00/00000002.xhp#proxy" name="Proxy servers">Proxy servers</link> for accessing the Internet can be set up manually as needed.</paragraph>
<section id="howtoget">
diff --git a/helpcontent2/source/text/shared/optionen/01020200.xhp b/helpcontent2/source/text/shared/optionen/01020200.xhp
index 7629fa533d..4bdc245a3b 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01020200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020200.xhp
@@ -43,7 +43,7 @@
<section id="suche">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154515"><bookmark_value>search engines; selecting</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_SEARCH" id="bm_id3156346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_SEARCH" id="bm_id3156346" localize="false"/>
<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01020200.xhp" name="Search">Search</link></paragraph>
<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_SEARCH">Use this tab page to define the settings for searching in the Internet.</ahelp></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01040000.xhp b/helpcontent2/source/text/shared/optionen/01040000.xhp
index 8d889c72a5..c6e416708f 100644
--- a/helpcontent2/source/text/shared/optionen/01040000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040000.xhp
@@ -40,7 +40,7 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SID_SW_EDITOPTIONS" id="bm_id7223842" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/.uno:SwEditOptions" id="bm_id7223842" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:SwEditOptions" id="bm_id3148491" localize="false"/>
<paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="1" l10n="U" oldref="1">%PRODUCTNAME Writer Options</paragraph>
<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="2"><variable id="optionentextdokument"><ahelp hid=".uno:SwEditOptions">These settings determine the way text documents that are created in $[officename] are handled. It is also possible to define settings for the current text document.</ahelp>
diff --git a/helpcontent2/source/text/shared/optionen/01040200.xhp b/helpcontent2/source/text/shared/optionen/01040200.xhp
index 6401124aee..c7b09d903e 100644
--- a/helpcontent2/source/text/shared/optionen/01040200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040200.xhp
@@ -104,7 +104,7 @@
<paragraph role="note" id="par_id3146898" xml-lang="en-US" l10n="U" oldref="39">If the <emph>Graphics and objects </emph>option is not selected, no graphics will be loaded from the Internet. Graphics within a table and without an indication of their size can cause display problems when using an older HTML standard on the browsed page.</paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_TBL" id="bm_id3154164" localize="false"/><paragraph role="heading" id="hd_id3156332" xml-lang="en-US" level="3" l10n="U" oldref="40">Tables</paragraph>
<paragraph role="paragraph" id="par_id3154482" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_TBL">Displays the tables contained in your document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/FN_VIEW_TABLEGRID" id="bm_id3119506" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:TableBoundaries" id="bm_id3119506" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:TableBoundaries" id="bm_id3155443" localize="false"/><paragraph role="paragraph" id="par_id3153713" xml-lang="en-US" l10n="CHG" oldref="67"><ahelp hid=".uno:TableBoundaries">To display the table boundaries, right-click any table and choose <emph>Table Boundaries</emph>, or choose <emph>Table - Table Boundaries</emph> in a Writer document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_DRWFAST" id="bm_id3154255" localize="false"/><paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3" l10n="U" oldref="42">Drawings and controls</paragraph>
<paragraph role="paragraph" id="par_id3151249" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_DRWFAST">Displays the drawings and controls contained in your document.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01040300.xhp b/helpcontent2/source/text/shared/optionen/01040300.xhp
index 1a123d5f00..d76ded3ab4 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01040300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040300.xhp
@@ -51,7 +51,7 @@
<bookmark_value>templates;changing basic fonts</bookmark_value>
<bookmark_value>paragraph styles;modifying basic fonts</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_STD_FONT" id="bm_id3154894" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_STD_FONT" id="bm_id3154894" localize="false"/>
<paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts">Basic Fonts</link></paragraph>
<paragraph role="paragraph" id="par_id3149786" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_STD_FONT">Specifies the settings for the basic fonts in your documents.</ahelp></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01040400.xhp b/helpcontent2/source/text/shared/optionen/01040400.xhp
index bfc17e6196..d28d0242a8 100644
--- a/helpcontent2/source/text/shared/optionen/01040400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040400.xhp
@@ -58,7 +58,7 @@
<bookmark_value>printing; creating individual jobs</bookmark_value>
<bookmark_value>faxes;selecting a fax machine</bookmark_value>
</bookmark><comment>mw made "fax machine selection" a two level entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTPRINT_PAGE" id="bm_id3153750" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_OPTPRINT_PAGE" id="bm_id3153750" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3156414" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040400.xhp" name="Print">Print</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTPRINT_PAGE">Specifies print settings within a text or HTML document.</ahelp></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01040500.xhp b/helpcontent2/source/text/shared/optionen/01040500.xhp
index 3e8ba15e04..6217049a78 100644
--- a/helpcontent2/source/text/shared/optionen/01040500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040500.xhp
@@ -48,7 +48,7 @@
<bookmark_value>aligning;tables in text</bookmark_value>
<bookmark_value>number formats; recognition in text tables</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTTABLE_PAGE" id="bm_id3148685" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_OPTTABLE_PAGE" id="bm_id3148685" localize="false"/>
<paragraph role="heading" id="hd_id3153087" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040500.xhp" name="Table">Table</link></paragraph>
<paragraph role="paragraph" id="par_id3145674" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTTABLE_PAGE">Defines the attributes of tables in text documents.</ahelp></paragraph>
</section>
@@ -83,7 +83,7 @@
<paragraph role="heading" id="hd_id3146976" xml-lang="en-US" level="2" l10n="U" oldref="37">Input in tables</paragraph>
</section>
<section id="opttabf">
-<bookmark xml-lang="en-US" branch="hid/FN_SET_MODOPT_TBLNUMFMT" id="bm_id3219862" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:TableNumberRecognition" id="bm_id3219862" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:TableNumberRecognition" id="bm_id3147434" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFORMATTING" id="bm_id3152577" localize="false"/>
<paragraph role="heading" id="hd_id3153142" xml-lang="en-US" level="3" l10n="U" oldref="39">Number recognition</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01040600.xhp b/helpcontent2/source/text/shared/optionen/01040600.xhp
index bb8d6bffdb..8bd9918c2c 100644
--- a/helpcontent2/source/text/shared/optionen/01040600.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040600.xhp
@@ -61,7 +61,7 @@
<bookmark_value>paragraphs; hidden paragraphs (Writer)</bookmark_value>
<bookmark_value>cursor; allowing in protected areas (Writer)</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTSHDWCRSR" id="bm_id3155388" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_OPTSHDWCRSR" id="bm_id3155388" localize="false"/>
<paragraph role="heading" id="hd_id3154285" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040600.xhp" name="Formatting Aids">Formatting Aids</link></paragraph>
<paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTSHDWCRSR">In $[officename] text and HTML documents, defines the display for certain characters and for the direct cursor.</ahelp></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01040700.xhp b/helpcontent2/source/text/shared/optionen/01040700.xhp
index 83a265ca6d..d2a53ba8f3 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01040700.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040700.xhp
@@ -39,7 +39,7 @@
</meta>
<body>
<section id="aenderungen">
-<bookmark xml-lang="en-US" branch="hid/HID_REDLINE_OPT" id="bm_id3149795" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_REDLINE_OPT" id="bm_id3149795" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153823" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040700.xhp" name="Changes">Changes</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3149416" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_REDLINE_OPT">Defines the appearance of changes in the document.</ahelp></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01040900.xhp b/helpcontent2/source/text/shared/optionen/01040900.xhp
index e0b3ad9d32..bc0bba1f9c 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01040900.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040900.xhp
@@ -54,7 +54,7 @@
<bookmark_value>tab stops; spacing in text documents</bookmark_value>
<bookmark_value>spacing; tab stops in text documents</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTLOAD_PAGE" id="bm_id3150443" localize="false"/><paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040900.xhp" name="General">General</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_OPTLOAD_PAGE" id="bm_id3150443" localize="false"/><paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040900.xhp" name="General">General</link></paragraph>
<paragraph role="paragraph" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTLOAD_PAGE">Specifies general settings for text documents.</ahelp></paragraph>
</section>
<section id="howtoget">
diff --git a/helpcontent2/source/text/shared/optionen/01041000.xhp b/helpcontent2/source/text/shared/optionen/01041000.xhp
index 0e93dac57e..1fb25e45dc 100644
--- a/helpcontent2/source/text/shared/optionen/01041000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01041000.xhp
@@ -49,7 +49,7 @@
<bookmark_value>printer metrics for document formatting (Writer)</bookmark_value>
</bookmark>
<section id="compatibility">
-<bookmark xml-lang="en-US" branch="hid/HID_OPTCOMPATIBILITY_PAGE" id="bm_id2023987" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_OPTCOMPATIBILITY_PAGE" id="bm_id2023987" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10607" role="heading" level="1" l10n="NEW"><variable id="compatibility_var"><link href="text/shared/optionen/01041000.xhp">Compatibility</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10625" xml-lang="en-US" l10n="NEW"><ahelp hid="53251">Specifies compatibility settings for text documents. These options help in fine-tuning %PRODUCTNAME when importing Microsoft Word documents.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01041100.xhp b/helpcontent2/source/text/shared/optionen/01041100.xhp
index 86f739a77c..a474855f71 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01041100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01041100.xhp
@@ -60,7 +60,7 @@
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTCAPTION_CLB" id="bm_id1826837" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_OPTCAPTION_CLB" id="bm_id1826837" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10588" role="heading" level="2" l10n="NEW">Add captions automatically when inserting</paragraph>
<paragraph xml-lang="en-US" id="par_idN1058C" role="paragraph" l10n="NEW"><ahelp hid=".">Select the object type for which the AutoCaption settings are to be valid.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN1058F" role="heading" level="2" l10n="NEW">Caption</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01050100.xhp b/helpcontent2/source/text/shared/optionen/01050100.xhp
index 5c592e8461..6ddefb1561 100644
--- a/helpcontent2/source/text/shared/optionen/01050100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01050100.xhp
@@ -43,7 +43,7 @@
<bookmark_value>defaults; grids (Writer/Calc)</bookmark_value>
<bookmark_value>snap grid defaults (Writer/Calc)</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_GRID" id="bm_id3155552" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_OPTIONS_GRID" id="bm_id3155552" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147226" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01050100.xhp" name="Grid">Grid</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_GRID">Specifies the settings for the configurable grid on your document pages. This grid helps you determine the exact position of your objects. You can also set this grid in line with the "magnetic" snap grid.</ahelp></paragraph>
</section>
@@ -58,7 +58,7 @@
<paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_USE_GRIDSNAP">Specifies whether to move frames, drawing elements, and controls only between grid points.</ahelp> To change the status of the snap grip only for the current action, drag an object while holding down the <switchinline select="sys"><caseinline select="MAC">Control key
</caseinline><defaultinline>Ctrl key</defaultinline></switchinline>.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SID_GRID_VISIBLE" id="bm_id8442192" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:GridVisible" id="bm_id8442192" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:GridVisible" id="bm_id3148473" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_GRID_VISIBLE" id="bm_id3149795" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153824" role="heading" level="3" l10n="U" oldref="7">Visible grid</paragraph>
@@ -98,7 +98,7 @@
</caseinline><caseinline select="IMPRESS">There are additional commands on the context menu of a page:
</caseinline></switchinline></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SID_GRID_FRONT" id="bm_id8062547" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:GridFront" id="bm_id8062547" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:GridFront" id="bm_id3147319" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3146984" role="heading" level="2" l10n="U"
oldref="32"><switchinline select="appl"><caseinline select="DRAW">Grid to Front
@@ -108,7 +108,7 @@
</caseinline><caseinline select="IMPRESS">Sets the visible grid in front of all objects.
</caseinline></switchinline></paragraph>
<paragraph xml-lang="en-US" id="par_id4122135" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the visible grid in front of all objects.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_HELPLINES_FRONT" id="bm_id6135046" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:HelplinesFront" id="bm_id6135046" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HelplinesFront" id="bm_id3150116" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149419" role="heading" level="2" l10n="U"
oldref="34"><switchinline select="appl"><caseinline select="DRAW">Snap Lines to Front
diff --git a/helpcontent2/source/text/shared/optionen/01060000.xhp b/helpcontent2/source/text/shared/optionen/01060000.xhp
index 4a14e09704..d8f697c1d6 100644
--- a/helpcontent2/source/text/shared/optionen/01060000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060000.xhp
@@ -40,9 +40,9 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SID_SC_EDITOPTIONS" id="bm_id4992961" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ScEditOptions" id="bm_id4992961" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ScEditOptions" id="bm_id3153750" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_SCOPTIONS" id="bm_id5861691" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ToolsOptions" id="bm_id5861691" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ToolsOptions" id="bm_id3154751" localize="false"/>
<paragraph role="heading" id="hd_id3156414" xml-lang="en-US" level="1" l10n="U" oldref="1">%PRODUCTNAME Calc Options</paragraph>
<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="2"><variable id="allgemein"><ahelp hid=".uno:ToolsOptions">Defines various settings for spreadsheets, contents to be displayed, and the cursor direction after a cell entry. You can also define sorting lists, determine the number of decimal places and the settings for recording and highlighting changes. </ahelp>
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp
index 761436676d..0d90f46e3a 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -66,7 +66,7 @@
<bookmark_value>tabs; displaying sheet tabs</bookmark_value>
<bookmark_value>outlines;outline symbols</bookmark_value>
</bookmark><comment>MW copied "displaying;comments" over to Calc guide note_insert.xhp and deleted "comments;displaying"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_CONTENT" id="bm_id3157898" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_SCPAGE_CONTENT" id="bm_id3157898" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3150445" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060100.xhp" name="View">View</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3153988" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CONTENT">Defines which elements of the <item type="productname">%PRODUCTNAME</item> Calc main window are displayed. You can also show or hide highlighting of values in tables.</ahelp></paragraph>
</section>
@@ -111,7 +111,7 @@
<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>%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_id2862651" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:NoteVisible" id="bm_id3153574" localize="false"/>
<paragraph xml-lang="en-US" id="par_id3150487" role="paragraph" 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>
<paragraph xml-lang="en-US" id="par_id3149667" role="paragraph" l10n="CHG" oldref="25">You can type and edit comments with the <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link> command. Comments that are permanently displayed can be edited by clicking the comment box. Click the Navigator and under the <emph>Comments</emph> entry you can view all comments in the current document. By double clicking a comment in Navigator, the cursor will jump to the corresponding cell containing the comment.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01060400.xhp b/helpcontent2/source/text/shared/optionen/01060400.xhp
index 570b0d8fe3..91d08cd012 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01060400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060400.xhp
@@ -39,7 +39,7 @@
</meta>
<body>
<section id="sortierlisten">
-<bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_USERLISTS" id="bm_id3148538" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_SCPAGE_USERLISTS" id="bm_id3148538" localize="false"/>
<paragraph role="heading" id="hd_id3145382" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060400.xhp" name="Sort Lists">Sort Lists</link></paragraph>
<paragraph role="paragraph" id="par_id3153825" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_SCPAGE_USERLISTS">All user-defined lists are displayed in the<emph> Sort Lists </emph>dialog. You can also define and edit your own lists. Only text can be used as sort lists, no numbers.</ahelp><comment>UFI: fix to #111848#</comment></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01060500.xhp b/helpcontent2/source/text/shared/optionen/01060500.xhp
index 4f6356b778..57af9486b8 100644
--- a/helpcontent2/source/text/shared/optionen/01060500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060500.xhp
@@ -54,7 +54,7 @@
<bookmark_value>search criteria for database functions in cells</bookmark_value>
<bookmark_value>Excel; search criteria</bookmark_value>
</bookmark><comment>UFI: removed a double entry</comment><comment>mw changed "cell contents;" to "case sensitivity;.."</comment><comment>mw deleted "numbers;decimal places (Calc)"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_CALC" id="bm_id3149095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_SCPAGE_CALC" id="bm_id3149095" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145071" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060500.xhp" name="Calculate">Calculate</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CALC">Defines the calculation settings for spreadsheets. Defines the behavior of spreadsheets with iterative references, the date settings, the number of decimal places, and if capitalization or lower cases are to be considered when searching within sheets.</ahelp></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01060600.xhp b/helpcontent2/source/text/shared/optionen/01060600.xhp
index 0229554125..2ea720cfd8 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01060600.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060600.xhp
@@ -41,7 +41,7 @@
</meta>
<body>
<section id="aenderungen">
-<bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_OPREDLINE" id="bm_id3149233" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_SCPAGE_OPREDLINE" id="bm_id3149233" localize="false"/>
<paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060600.xhp" name="Changes">Changes</link></paragraph>
<paragraph role="paragraph" id="par_id3155390" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_OPREDLINE">The<emph> Changes </emph>dialog specifies various options for highlighting recorded changes in documents.</ahelp></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01070000.xhp b/helpcontent2/source/text/shared/optionen/01070000.xhp
index f14806ff45..a475fc8911 100644
--- a/helpcontent2/source/text/shared/optionen/01070000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070000.xhp
@@ -40,7 +40,7 @@
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SID_SD_EDITOPTIONS" id="bm_id3420160" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SdEditOptions" id="bm_id3420160" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SdEditOptions" id="bm_id3147834" localize="false"/><paragraph role="heading" id="hd_id3155805" xml-lang="en-US" level="1" l10n="U" oldref="1">%PRODUCTNAME Impress Options</paragraph>
<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="allgemein"><ahelp hid=".uno:SdEditOptions">Defines various settings for newly created presentation documents, such as the contents to be displayed, the measurement unit used, if and how grid alignment is carried out.</ahelp>
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01070100.xhp b/helpcontent2/source/text/shared/optionen/01070100.xhp
index 611fe0cbf2..6033d6c28b 100644
--- a/helpcontent2/source/text/shared/optionen/01070100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070100.xhp
@@ -47,13 +47,13 @@
<bookmark_value>control point display in presentations</bookmark_value>
<bookmark_value>Bézier curves; control points in presentations</bookmark_value>
</bookmark><comment>mw made "line contours..." a two level entry</comment><comment>removed "placeholder" entries, see i81634</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SD_OPTIONS_VIEW" id="bm_id3153323" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SD_OPTIONS_CONTENTS" id="bm_id3109850" localize="false"/><paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01070100.xhp" name="View">View</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_OPTIONS_VIEW" id="bm_id3153323" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_OPTIONS_CONTENTS" id="bm_id3109850" localize="false"/><paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01070100.xhp" name="View">View</link></paragraph>
<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_SD_OPTIONS_CONTENTS">Specifies the available display modes.</ahelp> By selecting an alternative display, you can speed up the screen display while editing your presentation.</paragraph>
</section><comment>removed 4 options, see i81634</comment><paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="2" l10n="U" oldref="23">Display</paragraph>
<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_RULER" id="bm_id3159252" localize="false"/><paragraph role="heading" id="hd_id3155430" xml-lang="en-US" level="3" l10n="U" oldref="25">Rulers visible</paragraph>
<paragraph role="paragraph" id="par_id3147443" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_RULER">Specifies whether to display the rulers at the top and to the left of the work area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_HELPLINES_MOVE" id="bm_id2451068" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:HelplinesMove" id="bm_id2451068" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HelplinesMove" id="bm_id3163712" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HELPLINES" id="bm_id3147213" localize="false"/><paragraph role="heading" id="hd_id3145364" xml-lang="en-US" level="3" l10n="U" oldref="27">Guides when moving</paragraph>
<paragraph role="paragraph" id="par_id3154147" xml-lang="en-US" l10n="U" oldref="28"><variable id="verschieb"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_HELPLINES">Specifies whether to display guides when moving an object.</ahelp>
diff --git a/helpcontent2/source/text/shared/optionen/01070300.xhp b/helpcontent2/source/text/shared/optionen/01070300.xhp
index f05c46b1d5..68511dc868 100644
--- a/helpcontent2/source/text/shared/optionen/01070300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070300.xhp
@@ -42,7 +42,7 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3163802"><bookmark_value>snapping in presentations and drawings</bookmark_value>
<bookmark_value>points;reducing editing points when snapping (Impress/Draw)</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_SD_OPTIONS_SNAP" id="bm_id3147834" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_OPTIONS_SNAP" id="bm_id3147834" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147571" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01070300.xhp" name="Grid">Grid</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SD_OPTIONS_SNAP">Defines the grid settings for creating and moving objects.</ahelp></paragraph>
</section>
@@ -53,7 +53,7 @@
<paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="3">If you have activated the snap grid but wish to move or create individual objects without snap positions, keep the Shift key pressed to deactivate this function for as long as needed.</paragraph>
<embed href="text/shared/optionen/01050100.xhp#aufun"/>
<paragraph xml-lang="en-US" id="hd_id3156346" role="heading" level="2" l10n="U" oldref="4">Snap</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_HELPLINES_USE" id="bm_id3115680" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:HelplinesUse" id="bm_id3115680" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HelplinesUse" id="bm_id3147335" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_HELPLINES" id="bm_id3156329" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3163802" role="heading" level="3" l10n="U" oldref="8">To snap lines</paragraph>
@@ -62,7 +62,7 @@
<paragraph xml-lang="en-US" id="par_id3154142" role="paragraph" l10n="CHG" oldref="37">You can also define this setting by using the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides"><emph>Snap to Guides</emph></link>
</caseinline><caseinline select="DRAW"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides"><emph>Snap to Guides</emph></link>
</caseinline><defaultinline><emph>Snap to Guides</emph></defaultinline></switchinline> icon, which is available in the <emph>Options</emph> bar in a presentation or drawing document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_SNAP_BORDER" id="bm_id2054461" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SnapBorder" id="bm_id2054461" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SnapBorder" id="bm_id3153254" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER" id="bm_id3153063" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154306" role="heading" level="3" l10n="U"
@@ -74,7 +74,7 @@
<paragraph xml-lang="en-US" id="par_id3148947" role="paragraph" l10n="CHG" oldref="38">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13150000.xhp" name="Snap to Page Margins"><emph>Snap to Page Margins</emph></link>
</caseinline><caseinline select="DRAW"><link href="text/simpress/02/13150000.xhp" name="Snap to Page Margins"><emph>Snap to Page Margins</emph></link>
</caseinline><defaultinline><emph>Snap to Page Margins</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_SNAP_FRAME" id="bm_id215332" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SnapFrame" id="bm_id215332" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SnapFrame" id="bm_id3153194" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_FRAME" id="bm_id3151380" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154365" role="heading" level="3" l10n="U"
@@ -86,7 +86,7 @@
<paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="CHG" oldref="39">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13160000.xhp" name="Snap to Object Border"><emph>Snap to Object Border</emph></link>
</caseinline><caseinline select="DRAW"><link href="text/simpress/02/13160000.xhp" name="Snap to Object Border"><emph>Snap to Object Border</emph></link>
</caseinline><defaultinline><emph>Snap to Object Border</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_SNAP_POINTS" id="bm_id5317182" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SnapPoints" id="bm_id5317182" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SnapPoints" id="bm_id3155131" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_POINTS" id="bm_id3147288" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155431" role="heading" level="3" l10n="U"
diff --git a/helpcontent2/source/text/shared/optionen/01070400.xhp b/helpcontent2/source/text/shared/optionen/01070400.xhp
index 2a2f58e3c1..d13ae75014 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01070400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070400.xhp
@@ -55,7 +55,7 @@
<bookmark_value>fitting to pages; print settings in presentations</bookmark_value>
<bookmark_value>printing; tiling pages in presentations</bookmark_value>
</bookmark><comment>MW made "page name printing..." a two level entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SD_PRINT_OPTIONS" id="bm_id3158430" localize="false"/><paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01070400.xhp" name="Print">Print</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_PRINT_OPTIONS" id="bm_id3158430" localize="false"/><paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01070400.xhp" name="Print">Print</link></paragraph>
<paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SD_PRINT_OPTIONS">Specifies print settings within a drawing or presentation document.</ahelp></paragraph>
</section>
<section id="howtoget">
diff --git a/helpcontent2/source/text/shared/optionen/01070500.xhp b/helpcontent2/source/text/shared/optionen/01070500.xhp
index 018a4d6580..eb5759d9fe 100644
--- a/helpcontent2/source/text/shared/optionen/01070500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070500.xhp
@@ -46,7 +46,7 @@
<bookmark_value>tab stops; spacing in presentations</bookmark_value>
<bookmark_value>text objects; in presentations and drawings</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_SD_OPTIONS_MISC" id="bm_id3153824" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_OPTIONS_MISC" id="bm_id3153824" localize="false"/>
<paragraph role="heading" id="hd_id3143270" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01070500.xhp" name="General">General</link></paragraph>
<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SD_OPTIONS_MISC">Defines the general options for drawing or presentation documents.</ahelp></paragraph>
</section>
@@ -55,7 +55,7 @@
</section>
<paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="2" l10n="U" oldref="3">Text objects</paragraph>
<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_QUICKEDIT" id="bm_id3156343" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_QUICKEDIT" id="bm_id7033098" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:QuickEdit" id="bm_id7033098" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:QuickEdit" id="bm_id3147264" localize="false"/>
<paragraph role="heading" id="hd_id3149295" xml-lang="en-US" level="3" l10n="U" oldref="5">Allow quick editing</paragraph>
<paragraph role="paragraph" id="par_id3148947" xml-lang="en-US" l10n="U" oldref="6"><variable id="schnellbearb"><ahelp hid=".uno:QuickEdit">Specifies whether to immediately switch to the text editing mode when clicking a text object.</ahelp>
@@ -66,7 +66,7 @@
</caseinline><caseinline select="MATH">
</caseinline><defaultinline>In a presentation or drawing document, you can also activate the text editing mode through the<emph> Allow Quick Editing </emph><link href="text/simpress/02/13180000.xhp" name="icon">icon</link> in the <emph>Option</emph> bar.</defaultinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_PICKTHROUGH" id="bm_id3148920" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_PICK_THROUGH" id="bm_id1003023" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:PickThrough" id="bm_id1003023" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:PickThrough" id="bm_id3153969" localize="false"/>
<paragraph role="heading" id="hd_id3154686" xml-lang="en-US" level="3" l10n="U" oldref="7">Only text area selectable</paragraph>
<paragraph role="paragraph" id="par_id3149808" xml-lang="en-US" l10n="U" oldref="8"><variable id="textbereich"><ahelp hid=".uno:PickThrough">Specifies whether to select a text frame by clicking the text.</ahelp>
diff --git a/helpcontent2/source/text/shared/optionen/01080000.xhp b/helpcontent2/source/text/shared/optionen/01080000.xhp
index 906fe5f4cb..0d989871a6 100644
--- a/helpcontent2/source/text/shared/optionen/01080000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01080000.xhp
@@ -40,7 +40,7 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SID_SD_GRAPHIC_OPTIONS" id="bm_id5783031" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SdGraphicOptions" id="bm_id5783031" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SdGraphicOptions" id="bm_id3153087" localize="false"/>
<paragraph role="heading" id="hd_id3155135" xml-lang="en-US" level="1" l10n="U" oldref="1">%PRODUCTNAME Draw Options</paragraph>
<paragraph role="paragraph" id="par_id3158430" xml-lang="en-US" l10n="U" oldref="2"><variable id="allgemein"><ahelp hid=".uno:SdGraphicOptions">Defines the global settings for drawing documents, including the contents to be displayed, the scale to be used, the grid alignment and the contents to be printed by default.</ahelp>
diff --git a/helpcontent2/source/text/shared/optionen/01090000.xhp b/helpcontent2/source/text/shared/optionen/01090000.xhp
index 000d4df425..faad36d19b 100644
--- a/helpcontent2/source/text/shared/optionen/01090000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01090000.xhp
@@ -40,7 +40,7 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SID_SM_EDITOPTIONS" id="bm_id1104917" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/.uno:SmEditOptions" id="bm_id1104917" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:SmEditOptions" id="bm_id3155338" localize="false"/>
<paragraph role="heading" id="hd_id3150040" xml-lang="en-US" level="1" l10n="U" oldref="1">%PRODUCTNAME Math Options</paragraph>
<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="druckentext"><ahelp hid=".uno:SmEditOptions">Defines the print format and print options for all new formula documents. These options apply when you print a formula directly from <item type="productname">%PRODUCTNAME</item> Math.</ahelp>
diff --git a/helpcontent2/source/text/shared/optionen/01090100.xhp b/helpcontent2/source/text/shared/optionen/01090100.xhp
index 641f4e3e43..57567c6a35 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01090100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01090100.xhp
@@ -53,7 +53,7 @@
<bookmark_value>fitting to pages;print settings in Math</bookmark_value>
</bookmark><comment>mw inserted "fitting..."</comment>
<bookmark xml-lang="en-US" branch="hid/starmath:TabPage:RID_PRINTOPTIONPAGE" id="bm_id3150178" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PRINT_OPTIONS" id="bm_id3147226" localize="false"/><paragraph role="heading" id="hd_id3150713" xml-lang="en-US" level="1" l10n="U" oldref="1">Settings</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2_HID_PRINT_OPTIONS" id="bm_id3147226" localize="false"/><paragraph role="heading" id="hd_id3150713" xml-lang="en-US" level="1" l10n="U" oldref="1">Settings</paragraph>
<paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="18"><variable id="einst"><ahelp hid="HID_PRINT_OPTIONS">Defines formula settings that will be valid for all documents.</ahelp>
</variable></paragraph>
<section id="howtoget">
diff --git a/helpcontent2/source/text/shared/optionen/01130200.xhp b/helpcontent2/source/text/shared/optionen/01130200.xhp
index ad48159533..94bcc36b5e 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01130200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01130200.xhp
@@ -48,7 +48,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#etsofi2"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_MSFLTR2_CLB" id="bm_id3158430" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OFAPAGE_MSFLTR2_CLB" id="bm_id3158430" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3146798" role="heading" level="2" l10n="U" oldref="3">List Box</paragraph>
<paragraph xml-lang="en-US" id="par_id3150670" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_OFAPAGE_MSFLTR2_CLB">The<emph> List Box </emph>field displays the entries for the pair of OLE objects that can be converted when loading into $[officename] (L) and/or when saving into a Microsoft format (S). </ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="5">Mark the box in the [L] column in front of the entry if a Microsoft OLE object is to be converted into the specified $[officename] OLE object when a Microsoft document is loaded into $[officename].</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01160100.xhp b/helpcontent2/source/text/shared/optionen/01160100.xhp
index 4228e383d0..0248fd00f6 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01160100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160100.xhp
@@ -47,7 +47,7 @@
<bookmark_value>data sources; connection settings (Base)</bookmark_value>
</bookmark>
<!-- removed HID OFFMGR_TABPAGE_RID_OFAPAGE_CONNPOOLOPTIONS -->
-<bookmark xml-lang="en-US" branch="hid/HID_DSBROWSER_DISCONNECTING" id="bm_id3149798" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSBROWSER_DISCONNECTING" id="bm_id3149798" localize="false"/>
<paragraph role="heading" id="hd_id3154136" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01160100.xhp" name="Connections">Connections</link></paragraph>
<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="2">Defines how the connections to data sources are pooled.</paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01160200.xhp b/helpcontent2/source/text/shared/optionen/01160200.xhp
index 47d3a6eb2a..ea220a1d8d 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01160200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160200.xhp
@@ -49,7 +49,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#registered"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_DBPATH_CTL_PATH" id="bm_id4985198" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_DBPATH_CTL_PATH" id="bm_id4985198" localize="false"/>
<paragraph role="heading" id="par_idN1058E" xml-lang="en-US" level="2" l10n="NEW">Registered Databases</paragraph>
<paragraph role="paragraph" id="par_idN10592" xml-lang="en-US" l10n="NEW"><ahelp hid="35535">Lists the registered name and database file of all registered databases. Double-click an entry to edit.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW" id="bm_id1757866" localize="false"/>
diff --git a/helpcontent2/source/text/shared/optionen/java.xhp b/helpcontent2/source/text/shared/optionen/java.xhp
index b71eeaa119..04badd01d5 100755..100644
--- a/helpcontent2/source/text/shared/optionen/java.xhp
+++ b/helpcontent2/source/text/shared/optionen/java.xhp
@@ -53,7 +53,7 @@
<!-- removed HID SVX_CHECKBOX_RID_SVXPAGE_INET_SCRIPTING_CB_J_ENABLE -->
<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE" id="bm_id6882839" localize="false"/><paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="3" l10n="NEW">Use a Java runtime environment</paragraph>
<paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="CHG"><ahelp hid="svx:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE">Allows you to run Java applications in %PRODUCTNAME.</ahelp> When a Java application attempts to access your hard drive, a prompt opens.<comment>UFI: moved this para here from Security tab page</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_JAVA_LIST" id="bm_id6775719" localize="false"/><paragraph role="heading" id="par_idN10610" xml-lang="en-US" level="3" l10n="NEW">Java runtime environments (JRE) already installed:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_JAVA_LIST" id="bm_id6775719" localize="false"/><paragraph role="heading" id="par_idN10610" xml-lang="en-US" level="3" l10n="NEW">Java runtime environments (JRE) already installed:</paragraph>
<paragraph role="paragraph" id="par_idN10614" xml-lang="en-US" l10n="CHG"><ahelp hid="HID_OPTIONS_JAVA_LIST">Select the JRE that you want to use. On some systems, you must wait a minute until the list gets populated. On some systems, you must restart %PRODUCTNAME to use your changed setting.</ahelp> The path to the JRE is displayed beneath the list box.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD" id="bm_id5543382" localize="false"/><paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
<paragraph role="paragraph" id="par_idN10635" xml-lang="en-US" l10n="CHG"><ahelp hid="svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD">Add a path to the root folder of a JRE on your computer.</ahelp> The path is set in the following dialog.<comment>UFI: #i38927#</comment></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp b/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp
index 93255e6bd7..92641910b1 100644
--- a/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp
+++ b/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp
@@ -43,7 +43,7 @@
<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity_ts"><link href="text/shared/optionen/macrosecurity_ts.xhp">Trusted Sources</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW">Specifies the <link href="text/shared/optionen/macrosecurity.xhp">macro security</link> settings for trusted certificates and trusted file locations.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_TRUSTSOURCES" id="bm_id3047883" localize="false"/><paragraph role="heading" id="par_idN10578" xml-lang="en-US" level="2" l10n="NEW">Trusted certificates</paragraph>
+<bookmark xml-lang="en-US" branch="hid/XMLSECURITY_HID_XMLSEC_CTRL_TRUSTSOURCES" id="bm_id3047883" localize="false"/><paragraph role="heading" id="par_idN10578" xml-lang="en-US" level="2" l10n="NEW">Trusted certificates</paragraph>
<paragraph role="paragraph" id="par_idN1057C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the trusted certificates.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_VIEW_TRUSTCERT" id="bm_id146183" localize="false"/><paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="3" l10n="NEW">View</paragraph>
<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the View Certificate dialog for the selected certificate.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/testaccount.xhp b/helpcontent2/source/text/shared/optionen/testaccount.xhp
index 2e81023e1a..adec0988b0 100755..100644
--- a/helpcontent2/source/text/shared/optionen/testaccount.xhp
+++ b/helpcontent2/source/text/shared/optionen/testaccount.xhp
@@ -38,7 +38,7 @@
<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 <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"/>
+<bookmark xml-lang="en-US" branch="hid/SW_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>
<bookmark xml-lang="en-US" branch="hid/sw:MultiLineEdit:DLG_MM_TESTACCOUNTSETTINGS:ED_ERROR" id="bm_id3895382" localize="false"/>
diff --git a/helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp b/helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp
index ad9060d1f4..12e2a3f66d 100644
--- a/helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp
+++ b/helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp
@@ -40,9 +40,9 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_VIEWSIGNATURES" id="bm_id7465742" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/XMLSECURITY_HID_XMLSEC_CTRL_VIEWSIGNATURES" id="bm_id7465742" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/xmlsecurity:MultiLineEdit:RID_XMLSECTP_CERTPATH:ML_CERTSTATUS" id="bm_id3149815" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_TP_CERTPATH" id="bm_id3747978" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/XMLSECURITY_HID_XMLSEC_TP_CERTPATH" id="bm_id3747978" localize="false"/>
<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><variable id="certificatepath"><link href="text/shared/optionen/viewcertificate_c.xhp">Certificate Path</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Certificate Path page of the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog displays the location and the status of the certificate.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/viewcertificate_d.xhp b/helpcontent2/source/text/shared/optionen/viewcertificate_d.xhp
index 4afe249f80..e8a8168585 100644
--- a/helpcontent2/source/text/shared/optionen/viewcertificate_d.xhp
+++ b/helpcontent2/source/text/shared/optionen/viewcertificate_d.xhp
@@ -40,8 +40,8 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_ELEMENTS" id="bm_id9764091" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_TP_DETAILS" id="bm_id5656300" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/XMLSECURITY_HID_XMLSEC_CTRL_ELEMENTS" id="bm_id9764091" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/XMLSECURITY_HID_XMLSEC_TP_DETAILS" id="bm_id5656300" localize="false"/>
<paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><variable id="details"><link href="text/shared/optionen/viewcertificate_d.xhp">Details</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10562" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Details page of the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog displays detailed information about the certificate.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/viewcertificate_g.xhp b/helpcontent2/source/text/shared/optionen/viewcertificate_g.xhp
index b140a181f4..9610adb6a0 100644
--- a/helpcontent2/source/text/shared/optionen/viewcertificate_g.xhp
+++ b/helpcontent2/source/text/shared/optionen/viewcertificate_g.xhp
@@ -40,7 +40,7 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_TP_GENERAL" id="bm_id8695333" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/XMLSECURITY_HID_XMLSEC_TP_GENERAL" id="bm_id8695333" localize="false"/>
<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><variable id="general"><link href="text/shared/optionen/viewcertificate_g.xhp">General</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The General page of the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog displays basic information about the certificate.</ahelp></paragraph>