Merge remote branch 'stage/ooo/dev300' into intm98integration/dev300_m98

Conflicts: helpcontent2/helpers/hid.lst helpcontent2/source/auxiliary/bn/default.css helpcontent2/source/auxiliary/ca-XV/default.css helpcontent2/source/auxiliary/ca-XV/highcontrast1.css helpcontent2/source/auxiliary/ca-XV/highcontrast2.css helpcontent2/source/auxiliary/ca-XV/highcontrastblack.css helpcontent2/source/auxiliary/ca-XV/highcontrastwhite.css helpcontent2/source/auxiliary/eu/default.css helpcontent2/source/auxiliary/eu/highcontrast1.css helpcontent2/source/auxiliary/eu/highcontrast2.css helpcontent2/source/auxiliary/eu/highcontrastblack.css helpcontent2/source/auxiliary/eu/highcontrastwhite.css helpcontent2/source/auxiliary/makefile.mk helpcontent2/source/auxiliary/sq/default.css helpcontent2/source/auxiliary/sq/highcontrast1.css helpcontent2/source/auxiliary/sq/highcontrast2.css helpcontent2/source/auxiliary/sq/highcontrastblack.css helpcontent2/source/auxiliary/sq/highcontrastwhite.css helpcontent2/source/text/sbasic/guide/translation.xhp helpcontent2/source/text/sbasic/shared/00000003.xhp helpcontent2/source/text/sbasic/shared/01010210.xhp helpcontent2/source/text/sbasic/shared/01020300.xhp helpcontent2/source/text/sbasic/shared/01050300.xhp helpcontent2/source/text/sbasic/shared/01170101.xhp helpcontent2/source/text/sbasic/shared/03050500.xhp helpcontent2/source/text/sbasic/shared/03080301.xhp helpcontent2/source/text/sbasic/shared/03080302.xhp helpcontent2/source/text/sbasic/shared/03090201.xhp helpcontent2/source/text/sbasic/shared/03132400.xhp helpcontent2/source/text/scalc/01/02120100.xhp helpcontent2/source/text/scalc/01/02140500.xhp helpcontent2/source/text/scalc/01/02160000.xhp helpcontent2/source/text/scalc/01/03080000.xhp helpcontent2/source/text/scalc/01/04050000.xhp helpcontent2/source/text/scalc/01/04080000.xhp helpcontent2/source/text/scalc/01/04090000.xhp helpcontent2/source/text/scalc/01/05050100.xhp helpcontent2/source/text/scalc/01/05070000.xhp helpcontent2/source/text/scalc/01/06050000.xhp helpcontent2/source/text/scalc/01/12080300.xhp helpcontent2/source/text/scalc/02/06030000.xhp helpcontent2/source/text/scalc/guide/borders.xhp helpcontent2/source/text/scalc/guide/calculate.xhp helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp helpcontent2/source/text/scalc/guide/finding.xhp helpcontent2/source/text/scalc/guide/multitables.xhp helpcontent2/source/text/scalc/guide/text_rotate.xhp helpcontent2/source/text/scalc/guide/value_with_name.xhp helpcontent2/source/text/scalc/main0210.xhp helpcontent2/source/text/schart/01/03010000.xhp helpcontent2/source/text/schart/01/04020000.xhp helpcontent2/source/text/schart/01/04030000.xhp helpcontent2/source/text/schart/01/04040000.xhp helpcontent2/source/text/schart/01/04050000.xhp helpcontent2/source/text/schart/01/04070000.xhp helpcontent2/source/text/schart/01/05020201.xhp helpcontent2/source/text/shared/00/00000001.xhp helpcontent2/source/text/shared/00/00000020.xhp helpcontent2/source/text/shared/00/00000021.xhp helpcontent2/source/text/shared/00/00000202.xhp helpcontent2/source/text/shared/00/00000203.xhp helpcontent2/source/text/shared/00/00000204.xhp helpcontent2/source/text/shared/00/00000205.xhp helpcontent2/source/text/shared/00/00000208.xhp helpcontent2/source/text/shared/00/00000212.xhp helpcontent2/source/text/shared/00/00000213.xhp helpcontent2/source/text/shared/00/00000214.xhp helpcontent2/source/text/shared/00/00000401.xhp helpcontent2/source/text/shared/00/00040501.xhp helpcontent2/source/text/shared/00/01010000.xhp helpcontent2/source/text/shared/00/01050000.xhp helpcontent2/source/text/shared/01/01020000.xhp helpcontent2/source/text/shared/01/01100300.xhp helpcontent2/source/text/shared/01/01100400.xhp helpcontent2/source/text/shared/01/01100600.xhp helpcontent2/source/text/shared/01/01130000.xhp helpcontent2/source/text/shared/01/02100001.xhp helpcontent2/source/text/shared/01/02100100.xhp helpcontent2/source/text/shared/01/02180000.xhp helpcontent2/source/text/shared/01/03010000.xhp helpcontent2/source/text/shared/01/04050000.xhp helpcontent2/source/text/shared/01/04140000.xhp helpcontent2/source/text/shared/01/04150100.xhp helpcontent2/source/text/shared/01/04160500.xhp helpcontent2/source/text/shared/01/05020200.xhp helpcontent2/source/text/shared/01/05020500.xhp helpcontent2/source/text/shared/01/05030600.xhp helpcontent2/source/text/shared/01/05050000.xhp helpcontent2/source/text/shared/01/05190000.xhp helpcontent2/source/text/shared/01/05230500.xhp helpcontent2/source/text/shared/01/05290100.xhp helpcontent2/source/text/shared/01/05290200.xhp helpcontent2/source/text/shared/01/05340100.xhp helpcontent2/source/text/shared/01/05340300.xhp helpcontent2/source/text/shared/01/05340400.xhp helpcontent2/source/text/shared/01/06010000.xhp helpcontent2/source/text/shared/01/06020000.xhp helpcontent2/source/text/shared/01/06040000.xhp helpcontent2/source/text/shared/01/06040100.xhp helpcontent2/source/text/shared/01/06040400.xhp helpcontent2/source/text/shared/01/06050200.xhp helpcontent2/source/text/shared/01/06140100.xhp helpcontent2/source/text/shared/01/06140102.xhp helpcontent2/source/text/shared/01/06140400.xhp helpcontent2/source/text/shared/01/06140500.xhp helpcontent2/source/text/shared/01/digitalsignatures.xhp helpcontent2/source/text/shared/01/extensionupdate.xhp helpcontent2/source/text/shared/01/gallery.xhp helpcontent2/source/text/shared/01/packagemanager.xhp helpcontent2/source/text/shared/01/password_dlg.xhp helpcontent2/source/text/shared/01/ref_pdf_export.xhp helpcontent2/source/text/shared/01/securitywarning.xhp helpcontent2/source/text/shared/02/01140000.xhp helpcontent2/source/text/shared/02/01170004.xhp helpcontent2/source/text/shared/02/01170101.xhp helpcontent2/source/text/shared/02/01170103.xhp helpcontent2/source/text/shared/02/01170202.xhp helpcontent2/source/text/shared/02/09070100.xhp helpcontent2/source/text/shared/02/10100000.xhp helpcontent2/source/text/shared/02/12000000.xhp helpcontent2/source/text/shared/02/12090000.xhp helpcontent2/source/text/shared/02/12100200.xhp helpcontent2/source/text/shared/02/24010000.xhp helpcontent2/source/text/shared/02/colortoolbar.xhp helpcontent2/source/text/shared/05/00000110.xhp helpcontent2/source/text/shared/3dsettings_toolbar.xhp helpcontent2/source/text/shared/autopi/01020200.xhp helpcontent2/source/text/shared/autopi/01020300.xhp helpcontent2/source/text/shared/autopi/01040200.xhp helpcontent2/source/text/shared/autopi/01050200.xhp helpcontent2/source/text/shared/autopi/01090100.xhp helpcontent2/source/text/shared/autopi/01130000.xhp helpcontent2/source/text/shared/autopi/01130100.xhp helpcontent2/source/text/shared/autopi/01150000.xhp helpcontent2/source/text/shared/autopi/01170000.xhp helpcontent2/source/text/shared/autopi/01170300.xhp helpcontent2/source/text/shared/autopi/01170400.xhp helpcontent2/source/text/shared/autopi/webwizard01.xhp helpcontent2/source/text/shared/explorer/database/30100000.xhp helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp helpcontent2/source/text/shared/explorer/database/menuedit.xhp helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp helpcontent2/source/text/shared/explorer/database/rep_prop.xhp helpcontent2/source/text/shared/explorer/database/rep_sort.xhp helpcontent2/source/text/shared/fontwork_toolbar.xhp helpcontent2/source/text/shared/guide/chart_barformat.xhp helpcontent2/source/text/shared/guide/collab.xhp helpcontent2/source/text/shared/guide/copytable2application.xhp helpcontent2/source/text/shared/guide/fontwork.xhp helpcontent2/source/text/shared/optionen/01010400.xhp helpcontent2/source/text/shared/optionen/01010501.xhp helpcontent2/source/text/shared/optionen/01030000.xhp helpcontent2/source/text/shared/optionen/01040400.xhp helpcontent2/source/text/shared/optionen/01041000.xhp helpcontent2/source/text/shared/optionen/01060100.xhp helpcontent2/source/text/shared/optionen/01060500.xhp helpcontent2/source/text/shared/optionen/01070500.xhp helpcontent2/source/text/shared/optionen/01090100.xhp helpcontent2/source/text/shared/optionen/01160100.xhp helpcontent2/source/text/shared/optionen/01160201.xhp helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp helpcontent2/source/text/simpress/00/00000004.xhp helpcontent2/source/text/simpress/01/02120000.xhp helpcontent2/source/text/simpress/01/04030100.xhp helpcontent2/source/text/simpress/01/06040000.xhp helpcontent2/source/text/simpress/01/taskpanel.xhp helpcontent2/source/text/simpress/02/10020000.xhp helpcontent2/source/text/simpress/guide/individual.xhp helpcontent2/source/text/smath/00/00000004.xhp helpcontent2/source/text/smath/01/02080000.xhp helpcontent2/source/text/smath/01/02090000.xhp helpcontent2/source/text/smath/01/02100000.xhp helpcontent2/source/text/smath/01/02110000.xhp helpcontent2/source/text/smath/01/03040000.xhp helpcontent2/source/text/smath/01/03050000.xhp helpcontent2/source/text/smath/01/03060000.xhp helpcontent2/source/text/smath/01/03070000.xhp helpcontent2/source/text/smath/01/03080000.xhp helpcontent2/source/text/smath/01/03090000.xhp helpcontent2/source/text/smath/01/03090100.xhp helpcontent2/source/text/smath/01/03090200.xhp helpcontent2/source/text/smath/01/03090300.xhp helpcontent2/source/text/smath/01/03090400.xhp helpcontent2/source/text/smath/01/03090500.xhp helpcontent2/source/text/smath/01/03090600.xhp helpcontent2/source/text/smath/01/03090700.xhp helpcontent2/source/text/smath/01/03090800.xhp helpcontent2/source/text/smath/01/03091100.xhp helpcontent2/source/text/smath/01/03091500.xhp helpcontent2/source/text/smath/01/03091501.xhp helpcontent2/source/text/smath/01/03091502.xhp helpcontent2/source/text/smath/01/03091503.xhp helpcontent2/source/text/smath/01/03091504.xhp helpcontent2/source/text/smath/01/03091505.xhp helpcontent2/source/text/smath/01/03091506.xhp helpcontent2/source/text/smath/01/03091507.xhp helpcontent2/source/text/smath/01/03091508.xhp helpcontent2/source/text/smath/01/03091509.xhp helpcontent2/source/text/smath/01/05010000.xhp helpcontent2/source/text/smath/01/05020000.xhp helpcontent2/source/text/smath/01/05030000.xhp helpcontent2/source/text/smath/01/05040000.xhp helpcontent2/source/text/smath/01/05050000.xhp helpcontent2/source/text/smath/01/06010000.xhp helpcontent2/source/text/smath/01/06020000.xhp helpcontent2/source/text/smath/02/03010000.xhp helpcontent2/source/text/smath/04/01020000.xhp helpcontent2/source/text/smath/guide/keyboard.xhp helpcontent2/source/text/smath/guide/limits.xhp helpcontent2/source/text/smath/main0103.xhp helpcontent2/source/text/smath/main0503.xhp helpcontent2/source/text/swriter/01/01150000.xhp helpcontent2/source/text/swriter/01/02110100.xhp helpcontent2/source/text/swriter/01/02150000.xhp helpcontent2/source/text/swriter/01/04070000.xhp helpcontent2/source/text/swriter/01/04090002.xhp helpcontent2/source/text/swriter/01/04200000.xhp helpcontent2/source/text/swriter/01/05040500.xhp helpcontent2/source/text/swriter/01/05060200.xhp helpcontent2/source/text/swriter/01/05060201.xhp helpcontent2/source/text/swriter/01/05150101.xhp helpcontent2/source/text/swriter/01/05150200.xhp helpcontent2/source/text/swriter/01/05170000.xhp helpcontent2/source/text/swriter/01/06040000.xhp helpcontent2/source/text/swriter/01/mailmerge00.xhp helpcontent2/source/text/swriter/02/10020000.xhp helpcontent2/source/text/swriter/02/10070000.xhp helpcontent2/source/text/swriter/02/10090000.xhp helpcontent2/source/text/swriter/04/01020000.xhp helpcontent2/source/text/swriter/guide/borders.xhp helpcontent2/source/text/swriter/guide/finding.xhp helpcontent2/source/text/swriter/guide/load_styles.xhp helpcontent2/source/text/swriter/guide/main.xhp helpcontent2/source/text/swriter/guide/select_language.xhp helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp helpcontent2/source/text/swriter/guide/subscript.xhp helpcontent2/source/text/swriter/main0204.xhp helpcontent2/source/text/swriter/main0206.xhp helpcontent2/source/text/swriter/main0215.xhp helpcontent2/util/target.pmk
author: Jan Holesovsky <kendy@suse.cz> 2011-02-24 01:28:52 +0100
committer: Jan Holesovsky <kendy@suse.cz> 2011-02-24 01:28:52 +0100
commit: 163ef6974d47e4715212e65f1acd1aaafffb0283 (patch)
tree: 15ca5eb9f08895036628a14ab2b033cb3998314c /helpcontent2/source/text/shared/explorer/database
parent: 901c96619abba313f2e8b3f11c2aa1964343a1ed (diff)
parent: 4a2c0dd651563469e70a0999086a4678036675a0 (diff)
54 files changed, 282 insertions, 273 deletions
diff --git a/helpcontent2/source/text/shared/explorer/database/02010100.xhp b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
index 204a16eb12..4c70c8ee50 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/02010100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
@@ -108,7 +108,7 @@
 </table>
 <paragraph role="heading" id="hd_id3154939" xml-lang="en-US" level="2" l10n="U" oldref="7">Browse</paragraph>
 <paragraph role="paragraph" id="par_id3148799" xml-lang="en-US" l10n="U" oldref="8">When you open the query design for the first time, in order to create a new query, you can click <link href="text/shared/02/14020100.xhp" name="Add Tables"><emph>Add Tables</emph></link>. You then see a dialog in which you must first select the table that will be the basis for the query.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_CTL_QRYDGNTAB" id="bm_id3150767" localize="false"/><paragraph role="paragraph" id="par_id3144762" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_CTL_QRYDGNTAB">Double-click fields to add them to the query. Drag-and-drop to define relations.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_CTL_QRYDGNTAB" id="bm_id3150767" localize="false"/><paragraph role="paragraph" id="par_id3144762" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_CTL_QRYDGNTAB">Double-click fields to add them to the query. Drag-and-drop to define relations.</ahelp></paragraph>
 <paragraph role="note" id="par_id3157894" xml-lang="en-US" l10n="U" oldref="141">While designing a query, you cannot modify the selected tables.</paragraph>
 <paragraph role="heading" id="hd_id3149562" xml-lang="en-US" level="3" l10n="U" oldref="11">Remove tables</paragraph>
 <paragraph role="paragraph" id="par_id3150685" xml-lang="en-US" l10n="U" oldref="12">To remove the table from Design View, click the upper border of the table window and display the context menu. You can use the <emph>Delete</emph> command to remove the table from the Design View. Another option is to press the Delete key.</paragraph>
@@ -124,11 +124,11 @@
 <paragraph role="note" id="par_id3145646" xml-lang="en-US" l10n="U" oldref="246">You cannot access tables from different databases in a query. Queries involving multiple tables can only be created within one database.</paragraph>
 <paragraph role="heading" id="hd_id3153279" xml-lang="en-US" level="3" l10n="U" oldref="224">Specifying link type</paragraph>
 <paragraph role="paragraph" id="par_id3154791" xml-lang="en-US" l10n="U" oldref="225">If you double-click the line connecting two linked fields or call the menu command <emph>Insert - New Relation</emph>, you can specify the type of link in the <link href="text/shared/explorer/database/02010101.xhp" name="Relations"><emph>Relations</emph></link> dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERY_EDIT_JOINCONNECTION" id="bm_id3145253" localize="false"/><paragraph role="paragraph" id="par_id3150094" xml-lang="en-US" l10n="CHG" oldref="285"><ahelp hid="HID_QUERY_EDIT_JOINCONNECTION" visibility="hidden">Edit Join Properties.</ahelp>Alternatively, press Tab until the line is selected, then press Shift+F10 to display the context menu and there choose the command <emph>Edit</emph>. Some databases support only a subset of the possible join types.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_QUERY_EDIT_JOINCONNECTION" id="bm_id3145253" localize="false"/><paragraph role="paragraph" id="par_id3150094" xml-lang="en-US" l10n="CHG" oldref="285"><ahelp hid="HID_QUERY_EDIT_JOINCONNECTION" visibility="hidden">Edit Join Properties.</ahelp>Alternatively, press Tab until the line is selected, then press Shift+F10 to display the context menu and there choose the command <emph>Edit</emph>. Some databases support only a subset of the possible join types.</paragraph>
 <paragraph role="heading" id="hd_id3155851" xml-lang="en-US" level="3" l10n="U" oldref="145">Deleting relations</paragraph>
 <paragraph role="paragraph" id="par_id3156178" xml-lang="en-US" l10n="U" oldref="146">To delete a relation between two tables, click the connection line and then press the Delete key.</paragraph>
 <paragraph role="paragraph" id="par_id3150715" xml-lang="en-US" l10n="U" oldref="284">Alternatively, delete the respective entries in <emph>Fields involved </emph>in the <emph>Relations</emph> dialog. Or press Tab until the connecting vector is displayed highlighted, then press Shift+F10 to open the context menu and select <emph>Delete </emph>command.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_CTL_QRYDGNCRIT" id="bm_id3152972" localize="false"/><paragraph role="heading" id="hd_id3151208" xml-lang="en-US" level="2" l10n="U" oldref="17">Define query</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_CTL_QRYDGNCRIT" id="bm_id3152972" localize="false"/><paragraph role="heading" id="hd_id3151208" xml-lang="en-US" level="2" l10n="U" oldref="17">Define query</paragraph>
 <paragraph role="paragraph" id="par_id3158416" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_CTL_QRYDGNCRIT">Select conditions to define the query.</ahelp> Each column of the design table accepts a data field for the query. The conditions in one row are linked with a Boolean AND.</paragraph>
 <paragraph role="heading" id="hd_id3154161" xml-lang="en-US" level="3" l10n="U" oldref="19">Specify field name</paragraph>
 <paragraph role="paragraph" id="par_id3146791" xml-lang="en-US" l10n="U" oldref="20">First, select all field names from the tables that you want to add to the query. You can do this either with drag-and-drop or by double-clicking a field name in the table window. With the drag-and-drop method, use the mouse to drag a field name from the table window into the lower area of the query design. As you do this, you can decide which column you want to add the field to. Select a field name by double-clicking. It will then be added to the next free column.</paragraph>
@@ -142,26 +142,26 @@
 <paragraph role="paragraph" id="par_id3154253" xml-lang="en-US" l10n="U" oldref="282"><ahelp hid="DBACCESS_EDIT_DLG_SAVE_AS_ET_TITLE">Enter the name of the query or table view.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3163805" xml-lang="en-US" level="3" l10n="U" oldref="23">Filtering data</paragraph>
 <paragraph role="paragraph" id="par_id3154964" xml-lang="en-US" l10n="U" oldref="24">To filter data for the query, set the desired preferences in the lower area of the Design View. The following lines are available:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QRYDGN_ROW_FIELD" id="bm_id3148536" localize="false"/><paragraph role="heading" id="hd_id3146916" xml-lang="en-US" level="4" l10n="U" oldref="25">Field</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_QRYDGN_ROW_FIELD" id="bm_id3148536" localize="false"/><paragraph role="heading" id="hd_id3146916" xml-lang="en-US" level="4" l10n="U" oldref="25">Field</paragraph>
 <paragraph role="paragraph" id="par_id3156372" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="HID_QRYDGN_ROW_FIELD">Enter the name of the data field that you referred to in the Query. All settings made in the lower rows refer to this field.</ahelp> If you activate a cell with a mouse click you'll see an arrow button, which enables you to select a field. The "Table name.*" option selects all data fields and the criteria is valid for all table fields.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QRYDGN_ROW_ALIAS" id="bm_id3154702" localize="false"/><paragraph role="heading" id="hd_id3145150" xml-lang="en-US" level="4" l10n="U" oldref="148">Alias</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_QRYDGN_ROW_ALIAS" id="bm_id3154702" localize="false"/><paragraph role="heading" id="hd_id3145150" xml-lang="en-US" level="4" l10n="U" oldref="148">Alias</paragraph>
 <paragraph role="paragraph" id="par_id3146315" xml-lang="en-US" l10n="U" oldref="149"><ahelp hid="HID_QRYDGN_ROW_ALIAS">Specifies an alias. This alias will be listed in a query instead of the field name. This makes it possible to use user-defined column labels.</ahelp> For example, if the data field has the name PtNo and, instead of that name, you would like to have PartNum appear in the query, enter PartNum as alias.</paragraph>
 <paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="U" oldref="193">In an SQL statement, aliases are defined as following:</paragraph>
 <paragraph role="paragraph" id="par_id3149922" xml-lang="en-US" l10n="U" oldref="194">SELECT column AS alias FROM table.</paragraph>
 <paragraph role="paragraph" id="par_id3159335" xml-lang="en-US" l10n="U" oldref="195">For example:</paragraph>
 <paragraph role="paragraph" id="par_id3148478" xml-lang="en-US" l10n="U" oldref="196">SELECT "PtNo" AS "PartNum" FROM "Parts"</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QRYDGN_ROW_TABLE" id="bm_id3154665" localize="false"/><paragraph role="heading" id="hd_id3148485" xml-lang="en-US" level="4" l10n="U" oldref="27">Table</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_QRYDGN_ROW_TABLE" id="bm_id3154665" localize="false"/><paragraph role="heading" id="hd_id3148485" xml-lang="en-US" level="4" l10n="U" oldref="27">Table</paragraph>
 <paragraph role="paragraph" id="par_id3163665" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="HID_QRYDGN_ROW_TABLE">The corresponding database table of the selected data field is listed here.</ahelp> If you activate the a cell with a mouse click, an arrow will appear which enables you to select another table of the current query.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QRYDGN_ROW_ORDER" id="bm_id3154202" localize="false"/><paragraph role="heading" id="hd_id3154207" xml-lang="en-US" level="4" l10n="U" oldref="29">Sort</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_QRYDGN_ROW_ORDER" id="bm_id3154202" localize="false"/><paragraph role="heading" id="hd_id3154207" xml-lang="en-US" level="4" l10n="U" oldref="29">Sort</paragraph>
 <paragraph role="paragraph" id="par_id3150979" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_QRYDGN_ROW_ORDER">If you click the cell, you can select among the sorting options: ascending, descending and not sorted.</ahelp> Text fields will be sorted alphabetically and numerical fields numerically. For most databases, administrators can set the sorting options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QRYDGN_ROW_VISIBLE" id="bm_id3149334" localize="false"/><paragraph role="heading" id="hd_id3150384" xml-lang="en-US" level="4" l10n="U" oldref="31">Visible</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_QRYDGN_ROW_VISIBLE" id="bm_id3149334" localize="false"/><paragraph role="heading" id="hd_id3150384" xml-lang="en-US" level="4" l10n="U" oldref="31">Visible</paragraph>
 <paragraph role="paragraph" id="par_id3146133" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="HID_QRYDGN_ROW_VISIBLE">If you mark the <emph>Visible</emph> property for a data field, that field will be visible in the query</ahelp>. If you only use a data field to formulate a condition, you do not necessarily need to show it.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QRYDGN_ROW_CRIT" id="bm_id3147130" localize="false"/><paragraph role="heading" id="hd_id3154714" xml-lang="en-US" level="4" l10n="U" oldref="33">Criteria</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_QRYDGN_ROW_CRIT" id="bm_id3147130" localize="false"/><paragraph role="heading" id="hd_id3154714" xml-lang="en-US" level="4" l10n="U" oldref="33">Criteria</paragraph>
 <paragraph role="paragraph" id="par_id3145134" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_QRYDGN_ROW_CRIT">Specifies the <link href="text/shared/explorer/database/02010100.xhp" name="criteria ">criteria </link>by which the content of the data field should be filtered.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3152477" xml-lang="en-US" level="4" l10n="U" oldref="35">or</paragraph>
 <paragraph role="paragraph" id="par_id3154585" xml-lang="en-US" l10n="U" oldref="36">Here you can enter one additional criterion for filtering in each line. Multiple criteria in one column will be connected by an OR link.</paragraph>
 <paragraph role="paragraph" id="par_id3148800" xml-lang="en-US" l10n="U" oldref="150">You can also use the context menu of the line headers in the lower area of the query design to insert another line for functions:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QRYDGN_ROW_FUNCTION" id="bm_id3153275" localize="false"/><paragraph role="heading" id="hd_id3148419" xml-lang="en-US" level="3" l10n="U" oldref="151">Functions</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_QRYDGN_ROW_FUNCTION" id="bm_id3153275" localize="false"/><paragraph role="heading" id="hd_id3148419" xml-lang="en-US" level="3" l10n="U" oldref="151">Functions</paragraph>
 <paragraph role="paragraph" id="par_id3153233" xml-lang="en-US" l10n="CHG" oldref="152"><ahelp hid="HID_QRYDGN_ROW_FUNCTION" visibility="hidden">Select a function to run in the query here.</ahelp> The functions you can run here depend on the database. </paragraph>
 <paragraph role="paragraph" id="par_id8760818" xml-lang="en-US" l10n="CHG">If you are working with the HSQL database, the list box in the <emph>Function</emph> row offers you the following options:</paragraph>
 <table id="tbl_id3148461">
diff --git a/helpcontent2/source/text/shared/explorer/database/02010101.xhp b/helpcontent2/source/text/shared/explorer/database/02010101.xhp
index 58eb67f46d..e432005e6a 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/02010101.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02010101.xhp
@@ -51,8 +51,8 @@
       <section id="howtoget">
          <embed href="text/shared/00/00000450.xhp#Joins"/>
       </section>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_LEFT_TABLE" id="bm_id3150749" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_RIGHT_TABLE" id="bm_id3150752" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_QRY_LEFT_TABLE" id="bm_id3150749" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_QRY_RIGHT_TABLE" id="bm_id3150752" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3155066" role="heading" level="2" l10n="U"
                  oldref="17">Tables involved</paragraph>
       <paragraph xml-lang="en-US" id="par_id3153924" role="paragraph" l10n="U" oldref="16"><ahelp hid="HID_DLG_QRY_RIGHT_TABLE">Specifies two different tables that you want to join.</ahelp></paragraph>
@@ -60,7 +60,7 @@
                  oldref="15">Fields involved</paragraph>
       <paragraph xml-lang="en-US" id="par_id3148994" role="paragraph" l10n="CHG" oldref="14"><ahelp hid=".">Specifies two data fields that will be joined by a relation.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="hd_id3159267" role="heading" level="2" l10n="U" oldref="3">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOINTYPE" id="bm_id3147321" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_QRY_JOINTYPE" id="bm_id3147321" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3147340" role="heading" level="3" l10n="U"
                  oldref="13">Type</paragraph>
       <paragraph xml-lang="en-US" id="par_id3152482" role="paragraph" l10n="CHG" oldref="4"><ahelp hid="HID_DLG_QRY_JOINTYPE">Specifies the link type of the selected link.</ahelp> Some databases support only a subset of the possible types.</paragraph>
@@ -73,7 +73,7 @@
       <paragraph xml-lang="en-US" id="hd_id3158215" role="heading" level="3" l10n="U"
                  oldref="11">Full Join</paragraph>
       <paragraph xml-lang="en-US" id="par_id3163665" role="paragraph" l10n="U" oldref="12"><ahelp hid="HID_DLG_QRY_JOINTYPE">For a full join, the results table contains all fields of the left and right tables.</ahelp> In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOIN_CONTROL" id="bm_id0305200912022930" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_QRY_JOIN_CONTROL" id="bm_id0305200912022930" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id0305200912031976" role="heading" level="3" l10n="NEW">Natural</paragraph>
       <paragraph xml-lang="en-US" id="par_id0305200912031977" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts the keyword NATURAL into the SQL statement that defines the relation. The relation joins all columns that have the same column name in both tables. The resulting joined table contains only one column for each pair of equally named columns.</ahelp></paragraph>
    </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05010000.xhp b/helpcontent2/source/text/shared/explorer/database/05010000.xhp
index 85d7bf403d..879a44b84e 100644
--- a/helpcontent2/source/text/shared/explorer/database/05010000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05010000.xhp
@@ -52,16 +52,16 @@
 <embed href="text/shared/guide/database_main.xhp#database_main"/>
 <embed href="text/shared/guide/data_tabledefine.xhp#data_tabledefine"/>
 <paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="3">The window has its own menu bar. It also contains the following new command: <link href="text/shared/explorer/database/05010100.xhp" name="Index Design"><emph>Index Design</emph></link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TABDESIGN_BACKGROUND" id="bm_id3147088" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TABDESIGN_BACKGROUND" id="bm_id3147088" localize="false"/>
 <paragraph role="heading" id="hd_id3152551" xml-lang="en-US" level="2" l10n="U" oldref="4">Table definition area</paragraph>
 <paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_TABDESIGN_BACKGROUND">This area is where you define the table structure.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TABDESIGN_NAMECELL" id="bm_id3145382" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TABDESIGN_NAMECELL" id="bm_id3145382" localize="false"/>
 <paragraph role="heading" id="hd_id3153031" xml-lang="en-US" level="3" l10n="U" oldref="6">Field Name</paragraph>
 <paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_TABDESIGN_NAMECELL">Specifies the name of the data field. Note the database restrictions, such as the length of the name, special characters and spaces.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TABDESIGN_TYPECELL" id="bm_id3148473" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TABDESIGN_TYPECELL" id="bm_id3148473" localize="false"/>
 <paragraph role="heading" id="hd_id3147618" xml-lang="en-US" level="3" l10n="U" oldref="8">Field type</paragraph>
 <paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_TABDESIGN_TYPECELL">Specifies the field type.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TABDESIGN_COMMENTCELL" id="bm_id3149233" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TABDESIGN_COMMENTCELL" id="bm_id3149233" localize="false"/>
 <paragraph role="heading" id="hd_id3156119" xml-lang="en-US" level="3" l10n="U" oldref="10">Description</paragraph>
 <paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_TABDESIGN_COMMENTCELL">Specifies an optional description.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3155630" xml-lang="en-US" l10n="U" oldref="12">The row headers contain the following context menu commands:</paragraph>
@@ -73,10 +73,10 @@
 <paragraph role="paragraph" id="par_id3152472" xml-lang="en-US" l10n="U" oldref="18">Pastes the content of the clipboard.</paragraph>
 <paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="3" l10n="U" oldref="19">Delete</paragraph>
 <paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid=".uno:Delete">Deletes the selected row.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLEDESIGN_INSERTROWS" id="bm_id3159414" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TABLEDESIGN_INSERTROWS" id="bm_id3159414" localize="false"/>
 <paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="3" l10n="U" oldref="21">Insert Rows</paragraph>
 <paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="SID_TABLEDESIGN_INSERTROWS">Inserts an empty row above the current row, if the table has not been saved. Inserts an empty row at the end of the table if the table has been saved.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLEDESIGN_TABED_PRIMARYKEY" id="bm_id3150791" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TABLEDESIGN_TABED_PRIMARYKEY" id="bm_id3150791" localize="false"/>
 <paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="3" l10n="U" oldref="23">Primary Key</paragraph>
 <paragraph role="paragraph" id="par_id3150398" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SID_TABLEDESIGN_TABED_PRIMARYKEY">If this command has a check mark, the data field in this line is a primary key.</ahelp> By clicking the command you activate/deactivate the status. The command is only visible if the data source supports primary keys.</paragraph>
 <paragraph role="heading" id="hd_id3153104" xml-lang="en-US" level="2" l10n="U" oldref="25">Field properties</paragraph>
@@ -85,16 +85,16 @@
 <paragraph role="paragraph" id="par_id3144761" xml-lang="en-US" l10n="U" oldref="28">Specifies the length of the data field.</paragraph>
 <paragraph role="heading" id="hd_id3154948" xml-lang="en-US" level="3" l10n="U" oldref="29">Decimal places</paragraph>
 <paragraph role="paragraph" id="par_id3149203" xml-lang="en-US" l10n="U" oldref="30">Specifies the number of decimal places for a numerical field or decimal field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_ENT_DEFAULT" id="bm_id3158410" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_DEFAULT" id="bm_id3158410" localize="false"/>
 <paragraph role="heading" id="hd_id3156422" xml-lang="en-US" level="3" l10n="U" oldref="31">Default value</paragraph>
 <paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="HID_TAB_ENT_DEFAULT">Specifies the value that is the default in new data records.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_ENT_FORMAT_SAMPLE" id="bm_id3149562" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE" id="bm_id3149562" localize="false"/>
 <paragraph role="heading" id="hd_id3147289" xml-lang="en-US" level="3" l10n="U" oldref="33">Format example</paragraph>
 <paragraph role="paragraph" id="par_id3155131" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_TAB_ENT_FORMAT_SAMPLE">Displays the format code that you can select with the<emph> ... </emph>button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_ENT_FORMAT" id="bm_id3147319" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_FORMAT" id="bm_id3147319" localize="false"/>
 <paragraph role="heading" id="hd_id3154129" xml-lang="en-US" level="3" l10n="U" oldref="35">...</paragraph>
 <paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="HID_TAB_ENT_FORMAT">This button opens the <link href="text/shared/01/05340405.xhp" name="Field Format"><emph>Field Format</emph></link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TABLE_DESIGN_HELP_WINDOW" id="bm_id3152941" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TABLE_DESIGN_HELP_WINDOW" id="bm_id3152941" localize="false"/>
 <paragraph role="heading" id="hd_id3152576" xml-lang="en-US" level="2" l10n="U" oldref="37">Help area</paragraph>
 <paragraph role="paragraph" id="par_id3150685" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="HID_TABLE_DESIGN_HELP_WINDOW">Displays help texts.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05010100.xhp b/helpcontent2/source/text/shared/explorer/database/05010100.xhp
index ffcb8e5368..8e8f76b789 100644
--- a/helpcontent2/source/text/shared/explorer/database/05010100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05010100.xhp
@@ -49,17 +49,17 @@
   <embed href="text/shared/00/00000450.xhp#indexentwurf"/>
 </section>
 <embed href="text/shared/guide/data_tabledefine.xhp#data_tabledefine"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIDX_INDEXLIST" id="bm_id3148473" localize="false"/><paragraph role="heading" id="hd_id3149578" xml-lang="en-US" level="2" l10n="U" oldref="3">Index list</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLGIDX_INDEXLIST" id="bm_id3148473" localize="false"/><paragraph role="heading" id="hd_id3149578" xml-lang="en-US" level="2" l10n="U" oldref="3">Index list</paragraph>
 <paragraph role="paragraph" id="par_id3155342" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="HID_DLGIDX_INDEXLIST">Displays the available indexes. Select an index from the list to edit. The details of the selected index are displayed in the dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIDX_NEWINDEX" id="bm_id3158430" localize="false"/><paragraph role="heading" id="hd_id3149795" xml-lang="en-US" level="3" l10n="U" oldref="5">New Index</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLGIDX_NEWINDEX" id="bm_id3158430" localize="false"/><paragraph role="heading" id="hd_id3149795" xml-lang="en-US" level="3" l10n="U" oldref="5">New Index</paragraph>
 <paragraph role="paragraph" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_DLGIDX_NEWINDEX">Creates a new index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIDX_DROPINDEX" id="bm_id3148642" localize="false"/><paragraph role="heading" id="hd_id3145317" xml-lang="en-US" level="3" l10n="U" oldref="7">Delete Current Index</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLGIDX_DROPINDEX" id="bm_id3148642" localize="false"/><paragraph role="heading" id="hd_id3145317" xml-lang="en-US" level="3" l10n="U" oldref="7">Delete Current Index</paragraph>
 <paragraph role="paragraph" id="par_id3154860" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_DLGIDX_DROPINDEX">Deletes the current index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIDX_RENAMEINDEX" id="bm_id3154285" localize="false"/><paragraph role="heading" id="hd_id3150986" xml-lang="en-US" level="3" l10n="U" oldref="9">Rename Current Index</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLGIDX_RENAMEINDEX" id="bm_id3154285" localize="false"/><paragraph role="heading" id="hd_id3150986" xml-lang="en-US" level="3" l10n="U" oldref="9">Rename Current Index</paragraph>
 <paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_DLGIDX_RENAMEINDEX">Renames the current index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIDX_SAVEINDEX" id="bm_id3151245" localize="false"/><paragraph role="heading" id="hd_id3153628" xml-lang="en-US" level="3" l10n="U" oldref="11">Save Current Index</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLGIDX_SAVEINDEX" id="bm_id3151245" localize="false"/><paragraph role="heading" id="hd_id3153628" xml-lang="en-US" level="3" l10n="U" oldref="11">Save Current Index</paragraph>
 <paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_DLGIDX_SAVEINDEX">Saves the current index in the data source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIDX_RESETINDEX" id="bm_id3147265" localize="false"/><paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3" l10n="U" oldref="13">Reset Current Index</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLGIDX_RESETINDEX" id="bm_id3147265" localize="false"/><paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3" l10n="U" oldref="13">Reset Current Index</paragraph>
 <paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_DLGIDX_RESETINDEX">Resets the current index to the setting that it had when the dialog was started.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3152812" xml-lang="en-US" level="2" l10n="U" oldref="15">Index details</paragraph>
 <paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="16">As soon as you change a detail of the current index and then select another index, the change is immediately passed to the data source. You can only leave the dialog, or select another index, if the change has been successfully acknowledged by the data source. However, you can undo the change by clicking the <emph>Reset Current Index </emph>icon.</paragraph>
@@ -67,9 +67,9 @@
 <paragraph role="paragraph" id="par_id3156282" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="DBACCESS_CHECKBOX_DLG_INDEXDESIGN_CB_UNIQUE">Specifies whether the current index allows only unique values.</ahelp> Checking the <emph>Unique </emph>option prevents duplicate data from being entered in the field and ensures data integrity.</paragraph>
 <paragraph role="heading" id="hd_id3150448" xml-lang="en-US" level="3" l10n="U" oldref="19">Fields</paragraph>
 <paragraph role="paragraph" id="par_id3147085" xml-lang="en-US" l10n="U" oldref="20">The<emph> Fields</emph> area displays a list of fields in the current table. You can also select multiple fields. In order to remove a field from the selection, select the empty entry at the start of the list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGINDEX_INDEXDETAILS_FIELD" id="bm_id3147230" localize="false"/><paragraph role="heading" id="hd_id3149765" xml-lang="en-US" level="3" l10n="U" oldref="21">Index field</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD" id="bm_id3147230" localize="false"/><paragraph role="heading" id="hd_id3149765" xml-lang="en-US" level="3" l10n="U" oldref="21">Index field</paragraph>
 <paragraph role="paragraph" id="par_id3158408" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="HID_DLGINDEX_INDEXDETAILS_FIELD">Displays a list of the fields in the current table. You can select more than one field.</ahelp><comment>i73718</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGINDEX_INDEXDETAILS_SORTORDER" id="bm_id3154910" localize="false"/><paragraph role="heading" id="hd_id3153192" xml-lang="en-US" level="3" l10n="U" oldref="23">Sort order</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER" id="bm_id3154910" localize="false"/><paragraph role="heading" id="hd_id3153192" xml-lang="en-US" level="3" l10n="U" oldref="23">Sort order</paragraph>
 <paragraph role="paragraph" id="par_id3149561" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="HID_DLGINDEX_INDEXDETAILS_SORTORDER">Determines the sort order.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:DLG_INDEXDESIGN:PB_CLOSE" id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="2" l10n="U" oldref="25">Close</paragraph>
 <paragraph role="paragraph" id="par_id3154190" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="DBACCESS_PUSHBUTTON_DLG_INDEXDESIGN_PB_CLOSE">Closes the dialog.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/05020000.xhp b/helpcontent2/source/text/shared/explorer/database/05020000.xhp
index 5ab4003832..9dfe1b9aaf 100644
--- a/helpcontent2/source/text/shared/explorer/database/05020000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05020000.xhp
@@ -39,7 +39,7 @@
 </meta>
 <body>
 <section id="relationen">
-<bookmark xml-lang="en-US" branch="hid/HID_CTL_RELATIONTAB" id="bm_id3153345" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_CTL_RELATIONTAB" id="bm_id3153345" localize="false"/>
 <paragraph role="heading" id="hd_id3153323" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/05020000.xhp" name="Relations">Relations</link></paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146957"><bookmark_value>relational databases (Base)</bookmark_value>
 </bookmark><comment>mw added "(Base)"</comment>
diff --git a/helpcontent2/source/text/shared/explorer/database/05020100.xhp b/helpcontent2/source/text/shared/explorer/database/05020100.xhp
index c2f49abaf5..c38239fb97 100644
--- a/helpcontent2/source/text/shared/explorer/database/05020100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05020100.xhp
@@ -57,11 +57,11 @@
 <paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="2" l10n="U" oldref="27">Tables</paragraph>
 <paragraph role="paragraph" id="par_id3153880" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_RIGHT_TABLE" visibility="hidden">This is where the two related tables are listed.</ahelp>If you create a new relation, you can select one table from each of the combo boxes in the top part of the dialog.</paragraph>
 <paragraph role="paragraph" id="par_id3154047" xml-lang="en-US" l10n="U" oldref="29">If you opened the <emph>Relations</emph> dialog for an existing relation by double-clicking the connection lines in the Relation window, then the tables involved in the relation cannot be modified.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_RELDLG_KEYFIELDS" id="bm_id3153716" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_RELDLG_KEYFIELDS" id="bm_id3153716" localize="false"/>
 <paragraph role="heading" id="hd_id3153822" xml-lang="en-US" level="2" l10n="U" oldref="4">Key fields</paragraph>
 <paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_RELDLG_KEYFIELDS">Defines the key fields for the relation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_RELATIONDIALOG_LEFTFIELDCELL" id="bm_id3153561" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_RELATIONDIALOG_RIGHTFIELDCELL" id="bm_id3153543" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL" id="bm_id3153561" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL" id="bm_id3153543" localize="false"/>
 <paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="HID_RELATIONDIALOG_RIGHTFIELDCELL">The names of the tables selected for the link appear here as column names.</ahelp> If you click a field, you can use the arrow buttons to select a field from the table. Each relation is written in a row.</paragraph>
 <paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="2" l10n="U" oldref="6">Update options</paragraph>
 <paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="7">Here you can select options that take effect when there are changes to a primary key field.</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030100.xhp b/helpcontent2/source/text/shared/explorer/database/05030100.xhp
index 253a03adab..1c0e50f08c 100644
--- a/helpcontent2/source/text/shared/explorer/database/05030100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030100.xhp
@@ -44,7 +44,7 @@
 <paragraph role="heading" id="hd_id3085157" xml-lang="en-US" level="1" l10n="U" oldref="28"><link href="text/shared/explorer/database/05030100.xhp" name="Copy Table">Copy Table</link></paragraph>
 <paragraph role="paragraph" id="par_id3149264" xml-lang="en-US" l10n="CHG" oldref="29">You can copy a table by dragging and dropping the table onto the table area of a database file window. The <emph>Copy table </emph>dialog appears.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_WIZ_TABLENAME_EDIT" id="bm_id3154840" localize="false"/><paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="2" l10n="U" oldref="3">Table name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_WIZ_TABLENAME_EDIT" id="bm_id3154840" localize="false"/><paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="2" l10n="U" oldref="3">Table name</paragraph>
 <paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_TAB_WIZ_TABLENAME_EDIT">Specifies a name for the copy.</ahelp> Some databases only accept names containing eight or fewer characters.</paragraph>
 <paragraph role="heading" id="hd_id3154228" xml-lang="en-US" level="2" l10n="U" oldref="5">Options</paragraph>
 <bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEFDATA" id="bm_id3147576" localize="false"/><paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="3" l10n="U" oldref="7">Definition and data</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030300.xhp b/helpcontent2/source/text/shared/explorer/database/05030300.xhp
index eb97219d79..fd3ab29a6c 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/05030300.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030300.xhp
@@ -50,20 +50,20 @@
 <paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="2" l10n="U" oldref="3">List box</paragraph>
 <paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="DBACCESS_MULTILISTBOX_TAB_WIZ_TYPE_SELECT_LB_NEW_COLUMN_NAMES">Lists the data fields that will be included in to the copied table.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="U" oldref="5">Column information</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_ENT_COLUMNNAME" id="bm_id3153311" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_COLUMNNAME" id="bm_id3153311" localize="false"/>
 <paragraph role="heading" id="hd_id3156426" xml-lang="en-US" level="3" l10n="U" oldref="7">Field name</paragraph>
 <paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_TAB_ENT_COLUMNNAME">Displays the name of the selected data field. If you want, you can enter a new name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_ENT_TYPE" id="bm_id3154749" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_TYPE" id="bm_id3154749" localize="false"/>
 <paragraph role="heading" id="hd_id3156113" xml-lang="en-US" level="3" l10n="U" oldref="9">Field type</paragraph>
 <paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_TAB_ENT_TYPE">Select a field type.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_ENT_TEXT_LEN" id="bm_id3149795" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_ENT_LEN" id="bm_id3149516" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_TEXT_LEN" id="bm_id3149795" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_LEN" id="bm_id3149516" localize="false"/>
 <paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="11">Length</paragraph>
 <paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_TAB_ENT_LEN">Enter the number of characters for the data field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_ENT_SCALE" id="bm_id3154285" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_SCALE" id="bm_id3154285" localize="false"/>
 <paragraph role="heading" id="hd_id3159176" xml-lang="en-US" level="3" l10n="U" oldref="13">Decimal places</paragraph>
 <paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_TAB_ENT_SCALE">Enter the number of decimal places for the data field. This option is only available for numerical or decimal data fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_ENT_BOOL_DEFAULT" id="bm_id3156155" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_BOOL_DEFAULT" id="bm_id3156155" localize="false"/>
 <paragraph role="heading" id="hd_id3150276" xml-lang="en-US" level="3" l10n="U" oldref="15">Default value</paragraph>
 <paragraph role="paragraph" id="par_id3147620" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_TAB_ENT_BOOL_DEFAULT">Select the default value for a Yes/No field.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153087" xml-lang="en-US" level="2" l10n="U" oldref="17">Automatic type recognition</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030400.xhp b/helpcontent2/source/text/shared/explorer/database/05030400.xhp
index aca297e55f..ea10b45f1c 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/05030400.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030400.xhp
@@ -46,10 +46,10 @@
 <paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/05030400.xhp" name="Assign columns">Assign columns</link></paragraph>
 <paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U" oldref="2">In the data source explorer, you can copy a table by dragging and dropping the table onto the table container. If you select the <emph>Attach data </emph>check box on the first page of the <emph>Copy table </emph>dialog, the <emph>Assign columns </emph>dialog opens as the second window. You can use this dialog to map the contents of a data field in the source table to a different data field in the destination table.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_NAMEMATCHING_COLS_AVAIL" id="bm_id3153527" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL" id="bm_id3153527" localize="false"/>
 <paragraph role="heading" id="hd_id3157958" xml-lang="en-US" level="2" l10n="U" oldref="4">Source table</paragraph>
 <paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_TAB_NAMEMATCHING_COLS_AVAIL">Lists the data fields in the source table. To include a data field from the source table in the destination table, select the check box in front of the data field name. To map the contents of a data field in the source table to a different data field in the destination table, click the data field in the source table list, and then click the up or down arrow.</ahelp> To include all of the source data fields in the destination table, click <emph>All</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_NAMEMATCHING_COLS_ASSIGN" id="bm_id3147242" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_NAMEMATCHING_COLS_ASSIGN" id="bm_id3147242" localize="false"/>
 <paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="6">Destination table</paragraph>
 <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_TAB_NAMEMATCHING_COLS_ASSIGN">Lists the possible data fields in the destination table. Only the data fields that are selected in the source table list will be included the destination table.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP" id="bm_id3149516" localize="false"/>
diff --git a/helpcontent2/source/text/shared/explorer/database/11020000.xhp b/helpcontent2/source/text/shared/explorer/database/11020000.xhp
index aca738877a..4c6eb75db7 100644
--- a/helpcontent2/source/text/shared/explorer/database/11020000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11020000.xhp
@@ -53,7 +53,7 @@
 <paragraph role="paragraph" id="par_id3145119" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid=".">Prevents an unauthorized user from accessing the database. You only need to enter the password once per session.</ahelp></paragraph>
 </section>
 <section id="treibereinstellungen">
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_ODBC_OPTIONS" id="bm_id3148473" localize="false"/><paragraph role="heading" id="hd_id3153087" xml-lang="en-US" level="2" l10n="U" oldref="10">Driver Settings</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_ODBC_OPTIONS" id="bm_id3148473" localize="false"/><paragraph role="heading" id="hd_id3153087" xml-lang="en-US" level="2" l10n="U" oldref="10">Driver Settings</paragraph>
 <paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_DSADMIN_ODBC_OPTIONS">Use this text field to enter additional optional driver settings if this is necessary.</ahelp></paragraph>
 </section>
 <section id="zeichensatz">
@@ -62,23 +62,23 @@
 </section>
 <section id="retrieve">
 <paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="2" l10n="U" oldref="22">General</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_AUTORETRIEVEENABLED" id="bm_id3161657" localize="false"/><paragraph role="heading" id="hd_id3147265" xml-lang="en-US" level="3" l10n="U" oldref="24">Retrieve generated values</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_AUTORETRIEVEENABLED" id="bm_id3161657" localize="false"/><paragraph role="heading" id="hd_id3147265" xml-lang="en-US" level="3" l10n="U" oldref="24">Retrieve generated values</paragraph>
 <paragraph role="paragraph" id="par_id3151054" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="HID_DSADMIN_AUTORETRIEVEENABLED">Enables $[officename] support of auto-incremented data fields for the current ODBC or JDBC data source.</ahelp> Select this check box if the database does not support the auto-increment feature in its SDBCX layer. In general, the auto-increment is selected for the primary key field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_AUTOINCREMENTVALUE" id="bm_id3150792" localize="false"/><paragraph role="heading" id="hd_id3150400" xml-lang="en-US" level="3" l10n="U" oldref="26">Auto-increment statement</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_AUTOINCREMENTVALUE" id="bm_id3150792" localize="false"/><paragraph role="heading" id="hd_id3150400" xml-lang="en-US" level="3" l10n="U" oldref="26">Auto-increment statement</paragraph>
 <paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="HID_DSADMIN_AUTOINCREMENTVALUE">Enter the SQL command specifier that instructs the data source to auto-increment a specified Integer data field.</ahelp> For example, a typical SQL statement to create a data field is: </paragraph>
 <paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="28">CREATE TABLE "table1" ("id" INTEGER)</paragraph>
 <paragraph role="paragraph" id="par_id3147084" xml-lang="en-US" l10n="U" oldref="29">To auto-increment the "id" data field in a MySQL database, change the statement to:</paragraph>
 <paragraph role="paragraph" id="par_id3154909" xml-lang="en-US" l10n="U" oldref="30">CREATE TABLE "table1" ("id" INTEGER AUTO_INCREMENT)</paragraph>
 <paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="31">In other words, enter AUTO_INCREMENT into <emph>Auto-increment statement</emph> box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_RETRIEVE_AUTO" id="bm_id3153195" localize="false"/><paragraph role="heading" id="hd_id3149765" xml-lang="en-US" level="3" l10n="U" oldref="32">Query of generated values</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_RETRIEVE_AUTO" id="bm_id3153195" localize="false"/><paragraph role="heading" id="hd_id3149765" xml-lang="en-US" level="3" l10n="U" oldref="32">Query of generated values</paragraph>
 <paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="HID_DSADMIN_RETRIEVE_AUTO">Enter an SQL statement that returns the last auto-incremented value for the primary key data field.</ahelp> For example:</paragraph>
 <paragraph role="paragraph" id="par_id3150769" xml-lang="en-US" l10n="U" oldref="34">SELECT LAST_INSERT_D();</paragraph>
 </section>
 <section id="sql92">
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SQL92CHECK" id="bm_id3147289" localize="false"/><paragraph role="heading" id="hd_id3157892" xml-lang="en-US" level="3" l10n="U" oldref="18">Use SQL92 naming constraints</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_SQL92CHECK" id="bm_id3147289" localize="false"/><paragraph role="heading" id="hd_id3157892" xml-lang="en-US" level="3" l10n="U" oldref="18">Use SQL92 naming constraints</paragraph>
 <paragraph role="paragraph" id="par_id3153368" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_DSADMIN_SQL92CHECK">Only allows names that use characters that conform to the SQL92 naming constraints in the data source. All other characters are rejected.</ahelp> Each name must begin with a lower or upper case letter, or an underline ( _ ). The remaining characters can be ASCII letters, underlines, and numbers.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_USECATALOG" id="bm_id3146148" localize="false"/><paragraph role="heading" id="hd_id3154011" xml-lang="en-US" level="3" l10n="U" oldref="15">Use Catalog for file-based databases</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_USECATALOG" id="bm_id3146148" localize="false"/><paragraph role="heading" id="hd_id3154011" xml-lang="en-US" level="3" l10n="U" oldref="15">Use Catalog for file-based databases</paragraph>
 <paragraph role="paragraph" id="par_id3148618" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_DSADMIN_USECATALOG">Uses the current data source of the Catalog. This is useful when the ODBC data source is a database server. If the ODBC data source is a dBASE driver, leave this check box clear.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/11030000.xhp b/helpcontent2/source/text/shared/explorer/database/11030000.xhp
index 558d0cb75e..99bedf79c5 100644
--- a/helpcontent2/source/text/shared/explorer/database/11030000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11030000.xhp
@@ -46,7 +46,7 @@
 <embed href="text/shared/00/00000450.xhp#dBase"/>
 </section>
 <paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U" oldref="18">To be able to define relations between tables, use JDBC or ODBC from within $[officename].</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SHOWDELETED" id="bm_id3154142" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_SHOWDELETED" id="bm_id3154142" localize="false"/>
 <paragraph role="heading" id="hd_id3149233" xml-lang="en-US" level="2" l10n="U" oldref="4">Display inactive records</paragraph>
 <paragraph role="paragraph" id="par_id3153823" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_DSADMIN_SHOWDELETED">Displays all the records in a file, including those marked as deleted. If you select this check box, you cannot delete records.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="17">In dBASE format, deleted records remain in the file. </paragraph>
@@ -56,7 +56,7 @@
 <paragraph role="paragraph" id="par_id0904200811094971" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the code conversion that you want to use to view the database in $[officename]. This does not affect the database.</ahelp></paragraph>
 <embed href="text/shared/explorer/database/11020000.xhp#zeichensatz"/>
 <embed href="text/shared/explorer/database/11020000.xhp#sql92"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DBASE_INDICIES" id="bm_id3151056" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_DBASE_INDICIES" id="bm_id3151056" localize="false"/>
 <paragraph role="heading" id="hd_id3149047" xml-lang="en-US" level="2" l10n="U" oldref="8">Indexes</paragraph>
 <paragraph role="paragraph" id="par_id3161656" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DSADMIN_DBASE_INDICIES">Opens the <link href="text/shared/explorer/database/11030100.xhp" name="Indexes"><emph>Indexes</emph></link> dialog, where you can organize the table indexes in the current dBASE database.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/11090000.xhp b/helpcontent2/source/text/shared/explorer/database/11090000.xhp
index 68990208c9..9e27ecc620 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/11090000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11090000.xhp
@@ -42,8 +42,8 @@
 <body>
 <section id="tabellen">
 <paragraph role="heading" id="hd_id3150702" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/explorer/database/11090000.xhp" name="Tables">Table Filter</link></paragraph><comment>UFI: file remains as a help id container - no browsing</comment></section>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SUPPRESS_VERSIONCL" id="bm_id3154046" localize="false"/><paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="." visibility="hidden">Some databases track changes to each record by assigning version number to fields that are changed. This number is incremented by 1 each time the field is changed. Displays the internal version number of the record in the database table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_FM_SORTUP" id="bm_id5955967" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_SUPPRESS_VERSIONCL" id="bm_id3154046" localize="false"/><paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="." visibility="hidden">Some databases track changes to each record by assigning version number to fields that are changed. This number is incremented by 1 each time the field is changed. Displays the internal version number of the record in the database table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Sortup" id="bm_id5955967" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Sortup" id="bm_id5298928" localize="false"/><paragraph role="heading" id="hd_id3154923" xml-lang="en-US" level="2" l10n="U" oldref="8">Sort Ascending<comment>in View - Sort menu</comment></paragraph>
 <paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DSADMIN_SUPPRESS_VERSIONCL">Sorts the list of table names in ascending order starting at the beginning of the alphabet.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/11150200.xhp b/helpcontent2/source/text/shared/explorer/database/11150200.xhp
index f1abe9b45a..54a1833ed5 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/11150200.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11150200.xhp
@@ -45,15 +45,15 @@
 <paragraph role="paragraph" id="par_id3153539" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Manages user data for accessing Adabas or ADO databases.</ahelp></paragraph>
 </section>
 <paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="2" l10n="U" oldref="4">User selection</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_PAGE_LBUSER" id="bm_id3145345" localize="false"/><paragraph role="heading" id="hd_id3153312" xml-lang="en-US" level="3" l10n="U" oldref="5">User</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_PAGE_LBUSER" id="bm_id3145345" localize="false"/><paragraph role="heading" id="hd_id3153312" xml-lang="en-US" level="3" l10n="U" oldref="5">User</paragraph>
 <paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_TAB_PAGE_LBUSER">Select the user whose settings you want to modify.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_PAGE_PBUSER" id="bm_id3146957" localize="false"/><paragraph role="heading" id="hd_id3154824" xml-lang="en-US" level="3" l10n="U" oldref="7">Add user</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_PAGE_PBUSER" id="bm_id3146957" localize="false"/><paragraph role="heading" id="hd_id3154824" xml-lang="en-US" level="3" l10n="U" oldref="7">Add user</paragraph>
 <paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_TAB_PAGE_PBUSER">Adds a new user for accessing the selected database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_PAGE_PBCHGPWD" id="bm_id3166410" localize="false"/><paragraph role="heading" id="hd_id3150355" xml-lang="en-US" level="3" l10n="U" oldref="9">Change password</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_PAGE_PBCHGPWD" id="bm_id3166410" localize="false"/><paragraph role="heading" id="hd_id3150355" xml-lang="en-US" level="3" l10n="U" oldref="9">Change password</paragraph>
 <paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_TAB_PAGE_PBCHGPWD">Changes the current user password for accessing the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_PAGE_PBUSERDELETE" id="bm_id3149578" localize="false"/><paragraph role="heading" id="hd_id3163662" xml-lang="en-US" level="3" l10n="U" oldref="11">Delete user</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_PAGE_PBUSERDELETE" id="bm_id3149578" localize="false"/><paragraph role="heading" id="hd_id3163662" xml-lang="en-US" level="3" l10n="U" oldref="11">Delete user</paragraph>
 <paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_TAB_PAGE_PBUSERDELETE">Removes the selected user.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_PAGE_TBLGRANTS" id="bm_id3153561" localize="false"/><paragraph role="heading" id="hd_id3149166" xml-lang="en-US" level="2" l10n="U" oldref="13">Access rights for selected user.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_PAGE_TBLGRANTS" id="bm_id3153561" localize="false"/><paragraph role="heading" id="hd_id3149166" xml-lang="en-US" level="2" l10n="U" oldref="13">Access rights for selected user.</paragraph>
 <paragraph role="paragraph" id="par_id3155136" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_TAB_PAGE_TBLGRANTS">Displays and lets you edit the database access rights for the selected user.</ahelp></paragraph>
 <section id="relatedtopics">
 <paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="3"><link href="text/shared/explorer/database/30000000.xhp" name="Adabas D database format">Adabas D database format</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/30100000.xhp b/helpcontent2/source/text/shared/explorer/database/30100000.xhp
index c673f7af1c..da8a401c81 100644
--- a/helpcontent2/source/text/shared/explorer/database/30100000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/30100000.xhp
@@ -42,41 +42,41 @@
 <body>
 <paragraph role="heading" id="hd_id3159176" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/30100000.xhp" name="Create New Adabas Database">Create New Adabas Database</link></paragraph>
 <paragraph role="paragraph" id="par_id3154515" xml-lang="en-US" l10n="U" oldref="2">Creates a new <link href="text/shared/explorer/database/30000000.xhp" name="Adabas database">Adabas database</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_DBNAME" id="bm_id3153716" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_DBNAME" id="bm_id3153716" localize="false"/>
 <paragraph role="heading" id="hd_id3156117" xml-lang="en-US" level="3" l10n="U" oldref="37">Database name</paragraph>
 <paragraph role="paragraph" id="par_id3158432" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="HID_DLG_ADABAS_DBNAME">Type the name of the database.</ahelp> The name is added to the <emph>Data source URL</emph> field.</paragraph>
 <paragraph role="heading" id="hd_id3150256" xml-lang="en-US" level="2" l10n="U" oldref="3">User settings</paragraph>
 <!-- removed HID SD_EDIT_DLG_INSERT_PAGE_EDT_NAME -->
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_SYSUSR" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="5">Administrator</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_SYSUSR" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="5">Administrator</paragraph>
 <paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_DLG_ADABAS_SYSUSR" visibility="hidden">Enter the name of the database administrator.</ahelp> The administrator name and password is assigned when you create an Adabas database. Apart from the administrator, two more users can access the Adabas database.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_CONUSR" id="bm_id3149670" localize="false"/><paragraph role="heading" id="hd_id3149045" xml-lang="en-US" level="3" l10n="U" oldref="7">Control User</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_CONUSR" id="bm_id3149670" localize="false"/><paragraph role="heading" id="hd_id3149045" xml-lang="en-US" level="3" l10n="U" oldref="7">Control User</paragraph>
 <paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_DLG_ADABAS_CONUSR">Enter the name of a user that you want to give limited control to modify some parameters of the database. Normally, the default settings for the name and the password of the control user are not changed.</ahelp> The control user does not affect the three-user limitation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_USR" id="bm_id3150792" localize="false"/><paragraph role="heading" id="hd_id3153379" xml-lang="en-US" level="3" l10n="U" oldref="9">Domain User</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_USR" id="bm_id3150792" localize="false"/><paragraph role="heading" id="hd_id3153379" xml-lang="en-US" level="3" l10n="U" oldref="9">Domain User</paragraph>
 <paragraph role="paragraph" id="par_id3153362" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_DLG_ADABAS_USR">Enter the name of the domain user that is used by Adabas internally. Normally, the default settings for the name and password of the domain user are not changed.</ahelp> The domain user does not affect the three-user limit.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_SYSPWD" id="bm_id3154125" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_CONPWD" id="bm_id3150769" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_DOMAINPWD" id="bm_id3154218" localize="false"/><paragraph role="heading" id="hd_id3147084" xml-lang="en-US" level="3" l10n="U" oldref="11">Password</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_SYSPWD" id="bm_id3154125" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_CONPWD" id="bm_id3150769" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_DOMAINPWD" id="bm_id3154218" localize="false"/><paragraph role="heading" id="hd_id3147084" xml-lang="en-US" level="3" l10n="U" oldref="11">Password</paragraph>
 <paragraph role="paragraph" id="par_id3148674" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_DLG_ADABAS_DOMAINPWD">Enter a password.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3144433" xml-lang="en-US" level="2" l10n="U" oldref="13">Database settings</paragraph>
 <paragraph role="paragraph" id="par_id3145607" xml-lang="en-US" l10n="U" oldref="15">Drives containing parts of the Serverdb are called DEVSPACEs. To improve performance, store each DEVSPACE on separate drives.</paragraph>
 <paragraph role="warning" id="par_id3146985" xml-lang="en-US" l10n="U" oldref="36">The file path for a DEVSPACE, including its file name, cannot exceed 40 characters.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_SYSDEVSPACE" id="bm_id3150873" localize="false"/><paragraph role="heading" id="hd_id3146148" xml-lang="en-US" level="3" l10n="U" oldref="16">SYSDEVSPACE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_SYSDEVSPACE" id="bm_id3150873" localize="false"/><paragraph role="heading" id="hd_id3146148" xml-lang="en-US" level="3" l10n="U" oldref="16">SYSDEVSPACE</paragraph>
 <paragraph role="paragraph" id="par_id3149064" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_DLG_ADABAS_SYSDEVSPACE">Enter the path for the system DEVSPACE.</ahelp> The SYSDEVSPACE manages the configuration data for the database. The size of the SYSDEVSPACE depends on the size of the database.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_TRANSACTIONLOG" id="bm_id3152793" localize="false"/><paragraph role="heading" id="hd_id3147319" xml-lang="en-US" level="3" l10n="U" oldref="18">TRANSACTIONLOG</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_TRANSACTIONLOG" id="bm_id3152793" localize="false"/><paragraph role="heading" id="hd_id3147319" xml-lang="en-US" level="3" l10n="U" oldref="18">TRANSACTIONLOG</paragraph>
 <paragraph role="paragraph" id="par_id3154190" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_DLG_ADABAS_TRANSACTIONLOG">Enter the path for the transaction log file.</ahelp> This file records all modifications that are made to the database during a transaction, and overwrites them when the transaction is completed. The TRANSACTIONLOG is also used for the rollback of a transaction.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_DATADEVSPACE" id="bm_id3150488" localize="false"/><paragraph role="heading" id="hd_id3145748" xml-lang="en-US" level="3" l10n="U" oldref="20">DATADEVSPACE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_DATADEVSPACE" id="bm_id3150488" localize="false"/><paragraph role="heading" id="hd_id3145748" xml-lang="en-US" level="3" l10n="U" oldref="20">DATADEVSPACE</paragraph>
 <paragraph role="paragraph" id="par_id3152597" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_DLG_ADABAS_DATADEVSPACE">Enter the path for the data DEVSPACE.</ahelp> This file stores user data, such as tables and indexes, as well as the SQL catalog (schema info). The data contained in one user table is evenly distributed across all DATADEVSPACEs. The combined size of all DATADEVSPACEs corresponds to the size of the database.</paragraph>
 <paragraph role="paragraph" id="par_id3150103" xml-lang="en-US" l10n="U" oldref="22">The maximum size for a DATADEVSPACE in the limited version Adabas database is 100MB.</paragraph>
 <paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="23">If the DATADEVSPACE reaches full capacity during a database operation, Adabas shuts down, increases the capacity of the DATADEVSPACE (up to 100 MB), and restarts the database. Saved data is not lost.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_PBSYSDEVSPACE" id="bm_id3083445" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_PBTRANSACTIONLOG" id="bm_id3153139" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_PBDATADEVSPACE" id="bm_id3146120" localize="false"/><paragraph role="heading" id="hd_id3153189" xml-lang="en-US" level="3" l10n="U" oldref="24">...</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_PBSYSDEVSPACE" id="bm_id3083445" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_PBTRANSACTIONLOG" id="bm_id3153139" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_PBDATADEVSPACE" id="bm_id3146120" localize="false"/><paragraph role="heading" id="hd_id3153189" xml-lang="en-US" level="3" l10n="U" oldref="24">...</paragraph>
 <paragraph role="paragraph" id="par_id3153091" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="HID_DLG_ADABAS_PBDATADEVSPACE">Locate the directory where you want to save the file, and then click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_TRANSACTIONLOG_SIZE" id="bm_id3147048" localize="false"/><paragraph role="heading" id="hd_id3150686" xml-lang="en-US" level="3" l10n="U" oldref="26">Transaction file (MB)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_TRANSACTIONLOG_SIZE" id="bm_id3147048" localize="false"/><paragraph role="heading" id="hd_id3150686" xml-lang="en-US" level="3" l10n="U" oldref="26">Transaction file (MB)</paragraph>
 <paragraph role="paragraph" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="HID_DLG_ADABAS_TRANSACTIONLOG_SIZE">Enter the size of the transaction file in megabytes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_DATADEVSPACE_SIZE" id="bm_id3151060" localize="false"/><paragraph role="heading" id="hd_id3157977" xml-lang="en-US" level="3" l10n="U" oldref="28">Database size (MB)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_DATADEVSPACE_SIZE" id="bm_id3151060" localize="false"/><paragraph role="heading" id="hd_id3157977" xml-lang="en-US" level="3" l10n="U" oldref="28">Database size (MB)</paragraph>
 <paragraph role="paragraph" id="par_id3150115" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_DLG_ADABAS_DATADEVSPACE_SIZE">Enter the size of the database in megabytes here. The maximum size is 100 MB.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_CACHE_SIZE" id="bm_id3151053" localize="false"/><paragraph role="heading" id="hd_id3155415" xml-lang="en-US" level="3" l10n="U" oldref="30">Data buffer size (MB)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ADABAS_CACHE_SIZE" id="bm_id3151053" localize="false"/><paragraph role="heading" id="hd_id3155415" xml-lang="en-US" level="3" l10n="U" oldref="30">Data buffer size (MB)</paragraph>
 <paragraph role="paragraph" id="par_id3149378" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="HID_DLG_ADABAS_CACHE_SIZE">Enter the size of the data cache in megabytes. </ahelp> The data buffer can be simultaneously accessed by all users and stores the most recently accessed pages from the DATADEVSPACEs.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
index 6dd9b75476..94a4cb08cd 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
@@ -49,52 +49,60 @@
       <paragraph xml-lang="en-US" id="par_id4572283" role="paragraph" l10n="NEW">The availability of the following controls depends on the type of database:</paragraph>
       <paragraph xml-lang="en-US" id="par_idN10590" role="heading" level="2" l10n="NEW">Use SQL92 naming constraints<comment>UFI: found this for dBase and for text file folder</comment></paragraph>
       <paragraph xml-lang="en-US" id="par_idN10594" role="paragraph" l10n="NEW"><ahelp hid=".">Only allows characters that conform to the SQL92 naming convention in a name in a data source. All other characters are rejected. Each name must begin with a lowercase letter, an uppercase letter, or an underscore ( _ ). The remaining characters can be ASCII letters, numbers, and underscores.</ahelp></paragraph>
-
+      <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_AS_BEFORE_CORRELATION_NAME" id="bm_id6617777328" localize="false"/>
       <paragraph xml-lang="en-US" id="par_idN105907" role="heading" level="2" l10n="NEW">Use keyword AS before table alias names</paragraph>
       <paragraph xml-lang="en-US" id="par_idN105947" role="paragraph" l10n="NEW"><ahelp hid=".">Some databases use the keyword "AS" between a name and its alias, while other databases use a whitespace. Enable this option to insert AS before the alias.</ahelp><comment>http://dba.openoffice.org/specifications/Data_Source_Property_Dialog.sxw</comment></paragraph>
 
 
-      <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/>
+      <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3534958" role="heading" level="2" l10n="NEW">End text lines with CR + LF<comment>UFI: found for dBase and text file folder</comment></paragraph>
       <paragraph xml-lang="en-US" id="par_id6151921" role="paragraph" l10n="NEW"><ahelp hid=".">Select to use the CR + LF code pair to end every text line (preferred for DOS and Windows operating systems).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_APPENDTABLEALIAS" id="bm_id9050569" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_APPENDTABLEALIAS" id="bm_id9050569" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN1059E" role="heading" level="2" l10n="NEW">Append the table alias name in SELECT statements</paragraph>
       <paragraph xml-lang="en-US" id="par_idN105A2" role="paragraph" l10n="NEW"><ahelp hid=".">Appends the alias to the table name in SELECT statements.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_ENABLEOUTERJOIN" id="bm_id7278664" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_ENABLEOUTERJOIN" id="bm_id7278664" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN105A5" role="heading" level="2" l10n="NEW">Use Outer Join syntax '{OJ }'</paragraph>
       <paragraph xml-lang="en-US" id="par_idN105A9" role="paragraph" l10n="NEW"><ahelp hid=".">Use escape sequences for outer joins. The syntax for this escape sequence is {oj outer-join}</ahelp><comment>copied from shared\explorer\database\02010100.xhp</comment></paragraph>
       <paragraph xml-lang="en-US" id="par_idN105BE" role="paragraph" l10n="NEW">Example:</paragraph>
       <paragraph xml-lang="en-US" id="par_idN105C1" role="example" l10n="NEW">select Article.* from {oj item LEFT OUTER JOIN orders ON item.no=orders.ANR}</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_IGNOREDRIVER_PRIV" id="bm_id3826715" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_IGNOREDRIVER_PRIV" id="bm_id3826715" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN105C4" role="heading" level="2" l10n="NEW">Ignore the privileges from the database driver</paragraph>
       <paragraph xml-lang="en-US" id="par_idN105C8" role="paragraph" l10n="NEW"><ahelp hid=".">Ignores access privileges that are provided by the database driver.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_PARAMETERNAMESUBST" id="bm_id8939786" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_PARAMETERNAMESUBST" id="bm_id8939786" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN105CB" role="heading" level="2" l10n="NEW">Replace named parameters with ?</paragraph>
       <paragraph xml-lang="en-US" id="par_idN105CF" role="paragraph" l10n="NEW"><ahelp hid=".">Replaces named parameters in a data source with a question mark (?).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SUPPRESS_VERSIONCL" id="bm_id6642353" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_SUPPRESS_VERSIONCL" id="bm_id6642353" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN105D2" role="heading" level="2" l10n="NEW">Display version columns (when available)</paragraph>
       <paragraph xml-lang="en-US" id="par_idN105D6" role="paragraph" l10n="NEW">Some databases assign version numbers to fields to track changes to records. The version number of a field is incremented by one each time the contents of the field are changed. <ahelp hid="HID_DSADMIN_SUPPRESS_VERSIONCL">Displays the internal version number of the record in the database table.</ahelp><comment>copied from shared\explorer\database\11090000.xhp</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CATALOG" id="bm_id2444532" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_CATALOG" id="bm_id2444532" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN105FA" role="heading" level="2" l10n="NEW">Use the catalog name in SELECT statements</paragraph>
       <paragraph xml-lang="en-US" id="par_idN105FE" role="paragraph" l10n="NEW"><ahelp hid=".">Uses the current data source of the catalog. This option is useful when the ODBC data source is a database server. Do not select this option if the ODBC data source is a dBASE driver.</ahelp><comment>copie from shared\explorer\database\11020000.xhp</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SCHEMA" id="bm_id7354655" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_SCHEMA" id="bm_id7354655" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN10613" role="heading" level="2" l10n="NEW">Use the schema name in SELECT statements</paragraph>
       <paragraph xml-lang="en-US" id="par_idN10617" role="paragraph" l10n="NEW"><ahelp hid=".">Allows you to use the schema name in SELECT statements.</ahelp><comment>UFI: ???</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_IGNOREINDEXAPPENDIX" id="bm_id321665" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_IGNOREINDEXAPPENDIX" id="bm_id321665" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN1061A" role="heading" level="2" l10n="NEW">Create index with ASC or DESC statement</paragraph>
       <paragraph xml-lang="en-US" id="par_idN1061E" role="paragraph" l10n="NEW"><ahelp hid=".">Creates an index with ASC or DESC statements.</ahelp><comment>UFI: ???</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_BOOLEANCOMPARISON" id="bm_id5289773" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_BOOLEANCOMPARISON" id="bm_id5289773" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN10621" role="heading" level="2" l10n="NEW">Comparison of Boolean values</paragraph>
       <paragraph xml-lang="en-US" id="par_idN10625" role="paragraph" l10n="NEW"><ahelp hid=".">Select the type of Boolean comparison that you want to use.</ahelp><comment>UFI: ???</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHECK_REQUIRED_FIELDS" id="bm_id4741355" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_CHECK_REQUIRED_FIELDS" id="bm_id4741355" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id1101718" role="heading" level="2" l10n="NEW">Form data input checks for required fields<comment>i82291</comment></paragraph>
       <paragraph xml-lang="en-US" id="par_id3783989" role="paragraph" l10n="NEW"><ahelp hid=".">When you enter a new record or update an existing record in a form, and you leave a field empty which is bound to a database column which requires input, then you will see a message complaining about the empty field.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_id6684163" role="paragraph" l10n="NEW">If this control box is not enabled, then the forms in the current database will not be checked for required fields.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3837397" role="paragraph" l10n="NEW">The control box is available for all data source types which support write access to their data. The control box does not exist for spreadsheets, text, csv, and the various read-only address books.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id0909200811170166" role="heading" level="2" l10n="NEW">Ignore currency field information</paragraph>
       <paragraph xml-lang="en-US" id="par_id0909200811170221" role="paragraph" l10n="NEW"><ahelp hid=".">Only for Oracle JDBC connections. When enabled it specifies that no column is treated as a currency field. The field type returned from the database driver is discarded.</ahelp></paragraph>
-<!-- removed HID 39067 -->
+
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_ESCAPE_DATETIME" id="bm_id4743451355" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id040920092139524" role="heading" level="2" l10n="NEW">Use ODBC conformant date/time literals</paragraph>
-      <paragraph xml-lang="en-US" id="par_id040920092139526" role="paragraph" l10n="NEW"><ahelp hid=".">Check to use ODBC conformant date/time literals.</ahelp></paragraph>
-   </body>
+<paragraph xml-lang="en-US" id="par_id040920092139526" role="paragraph" l10n="CHG"><ahelp hid=".">Use date/time literals that conform to ODBC standard.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_PRIMARY_KEY_SUPPORT" id="bm_id47434523231355" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id04092009442139524" role="heading" level="2" l10n="NEW">Supports primary keys</paragraph>
+<paragraph xml-lang="en-US" id="par_id04096620092139526" role="paragraph" l10n="NEW"><ahelp hid=".">Enable to overrule Base's heuristics used to detect whether the database supports primary keys.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id66841631" role="paragraph" l10n="NEW">When connecting to a database using a generic API like ODBC, JDBC, or ADO, Base currently applies heuristics to determine whether this database supports primary keys. None of those APIs has dedicated support to retrieve this information.</paragraph>
+<paragraph xml-lang="en-US" id="par_id66841632" role="paragraph" l10n="NEW">The heuristics sometimes fails. This tri-state check box by default is set to the undetermined state, which means "apply the heuristics". If the check box is enabled, primary key support is assumed. If the check box is disabled, no primary key support is assumed.</paragraph>
+<paragraph xml-lang="en-US" id="par_id66841633" role="paragraph" l10n="NEW">Note that if this option is just for overruling the heuristics. If you enable the check box for a database which actually does not support primary keys, you will see some errors.</paragraph>
+</body>
 </helpdocument>
 \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
index f9fcdbbf6d..42c505eb3f 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
@@ -54,7 +54,7 @@
 <paragraph role="paragraph" id="par_idN105F6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the port number for the server that hosts the database.</ahelp><comment>UFI: used for LDAP and MySQL, different default values</comment></paragraph>
 <paragraph role="heading" id="par_idN1057D" xml-lang="en-US" level="2" l10n="NEW">MySQL JDBC driver class</paragraph>
 <paragraph role="paragraph" id="par_idN10615" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the JDBC driver for the MySQL database.</ahelp><comment>UFI: copied from shared\explorer\database\11110000.xhp but that was changed before (??)</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHARSET" id="bm_id9317606" localize="false"/><paragraph role="heading" id="par_idN10581" xml-lang="en-US" level="2" l10n="NEW">Character set<comment>UFI: seen for dBase</comment><comment>and for text file folder</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_CHARSET" id="bm_id9317606" localize="false"/><paragraph role="heading" id="par_idN10581" xml-lang="en-US" level="2" l10n="NEW">Character set<comment>UFI: seen for dBase</comment><comment>and for text file folder</comment></paragraph>
 <paragraph role="paragraph" id="par_idN10634" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the character set that you want to use to view the database in $[officename].</ahelp> This setting does not affect the database. To use the default character set of your operating system, select "System".</paragraph>
 <paragraph role="note" id="par_idN10651" xml-lang="en-US" l10n="NEW">Text and dBASE databases are restricted to character sets with a fixed-size character length, where all characters are encoded with the same number of bytes.<comment>UFI. copied from shared\explorer\database\11020000.xhp</comment></paragraph>
 <paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Oracle JDBC driver class</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropcon.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropcon.xhp
index 4c75609805..9cf81180c7 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabapropcon.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropcon.xhp
@@ -52,7 +52,7 @@
 </section>
 <paragraph role="paragraph" id="par_idN10569" xml-lang="en-US" l10n="NEW">The Connection Type Wizard consists of three pages. You cannot transfer all settings from one database type to another.<comment>UFI: what does this para mean? Who writes such &amp;/()?</comment></paragraph>
 <paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="NEW">For example, you can use the wizard to open a database file that is in a format that is usually not recognized by an installed database.<comment>UFI: what does this para mean? Who writes such &amp;/()?</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SPECIAL_MESSAGE" id="bm_id3653981" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_SPECIAL_MESSAGE" id="bm_id3653981" localize="false"/>
 <paragraph role="heading" id="par_idN1056F" xml-lang="en-US" level="2" l10n="NEW">Database type</paragraph>
 <paragraph role="paragraph" id="par_idN10573" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the type of database that you want to connect to.</ahelp></paragraph>
 <embed href="text/shared/explorer/database/dabapropgen.xhp#dabapropgen"/>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
index 77892be6b7..b36c1d5ac0 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
@@ -48,16 +48,16 @@
 <paragraph role="paragraph" id="par_id4513992" xml-lang="en-US" l10n="NEW">In a database window, choose <emph>Edit - Database - Properties</emph>, click <emph>Advanced Properties</emph> tab</paragraph>
 </section>
 <paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW">The availability of the following controls depends on the type of database:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DBASE_PATH" id="bm_id4886623" localize="false"/><paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">Path to dBASE files<comment>UFI: found for dBase</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_DBASE_PATH" id="bm_id4886623" localize="false"/><paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">Path to dBASE files<comment>UFI: found for dBase</comment></paragraph>
 <paragraph role="paragraph" id="par_idN10579" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the path to the directory that contains the dBASE files.</ahelp></paragraph>
 <paragraph role="warning" id="par_idN1057C" xml-lang="en-US" l10n="NEW">Ensure that the *.dbf file name extension of the dBASE files is lowercase.<comment>moved from shared\explorer\database\11030000.xhp</comment></paragraph>
 <paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2" l10n="NEW">Browse<comment>UFI: found for dBase</comment></paragraph>
 <paragraph role="paragraph" id="par_idN10595" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a dialog where you can select a file or a directory.</ahelp><comment>which one? or depends?</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:PAGE_CONNECTION:PB_TESTCONNECTION" id="bm_id7854243" localize="false"/><paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2" l10n="NEW">Test Connection<comment>UFI: found for dBase</comment><comment>and for Calc doc</comment></paragraph>
 <paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the database connection with the current settings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_FLAT_PATH" id="bm_id4529251" localize="false"/><paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="2" l10n="NEW">Path to the text files<comment>UFI: found for text file folder</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_FLAT_PATH" id="bm_id4529251" localize="false"/><paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="2" l10n="NEW">Path to the text files<comment>UFI: found for text file folder</comment></paragraph>
 <paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enter the path to the folder of the text files.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CALC_PATH" id="bm_id8492385" localize="false"/><paragraph role="heading" id="par_idN105B8" xml-lang="en-US" level="2" l10n="NEW">Path to the spreadsheet document<comment>UFI: found for a Calc doc</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_CALC_PATH" id="bm_id8492385" localize="false"/><paragraph role="heading" id="par_idN105B8" xml-lang="en-US" level="2" l10n="NEW">Path to the spreadsheet document<comment>UFI: found for a Calc doc</comment></paragraph>
 <paragraph role="paragraph" id="par_idN105BC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the path to the spreadsheet document that you want to use as a database.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN105BF" xml-lang="en-US" level="2" l10n="NEW">Name of the ODBC data source on your system</paragraph>
 <paragraph role="paragraph" id="par_idN105C3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the ODBC data source.</ahelp></paragraph>
@@ -65,7 +65,7 @@
 <paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the user name that is required to access the database.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/dbaccess:CheckBox:PAGE_CONNECTION:CB_PASSWORD_REQUIRED" id="bm_id4072084" localize="false"/><paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="2" l10n="NEW">Password required<comment>UFI: found for Calc doc</comment></paragraph>
 <paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If checked, the user will be asked to enter the password that is required to access the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME" id="bm_id7675099" localize="false"/><paragraph role="heading" id="hd_id7806329" xml-lang="en-US" level="2" l10n="NEW">Name of the database<comment>UFI: found for JDBC</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME" id="bm_id7675099" localize="false"/><paragraph role="heading" id="hd_id7806329" xml-lang="en-US" level="2" l10n="NEW">Name of the database<comment>UFI: found for JDBC</comment></paragraph>
 <paragraph role="paragraph" id="par_id5589159" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the database.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN105D4" xml-lang="en-US" level="2" l10n="NEW">Name of the MySQL database</paragraph>
 <paragraph role="paragraph" id="par_idN105D8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the MySQL database that you want to use as a data source.</ahelp></paragraph>
@@ -77,10 +77,10 @@
 <paragraph role="paragraph" id="par_idN105F4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the host name for the LDAP data source.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN105F7" xml-lang="en-US" level="2" l10n="NEW">Data source URL</paragraph>
 <paragraph role="paragraph" id="par_idN105FB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the location of the JDBC data source as a URL.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS" id="bm_id9936216" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS" id="bm_id9936216" localize="false"/>
 <!-- removed HID 39110 --><paragraph role="heading" id="par_idN105FE" xml-lang="en-US" level="2" l10n="NEW">JDBC driver class</paragraph>
 <paragraph role="paragraph" id="par_idN10602" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the JDBC driver class that connects to the data source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS" id="bm_id7953123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS" id="bm_id7953123" localize="false"/>
 <!-- removed HID 39111 --><paragraph role="heading" id="par_idN10605" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: found for JDBC</comment></paragraph>
 <paragraph role="paragraph" id="par_idN10609" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the database connection through the JDBC driver class.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10613" xml-lang="en-US" level="3" l10n="NEW">Choose a database</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
index e2d6fe116a..74143f558d 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textsharedexplorerdatabasedabawiz00xml" indexer="include">
 <title id="tit" xml-lang="en-US">Database Wizard</title>
@@ -46,20 +46,20 @@
 <bookmark_value>dBASE; database settings (Base)</bookmark_value>
 <bookmark_value>spreadsheets;as databases (base)</bookmark_value>
 </bookmark><comment>mw added "(Base)" to all entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_DATABASE_WIZARD" id="bm_id3952452" localize="false"/><comment>UFI: added Help ID, see #i62242</comment>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_DATABASE_WIZARD" id="bm_id3952452" localize="false"/><comment>UFI: added Help ID, see #i62242</comment>
 <paragraph role="heading" id="par_idN105B4" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
 <paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The Database Wizard creates a database file that contains information about a database.</ahelp><comment>UFI: extended help text must no longer contain switches or links</comment></paragraph>
 <paragraph role="paragraph" id="par_id9856563" xml-lang="en-US" l10n="NEW">The Database Wizard creates a <link href="text/shared/explorer/database/dabadoc.xhp">database file</link> that contains information about a database.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_idN105D5" xml-lang="en-US" l10n="NEW">Depending on the type of operation and the type of database, the Database Wizard consists of a varying number of steps.</paragraph>
-<list type="ordered">
+<list type="unordered">
 <listitem>
 <paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US" l10n="NEW">If you create a new database file, the wizard contains two steps.</paragraph>
 </listitem>
 </list>
 <embed href="text/shared/explorer/database/dabawiz01.xhp#dabaselection"/>
 <embed href="text/shared/explorer/database/dabawiz02.xhp#nextsteps"/>
-<list type="ordered">
+<list type="unordered">
 <listitem>
 <paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US" l10n="NEW">If you open the Database Wizard to create a database file for an existing database connection, there may be more steps to specify paths, authentication information, and more.</paragraph>
 </listitem>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
index 6ce4165036..598b98e938 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textsharedexplorerdatabasedabawiz01xml" indexer="include">
 <title id="tit" xml-lang="en-US">Database Selection</title>
@@ -44,7 +44,7 @@
 <paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabawiz01.xhp">Database Selection</link></paragraph>
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Creates a new database, opens a database file, or connects to an existing database.</ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE" id="bm_id2482985" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE" id="bm_id2482985" localize="false"/>
 <paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Create a new database</paragraph>
 <paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to create a new database. </ahelp>This option uses the HSQL database engine with default settings. The final page of the wizard appears next.</paragraph>
 <paragraph role="paragraph" id="par_id8584246" xml-lang="en-US" l10n="NEW"><link href="http://hsqldb.org/">External web page about HSQL</link>.</paragraph>
@@ -60,13 +60,13 @@
 <bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:PAGE_GENERAL:PB_OPENDOCUMENT" id="bm_id6427198" localize="false"/>
 <paragraph role="heading" id="par_idN1062F" xml-lang="en-US" level="3" l10n="NEW">Open</paragraph>
 <paragraph role="paragraph" id="par_idN10633" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a file selection dialog where you can select a database file. Click Open or OK in the file selection dialog to open the file immediately and to exit the wizard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE" id="bm_id5028229" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE" id="bm_id5028229" localize="false"/>
 <paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="2" l10n="NEW">Connect to an existing database</paragraph>
 <paragraph role="paragraph" id="par_idN10590" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to create a database document for an existing database connection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DSTYPE" id="bm_id763267" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_DSTYPE" id="bm_id763267" localize="false"/>
 <paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="3" l10n="NEW">Database type</paragraph>
 <paragraph role="paragraph" id="par_idN10597" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the database type for the existing database connection.</ahelp></paragraph>
-<paragraph role="note" id="par_idN1059A" xml-lang="en-US" l10n="NEW">The Outlook, Evolution, KDE Address Book, and Mozilla database types do not need additional information. For other database types, the wizard contains additional pages to specify the required information.</paragraph>
+<paragraph role="note" id="par_idN1059A" xml-lang="en-US" l10n="NEW">The Outlook, Evolution, KDE Address Book, and Seamonkey database types do not need additional information. For other database types, the wizard contains additional pages to specify the required information.</paragraph>
 <paragraph role="paragraph" id="par_idN10611" xml-lang="en-US" l10n="NEW">The next wizard page is one of the following pages:</paragraph>
 <embed href="text/shared/explorer/database/dabawiz02.xhp#nextsteps"/>
 <paragraph role="paragraph" id="par_idN1061C" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02text.xhp">Set up text file connection</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp
index ad52969bf6..4ac787b4b7 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp
@@ -44,13 +44,13 @@
 <paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/explorer/database/dabawiz02.xhp">Save and proceed</link></paragraph>
 <paragraph role="paragraph" id="par_idN10554" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies whether you want to register the database, open the database for editing, or insert a new table.</ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE" id="bm_id9310281" localize="false"/><paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="2" l10n="NEW">Yes, register the Database for me</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE" id="bm_id9310281" localize="false"/><paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="2" l10n="NEW">Yes, register the Database for me</paragraph>
 <paragraph role="paragraph" id="par_idN105B4" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Select to register the database within your user copy of %PRODUCTNAME. After registering, the database is displayed in the <emph>View - Data Sources</emph> window. You must register a database to be able to insert the database fields in a document (Insert - Fields - Other) or in a mail merge.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE" id="bm_id8243354" localize="false"/><paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="2" l10n="NEW">No, do not register the database</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE" id="bm_id8243354" localize="false"/><paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="2" l10n="NEW">No, do not register the database</paragraph>
 <paragraph role="paragraph" id="par_idN105BB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to keep the database information only within the created database file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS" id="bm_id971404" localize="false"/><paragraph role="heading" id="par_idN1055B" xml-lang="en-US" level="2" l10n="NEW">Open the database for editing</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS" id="bm_id971404" localize="false"/><paragraph role="heading" id="par_idN1055B" xml-lang="en-US" level="2" l10n="NEW">Open the database for editing</paragraph>
 <paragraph role="paragraph" id="par_idN105C6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to display the database file, where you can edit the database structure.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD" id="bm_id1763359" localize="false"/><paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">Create tables using the table wizard</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD" id="bm_id1763359" localize="false"/><paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">Create tables using the table wizard</paragraph>
 <paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to call the <link href="text/shared/explorer/database/tablewizard00.xhp">Table Wizard</link> after the Database Wizard is finished.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp
index b17ecbba7e..69752d2721 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp
@@ -46,9 +46,9 @@
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10541" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Specifies the settings for importing a database file in Microsoft Access or Access 2007 format.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id1142772" xml-lang="en-US" l10n="NEW">See also the English Wiki page <link href="http://wiki.services.openoffice.org/wiki/MSA-Base_Faq">http://wiki.services.openoffice.org/wiki/MSA-Base_Faq</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION" id="bm_id627155" localize="false"/><paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="2" l10n="NEW">Microsoft Access database file</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION" id="bm_id627155" localize="false"/><paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="2" l10n="NEW">Microsoft Access database file</paragraph>
 <paragraph role="paragraph" id="par_idN10548" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the path to the database file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION" id="bm_id8335215" localize="false"/><paragraph role="heading" id="par_idN1054B" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION" id="bm_id8335215" localize="false"/><paragraph role="heading" id="par_idN1054B" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN1054F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to open a file selection dialog.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10552" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02adabas.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02adabas.xhp
index 03bebac157..1596d8f598 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02adabas.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02adabas.xhp
@@ -44,9 +44,9 @@
 </bookmark><comment>mw added one index entry</comment><paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1" l10n="NEW"><variable id="adabas"><link href="text/shared/explorer/database/dabawiz02adabas.xhp">Adabas D Connection</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN1053E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the settings for importing an Adabas D database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME" id="bm_id1395306" localize="false"/><paragraph role="heading" id="par_idN10541" xml-lang="en-US" level="2" l10n="NEW">Name of the Adabas D database</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME" id="bm_id1395306" localize="false"/><paragraph role="heading" id="par_idN10541" xml-lang="en-US" level="2" l10n="NEW">Name of the Adabas D database</paragraph>
 <paragraph role="paragraph" id="par_idN10545" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the database file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME" id="bm_id5051118" localize="false"/><paragraph role="heading" id="par_idN10548" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME" id="bm_id5051118" localize="false"/><paragraph role="heading" id="par_idN10548" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN1054C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to open a file selection dialog.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN1054F" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph>
 <paragraph role="paragraph" id="par_idN10560" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp
index f5a54f9d3e..91aa94deb3 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp
@@ -50,7 +50,7 @@
 <paragraph role="paragraph" id="par_idN10550" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the options for adding an ADO (Microsoft ActiveX Data Objects) database.</ahelp><comment>UFI: copied text from shared\explorer\database\11160000</comment></paragraph>
 <paragraph role="note" id="par_idN10565" xml-lang="en-US" l10n="NEW">The ADO interface is a Microsoft Windows proprietary container for connecting to databases.</paragraph>
 <paragraph role="tip" id="par_idN10568" xml-lang="en-US" l10n="NEW">$[officename] requires the Microsoft Data Access Components (MDAC) to use the ADO interface. Microsoft Windows 2000 and XP include these components by default. For earlier visions of Windows, you need to install MDAC separately. You can download MDAC from the Microsoft web site.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_ADO_ET_ADOURL" id="bm_id2960600" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ADO_ET_ADOURL" id="bm_id2960600" localize="false"/>
 <paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2" l10n="NEW">Data source URL</paragraph>
 <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the data source URL.</ahelp><comment>UFI: removed three lines in hcshared01 #58442</comment></paragraph>
 <paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="3" l10n="NEW">Example URLs</paragraph>
@@ -60,12 +60,12 @@
 <paragraph role="example" id="par_idN1057F" xml-lang="en-US" l10n="NEW">PROVIDER=sqloledb;DATA SOURCE=turner;INITIAL CATALOG=First</paragraph>
 <paragraph role="paragraph" id="par_idN10582" xml-lang="en-US" l10n="NEW">To access an ODBC driver as a provider:</paragraph>
 <paragraph role="example" id="par_idN10585" xml-lang="en-US" l10n="NEW">DSN=SQLSERVER</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_ADO_PB_ADOURL" id="bm_id7212439" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ADO_PB_ADOURL" id="bm_id7212439" localize="false"/>
 <paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN1058C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to open a database selection dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME" id="bm_id5520493" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME" id="bm_id5520493" localize="false"/>
 <paragraph role="note" id="par_idN10596" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A user name can have a maximum of 18 characters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED" id="bm_id6467787" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED" id="bm_id6467787" localize="false"/>
 <paragraph role="note" id="par_idN10599" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A password must contain 3 to 18 characters.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN1059C" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
index 9eb29c2ae6..eee8966f6d 100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
@@ -40,10 +40,10 @@
 <body><comment>** Expression is faulty **</comment>
 <paragraph role="heading" id="par_idN1054A" xml-lang="en-US" level="1" l10n="CHG"><variable id="dbase"><link href="text/shared/explorer/database/dabawiz02dbase.xhp">dBASE Connection</link>
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION" id="bm_id2821131" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION" id="bm_id2821131" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="CHG">Path to the dBASE files</paragraph>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the path to the dBASE *.dbf files.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION" id="bm_id9754631" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION" id="bm_id9754631" localize="false"/>
 <paragraph role="heading" id="par_idN10571" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN10575" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Open a path selection dialog.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10584" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
index c15dfe0b0e..6464b8a2a5 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
@@ -70,7 +70,7 @@
 <paragraph role="listitem" id="par_idN1067C" xml-lang="en-US" l10n="NEW">database_name is the name of the Oracle database. Ask your database administrator for the correct name.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER" id="bm_id3033539" localize="false"/><paragraph role="heading" id="par_idN1067F" xml-lang="en-US" level="3" l10n="NEW">MySQL database</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER" id="bm_id3033539" localize="false"/><paragraph role="heading" id="par_idN1067F" xml-lang="en-US" level="3" l10n="NEW">MySQL database</paragraph>
 <paragraph role="paragraph" id="par_idN10683" xml-lang="en-US" l10n="CHG">The driver for the MySQL database is available on the MySQL web site.<comment>removed link, see i54077</comment></paragraph>
 <paragraph role="paragraph" id="par_idN10689" xml-lang="en-US" l10n="NEW">The syntax for a MySQL database is:</paragraph>
 <paragraph role="example" id="par_idN1068C" xml-lang="en-US" l10n="NEW">mysql://hostname:port/database_name</paragraph>
@@ -85,10 +85,10 @@
 <paragraph role="listitem" id="par_idN1069D" xml-lang="en-US" l10n="NEW">database_name is the name of the database.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL" id="bm_id6293221" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT" id="bm_id3450117" localize="false"/><paragraph role="heading" id="par_idN106A0" xml-lang="en-US" level="2" l10n="NEW">Data source URL</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL" id="bm_id6293221" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT" id="bm_id3450117" localize="false"/><paragraph role="heading" id="par_idN106A0" xml-lang="en-US" level="2" l10n="NEW">Data source URL</paragraph>
 <paragraph role="paragraph" id="par_idN106A4" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_CONNURL_JDBCPAGE">Enter the URL for the database. For example, for the MySQL JDBC driver, enter "jdbc:mysql://&lt;Servername&gt;/&lt;name of the database&gt;". For more information on the JDBC driver, consult the documentation that came with the driver.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DRIVERCLASS" id="bm_id3153970" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_DRIVERCLASS" id="bm_id3153970" localize="false"/>
 <!-- removed HID 852248660 -->
 <!-- removed HID 852330580 --><paragraph role="heading" id="par_idN106BB" xml-lang="en-US" level="2" l10n="NEW">JDBC Driver Class</paragraph>
 <paragraph role="paragraph" id="par_idN106BF" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_DRIVERCLASS">Enter the name of the JDBC driver.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
index a3ed715800..4ff7f65344 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
@@ -44,19 +44,19 @@
 <paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="1" l10n="NEW"><variable id="ldap"><link href="text/shared/explorer/database/dabawiz02ldap.xhp">LDAP Connection</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10558" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the settings for importing a database using LDAP</ahelp> (<emph>Lightweight Directory Access Protocol)</emph>. This page is only available if you registered an LDAP server as an address database.<comment>UFI: copied text from shared\explorer\database\11190000</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_LDAP_HOSTNAME" id="bm_id3147275" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER" id="bm_id7872249" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_LDAP_HOSTNAME" id="bm_id3147275" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER" id="bm_id7872249" localize="false"/>
 <paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="2" l10n="NEW">Server URL</paragraph>
 <paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_LDAP_HOSTNAME">Enter the name of the LDAP server using the format "ldap.server.com".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_LDAP_BASEDN" id="bm_id3145315" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_LDAP_ET_BASEDN" id="bm_id7593920" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_LDAP_BASEDN" id="bm_id3145315" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_BASEDN" id="bm_id7593920" localize="false"/>
 <paragraph role="heading" id="par_idN10594" xml-lang="en-US" level="2" l10n="NEW">Base DN</paragraph>
 <paragraph role="paragraph" id="par_idN10598" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_LDAP_BASEDN">Enter the starting point to search the LDAP database, for example, "dc=com".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_LDAP_PORTNUMBER" id="bm_id3155341" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER" id="bm_id5359660" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_LDAP_PORTNUMBER" id="bm_id3155341" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER" id="bm_id5359660" localize="false"/>
 <paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="2" l10n="NEW">Port number</paragraph>
 <paragraph role="paragraph" id="par_idN105BB" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_LDAP_PORTNUMBER">Enter the port of the LDAP server, normally 389.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_LDAP_CB_USESSL" id="bm_id9989623" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_LDAP_CB_USESSL" id="bm_id9989623" localize="false"/>
 <paragraph role="heading" id="par_idN105CA" xml-lang="en-US" level="3" l10n="NEW">Use secure connection (SSL)</paragraph>
 <paragraph role="paragraph" id="par_idN105CE" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_USESSL_LDAP">Creates a secure connection to the LDAP server through the Secure Sockets Layer (SSL).</ahelp> By default, an SSL connection uses port 636. A regular connection uses port 389.</paragraph>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
index 488a4c75ce..5b66491753 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
@@ -41,10 +41,10 @@
 <paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><variable id="mysql"><link href="text/shared/explorer/database/dabawiz02mysql.xhp">MySQL Connection</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN1054D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the options for MySQL databases.</ahelp><comment>text copied from shared\explorer\database\11120000</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC" id="bm_id6776940" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC" id="bm_id6776940" localize="false"/>
 <paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="2" l10n="NEW">Connect using ODBC (Open Database Connectivity)</paragraph>
 <paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Connects to an existing ODBC data source that was set on a system level.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC" id="bm_id4285409" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC" id="bm_id4285409" localize="false"/>
 <paragraph role="heading" id="par_idN10569" xml-lang="en-US" level="2" l10n="NEW">Connect using JDBC (Java Database Connectivity)</paragraph>
 <paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Connects to an existing JDBC data source that was set on a system level.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10570" xml-lang="en-US" l10n="NEW">The next wizard page depends on your choice of ODBC or JDBC:</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02odbc.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02odbc.xhp
index caef678b8e..b4d6ddf757 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02odbc.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02odbc.xhp
@@ -51,10 +51,10 @@
 <paragraph role="paragraph" id="par_id8034302" xml-lang="en-US" l10n="NEW">On Solaris and Linux platforms, try to use a JDBC driver instead of an ODBC driver. See http://www.unixodbc.org for an ODBC implementation on Solaris or Linux.</paragraph>
 <paragraph role="paragraph" id="par_id8560136" xml-lang="en-US" l10n="NEW">To connect to a Microsoft Access database on Windows, use the ADO or Access database interface, rather than ODBC.</paragraph>
 <paragraph role="note" id="par_id2082583" xml-lang="en-US" l10n="NEW">Drivers for ODBC are supplied and supported by the manufacturer of the database. $[officename] only supports the ODBC 3 standard.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE" id="bm_id9201025" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE" id="bm_id9201025" localize="false"/>
 <paragraph role="heading" id="par_idN10552" xml-lang="en-US" level="2" l10n="NEW">Name of the ODBC database</paragraph>
 <paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the path to the database file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE" id="bm_id5588549" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE" id="bm_id5588549" localize="false"/>
 <paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to open an ODBC data source selection dialog:</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10560" xml-lang="en-US" level="3" l10n="NEW">Choose a data source</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp
index ead2ab3e44..8884e8799b 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp
@@ -68,13 +68,13 @@
 <paragraph role="listitem" id="par_idN10605" xml-lang="en-US" l10n="NEW">database_name is the name of the Oracle database. Ask your database administrator for the correct name.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER" id="bm_id6442152" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER" id="bm_id6442152" localize="false"/>
 <paragraph role="heading" id="par_idN10608" xml-lang="en-US" level="2" l10n="NEW">Name of the Oracle database</paragraph>
 <paragraph role="paragraph" id="par_idN1060C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the Oracle database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS" id="bm_id7636036" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS" id="bm_id7636036" localize="false"/>
 <paragraph role="heading" id="par_idN1060F" xml-lang="en-US" level="2" l10n="NEW">Server URL</paragraph>
 <paragraph role="paragraph" id="par_idN10613" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the URL for the database server. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT" id="bm_id7325357" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT" id="bm_id7325357" localize="false"/>
 <paragraph role="heading" id="par_idN10616" xml-lang="en-US" level="2" l10n="NEW">Port number</paragraph>
 <paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the port number for the database server.</ahelp></paragraph>
 <!-- removed HID 852231276 -->
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
index 1842d906ec..de041a6648 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
@@ -39,13 +39,13 @@
 </meta>
 <body><comment>** Expression is faulty **</comment>
 <paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1" l10n="NEW">Spreadsheet Database Connection</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH" id="bm_id5975218" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH" id="bm_id5975218" localize="false"/>
 <paragraph role="heading" id="par_idN1053E" xml-lang="en-US" level="2" l10n="NEW">Location and file name</paragraph>
 <paragraph role="paragraph" id="par_idN10542" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the path and file name to the spreadsheet file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH" id="bm_id2601702" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH" id="bm_id2601702" localize="false"/>
 <paragraph role="heading" id="par_idN10545" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN10549" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to open a file selection dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED" id="bm_id4418774" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED" id="bm_id4418774" localize="false"/>
 <paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="3" l10n="NEW">Password required</paragraph>
 <paragraph role="paragraph" id="par_idN10550" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to request a password from the user of the database document.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02text.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02text.xhp
index c8e01bef11..78cd33e0d6 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02text.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02text.xhp
@@ -48,32 +48,32 @@
 <paragraph role="heading" id="par_idN1054F" xml-lang="en-US" level="1" l10n="NEW">Text File Connection</paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the settings for importing a database in text format.</ahelp><comment>UFI: most text copied without editing from shared\explorer\database\11040000</comment></paragraph>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW">In a text format database, data is stored in an unformatted ASCII file, where each record comprises a row. The data fields are divided by separators. Text in the data fields is divided by quotation marks.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE" id="bm_id1533860" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE" id="bm_id1533860" localize="false"/>
 <paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2" l10n="NEW">Path to text files</paragraph>
 <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the path to the text file or files. If you just want one text file, you can use any extension of the file name. If you enter a folder name, the text files in that folder must have the extension *.csv to be recognized as files of the text database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE" id="bm_id1796624" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE" id="bm_id1796624" localize="false"/>
 <paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to open a file selection dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES" id="bm_id3230994" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES" id="bm_id3230994" localize="false"/>
 <paragraph role="heading" id="par_idN10616" xml-lang="en-US" level="2" l10n="NEW">Plain text files (*.txt)</paragraph>
 <paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to access txt files.</ahelp><comment>UFI: sorry, this is not in the spec.</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES" id="bm_id1720023" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES" id="bm_id1720023" localize="false"/>
 <paragraph role="heading" id="par_idN10643" xml-lang="en-US" level="2" l10n="NEW">'Comma separated value' files (*.csv)</paragraph>
 <paragraph role="paragraph" id="par_idN10647" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to access csv files.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES" id="bm_id2862636" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION" id="bm_id2447279" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES" id="bm_id2862636" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION" id="bm_id2447279" localize="false"/>
 <paragraph role="heading" id="par_idN10666" xml-lang="en-US" level="2" l10n="NEW">Custom</paragraph>
 <paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to access custom files. Enter the extension in the text box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_FIELD_SEPARATOR" id="bm_id3149578" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_FIELD_SEPARATOR" id="bm_id3149578" localize="false"/>
 <paragraph role="heading" id="par_idN10581" xml-lang="en-US" level="2" l10n="NEW">Field separator</paragraph>
 <paragraph role="paragraph" id="par_idN10585" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_FIELD_SEPARATOR">Enter or select the character that separates data fields in the text file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_TEXT_SEPARATOR" id="bm_id3149795" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_TEXT_SEPARATOR" id="bm_id3149795" localize="false"/>
 <paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="2" l10n="NEW">Text separator</paragraph>
 <paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_TEXT_SEPARATOR">Enter or select the character that identifies a text field in the text file.</ahelp> You cannot use the same character as the field separator.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DECIMAL_SEPARATOR" id="bm_id3151385" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_DECIMAL_SEPARATOR" id="bm_id3151385" localize="false"/>
 <paragraph role="heading" id="par_idN105B8" xml-lang="en-US" level="2" l10n="NEW">Decimal separator</paragraph>
 <paragraph role="paragraph" id="par_idN105BC" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_DECIMAL_SEPARATOR">Enter or select the character that is used as a decimal separator in the text file, for example, a period (0.5) or a comma (0,5).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_THOUSANDS_SEPARATOR" id="bm_id3153897" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_THOUSANDS_SEPARATOR" id="bm_id3153897" localize="false"/>
 <paragraph role="heading" id="par_idN105D3" xml-lang="en-US" level="2" l10n="NEW">Thousands separator</paragraph>
 <paragraph role="paragraph" id="par_idN105D7" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_THOUSANDS_SEPARATOR">Enter or select the character that is used as a thousands separator in the text file, for example a comma (1,000), or a period (1.000).</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN105E6" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/makefile.mk b/helpcontent2/source/text/shared/explorer/database/makefile.mk
index 207808b4c8..7a71944d1e 100644
--- a/helpcontent2/source/text/shared/explorer/database/makefile.mk
+++ b/helpcontent2/source/text/shared/explorer/database/makefile.mk
@@ -131,7 +131,7 @@ XHPFILES = \
    tablewizard03.xhp \
    tablewizard04.xhp \
    toolbars.xhp 
-    
+	
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/helpcontent2/source/text/shared/explorer/database/menuedit.xhp b/helpcontent2/source/text/shared/explorer/database/menuedit.xhp
index 130b0653fd..ab7a8656ab 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/menuedit.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menuedit.xhp
@@ -53,13 +53,13 @@
 <paragraph role="heading" id="par_idN1056E" xml-lang="en-US" level="2" l10n="NEW">Paste Special</paragraph>
 <paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts an item from the clipboard. If you want, you can insert forms and reports, including subfolders, from one database file to another.</ahelp></paragraph>
 <section id="tabbea">
-<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_TABLE_EDIT" id="bm_id3152996" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_DB_APP_EDIT" id="bm_id2726523" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_BROWSER_TABLE_EDIT" id="bm_id3152996" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DBEdit" id="bm_id2726523" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DBEdit" id="bm_id2447279" localize="false"/>
 <paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="2" l10n="CHG" oldref="27">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid=".">Opens a window where you can edit the selected table, query, form, or report.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_TABLE_DELETE" id="bm_id3153824" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_DB_APP_DELETE" id="bm_id4481643" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_BROWSER_TABLE_DELETE" id="bm_id3153824" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DBDelete" id="bm_id4481643" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DBDelete" id="bm_id1720023" localize="false"/>
 <paragraph role="heading" id="hd_id3145315" xml-lang="en-US" level="2" l10n="U" oldref="29">Delete</paragraph>
 <paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_BROWSER_TABLE_DELETE">Deletes the selected table, query, form, or report.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/menuinsert.xhp b/helpcontent2/source/text/shared/explorer/database/menuinsert.xhp
index a54cd8a6e6..1a05430ddb 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/menuinsert.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menuinsert.xhp
@@ -52,7 +52,7 @@
 <paragraph role="paragraph" id="par_idN105A4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a new query in design mode.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:DBNewQuerySql" id="bm_id2862636" localize="false"/><paragraph role="heading" id="par_idN105A7" xml-lang="en-US" level="2" l10n="NEW">Query (SQL View)</paragraph>
 <paragraph role="paragraph" id="par_idN105AB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a new query in SQL mode.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_TABLE_CREATE_DESIGN" id="bm_id3147088" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_BROWSER_TABLE_CREATE_DESIGN" id="bm_id3147088" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DBNewTable" id="bm_id2447279" localize="false"/><paragraph role="heading" id="par_idN105AE" xml-lang="en-US" level="2" l10n="NEW">Table Design</paragraph>
 <paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the table design view.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:DBNewView" id="bm_id4928739" localize="false"/><paragraph role="heading" id="par_idN105C7" xml-lang="en-US" level="2" l10n="CHG">View Design</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/menutools.xhp b/helpcontent2/source/text/shared/explorer/database/menutools.xhp
index a25e2060f8..307d8cee3d 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/menutools.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menutools.xhp
@@ -50,7 +50,7 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:DBUserAdmin" id="bm_id2447279" localize="false"/>
 <paragraph role="heading" id="par_idN1058A" xml-lang="en-US" level="2" l10n="NEW">User Administration</paragraph>
 <paragraph role="paragraph" id="par_idN1058E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the User Administration dialog if the database supports this feature.</ahelp><comment>UFI: where is this specced?</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_TABLE_SELECTOR" id="bm_id3153087" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_TABLE_SELECTOR" id="bm_id3153087" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DBTableFilter" id="bm_id4928739" localize="false"/>
 <paragraph role="heading" id="hd_id3153880" xml-lang="en-US" level="2" l10n="U" oldref="13">Table Filter</paragraph>
 <paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_DSADMIN_TABLE_SELECTOR">Opens the Table Filter dialog where you can specify which tables of the database to show or to hide.</ahelp><comment>see text in shared\explorer\database\11090000.xhp</comment></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
index 6baf02dc4e..406cd11cc8 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
@@ -39,7 +39,7 @@
 </meta>
 <body>
 <section id="querywizard"><comment>mw deleted 2 index entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD" id="bm_id1895159" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD" id="bm_id1895159" localize="false"/>
 <paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/querywizard00.xhp">Query Wizard</link></paragraph>
 <paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Query Wizard helps you to design a database query.</ahelp> The saved query can be called later, either from the graphical user interface, or using the automatically created SQL language command.</paragraph>
 </section>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
index 450e2f8b50..c1194a8cce 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
@@ -42,7 +42,7 @@
 <paragraph role="heading" id="par_idN10546" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/querywizard01.xhp">Query Wizard - Field Selection</link></paragraph>
 <paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">Specifies the table to create the query, and specifies which fields you wish to include in the query.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTTABLES" id="bm_id8819849" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTTABLES" id="bm_id8819849" localize="false"/>
 <paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Tables</paragraph>
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the table for which the query is to be created.</ahelp></paragraph>
 <embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
@@ -51,7 +51,7 @@
 <embed href="text/shared/autopi/01090100.xhp#entfernen"/>
 <embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
 <embed href="text/shared/autopi/01090100.xhp#updown"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTSELFIELDS" id="bm_id5718253" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTSELFIELDS" id="bm_id5718253" localize="false"/>
 <paragraph role="heading" id="par_idN10590" xml-lang="en-US" level="2" l10n="NEW">Fields in the Query</paragraph>
 <paragraph role="paragraph" id="par_idN10594" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all fields that will be included in the new query.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10597" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/querywizard02.xhp" name="Query Wizard - Sorting order">Query Wizard - Sorting order</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard02.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard02.xhp
index 2e7ae511f9..0efe56f03f 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/querywizard02.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard02.xhp
@@ -44,24 +44,24 @@
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/querywizard02.xhp">Query Wizard - Sorting Order</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specifies the sorting order for the data records in your query.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_SORT1" id="bm_id1624805" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_SORT1" id="bm_id1624805" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Sort by</paragraph>
 <paragraph role="paragraph" id="par_idN105B2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the field by which the created query is sorted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTASCEND1" id="bm_id7582934" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTASCEND2" id="bm_id5498825" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTASCEND3" id="bm_id9416486" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTASCEND4" id="bm_id3401287" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTASCEND1" id="bm_id7582934" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTASCEND2" id="bm_id5498825" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTASCEND3" id="bm_id9416486" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTASCEND4" id="bm_id3401287" localize="false"/>
 <paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="3" l10n="NEW">Ascending</paragraph>
 <paragraph role="paragraph" id="par_idN105BF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to sort in alphabetically or numerically ascending order.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTDESCEND1" id="bm_id4680013" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTDESCEND2" id="bm_id9574571" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTDESCEND3" id="bm_id5775933" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTDESCEND4" id="bm_id5564439" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTDESCEND1" id="bm_id4680013" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTDESCEND2" id="bm_id9574571" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTDESCEND3" id="bm_id5775933" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTDESCEND4" id="bm_id5564439" localize="false"/>
 <paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="3" l10n="NEW">Descending</paragraph>
 <paragraph role="paragraph" id="par_idN105CC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to sort in alphabetically or numerically descending order.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_SORT2" id="bm_id9547715" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_SORT3" id="bm_id5757316" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_SORT4" id="bm_id6009094" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_SORT2" id="bm_id9547715" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_SORT3" id="bm_id5757316" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_SORT4" id="bm_id6009094" localize="false"/>
 <paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2" l10n="NEW">And then by</paragraph>
 <paragraph role="paragraph" id="par_idN105D9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies additional fields by which the created query is sorted, if previous sort fields are equal.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN1056E" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/querywizard03.xhp" name="Query Wizard - Search conditions">Query Wizard - Search conditions</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard03.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard03.xhp
index 7c818e7087..21f1fe4463 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/querywizard03.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard03.xhp
@@ -44,25 +44,25 @@
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/querywizard03.xhp">Query Wizard - Search Conditions</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specifies the search conditions to filter the query. </paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTMATCHALL" id="bm_id7941526" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTMATCHALL" id="bm_id7941526" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Match all of the following</paragraph>
 <paragraph role="paragraph" id="par_idN105B2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to filter the query by all the conditions using a logical AND.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTMATCHANY" id="bm_id8292489" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTMATCHANY" id="bm_id8292489" localize="false"/>
 <paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Match any of the following</paragraph>
 <paragraph role="paragraph" id="par_idN105BF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to filter the query by any of the conditions using a logical OR.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFIELDNAME_1" id="bm_id3359477" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFIELDNAME_2" id="bm_id3269447" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFIELDNAME_3" id="bm_id6917630" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_1" id="bm_id3359477" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_2" id="bm_id3269447" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_3" id="bm_id6917630" localize="false"/>
 <paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="3" l10n="NEW">Field</paragraph>
 <paragraph role="paragraph" id="par_idN105CC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the field name for the filter condition.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTOPERATOR_1" id="bm_id1973937" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTOPERATOR_2" id="bm_id9367046" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTOPERATOR_3" id="bm_id8345286" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_1" id="bm_id1973937" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_2" id="bm_id9367046" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_3" id="bm_id8345286" localize="false"/>
 <paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="3" l10n="NEW">Condition</paragraph>
 <paragraph role="paragraph" id="par_idN105D9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the condition for the filter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_TXTVALUE_1" id="bm_id1222266" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_TXTVALUE_2" id="bm_id2625812" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_TXTVALUE_3" id="bm_id251167" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTVALUE_1" id="bm_id1222266" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTVALUE_2" id="bm_id2625812" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTVALUE_3" id="bm_id251167" localize="false"/>
 <paragraph role="heading" id="par_idN1056E" xml-lang="en-US" level="3" l10n="NEW">Value</paragraph>
 <paragraph role="paragraph" id="par_idN105E6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the value for the filter condition.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10574" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/querywizard04.xhp" name="Query Wizard - Detail or Summary">Query Wizard - Detail or summary</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard04.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard04.xhp
index 32600760c6..977e416cf1 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/querywizard04.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard04.xhp
@@ -45,23 +45,23 @@
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specifies whether to display all records of the query, or only the results of aggregate functions. </paragraph>
 <paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">This page is only displayed when there are numerical fields in the query that allow the use of aggregate functions.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY" id="bm_id3563035" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY" id="bm_id3563035" localize="false"/>
 <paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Detailed query</paragraph>
 <paragraph role="paragraph" id="par_idN105BD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to show all records of the query.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY" id="bm_id9215063" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY" id="bm_id9215063" localize="false"/>
 <paragraph role="heading" id="par_idN105C2" xml-lang="en-US" level="2" l10n="NEW">Summary query</paragraph>
 <paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to show only results of aggregate functions.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN105D7" xml-lang="en-US" l10n="NEW">Select the aggregate function and the field name of the numeric field in the list box. You can enter as many aggregate functions as you want, one in each row of controls.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1" id="bm_id4928128" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1" id="bm_id4928128" localize="false"/>
 <paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="3" l10n="NEW">Aggregate function</paragraph>
 <paragraph role="paragraph" id="par_idN105E4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the aggregate function.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1" id="bm_id8988921" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1" id="bm_id8988921" localize="false"/>
 <paragraph role="heading" id="par_idN105DD" xml-lang="en-US" level="3" l10n="NEW">Field name</paragraph>
 <paragraph role="paragraph" id="par_idN10656" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the numeric field name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_BTNAGGREGATEPLUS" id="bm_id2591631" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEPLUS" id="bm_id2591631" localize="false"/>
 <paragraph role="heading" id="par_idN105E7" xml-lang="en-US" level="3" l10n="NEW">+</paragraph>
 <paragraph role="paragraph" id="par_idN105FE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Appends a new row of controls.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_BTNAGGREGATEMINUS" id="bm_id3288674" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEMINUS" id="bm_id3288674" localize="false"/>
 <paragraph role="heading" id="par_idN105F1" xml-lang="en-US" level="3" l10n="NEW">-</paragraph>
 <paragraph role="paragraph" id="par_idN1060B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Removes the last row of controls.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN1060E" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/querywizard05.xhp" name="Query Wizard - Grouping">Query Wizard - Grouping</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
index f283f1f4f7..74b2618eb2 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
@@ -46,7 +46,7 @@
 <embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
 <embed href="text/shared/autopi/01090100.xhp#entfernen"/>
 <embed href="text/shared/autopi/01090100.xhp#updown"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFILTERSELFIELDS" id="bm_id1776482" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFILTERSELFIELDS" id="bm_id1776482" localize="false"/>
 <paragraph role="heading" id="par_idN10589" xml-lang="en-US" level="2" l10n="NEW">Group by</paragraph>
 <paragraph role="paragraph" id="par_idN1058D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all fields that are to be used to group the query.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10590" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/querywizard06.xhp" name="Query Wizard - Grouping conditions">Query Wizard - Grouping conditions</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard06.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard06.xhp
index 66e7e4a6c3..c518c7a865 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/querywizard06.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard06.xhp
@@ -44,25 +44,25 @@
 <paragraph role="heading" id="par_idN10546" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/querywizard06.xhp">Query Wizard - Grouping Conditions</link></paragraph>
 <paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">Specifies the conditions to group the query. The data source must support the SQL statement "Order by clauses" to enable this page of the Wizard.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTGROUPMATCHALL" id="bm_id8115176" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHALL" id="bm_id8115176" localize="false"/>
 <paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Match all of the following</paragraph>
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to group the query by all the conditions using a logical AND.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTGROUPMATCHANY" id="bm_id8760948" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHANY" id="bm_id8760948" localize="false"/>
 <paragraph role="heading" id="par_idN10560" xml-lang="en-US" level="2" l10n="NEW">Match any of the following</paragraph>
 <paragraph role="paragraph" id="par_idN10564" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to group the query by any of the conditions using a logical OR.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFILTERFIELDNAME_1" id="bm_id9920041.00000001" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFILTERFIELDNAME_2" id="bm_id9279457" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFILTERFIELDNAME_3" id="bm_id1897946" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_1" id="bm_id9920041.00000001" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_2" id="bm_id9279457" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_3" id="bm_id1897946" localize="false"/>
 <paragraph role="heading" id="par_idN10567" xml-lang="en-US" level="3" l10n="NEW">Field name</paragraph>
 <paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the field name for the grouping condition.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFILTEROPERATOR_1" id="bm_id6163823" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFILTEROPERATOR_2" id="bm_id2742088" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFILTEROPERATOR_3" id="bm_id465102" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_1" id="bm_id6163823" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_2" id="bm_id2742088" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_3" id="bm_id465102" localize="false"/>
 <paragraph role="heading" id="par_idN1056E" xml-lang="en-US" level="3" l10n="NEW">Condition</paragraph>
 <paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the condition for the grouping.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_TXTFILTERVALUE_1" id="bm_id1756340" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_TXTFILTERVALUE_2" id="bm_id8361766" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_TXTFILTERVALUE_3" id="bm_id2075563" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_1" id="bm_id1756340" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_2" id="bm_id8361766" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_3" id="bm_id2075563" localize="false"/>
 <paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="3" l10n="NEW">Value</paragraph>
 <paragraph role="paragraph" id="par_idN10579" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the value for the grouping condition.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN1057C" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/querywizard07.xhp" name="Query Wizard - Aliases">Query Wizard - Aliases</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard07.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard07.xhp
index 1293b5bc48..39df1313ee 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/querywizard07.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard07.xhp
@@ -44,7 +44,7 @@
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/querywizard07.xhp">Query Wizard - Aliases</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Assigns aliases to field names. Aliases are optional, and can provide more user-friendly names, which are displayed in place of field names. For example, an alias can be used when fields from different tables have the same name.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_TXTTITLE_1" id="bm_id2467421" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTTITLE_1" id="bm_id2467421" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Alias</paragraph>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the alias for the field name.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/querywizard08.xhp" name="Query Wizard - Overview">Query Wizard - Overview</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard08.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard08.xhp
index 0f1cbd156a..2866524f7a 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/querywizard08.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard08.xhp
@@ -44,16 +44,16 @@
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/querywizard08.xhp">Query Wizard - Overview</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Enter a name of the query, and specify whether you want to display or to modify the query after the Wizard is finished.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_TXTQUERYTITLE" id="bm_id3238319" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTQUERYTITLE" id="bm_id3238319" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Name of the query</paragraph>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the query.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTDISPLAYQUERY" id="bm_id1403241" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTDISPLAYQUERY" id="bm_id1403241" localize="false"/>
 <paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">Display query</paragraph>
 <paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to save and display the query.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_OPTMODIFYQUERY" id="bm_id2776268" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTMODIFYQUERY" id="bm_id2776268" localize="false"/>
 <paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Modify query</paragraph>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to save the query and open it for editing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_TXTSUMMARY" id="bm_id4912869" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTSUMMARY" id="bm_id4912869" localize="false"/>
 <paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2" l10n="NEW">Overview</paragraph>
 <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays a summary of the query.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/querywizard00.xhp" name="Query Wizard">Query Wizard</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
index a154988d03..75e98c6bd6 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
@@ -39,6 +39,7 @@
    </meta>
    <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id1614429"><bookmark_value>Report Builder</bookmark_value>
+<bookmark_value>Oracle Report Builder</bookmark_value>
 </bookmark>
 <paragraph xml-lang="en-US" id="hd_id8773155" role="heading" level="1" l10n="NEW"><variable id="rep_main"><link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>
 </variable></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp b/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp
index a2c4323d92..4380d9a097 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp
@@ -47,7 +47,7 @@
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id1150852" xml-lang="en-US" l10n="NEW">You can open the Report Navigator window of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">View - Report Navigator</item>.</paragraph>
 <paragraph role="paragraph" id="par_id1111484" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Report Navigator reveals the structure of the report. You can use the Report Navigator to insert functions into the report.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_REPORT_NAVIGATOR_TREE" id="bm_id7007354" localize="false"/><paragraph role="paragraph" id="par_id8314157" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click an entry in the Report Navigator. The corresponding object or area is selected in the Report Builder view. Right-click an entry to open the context menu.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_REPORT_NAVIGATOR_TREE" id="bm_id7007354" localize="false"/><paragraph role="paragraph" id="par_id8314157" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click an entry in the Report Navigator. The corresponding object or area is selected in the Report Builder view. Right-click an entry to open the context menu.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id2932828" xml-lang="en-US" level="2" l10n="NEW">To enter functions to the report</paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:NewFunction" id="bm_id974456" localize="false"/><paragraph role="paragraph" id="par_id5091708" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In the context menu of the Report Navigator, you see the same commands as in the Report Builder view, plus additional commands to create new functions or to delete them.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id9449446" xml-lang="en-US" l10n="NEW">Functions can be entered using a syntax as specified by the <link href="http://en.wikipedia.org/wiki/OpenFormula">OpenFormula</link> proposal.</paragraph>
@@ -78,9 +78,9 @@
 <paragraph role="paragraph" id="par_id9256874" xml-lang="en-US" l10n="NEW">Maybe you have to set the initial value to the value of the field like [field].<comment>these 3 paras copied from another mail by Ocke in users@dba.o.o</comment></paragraph>
 <paragraph role="paragraph" id="par_id4601886" xml-lang="en-US" l10n="NEW">If there are blank fields in the cost column, use the following formula to replace the blank fields' content with zero:</paragraph>
 <paragraph role="code" id="par_id1754509" xml-lang="en-US" l10n="NEW">[SumCost] + IF(ISBLANK([field]);0;[field])</paragraph><comment>need some real working examples. See i81874</comment><comment>Formula</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_FORMULA" id="bm_id2767113" localize="false"/><paragraph role="paragraph" id="par_id8122196" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the formula that defines the function. Use OpenFormula syntax.</ahelp></paragraph><comment>Initial value</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_INITIALFORMULA" id="bm_id301828" localize="false"/><paragraph role="paragraph" id="par_id9909665" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Enter the initial value for the evaluation of the formula. Often this is set to 0 or to 1.</ahelp></paragraph><comment>Deep traversing</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_DEEPTRAVERSING" id="bm_id8996246" localize="false"/><paragraph role="paragraph" id="par_id9141819" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">If Deep traversing is enabled, functions are evaluated considering all lower levels of hierarchy. This would be used for instance for line numbering. If Deep traversing is not enabled, only the first level of hierarchy is evaluated.</ahelp></paragraph><comment>Pre evaluation</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PREEVALUATED" id="bm_id5729544" localize="false"/><paragraph role="paragraph" id="par_id6354869" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">If Pre evaluation is enabled, functions are evaluated only when the report is finished.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_FORMULA" id="bm_id2767113" localize="false"/><paragraph role="paragraph" id="par_id8122196" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the formula that defines the function. Use OpenFormula syntax.</ahelp></paragraph><comment>Initial value</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_INITIALFORMULA" id="bm_id301828" localize="false"/><paragraph role="paragraph" id="par_id9909665" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Enter the initial value for the evaluation of the formula. Often this is set to 0 or to 1.</ahelp></paragraph><comment>Deep traversing</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_DEEPTRAVERSING" id="bm_id8996246" localize="false"/><paragraph role="paragraph" id="par_id9141819" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">If Deep traversing is enabled, functions are evaluated considering all lower levels of hierarchy. This would be used for instance for line numbering. If Deep traversing is not enabled, only the first level of hierarchy is evaluated.</ahelp></paragraph><comment>Pre evaluation</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PREEVALUATED" id="bm_id5729544" localize="false"/><paragraph role="paragraph" id="par_id6354869" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">If Pre evaluation is enabled, functions are evaluated only when the report is finished.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_prop.xhp b/helpcontent2/source/text/shared/explorer/database/rep_prop.xhp
index 6f83c36817..820f71d054 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_prop.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_prop.xhp
@@ -46,35 +46,35 @@
 <paragraph role="tip" id="par_id1080660" xml-lang="en-US" l10n="NEW">Press <item type="keycode">Shift-F1</item> and point with the mouse at an input box to see a help text for this input box.</paragraph>
 <paragraph role="paragraph" id="par_id7175817" xml-lang="en-US" l10n="NEW">On first start of the Report Builder, the Properties window shows the <emph>Data</emph> tab page for the whole report.</paragraph>
 <paragraph role="paragraph" id="par_id9895931" xml-lang="en-US" l10n="NEW">Select a table from the Contents list, then press Tab or click outside the input box to leave the input box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_FIELD_SEL" id="bm_id5135044" localize="false"/><paragraph role="paragraph" id="par_id3587145" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Add Field window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type="menuitem">View - Add Field</item>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_FIELD_SEL" id="bm_id5135044" localize="false"/><paragraph role="paragraph" id="par_id3587145" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Add Field window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type="menuitem">View - Add Field</item>.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id6993926" xml-lang="en-US" l10n="NEW">The <emph>General</emph> tab page can be used to change the name of the report, and to disable the Page Header or Page Footer areas, among others.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:SelectReport" id="bm_id9044770" localize="false"/><paragraph role="tip" id="par_id3729361" xml-lang="en-US" l10n="NEW"><ahelp hid=".">To display the Data or General tab page for the whole report, choose Edit - Select Report.</ahelp></paragraph><comment>Group keep together</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_GROUPKEEPTOGETHER" id="bm_id5392315" localize="false"/><paragraph role="paragraph" id="par_id1768852" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Groups are kept together by page or by column (default). You must enable Keep Together also.</ahelp></paragraph><comment>Page header</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PAGEHEADEROPTION" id="bm_id7852412" localize="false"/><paragraph role="paragraph" id="par_id6304818" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies in which context the page header will be printed: on all pages, or not on pages with a report header or footer.</ahelp></paragraph><comment>Page footer</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PAGEFOOTEROPTION" id="bm_id9031952" localize="false"/><paragraph role="paragraph" id="par_id401623" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies in which context the page footer will be printed: on all pages, or not on pages with a report header or footer</ahelp></paragraph><comment>Print repeated values</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PRINTREPEATEDVALUES" id="bm_id7956785" localize="false"/><paragraph role="paragraph" id="par_id2162236" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies to print repeated values.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER" id="bm_id5392315" localize="false"/><paragraph role="paragraph" id="par_id1768852" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Groups are kept together by page or by column (default). You must enable Keep Together also.</ahelp></paragraph><comment>Page header</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION" id="bm_id7852412" localize="false"/><paragraph role="paragraph" id="par_id6304818" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies in which context the page header will be printed: on all pages, or not on pages with a report header or footer.</ahelp></paragraph><comment>Page footer</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION" id="bm_id9031952" localize="false"/><paragraph role="paragraph" id="par_id401623" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies in which context the page footer will be printed: on all pages, or not on pages with a report header or footer</ahelp></paragraph><comment>Print repeated values</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRINTREPEATEDVALUES" id="bm_id7956785" localize="false"/><paragraph role="paragraph" id="par_id2162236" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies to print repeated values.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id7022003" xml-lang="en-US" l10n="NEW">If you click the Page Header or Page Footer area without selecting any object, you see the <emph>General</emph> tab page for that area.</paragraph>
 <paragraph role="paragraph" id="par_id7004303" xml-lang="en-US" l10n="NEW">You can edit some visual properties for the area.<comment>screen only or also in report?</comment></paragraph><comment>Background color</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_BACKCOLOR" id="bm_id9801324" localize="false"/><paragraph role="paragraph" id="par_id2561723" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the background color for the selected object, both on screen and for printing.</ahelp></paragraph><comment>Visible</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_VISIBLE" id="bm_id7446516" localize="false"/><paragraph role="paragraph" id="par_id1064485" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">An invisible object is not shown in the executed report. It is still visible in the Report Builder view.</ahelp></paragraph><comment>Height</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_HEIGHT" id="bm_id8859828" localize="false"/><paragraph role="paragraph" id="par_id2356028" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Defines the height of the selected object.</ahelp></paragraph><comment>Conditional Print Expression</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_CONDITIONALPRINTEXPRESSION" id="bm_id4359874" localize="false"/><paragraph role="paragraph" id="par_id1404461" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If the Conditional Print Expression evaluates to TRUE, the selected object will be printed.</ahelp></paragraph><comment>id="par_id2386852" l10n="NEW"Conditions use the following form:</comment><comment>Background transparent</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_BACKTRANSPARENT" id="bm_id5689565" localize="false"/><paragraph role="paragraph" id="par_id7404705" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether the background of the selected object is transparent or opaque.</ahelp><comment>just guessing</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_BACKCOLOR" id="bm_id9801324" localize="false"/><paragraph role="paragraph" id="par_id2561723" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the background color for the selected object, both on screen and for printing.</ahelp></paragraph><comment>Visible</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_VISIBLE" id="bm_id7446516" localize="false"/><paragraph role="paragraph" id="par_id1064485" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">An invisible object is not shown in the executed report. It is still visible in the Report Builder view.</ahelp></paragraph><comment>Height</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_HEIGHT" id="bm_id8859828" localize="false"/><paragraph role="paragraph" id="par_id2356028" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Defines the height of the selected object.</ahelp></paragraph><comment>Conditional Print Expression</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION" id="bm_id4359874" localize="false"/><paragraph role="paragraph" id="par_id1404461" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If the Conditional Print Expression evaluates to TRUE, the selected object will be printed.</ahelp></paragraph><comment>id="par_id2386852" l10n="NEW"Conditions use the following form:</comment><comment>Background transparent</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT" id="bm_id5689565" localize="false"/><paragraph role="paragraph" id="par_id7404705" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether the background of the selected object is transparent or opaque.</ahelp><comment>just guessing</comment></paragraph>
 <paragraph role="paragraph" id="par_id7466963" xml-lang="en-US" l10n="NEW">If you click the <emph>Detail</emph> area without selecting any object, you see the <emph>General</emph> tab page for that area.</paragraph>
 <paragraph role="paragraph" id="par_id3644215" xml-lang="en-US" l10n="NEW">You can specify some properties to fine-tune the way the records are printed.</paragraph><comment>Force New Page</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_FORCENEWPAGE" id="bm_id66225" localize="false"/><paragraph role="paragraph" id="par_id3148899" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Force New Page specifies whether the current section and/or the next section is printed on a new page.</ahelp></paragraph><comment>New Row Or Column</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_NEWROWORCOL" id="bm_id3920102" localize="false"/><paragraph role="paragraph" id="par_id6164433" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">New Row Or Column specifies, for a multi-column design, whether the current section and/or the next section will be printed on a new row or column.</ahelp></paragraph><comment>Keep together</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_KEEPTOGETHER" id="bm_id8053529" localize="false"/><paragraph role="paragraph" id="par_id7405011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Keep Together specifies to print the current object starting on top of a new page if it doesn't fit on the current page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_FORCENEWPAGE" id="bm_id66225" localize="false"/><paragraph role="paragraph" id="par_id3148899" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Force New Page specifies whether the current section and/or the next section is printed on a new page.</ahelp></paragraph><comment>New Row Or Column</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_NEWROWORCOL" id="bm_id3920102" localize="false"/><paragraph role="paragraph" id="par_id6164433" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">New Row Or Column specifies, for a multi-column design, whether the current section and/or the next section will be printed on a new row or column.</ahelp></paragraph><comment>Keep together</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_KEEPTOGETHER" id="bm_id8053529" localize="false"/><paragraph role="paragraph" id="par_id7405011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Keep Together specifies to print the current object starting on top of a new page if it doesn't fit on the current page.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id1536606" xml-lang="en-US" l10n="NEW">Insert some data fields into the Detail area, or insert other control fields into any area. When you select an inserted field, you can set the properties in the Properties window.</paragraph>
 <paragraph role="paragraph" id="par_id9631641" xml-lang="en-US" l10n="NEW">For a Label field, you can change the displayed text in the Label input box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PRESERVEIRI" id="bm_id7422711" localize="false"/><paragraph role="paragraph" id="par_id7749565" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For a picture, you can specify to either insert the picture as a link to a file or only as an embedded object in the Base file. The embedded option increases the size of the Base file, while the link option is not as portable to other computers.</ahelp></paragraph><comment>Position x</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_POSITIONX" id="bm_id6006958" localize="false"/><paragraph role="paragraph" id="par_id4041871" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the X Position for the selected object</ahelp><comment>x in pixel or twips? or current measurement units? from origin as on ruler? from elsewhere?</comment></paragraph><comment>Position y</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_POSITIONY" id="bm_id7606128" localize="false"/><paragraph role="paragraph" id="par_id9930722" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the Y Position for the selected object</ahelp></paragraph><comment>Width</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_WIDTH" id="bm_id5778374" localize="false"/><paragraph role="paragraph" id="par_id5749687" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the width of the selected object.</ahelp></paragraph><comment>Font</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_FONT" id="bm_id3184301" localize="false"/><paragraph role="paragraph" id="par_id79348" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the font for the selected text object.</ahelp></paragraph><comment>Print when group change</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PRINTWHENGROUPCHANGE" id="bm_id2129276" localize="false"/><paragraph role="paragraph" id="par_id2414014" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Print when group change</ahelp></paragraph><comment>Vert. Alignment</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_VERTICAL_ALIGN" id="bm_id9719229" localize="false"/><paragraph role="paragraph" id="par_id7617114" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Vert. Alignment</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRESERVEIRI" id="bm_id7422711" localize="false"/><paragraph role="paragraph" id="par_id7749565" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For a picture, you can specify to either insert the picture as a link to a file or only as an embedded object in the Base file. The embedded option increases the size of the Base file, while the link option is not as portable to other computers.</ahelp></paragraph><comment>Position x</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONX" id="bm_id6006958" localize="false"/><paragraph role="paragraph" id="par_id4041871" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the X Position for the selected object</ahelp><comment>x in pixel or twips? or current measurement units? from origin as on ruler? from elsewhere?</comment></paragraph><comment>Position y</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONY" id="bm_id7606128" localize="false"/><paragraph role="paragraph" id="par_id9930722" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the Y Position for the selected object</ahelp></paragraph><comment>Width</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_WIDTH" id="bm_id5778374" localize="false"/><paragraph role="paragraph" id="par_id5749687" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the width of the selected object.</ahelp></paragraph><comment>Font</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_FONT" id="bm_id3184301" localize="false"/><paragraph role="paragraph" id="par_id79348" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the font for the selected text object.</ahelp></paragraph><comment>Print when group change</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE" id="bm_id2129276" localize="false"/><paragraph role="paragraph" id="par_id2414014" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Print when group change</ahelp></paragraph><comment>Vert. Alignment</comment>
+<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_PROP_VERTICAL_ALIGN" id="bm_id9719229" localize="false"/><paragraph role="paragraph" id="par_id7617114" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Vert. Alignment</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id1593676" xml-lang="en-US" l10n="NEW">On the <emph>General</emph> tab page of a data field, you can set the Formatting properties, among others.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_DATAFIELD" id="bm_id3860896" localize="false"/><paragraph role="paragraph" id="par_id1243629" xml-lang="en-US" l10n="NEW"><ahelp hid=".">On the Data tab page, you can change the data contents to be shown.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_DATAFIELD" id="bm_id3860896" localize="false"/><paragraph role="paragraph" id="par_id1243629" xml-lang="en-US" l10n="NEW"><ahelp hid=".">On the Data tab page, you can change the data contents to be shown.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_sort.xhp b/helpcontent2/source/text/shared/explorer/database/rep_sort.xhp
index b7cb9952de..f049359732 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_sort.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_sort.xhp
@@ -46,15 +46,15 @@
       </section>
       <paragraph xml-lang="en-US" id="par_id876186" role="paragraph" l10n="NEW">The Groups box shows the fields in an order from top to bottom. You can select any field, then click the Move Up or Move Down button to move this field up or down in the list. </paragraph>
       <paragraph xml-lang="en-US" id="par_id3939634" role="paragraph" l10n="NEW">The sorting and grouping will be applied in the order of the list from top to bottom.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_GROUPSBRW" id="bm_id2480849" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_GROUPSBRW" id="bm_id2480849" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id599688" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the fields that will be used for sorting or grouping. The field at the top has the highest priority, the second field has the second priority, and so on.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_FIELDEXPRESSION" id="bm_id4181951" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_FIELDEXPRESSION" id="bm_id4181951" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id1371501" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to open a list from which you can select a field.</ahelp></paragraph>
 <!-- removed HID 2114727444 -->
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_GROUPSORT_MOVE_UP" id="bm_id2927436" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_UP" id="bm_id2927436" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id4661702" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected field up in the list.</ahelp></paragraph>
 <!-- removed HID 2114727445 -->
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_GROUPSORT_MOVE_DOWN" id="bm_id2107304" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_DOWN" id="bm_id2107304" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id7868892" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected field down in the list.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_GROUPS_SORTING_LST_ORDER" id="bm_id4071779" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id2188787" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select the sorting order.</ahelp></paragraph>
@@ -64,7 +64,7 @@
 <paragraph xml-lang="en-US" id="par_id7726676" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select to show or hide the Group Footer.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_GROUPS_SORTING_LST_GROUPONLST" id="bm_id9038972" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3729361" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select to create a new group on each changed value, or on other properties.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_RPT_GROUPSORT_DELETE" id="bm_id9038973" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_GROUPSORT_DELETE" id="bm_id9038973" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id0409200922142041" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Removes the selected field from the list.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_id3405560" role="paragraph" l10n="NEW">By default a new group is created on every changed value of a record from the selected field. You can change this property depending on the type of field:</paragraph>
       <list type="ordered">
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
index aef55c0652..b8b1f28285 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
@@ -42,7 +42,7 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id6009094"><bookmark_value>wizards;database tables (Base)</bookmark_value>
 <bookmark_value>Table Wizard (Base)</bookmark_value>
 </bookmark><comment>mw added "(Base)" to all entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_DIALOG" id="bm_id406201" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_DIALOG" id="bm_id406201" localize="false"/>
 <paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/tablewizard00.xhp">Table Wizard</link></paragraph>
 <paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Table Wizard helps you to create a database table.</ahelp></paragraph>
 </section>
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
index b7144ede96..cccab879b0 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
@@ -42,13 +42,13 @@
 <paragraph role="heading" id="par_idN10546" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/explorer/database/tablewizard01.xhp">Table Wizard - Select Fields</link></paragraph>
 <paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">Select fields from the provided sample tables as a starting point to create your own table.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPTBUSINESS" id="bm_id9071932" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPTBUSINESS" id="bm_id9071932" localize="false"/>
 <paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Business</paragraph>
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the business category to see only business sample tables.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPTPRIVATE" id="bm_id5322428" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPTPRIVATE" id="bm_id5322428" localize="false"/>
 <paragraph role="heading" id="par_idN10560" xml-lang="en-US" level="2" l10n="NEW">Private</paragraph>
 <paragraph role="paragraph" id="par_idN10564" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the private category to see only private sample tables.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_LBTABLES" id="bm_id7499008" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_LBTABLES" id="bm_id7499008" localize="false"/>
 <paragraph role="heading" id="par_idN10567" xml-lang="en-US" level="2" l10n="NEW">Sample tables</paragraph>
 <paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select one of the sample tables. Then select fields from that table from the left list box. Repeat this step until you have selected all the fields that you need.</ahelp></paragraph>
 <embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
@@ -57,7 +57,7 @@
 <embed href="text/shared/autopi/01090100.xhp#entfernen"/>
 <embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
 <embed href="text/shared/autopi/01090100.xhp#updown"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_FIELDSSELECTED" id="bm_id6092104" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_FIELDSSELECTED" id="bm_id6092104" localize="false"/>
 <paragraph role="heading" id="par_idN1059E" xml-lang="en-US" level="2" l10n="CHG">Selected Fields</paragraph>
 <paragraph role="paragraph" id="par_idN105A4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all fields that will be included in the new table.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US" l10n="CHG"><link href="text/shared/explorer/database/tablewizard02.xhp" name="Table Wizard - Set types and formats">Table Wizard - Set types and formats</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard02.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard02.xhp
index 1d213ef501..84214f064d 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard02.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard02.xhp
@@ -44,21 +44,21 @@
 <paragraph role="heading" id="par_idN10552" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/explorer/database/tablewizard02.xhp">Table Wizard - Set Types and Formats</link></paragraph>
 <paragraph role="paragraph" id="par_idN10562" xml-lang="en-US" l10n="NEW">Specifies the field information for your selected fields.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_LB_SELFIELDNAMES" id="bm_id5365764" localize="false"/><paragraph role="heading" id="par_idN10565" xml-lang="en-US" level="2" l10n="NEW">Selected fields</paragraph>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES" id="bm_id5365764" localize="false"/><paragraph role="heading" id="par_idN10565" xml-lang="en-US" level="2" l10n="NEW">Selected fields</paragraph>
 <paragraph role="paragraph" id="par_idN10569" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a field in order to edit the field information.</ahelp></paragraph>
 <embed href="text/shared/autopi/01090100.xhp#updown"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMINUS" id="bm_id8947111.00000001" localize="false"/><paragraph role="heading" id="par_idN10574" xml-lang="en-US" level="3" l10n="NEW">-</paragraph>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDMINUS" id="bm_id8947111.00000001" localize="false"/><paragraph role="heading" id="par_idN10574" xml-lang="en-US" level="3" l10n="NEW">-</paragraph>
 <paragraph role="paragraph" id="par_idN10578" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Remove the selected field from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDPLUS" id="bm_id7230140" localize="false"/><paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="3" l10n="NEW">+</paragraph>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDPLUS" id="bm_id7230140" localize="false"/><paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="3" l10n="NEW">+</paragraph>
 <paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Add a new data field to the list box.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10582" xml-lang="en-US" level="2" l10n="NEW">Field information</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_COLNAME" id="bm_id1665089" localize="false"/><paragraph role="heading" id="par_idN10586" xml-lang="en-US" level="3" l10n="NEW">Field name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_COLNAME" id="bm_id1665089" localize="false"/><paragraph role="heading" id="par_idN10586" xml-lang="en-US" level="3" l10n="NEW">Field name</paragraph>
 <paragraph role="paragraph" id="par_idN1058A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the name of the selected data field. If you want, you can enter a new name.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN1058D" xml-lang="en-US" level="3" l10n="NEW">Field type</paragraph>
 <paragraph role="paragraph" id="par_idN10591" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a field type.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_ENT_AUTOINCREMENT" id="bm_id1055330" localize="false"/><paragraph role="heading" id="hd_id5486922" xml-lang="en-US" level="3" l10n="NEW">AutoValue</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_AUTOINCREMENT" id="bm_id1055330" localize="false"/><paragraph role="heading" id="hd_id5486922" xml-lang="en-US" level="3" l10n="NEW">AutoValue</paragraph>
 <paragraph role="paragraph" id="par_id4198736" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If set to Yes, the values for this data field are generated by the database engine.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_ENT_REQUIRED" id="bm_id3498336" localize="false"/><paragraph role="heading" id="par_idN106A0" xml-lang="en-US" level="3" l10n="NEW">Entry required</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_REQUIRED" id="bm_id3498336" localize="false"/><paragraph role="heading" id="par_idN106A0" xml-lang="en-US" level="3" l10n="NEW">Entry required</paragraph>
 <paragraph role="paragraph" id="par_idN106A6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If set to Yes, this field must not be empty.</ahelp><comment>not in spec doc</comment></paragraph>
 <paragraph role="heading" id="par_idN10594" xml-lang="en-US" level="3" l10n="NEW">Length</paragraph>
 <paragraph role="paragraph" id="par_idN10598" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the number of characters for the data field.</ahelp></paragraph>
@@ -66,7 +66,7 @@
 <paragraph role="paragraph" id="par_idN1059F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the number of decimal places for the data field. This option is only available for numerical or decimal data fields.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN105A2" xml-lang="en-US" level="3" l10n="NEW">Default value</paragraph>
 <paragraph role="paragraph" id="par_idN105A6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the default value for a Yes/No field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_AUTOINCREMENTVALUE" id="bm_id8732871.00000001" localize="false"/><paragraph role="heading" id="par_idN10730" xml-lang="en-US" level="3" l10n="NEW">Auto-increment statement</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_AUTOINCREMENTVALUE" id="bm_id8732871.00000001" localize="false"/><paragraph role="heading" id="par_idN10730" xml-lang="en-US" level="3" l10n="NEW">Auto-increment statement</paragraph>
 <paragraph role="paragraph" id="par_id6706747" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the SQL command specifier that instructs the data source to auto-increment a specified Integer data field.</ahelp> For example, the following MySQL statement used the AUTO_INCREMENT statement to increase the "id" field each time the statement creates a data field:</paragraph>
 <paragraph role="code" id="par_id8946501" xml-lang="en-US" l10n="NEW">CREATE TABLE "table1" ("id" INTEGER AUTO_INCREMENT)</paragraph>
 <paragraph role="paragraph" id="par_id4846949" xml-lang="en-US" l10n="NEW">For this example, you must enter AUTO_INCREMENT into the Auto-increment statement box.</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard03.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard03.xhp
index df0ff12d11..50836f1199 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard03.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard03.xhp
@@ -46,31 +46,31 @@
 <paragraph role="heading" id="par_idN10546" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/tablewizard03.xhp">Table Wizard - Set Primary Key</link></paragraph>
 <paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">Specifies a field in the table to be used as a primary key.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CHK_USEPRIMEKEY" id="bm_id2796411" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CHK_USEPRIMEKEY" id="bm_id2796411" localize="false"/>
 <paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Create a primary key</paragraph>
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to create a primary key. Add a primary key to every database table to uniquely identify each record. For some database systems within %PRODUCTNAME, a primary key is mandatory for editing the tables.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPT_PK_AUTOMATIC" id="bm_id1500289" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPT_PK_AUTOMATIC" id="bm_id1500289" localize="false"/>
 <paragraph role="heading" id="par_idN10560" xml-lang="en-US" level="3" l10n="NEW">Automatically add a primary key</paragraph>
 <paragraph role="paragraph" id="par_idN10564" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to automatically add a primary key as an additional field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPT_PK_SINGLE" id="bm_id9485152.00000001" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPT_PK_SINGLE" id="bm_id9485152.00000001" localize="false"/>
 <paragraph role="heading" id="par_idN10567" xml-lang="en-US" level="3" l10n="NEW">Use an existing field as a primary key</paragraph>
 <paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to use an existing field with unique values as a primary key.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_LB_PK_FIELDNAME" id="bm_id6801049" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_LB_PK_FIELDNAME" id="bm_id6801049" localize="false"/>
 <paragraph role="heading" id="par_idN1056E" xml-lang="en-US" level="4" l10n="NEW">Field name</paragraph>
 <paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the field name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CK_PK_AUTOVALUE" id="bm_id8796349" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC" id="bm_id1406292" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE" id="bm_id8796349" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC" id="bm_id1406292" localize="false"/>
 <paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="4" l10n="NEW">Auto value</paragraph>
 <paragraph role="paragraph" id="par_idN10579" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to automatically insert a value and increment the field's value for each new record. The database must support automatic incrementation in order to use the <emph>Auto value</emph> feature.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPT_PK_SEVERAL" id="bm_id130008" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPT_PK_SEVERAL" id="bm_id130008" localize="false"/>
 <paragraph role="heading" id="par_idN1057C" xml-lang="en-US" level="3" l10n="NEW">Define primary key by several fields</paragraph>
 <paragraph role="paragraph" id="par_idN10580" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to create a primary key from a combination of several existing fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_FIELDS_PK_AVAILABLE" id="bm_id2555009" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_FIELDS_PK_AVAILABLE" id="bm_id2555009" localize="false"/>
 <paragraph role="heading" id="par_idN10583" xml-lang="en-US" level="4" l10n="NEW">Available fields</paragraph>
 <paragraph role="paragraph" id="par_idN10587" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a field and click &gt; to add it to the list of primary key fields.</ahelp></paragraph>
 <embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
 <embed href="text/shared/autopi/01090100.xhp#entfernen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDREMOVE_PK_SELECTED" id="bm_id8829309" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDREMOVE_PK_SELECTED" id="bm_id8829309" localize="false"/>
 <paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="4" l10n="NEW">Primary key fields</paragraph>
 <paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a field and click &lt; to remove it from the list of primary key fields. The primary key is created as a concatenation of the fields in this list, from top to bottom.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN105A1" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/tablewizard04.xhp" name="Table Wizard - Create table">Table Wizard - Create table</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard04.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard04.xhp
index 8b591ef9b3..73f6b38a88 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard04.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard04.xhp
@@ -46,22 +46,22 @@
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/tablewizard04.xhp">Table Wizard - Create Table</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="CHG">Enter a name for the table and specify whether you want to modify the table after the wizard is finished.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_TXT_NAME" id="bm_id6823633" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_TXT_NAME" id="bm_id6823633" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Table name</paragraph>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the table name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_LST_CATALOG" id="bm_id3157139" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_LST_CATALOG" id="bm_id3157139" localize="false"/>
 <paragraph role="heading" id="par_idN105E4" xml-lang="en-US" level="2" l10n="NEW">Catalog of the table</paragraph>
 <paragraph role="paragraph" id="par_idN105EA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the catalog for the table. (Available only if the database supports catalogs)</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_LST_SCHEMA" id="bm_id2800683" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_LST_SCHEMA" id="bm_id2800683" localize="false"/>
 <paragraph role="heading" id="par_idN10605" xml-lang="en-US" level="2" l10n="NEW">Schema of the table</paragraph>
 <paragraph role="paragraph" id="par_idN1060B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the schema for the table. (Available only if the database supports schemas)</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPT_WORKWITHTABLE" id="bm_id5238807" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE" id="bm_id5238807" localize="false"/>
 <paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">Modify the table design</paragraph>
 <paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to save and edit the table design.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPT_MODIFYTABLE" id="bm_id2086855" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE" id="bm_id2086855" localize="false"/>
 <paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Insert data immediately</paragraph>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to save the table design and open the table to enter data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPT_STARTFORMWIZARD" id="bm_id3381145" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD" id="bm_id3381145" localize="false"/>
 <paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2" l10n="NEW">Create a form based on this table</paragraph>
 <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to create a form based on this table. The form is created on a text document with the last used settings of the <link href="text/shared/autopi/01090000.xhp">Form Wizard</link>.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10580" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/tablewizard00.xhp" name="Table Wizard">Table Wizard</link></paragraph>
author	Jan Holesovsky <kendy@suse.cz>	2011-02-24 01:28:52 +0100
committer	Jan Holesovsky <kendy@suse.cz>	2011-02-24 01:28:52 +0100
commit	163ef6974d47e4715212e65f1acd1aaafffb0283 (patch)
tree	15ca5eb9f08895036628a14ab2b033cb3998314c /helpcontent2/source/text/shared/explorer/database
parent	901c96619abba313f2e8b3f11c2aa1964343a1ed (diff)
parent	4a2c0dd651563469e70a0999086a4678036675a0 (diff)