summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared/explorer
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/shared/explorer')
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/02010100.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/05000003.xhp8
-rw-r--r--helpcontent2/source/text/shared/explorer/database/05010100.xhp6
-rw-r--r--helpcontent2/source/text/shared/explorer/database/05020100.xhp20
-rw-r--r--helpcontent2/source/text/shared/explorer/database/05030100.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/05030200.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/05030300.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/05030400.xhp12
-rw-r--r--helpcontent2/source/text/shared/explorer/database/11020000.xhp2
-rw-r--r--helpcontent2/source/text/shared/explorer/database/11030000.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/11030100.xhp14
-rw-r--r--helpcontent2/source/text/shared/explorer/database/11080000.xhp8
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/11170000.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/11170100.xhp12
-rw-r--r--helpcontent2/source/text/shared/explorer/database/30100000.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabapropgen.xhp8
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz01.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/menuedit.xhp4
-rw-r--r--helpcontent2/source/text/shared/explorer/database/menufilesave.xhp8
-rw-r--r--helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp4
-rw-r--r--helpcontent2/source/text/shared/explorer/database/password.xhp6
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_datetime.xhp16
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_main.xhp6
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp10
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_pagenumbers.xhp10
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_prop.xhp42
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_sort.xhp18
31 files changed, 146 insertions, 148 deletions
diff --git a/helpcontent2/source/text/shared/explorer/database/02010100.xhp b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
index dd093decbc..204a16eb12 100755
--- a/helpcontent2/source/text/shared/explorer/database/02010100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
@@ -136,9 +136,9 @@
<paragraph role="paragraph" id="par_id3154479" xml-lang="en-US" l10n="U" oldref="22">To remove a field name from the query, click the column header of the field and choose the <emph>Delete</emph> command on the context menu for the column.</paragraph>
<paragraph role="heading" id="hd_id3155764" xml-lang="en-US" level="3" l10n="U" oldref="277">Save query</paragraph>
<paragraph role="paragraph" id="par_id3148481" xml-lang="en-US" l10n="U" oldref="278">Use the <emph>Save</emph> icon on the Standard Bar to save the query. You see a dialog that asks you to enter a name for the query. If the database supports schemas, you can also enter a schema.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_COMBOBOX_DLG_SAVE_AS_ET_SCHEMA" id="bm_id3156378" localize="false"/><paragraph role="heading" id="hd_id3154362" xml-lang="en-US" level="4" l10n="U" oldref="279">Schema</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ComboBox:DLG_SAVE_AS:ET_SCHEMA" id="bm_id3156378" localize="false"/><paragraph role="heading" id="hd_id3154362" xml-lang="en-US" level="4" l10n="U" oldref="279">Schema</paragraph>
<paragraph role="paragraph" id="par_id3154754" xml-lang="en-US" l10n="U" oldref="280"><ahelp hid="DBACCESS_COMBOBOX_DLG_SAVE_AS_ET_SCHEMA">Enter the name of the schema that is assigned to the query or table view.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_SAVE_AS_ET_TITLE" id="bm_id3147340" localize="false"/><paragraph role="heading" id="hd_id3156717" xml-lang="en-US" level="4" l10n="U" oldref="281">Query name or table view name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_SAVE_AS:ET_TITLE" id="bm_id3147340" localize="false"/><paragraph role="heading" id="hd_id3156717" xml-lang="en-US" level="4" l10n="U" oldref="281">Query name or table view name</paragraph>
<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>
diff --git a/helpcontent2/source/text/shared/explorer/database/05000003.xhp b/helpcontent2/source/text/shared/explorer/database/05000003.xhp
index f61e3bf5da..219f2a70c8 100755
--- a/helpcontent2/source/text/shared/explorer/database/05000003.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05000003.xhp
@@ -44,16 +44,16 @@
<body>
<paragraph role="heading" id="hd_id3163829" xml-lang="en-US" level="1" l10n="U" oldref="1">Enter / change password</paragraph>
<paragraph role="paragraph" id="par_id3148520" xml-lang="en-US" l10n="U" oldref="2">Allows you to enter and confirm a new or changed password. If you have defined a new user, enter the user's name in this dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:DLG_PASSWD:ED_PASSWD_USER" id="bm_id3149283" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER" id="bm_id3149283" localize="false"/>
<paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="2" l10n="U" oldref="3">User</paragraph>
<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:DLG_PASSWD:ED_PASSWD_USER">Specifies the name of the new user.</ahelp> This field is only visible if you have defined a new user.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_PASSWORD_ED_OLDPASSWORD" id="bm_id3145346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_PASSWORD:ED_OLDPASSWORD" id="bm_id3145346" localize="false"/>
<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="9">Old password</paragraph>
<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_EDIT_DLG_PASSWORD_ED_OLDPASSWORD">Enter the old password.</ahelp> This field is visible when you have started the dialog via <emph>Change password</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORD" id="bm_id3166411" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD" id="bm_id3166411" localize="false"/>
<paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="2" l10n="U" oldref="5">Password</paragraph>
<paragraph role="paragraph" id="par_id3147243" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORD">Enter the new password.</ahelp></paragraph><comment>UFI: removed help id</comment>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORD_REPEAT" id="bm_id3163802" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD_REPEAT" id="bm_id3163802" localize="false"/>
<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="7">Confirm (password)</paragraph>
<paragraph role="paragraph" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORD_REPEAT">Enter the new password again.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05010100.xhp b/helpcontent2/source/text/shared/explorer/database/05010100.xhp
index 1707dadf60..ffcb8e5368 100644
--- a/helpcontent2/source/text/shared/explorer/database/05010100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05010100.xhp
@@ -41,7 +41,7 @@
</meta>
<body>
<section id="indexentwurf">
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MODALDIALOG_DLG_INDEXDESIGN" id="bm_id3156410" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ModalDialog:DLG_INDEXDESIGN" id="bm_id3156410" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DBIndexDesign" id="bm_id3149828" localize="false"/><paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/05010100.xhp" name="Index design">Index design</link></paragraph>
<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DBIndexDesign">The <emph>Index Design </emph>dialog allows you edit the indexes for the current table.</ahelp></paragraph>
</section>
@@ -63,7 +63,7 @@
<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>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_DLG_INDEXDESIGN_CB_UNIQUE" id="bm_id3145171" localize="false"/><paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="3" l10n="U" oldref="17">Unique</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:CheckBox:DLG_INDEXDESIGN:CB_UNIQUE" id="bm_id3145171" localize="false"/><paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="3" l10n="U" oldref="17">Unique</paragraph>
<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>
@@ -71,7 +71,7 @@
<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>
<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>
+<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>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/05020100.xhp b/helpcontent2/source/text/shared/explorer/database/05020100.xhp
index fb4216d867..c2f49abaf5 100644
--- a/helpcontent2/source/text/shared/explorer/database/05020100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05020100.xhp
@@ -52,8 +52,8 @@
<embed href="text/shared/00/00000450.xhp#relationen"/>
</section>
<paragraph role="note" id="par_id3155136" xml-lang="en-US" l10n="U" oldref="3">The update and delete options are only available if they are supported by the database used.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_LEFT_TABLE" id="bm_id3145120" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_RIGHT_TABLE" id="bm_id3153088" localize="false"/>
+<!-- removed HID DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_LEFT_TABLE -->
+<!-- removed HID DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_RIGHT_TABLE -->
<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>
@@ -65,31 +65,31 @@
<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>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_UPD" id="bm_id3148550" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_UPD -->
<paragraph role="heading" id="hd_id3149046" xml-lang="en-US" level="3" l10n="U" oldref="8">No action</paragraph>
<paragraph role="paragraph" id="par_id3152360" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_UPD">Specifies that any change made to a primary key does not affect other external key fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD" id="bm_id3153379" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD -->
<paragraph role="heading" id="hd_id3148664" xml-lang="en-US" level="3" l10n="U" oldref="10">Updating cascade</paragraph>
<paragraph role="paragraph" id="par_id3154073" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD">Updates all the external key fields if the value of the corresponding primary key has been modified (Cascading Update).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_NULL" id="bm_id3156280" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_NULL -->
<paragraph role="heading" id="hd_id3145171" xml-lang="en-US" level="3" l10n="U" oldref="12">Set null</paragraph>
<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_NULL"> If the corresponding primary key has been modified, use this option to set the "IS NULL" value to all external key fields. IS NULL means that the field is empty.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_DEFAULT" id="bm_id3150767" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_DEFAULT -->
<paragraph role="heading" id="hd_id3150448" xml-lang="en-US" level="3" l10n="U" oldref="14">Set default</paragraph>
<paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_DEFAULT"> If the corresponding primary key has been modified, use this option to set a default value to all external key fields.</ahelp> During the creation of the corresponding table, the default value of an external key field will be defined when you assign the field properties.</paragraph>
<paragraph role="heading" id="hd_id3125863" xml-lang="en-US" level="2" l10n="U" oldref="16">Delete options</paragraph>
<paragraph role="paragraph" id="par_id3153193" xml-lang="en-US" l10n="U" oldref="17">Here you can select options that take effect when a primary key field is deleted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_DEL" id="bm_id3150439" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_DEL -->
<paragraph role="heading" id="hd_id3159252" xml-lang="en-US" level="3" l10n="U" oldref="18">No action</paragraph>
<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_DEL">Specifies that the deletion of a primary key will not have any effect on other external key fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL" id="bm_id3149260" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL -->
<paragraph role="heading" id="hd_id3154146" xml-lang="en-US" level="3" l10n="U" oldref="20">Delete cascade</paragraph>
<paragraph role="paragraph" id="par_id3155309" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL">Specifies that all external key fields will be deleted if you delete the corresponding primary key field.</ahelp></paragraph>
<paragraph role="warning" id="par_id3153140" xml-lang="en-US" l10n="U" oldref="22">When you delete a primary key field with the<emph> Delete cascade </emph>option, all records from other tables that have this key as their foreign key are also deleted. Use this option with great care; it is possible that a major portion of the database can be deleted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_NULL" id="bm_id3154987" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_NULL -->
<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="3" l10n="U" oldref="23">Set null</paragraph>
<paragraph role="paragraph" id="par_id3153363" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_NULL">If you delete the corresponding primary key, the "IS NULL" value will be assigned to all external key fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_DEFAULT" id="bm_id3163712" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_DEFAULT -->
<paragraph role="heading" id="hd_id3145272" xml-lang="en-US" level="3" l10n="U" oldref="25">Set Default</paragraph>
<paragraph role="paragraph" id="par_id3154320" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_DEFAULT">If you delete the corresponding primary key, a set value will be set to all external key fields.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030100.xhp b/helpcontent2/source/text/shared/explorer/database/05030100.xhp
index c295caf84c..253a03adab 100644
--- a/helpcontent2/source/text/shared/explorer/database/05030100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030100.xhp
@@ -47,13 +47,13 @@
<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>
<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>
+<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>
<paragraph role="paragraph" id="par_id3150178" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEFDATA">Creates a 1:1 copy of the database table.</ahelp> The table definition and the complete data are copied. The table definition includes the table structure and format from different data fields, including special field properties. The field contents supply the data.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEF" id="bm_id3147226" localize="false"/><paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="3" l10n="U" oldref="9">Definition</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEF" id="bm_id3147226" localize="false"/><paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="3" l10n="U" oldref="9">Definition</paragraph>
<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEF">Copies only the table definition and not the corresponding data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_VIEW" id="bm_id3149096" localize="false"/><paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="22">As table view</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_VIEW" id="bm_id3149096" localize="false"/><paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="22">As table view</paragraph>
<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_VIEW">If the database supports Views, you can select this option only when a query is copied in a table container. This option enables you to see and edit a query as a normal table view.</ahelp> The table will be filtered in the view with a "Select" SQL statement.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_APPENDDATA" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="3" l10n="CHG" oldref="11">Append data<comment>see #i63815</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_APPENDDATA" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="3" l10n="CHG" oldref="11">Append data<comment>see #i63815</comment></paragraph>
<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_APPENDDATA">Appends the data of the table to be copied to an existing table.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="13">The table definition must be exactly the same so that data can be copied. Data cannot be copied if a data field in the target table has another format than the data field in the source table.</paragraph>
<paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="31">Match the data field names in the<emph> Copy Table</emph> dialog on the <link href="text/shared/explorer/database/05030400.xhp" name="Apply Columns">Apply Columns</link> page.</paragraph>
@@ -61,9 +61,9 @@
<paragraph role="note" id="par_id3158430" xml-lang="en-US" l10n="U" oldref="15">If the fields of the target table have a smaller field length than in the source table when data is being attached, the source data fields will automatically be truncated to match the field lengths in the target table.</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149164"><bookmark_value>primary keys; defining</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3149164" xml-lang="en-US" level="3" l10n="U" oldref="24">Create primary key</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_PRIMARY_COLUMN" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3149164" xml-lang="en-US" level="3" l10n="U" oldref="24">Create primary key</paragraph>
<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN">Automatically generates a primary key data field and fills it with values.</ahelp> You should always use this field, since a primary key must always be available in order to edit the table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_TAB_WIZ_COPYTABLE_ET_KEYNAME" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="3" l10n="U" oldref="26">Name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:TAB_WIZ_COPYTABLE:ET_KEYNAME" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="3" l10n="U" oldref="26">Name</paragraph>
<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="DBACCESS_EDIT_TAB_WIZ_COPYTABLE_ET_KEYNAME">Specifies a name for the primary key generated. This name is optional.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="33"><link href="text/shared/explorer/database/05030200.xhp" name="Next page">Next page</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030200.xhp b/helpcontent2/source/text/shared/explorer/database/05030200.xhp
index 2be88d55b4..a18e4b9bdb 100755
--- a/helpcontent2/source/text/shared/explorer/database/05030200.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030200.xhp
@@ -45,14 +45,14 @@
<paragraph role="paragraph" id="par_id3147143" 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. The <emph>Apply columns </emph>dialog is the second window of the <emph>Copy table</emph> dialog.</paragraph>
</section>
<paragraph role="heading" id="hd_id3155552" xml-lang="en-US" level="2" l10n="U" oldref="3">Existing columns</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILISTBOX_TAB_WIZ_COLUMN_SELECT_LB_ORG_COLUMN_NAMES" id="bm_id3155805" localize="false"/><paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="3" l10n="U" oldref="4">Left list box</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_ORG_COLUMN_NAMES" id="bm_id3155805" localize="false"/><paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="3" l10n="U" oldref="4">Left list box</paragraph>
<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="CHG" oldref="5"><ahelp hid="DBACCESS_MULTILISTBOX_TAB_WIZ_COLUMN_SELECT_LB_ORG_COLUMN_NAMES">Lists the available data fields that you can include in the copied table. To copy a data field, click its name, and then click the &gt; button. To copy all of the fields, click the <emph>&gt;&gt;</emph> button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILISTBOX_TAB_WIZ_COLUMN_SELECT_LB_NEW_COLUMN_NAMES" id="bm_id3149827" localize="false"/><paragraph role="heading" id="hd_id3154823" xml-lang="en-US" level="3" l10n="U" oldref="6">Right list box</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_NEW_COLUMN_NAMES" id="bm_id3149827" localize="false"/><paragraph role="heading" id="hd_id3154823" xml-lang="en-US" level="3" l10n="U" oldref="6">Right list box</paragraph>
<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="DBACCESS_MULTILISTBOX_TAB_WIZ_COLUMN_SELECT_LB_NEW_COLUMN_NAMES">Lists the fields that you want to include in the copied table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMN_RH" id="bm_id3152781" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_RH" id="bm_id3147653" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMN_LH" id="bm_id3151110" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_LH" id="bm_id3152996" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="8">Buttons</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_RH" id="bm_id3152781" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_RH" id="bm_id3147653" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_LH" id="bm_id3151110" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_LH" id="bm_id3152996" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="8">Buttons</paragraph>
<paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_LH">Adds or removes the selected field (&gt; or &lt; button) or all of the fields (&lt;&lt; or &gt;&gt; button).</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/explorer/database/05030300.xhp" name="Next page">Next page</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030300.xhp b/helpcontent2/source/text/shared/explorer/database/05030300.xhp
index 0a49810d1c..eb97219d79 100755
--- a/helpcontent2/source/text/shared/explorer/database/05030300.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030300.xhp
@@ -46,7 +46,7 @@
<paragraph role="heading" id="hd_id3163829" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/05030300.xhp" name="Type formatting">Type formatting</link></paragraph>
<paragraph role="paragraph" id="par_id3150247" 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. The<emph> Type formatting </emph>dialog is the third window of the <emph>Copy table</emph> dialog.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILISTBOX_TAB_WIZ_TYPE_SELECT_LB_NEW_COLUMN_NAMES" id="bm_id3147291" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiListBox:TAB_WIZ_TYPE_SELECT:LB_NEW_COLUMN_NAMES" id="bm_id3147291" localize="false"/>
<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>
@@ -68,10 +68,10 @@
<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>
<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="18">$[officename] can automatically recognize field contents when you copy database tables by drag and drop.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_NUMERICFIELD_TAB_WIZ_TYPE_SELECT_ET_AUTO" id="bm_id3153061" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO" id="bm_id3153061" localize="false"/>
<paragraph role="heading" id="hd_id3156023" xml-lang="en-US" level="3" l10n="U" oldref="19">(max.) lines</paragraph>
<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="DBACCESS_NUMERICFIELD_TAB_WIZ_TYPE_SELECT_ET_AUTO">Enter the number of lines to use for automatic type recognition.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_TAB_WIZ_TYPE_SELECT_PB_AUTO" id="bm_id3148946" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO" id="bm_id3148946" localize="false"/>
<paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="3" l10n="U" oldref="21">Auto</paragraph>
<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_WIZ_TYPE_SELECT_PB_AUTO">Enables automatic type recognition.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030400.xhp b/helpcontent2/source/text/shared/explorer/database/05030400.xhp
index c04c79d3f5..aca297e55f 100755
--- a/helpcontent2/source/text/shared/explorer/database/05030400.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030400.xhp
@@ -52,18 +52,18 @@
<bookmark xml-lang="en-US" branch="hid/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"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP_RIGHT" id="bm_id3155342" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP" id="bm_id3149516" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP_RIGHT" id="bm_id3155342" localize="false"/>
<paragraph role="heading" id="hd_id3150670" xml-lang="en-US" level="2" l10n="U" oldref="8">up</paragraph>
<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP_RIGHT">Moves the selected entry up one position in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN" id="bm_id3154307" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT" id="bm_id3153716" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN" id="bm_id3154307" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN_RIGHT" id="bm_id3153716" localize="false"/>
<paragraph role="heading" id="hd_id3149580" xml-lang="en-US" level="2" l10n="U" oldref="10">down</paragraph>
<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT">Moves the selected entry down one position in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_ALL" id="bm_id3147619" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_ALL" id="bm_id3147619" localize="false"/>
<paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2" l10n="U" oldref="12">all</paragraph>
<paragraph role="paragraph" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_ALL">Selects all of the data fields in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_NONE" id="bm_id3155341" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_NONE" id="bm_id3155341" localize="false"/>
<paragraph role="heading" id="hd_id3153541" xml-lang="en-US" level="2" l10n="U" oldref="14">none</paragraph>
<paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_NONE">Clears all of the check boxes in the list.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/11020000.xhp b/helpcontent2/source/text/shared/explorer/database/11020000.xhp
index a86b9e2fe5..aca738877a 100644
--- a/helpcontent2/source/text/shared/explorer/database/11020000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11020000.xhp
@@ -57,7 +57,7 @@
<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">
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHARSET_ODBC" id="bm_id3144511" localize="false"/><paragraph role="heading" id="hd_id3152472" xml-lang="en-US" level="2" l10n="U" oldref="12">Character Set</paragraph>
+<!-- removed HID HID_DSADMIN_CHARSET_ODBC --><paragraph role="heading" id="hd_id3152472" xml-lang="en-US" level="2" l10n="U" oldref="12">Character Set</paragraph>
<paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_DSADMIN_CHARSET_ODBC">Select the code conversion that you want to use to view the database in $[officename]. This does not affect the database.</ahelp> Choose "System" to use the default character set of your operating system. 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.</paragraph>
</section>
<section id="retrieve">
diff --git a/helpcontent2/source/text/shared/explorer/database/11030000.xhp b/helpcontent2/source/text/shared/explorer/database/11030000.xhp
index 9cce4c222d..558d0cb75e 100644
--- a/helpcontent2/source/text/shared/explorer/database/11030000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11030000.xhp
@@ -52,7 +52,7 @@
<paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="17">In dBASE format, deleted records remain in the file. </paragraph>
<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="15">To view any changes that you make to the database, close the connection to the database, and then reconnect the database.</paragraph>
<paragraph role="paragraph" id="par_id6051820" xml-lang="en-US" l10n="NEW"><comment>UFI: deleted note about case sensitivity. Should be not other than for all other files.</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHARSET_DBASE" id="bm_id3154760" localize="false"/>
+<!-- removed HID HID_DSADMIN_CHARSET_DBASE -->
<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"/>
diff --git a/helpcontent2/source/text/shared/explorer/database/11030100.xhp b/helpcontent2/source/text/shared/explorer/database/11030100.xhp
index e05f2537b1..733522a0ce 100755
--- a/helpcontent2/source/text/shared/explorer/database/11030100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11030100.xhp
@@ -45,19 +45,19 @@
<section id="howtoget">
<embed href="text/shared/00/00000450.xhp#dBasein"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_COMBOBOX_DLG_DBASE_INDEXES_CB_TABLES" id="bm_id3146958" localize="false"/><paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="2" l10n="U" oldref="3">Table</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ComboBox:DLG_DBASE_INDEXES:CB_TABLES" id="bm_id3146958" localize="false"/><paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="2" l10n="U" oldref="3">Table</paragraph>
<paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_COMBOBOX_DLG_DBASE_INDEXES_CB_TABLES">Select the database table that you want to index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_DBASE_INDEXES_LB_TABLEINDEXES" id="bm_id3153312" localize="false"/><paragraph role="heading" id="hd_id3159233" xml-lang="en-US" level="2" l10n="U" oldref="4">Table Indexes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_DBASE_INDEXES:LB_TABLEINDEXES" id="bm_id3153312" localize="false"/><paragraph role="heading" id="hd_id3159233" xml-lang="en-US" level="2" l10n="U" oldref="4">Table Indexes</paragraph>
<paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBACCESS_LISTBOX_DLG_DBASE_INDEXES_LB_TABLEINDEXES">Lists the current indexes for the selected database table.</ahelp> To remove an index from the list, click the index, and then click the right arrow.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_DBASE_INDEXES_LB_FREEINDEXES" id="bm_id3147276" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="5">Free Indexes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_DBASE_INDEXES:LB_FREEINDEXES" id="bm_id3147276" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="5">Free Indexes</paragraph>
<paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBACCESS_LISTBOX_DLG_DBASE_INDEXES_LB_FREEINDEXES">Lists the available indexes that you can assign to a table.</ahelp> To assign an index to a selected table, click the left arrow icon. The left double arrow assigns all available indexes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_ADD" id="bm_id3146949" localize="false"/><paragraph role="heading" id="hd_id3156152" xml-lang="en-US" level="2" l10n="U" oldref="6">&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADD" id="bm_id3146949" localize="false"/><paragraph role="heading" id="hd_id3156152" xml-lang="en-US" level="2" l10n="U" oldref="6">&lt;</paragraph>
<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_ADD">Moves the selected index to the <emph>Table Indexes</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_ADDALL" id="bm_id3153147" localize="false"/><paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="2" l10n="U" oldref="7">&lt;&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADDALL" id="bm_id3153147" localize="false"/><paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="2" l10n="U" oldref="7">&lt;&lt;</paragraph>
<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_ADDALL">Moves all of the free indexes to the <emph>Table Indexes</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_REMOVE" id="bm_id3147619" localize="false"/><paragraph role="heading" id="hd_id3149579" xml-lang="en-US" level="2" l10n="U" oldref="8">&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVE" id="bm_id3147619" localize="false"/><paragraph role="heading" id="hd_id3149579" xml-lang="en-US" level="2" l10n="U" oldref="8">&gt;</paragraph>
<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_REMOVE">Moves the selected table indexes to the <emph>Free Indexes</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_REMOVEALL" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3155629" xml-lang="en-US" level="2" l10n="U" oldref="9">&gt;&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVEALL" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3155629" xml-lang="en-US" level="2" l10n="U" oldref="9">&gt;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_REMOVEALL">Moves all of the table indexes to the <emph>Free Indexes</emph> list.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/11080000.xhp b/helpcontent2/source/text/shared/explorer/database/11080000.xhp
index 4a6ddd83ec..33e9fb1de6 100644
--- a/helpcontent2/source/text/shared/explorer/database/11080000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11080000.xhp
@@ -52,16 +52,16 @@
<embed href="text/shared/guide/data_enter_sql.xhp#data_enter_sql"/>
<paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="23">You can only enter administration commands in this dialog, such as Grant, Create Table, or Drop Table, and not filter commands. The commands that you can enter depend on the data source, for example, dBASE can only run some of the SQL commands list here.</paragraph>
<paragraph role="note" id="par_id3154860" xml-lang="en-US" l10n="U" oldref="10">To run an SQL query for filtering data in the database, use the <link href="text/shared/explorer/database/02010100.xhp" name="Query Design">Query Design View</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILINEEDIT_DLG_DIRECTSQL_ME_SQL" id="bm_id3150772" localize="false"/><paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="2" l10n="U" oldref="3">Command to execute</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_SQL" id="bm_id3150772" localize="false"/><paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="2" l10n="U" oldref="3">Command to execute</paragraph>
<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="DBACCESS_MULTILINEEDIT_DLG_DIRECTSQL_ME_SQL">Enter the SQL administration command that you want to run.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3153087" xml-lang="en-US" l10n="U" oldref="24">For example, for a "Bibliography" data source, you can enter the following SQL command:</paragraph>
<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="25">SELECT "Address" FROM "biblio" "biblio"</paragraph>
<paragraph role="paragraph" id="par_id3145611" xml-lang="en-US" l10n="U" oldref="21">For more information on SQL commands, please consult the documentation that came with the database.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_DIRECTSQL_LB_HISTORY" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3156024" xml-lang="en-US" level="2" l10n="U" oldref="26">Previous commands</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_DIRECTSQL:LB_HISTORY" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3156024" xml-lang="en-US" level="2" l10n="U" oldref="26">Previous commands</paragraph>
<paragraph role="paragraph" id="par_id3149045" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="DBACCESS_LISTBOX_DLG_DIRECTSQL_LB_HISTORY">Lists the previously executed SQL commands. To run a command again, click the command, and then click <emph>Run</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILINEEDIT_DLG_DIRECTSQL_ME_STATUS" id="bm_id3161656" localize="false"/><paragraph role="heading" id="hd_id3154348" xml-lang="en-US" level="2" l10n="U" oldref="5">Status</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_STATUS" id="bm_id3161656" localize="false"/><paragraph role="heading" id="hd_id3154348" xml-lang="en-US" level="2" l10n="U" oldref="5">Status</paragraph>
<paragraph role="paragraph" id="par_id3151054" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_MULTILINEEDIT_DLG_DIRECTSQL_ME_STATUS">Displays the results, including errors, of the SQL command that you ran.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_DLG_DIRECTSQL_PB_EXECUTE" id="bm_id3148798" localize="false"/><paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="2" l10n="U" oldref="7">Run</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:DLG_DIRECTSQL:PB_EXECUTE" id="bm_id3148798" localize="false"/><paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="2" l10n="U" oldref="7">Run</paragraph>
<paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_PUSHBUTTON_DLG_DIRECTSQL_PB_EXECUTE">Runs the command that you entered in the <emph>Command to execute </emph>box.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#schliessen2"/>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/11170000.xhp b/helpcontent2/source/text/shared/explorer/database/11170000.xhp
index 8e14bcc945..f05730913c 100755
--- a/helpcontent2/source/text/shared/explorer/database/11170000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11170000.xhp
@@ -44,17 +44,17 @@
<paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/11170000.xhp" name="Adabas D Statistics">Adabas D Statistics</link></paragraph>
<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Specifies the access options for the Adabas database.</ahelp></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_CACHE_SIZE" id="bm_id3151226" localize="false"/><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="4">Data Buffer Size</paragraph>
+<!-- removed HID DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_CACHE_SIZE --><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="4">Data Buffer Size</paragraph>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_CACHE_SIZE">Enter the size of the data buffer for the database.</ahelp> The setting takes effect after you restart the database.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_DATA_INCREMENT" id="bm_id3149827" localize="false"/><paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="6">Increment size</paragraph>
+<!-- removed HID DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_DATA_INCREMENT --><paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="6">Increment size</paragraph>
<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_DATA_INCREMENT">Enter the size by which you want to automatically increment the database. The maximum increment size is 100 MB.</ahelp> The setting takes effect after you restart the database.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLUSERNAME" id="bm_id3149399" localize="false"/><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="8">Control User Name</paragraph>
+<!-- removed HID DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLUSERNAME --><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="8">Control User Name</paragraph>
<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLUSERNAME">Enter the name of a user that you want to give limited control to modify some parameters of the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLPASSWORD" id="bm_id3149233" localize="false"/><paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="2" l10n="U" oldref="10">Control Password</paragraph>
+<!-- removed HID DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLPASSWORD --><paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="2" l10n="U" oldref="10">Control Password</paragraph>
<paragraph role="paragraph" id="par_id3153821" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLPASSWORD">Enter the password of the Control User.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_TAB_PAG_ADABAS_SETTINGS_CB_SHUTDB" id="bm_id3149516" localize="false"/><paragraph role="heading" id="hd_id3149235" xml-lang="en-US" level="2" l10n="U" oldref="12">Shut down the service when closing $[officename]</paragraph>
+<!-- removed HID DBACCESS_CHECKBOX_TAB_PAG_ADABAS_SETTINGS_CB_SHUTDB --><paragraph role="heading" id="hd_id3149235" xml-lang="en-US" level="2" l10n="U" oldref="12">Shut down the service when closing $[officename]</paragraph>
<paragraph role="paragraph" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBACCESS_CHECKBOX_TAB_PAG_ADABAS_SETTINGS_CB_SHUTDB">Exits the Adabas database server when you exit $[officename].</ahelp> This option is only available if you start the database server from $[officename] with a control user and password.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_TAB_PAG_ADABAS_SETTINGS_PB_STAT" id="bm_id3150670" localize="false"/><paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="2" l10n="U" oldref="14">Extended</paragraph>
+<!-- removed HID DBACCESS_PUSHBUTTON_TAB_PAG_ADABAS_SETTINGS_PB_STAT --><paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="2" l10n="U" oldref="14">Extended</paragraph>
<paragraph role="paragraph" id="par_id3156002" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_PAG_ADABAS_SETTINGS_PB_STAT">Opens the <link href="text/shared/explorer/database/11170100.xhp" name="Database Statistics">Database Statistics</link> dialog, where you can view statistics about the Adabas database.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/11170100.xhp b/helpcontent2/source/text/shared/explorer/database/11170100.xhp
index 8ac82d8d79..f8df2f7319 100755
--- a/helpcontent2/source/text/shared/explorer/database/11170100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11170100.xhp
@@ -43,18 +43,18 @@
<paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="1" l10n="U" oldref="1">Database Statistics</paragraph>
<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="2">Displays statistics about the Adabas database.</paragraph>
<paragraph role="heading" id="hd_id3150040" xml-lang="en-US" level="2" l10n="U" oldref="3">Database files</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_ADABASSTAT_ET_SYSDEVSPACE" id="bm_id3149346" localize="false"/><paragraph role="heading" id="hd_id3152594" xml-lang="en-US" level="3" l10n="U" oldref="5">SYSDEVSPACE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_ADABASSTAT:ET_SYSDEVSPACE" id="bm_id3149346" localize="false"/><paragraph role="heading" id="hd_id3152594" xml-lang="en-US" level="3" l10n="U" oldref="5">SYSDEVSPACE</paragraph>
<paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_EDIT_DLG_ADABASSTAT_ET_SYSDEVSPACE">Displays the path and the name of the SYSDEVSPACE file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_ADABASSTAT_ET_TRANSACTIONLOG" id="bm_id3156427" localize="false"/><paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="7">TRANSACTIONLOG</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_ADABASSTAT:ET_TRANSACTIONLOG" id="bm_id3156427" localize="false"/><paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="7">TRANSACTIONLOG</paragraph>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_EDIT_DLG_ADABASSTAT_ET_TRANSACTIONLOG">Displays the path and the name of the TRANSACTIONLOG file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_ADABASSTAT_LB_DATADEVS" id="bm_id3147089" localize="false"/><paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="3" l10n="U" oldref="9">DATADEVSPACE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_ADABASSTAT:LB_DATADEVS" id="bm_id3147089" localize="false"/><paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="3" l10n="U" oldref="9">DATADEVSPACE</paragraph>
<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_LISTBOX_DLG_ADABASSTAT_LB_DATADEVS">Displays the path and the name of the DATADEVSPACE file.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152996" xml-lang="en-US" level="2" l10n="U" oldref="11">Database sizes</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_ADABASSTAT_ET_SIZE" id="bm_id3150085" localize="false"/><paragraph role="heading" id="hd_id3145382" xml-lang="en-US" level="3" l10n="U" oldref="13">Size (MB)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_ADABASSTAT:ET_SIZE" id="bm_id3150085" localize="false"/><paragraph role="heading" id="hd_id3145382" xml-lang="en-US" level="3" l10n="U" oldref="13">Size (MB)</paragraph>
<paragraph role="paragraph" id="par_id3149415" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="DBACCESS_EDIT_DLG_ADABASSTAT_ET_SIZE">Displays the full size (in megabytes) of the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_ADABASSTAT_ET_FREESIZE" id="bm_id3152350" localize="false"/><paragraph role="heading" id="hd_id3154285" xml-lang="en-US" level="3" l10n="U" oldref="15">Free space (MB)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_ADABASSTAT:ET_FREESIZE" id="bm_id3152350" localize="false"/><paragraph role="heading" id="hd_id3154285" xml-lang="en-US" level="3" l10n="U" oldref="15">Free space (MB)</paragraph>
<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="DBACCESS_EDIT_DLG_ADABASSTAT_ET_FREESIZE">Displays the amount of free space (in megabytes) that is available in the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_NUMERICFIELD_DLG_ADABASSTAT_ET_MEMORYUSING" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3149237" xml-lang="en-US" level="3" l10n="U" oldref="17">Memory utilization (in %)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:NumericField:DLG_ADABASSTAT:ET_MEMORYUSING" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3149237" xml-lang="en-US" level="3" l10n="U" oldref="17">Memory utilization (in %)</paragraph>
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="DBACCESS_NUMERICFIELD_DLG_ADABASSTAT_ET_MEMORYUSING">Displays the amount of used space in the database as a percentage.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/30100000.xhp b/helpcontent2/source/text/shared/explorer/database/30100000.xhp
index 0e119329d5..c673f7af1c 100644
--- a/helpcontent2/source/text/shared/explorer/database/30100000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/30100000.xhp
@@ -46,7 +46,7 @@
<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>
-<bookmark xml-lang="en-US" branch="hid/SD_EDIT_DLG_INSERT_PAGE_EDT_NAME" id="bm_id3144510" localize="false"/>
+<!-- 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>
<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>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
index 15a408ea00..2ed11ea686 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
@@ -88,7 +88,7 @@
<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>
-<bookmark xml-lang="en-US" branch="hid/39067" id="bm_id4841355" localize="false"/>
+<!-- removed HID 39067 -->
<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>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
index 712bf16d96..77892be6b7 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
@@ -53,7 +53,7 @@
<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>
+<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>
<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>
@@ -63,7 +63,7 @@
<paragraph role="paragraph" id="par_idN105C3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the ODBC data source.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
<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>
+<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>
<paragraph role="paragraph" id="par_id5589159" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the database.</ahelp></paragraph>
@@ -78,10 +78,10 @@
<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/39110" id="bm_id5591296" localize="false"/><paragraph role="heading" id="par_idN105FE" xml-lang="en-US" level="2" l10n="NEW">JDBC driver class</paragraph>
+<!-- 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/39111" id="bm_id4361705" localize="false"/><paragraph role="heading" id="par_idN10605" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: found for JDBC</comment></paragraph>
+<!-- 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>
<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a database from the list or click <emph>Create</emph> to create a new database.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
index b5a13d3769..6ce4165036 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
@@ -48,16 +48,16 @@
<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>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_OPENEXISTINGDOC" id="bm_id8278756" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC" id="bm_id2400585" localize="false"/>
+<!-- removed HID HID_PAGE_DBWIZARD_GENERAL_RB_OPENEXISTINGDOC -->
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:PAGE_GENERAL:RB_OPENEXISTINGDOC" id="bm_id2400585" localize="false"/>
<paragraph role="heading" id="par_idN105F9" xml-lang="en-US" level="2" l10n="NEW">Open an existing database file</paragraph>
<paragraph role="paragraph" id="par_idN105FD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to open a database file from a list of recently used files or from a file selection dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_LB_DOCUMENTLIST" id="bm_id2050538" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST" id="bm_id5958128" localize="false"/>
+<!-- removed HID HID_PAGE_DBWIZARD_GENERAL_LB_DOCUMENTLIST -->
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:PAGE_GENERAL:LB_DOCUMENTLIST" id="bm_id5958128" localize="false"/>
<paragraph role="heading" id="par_idN10614" xml-lang="en-US" level="3" l10n="NEW">Recently used</paragraph>
<paragraph role="paragraph" id="par_idN10618" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a database file to open from the list of recently used files. Click Finish to open the file immediately and to exit the wizard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_PB_OPENDOCUMENT" id="bm_id1602832" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_PAGE_GENERAL_PB_OPENDOCUMENT" id="bm_id6427198" localize="false"/>
+<!-- removed HID HID_PAGE_DBWIZARD_GENERAL_PB_OPENDOCUMENT -->
+<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"/>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
index bb0b8e7306..c15dfe0b0e 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
@@ -89,14 +89,14 @@
<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>
<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/852248660" id="bm_id3400372" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/852330580" id="bm_id7055879" localize="false"/><paragraph role="heading" id="par_idN106BB" xml-lang="en-US" level="2" l10n="NEW">JDBC Driver Class</paragraph>
+<!-- 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>
<section id="classpath">
<paragraph role="warning" id="par_id7953733" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME</emph>
<emph>- Java</emph>, and click the <emph>Class Path</emph> button. After you add the path information, restart <item type="productname">%PRODUCTNAME</item>.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/852251216" id="bm_id3968932" localize="false"/><paragraph role="heading" id="par_idN106CE" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: may be Test Connection - both strings are in spec</comment></paragraph>
+<!-- removed HID 852251216 --><paragraph role="heading" id="par_idN106CE" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: may be Test Connection - both strings are in spec</comment></paragraph>
<paragraph role="paragraph" id="par_idN106E4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the connection with the current settings.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN106E7" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph>
<paragraph role="paragraph" id="par_idN106F6" 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/dabawiz02ldap.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
index 9f9d4d4ada..a3ed715800 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
@@ -35,10 +35,6 @@
<title id="tit" xml-lang="en-US">LDAP Connection</title>
<filename>/text/shared/explorer/database/dabawiz02ldap.xhp</filename>
</topic>
-<history>
-<created date="2004-07-28T15:24:27">UFI: Database Wizard LDAP page</created>
-<lastedited date="2006-04-28T12:20:09">YJ: checked</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id22583"><bookmark_value>LDAP server; address books (Base)</bookmark_value>
@@ -63,7 +59,9 @@
<bookmark xml-lang="en-US" branch="hid/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">
<paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph>
<paragraph role="paragraph" id="par_idN105F5" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
+</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp
index d5f351066a..ead2ab3e44 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp
@@ -77,10 +77,10 @@
<bookmark xml-lang="en-US" branch="hid/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>
-<bookmark xml-lang="en-US" branch="hid/852231276" id="bm_id3172399" localize="false"/>
+<!-- removed HID 852231276 -->
<paragraph role="heading" id="par_idN1061D" xml-lang="en-US" level="2" l10n="NEW">Oracle JDBC Driver Class</paragraph>
<paragraph role="paragraph" id="par_idN10621" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_DRIVERCLASS">Enter the name of the JDBC driver.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/852234832" id="bm_id209051" localize="false"/>
+<!-- removed HID 852234832 -->
<paragraph role="heading" id="par_idN10630" xml-lang="en-US" level="2" l10n="NEW">Test Class</paragraph>
<paragraph role="paragraph" id="par_idN10634" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the connection with the current settings.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10637" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/menuedit.xhp b/helpcontent2/source/text/shared/explorer/database/menuedit.xhp
index fd2904d857..130b0653fd 100755
--- a/helpcontent2/source/text/shared/explorer/database/menuedit.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menuedit.xhp
@@ -54,12 +54,12 @@
<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/12293" id="bm_id2726523" 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/.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/12291" id="bm_id4481643" 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/.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/menufilesave.xhp b/helpcontent2/source/text/shared/explorer/database/menufilesave.xhp
index 2ac073b678..a06681d9d2 100644
--- a/helpcontent2/source/text/shared/explorer/database/menufilesave.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menufilesave.xhp
@@ -44,16 +44,16 @@
<body>
<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW">Save</paragraph>
<paragraph role="paragraph" id="par_idN1054B" xml-lang="en-US" l10n="NEW">In this dialog, you can specify the position and name of a form <comment>UFI: spec says also for report, but reports can be created only by Wizard and are autosaved there</comment><comment>UFI: spec says also for query, cannot verify</comment> that you save within a <link href="text/shared/explorer/database/dabadoc.xhp">database file</link>. The dialog opens automatically when you save a form the first time.<comment>UFI: no chance to open the dialog a second time</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_NEWFOLDER" id="bm_id2862636" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_NEWFOLDER" id="bm_id2862636" localize="false"/>
<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Create New Directory</paragraph>
<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to create a new folder within the database file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_UP" id="bm_id2447279" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_UP" id="bm_id2447279" localize="false"/>
<paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="2" l10n="NEW">Up One Level</paragraph>
<paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to go up one level in the folder hierarchy.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_Edit_DLG_COLLECTION_VIEW_ED_EXPLORERFILE_FILENAME" id="bm_id1669362" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_COLLECTION_VIEW:ED_EXPLORERFILE_FILENAME" id="bm_id1669362" localize="false"/>
<paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="2" l10n="NEW">File name</paragraph>
<paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the file name for the saved form.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_SAVE" id="bm_id1720023" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_SAVE" id="bm_id1720023" localize="false"/>
<paragraph role="heading" id="par_idN105B5" xml-lang="en-US" level="2" l10n="NEW">Save</paragraph>
<paragraph role="paragraph" id="par_idN105B9" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Click to save the form to the database file.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp b/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
index 99a8adc119..11b48dd44f 100644
--- a/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
@@ -48,9 +48,9 @@
<bookmark xml-lang="en-US" branch="hid/.uno:DBMigrateScripts" id="bm_id0224200911384751" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0112200902353466" role="paragraph" l10n="NEW"><ahelp hid=".">The Database Document Macro Migration Wizard moves existing macros from sub-documents of an old Base file into the new Base file's macro storage area.</ahelp></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_TP_SAVE_DBDOC_AS_PB_BROWSE_SAVE_AS_LOCATION" id="bm_id022420091141368" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TP_SAVE_DBDOC_AS:PB_BROWSE_SAVE_AS_LOCATION" id="bm_id022420091141368" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0224200911454780" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose a location and file name to save the new database file. By default, the new file gets the same name as the old file, while the old file gets renamed with the string "backup" in the name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_MultiLineEdit_TP_SUMMARY_ED_CHANGES" id="bm_id0224200911450172" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiLineEdit:TP_SUMMARY:ED_CHANGES" id="bm_id0224200911450172" localize="false"/>
<paragraph xml-lang="en-US" id="par_id022420091145472" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The list shows all changes that were applied to the database file.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id0112200902353542" role="paragraph" l10n="NEW">Previously, macros have been allowed to reside only in the text sub-documents of forms and reports. Now macros can also be stored in the Base file itself. This means that macros in Base files can be called now from any of its sub-components: forms, reports, table design, query design, relation design, table data view.</paragraph>
<paragraph xml-lang="en-US" id="par_id0112200903075865" role="paragraph" l10n="NEW">However, it is technically not possible to store macros both in a Base file and in its sub-documents at the same time. So, if you want to attach some new macros to the Base file, while retaining any existing old macros that were stored in the sub-documents, you must move the existing old macros up to the Base file's macro storage area. </paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/password.xhp b/helpcontent2/source/text/shared/explorer/database/password.xhp
index f9900f1697..18782424a4 100644
--- a/helpcontent2/source/text/shared/explorer/database/password.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/password.xhp
@@ -41,13 +41,13 @@
</meta>
<body>
<paragraph role="heading" id="par_idN10541" xml-lang="en-US" level="1" l10n="NEW">User Name and Password Required</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_Edit_DLG_LOGIN_ED_LOGIN_USERNAME" id="bm_id1444135" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:Edit:DLG_LOGIN:ED_LOGIN_USERNAME" id="bm_id1444135" localize="false"/>
<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
<paragraph role="paragraph" id="par_idN10551" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the user name to connect to the data source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_Edit_DLG_LOGIN_ED_LOGIN_PASSWORD" id="bm_id7426984" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:Edit:DLG_LOGIN:ED_LOGIN_PASSWORD" id="bm_id7426984" localize="false"/>
<paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2" l10n="NEW">Password</paragraph>
<paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the password to connect to the data source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_CheckBox_DLG_LOGIN_CB_LOGIN_SAVEPASSWORD" id="bm_id9922788" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_LOGIN:CB_LOGIN_SAVEPASSWORD" id="bm_id9922788" localize="false"/>
<paragraph role="heading" id="par_idN10583" xml-lang="en-US" level="2" l10n="NEW">Remember password till end of session</paragraph>
<paragraph role="paragraph" id="par_idN10587" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to use the same user name and password without further dialog, when you connect again to the same data source in the current %PRODUCTNAME session.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_datetime.xhp b/helpcontent2/source/text/shared/explorer/database/rep_datetime.xhp
index 1bb5ed05bc..e08f3b0657 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_datetime.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_datetime.xhp
@@ -44,14 +44,14 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id8638874" xml-lang="en-US" l10n="NEW"><ahelp hid=".">You can open the Date and Time dialog of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">Insert - Date and Time</item>.</ahelp></paragraph>
<paragraph role="tip" id="par_id6278878" 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>
-<bookmark xml-lang="en-US" branch="hid/1577878529" id="bm_id5607470" localize="false"/><paragraph role="paragraph" id="par_id393078" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable Include Date to insert a date field into the active area of the report. The date field displays the current date when the report is executed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577878018" id="bm_id9102145" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1577878019" id="bm_id3624073" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1577878020" id="bm_id1140781" localize="false"/><paragraph role="paragraph" id="par_id1271401" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a format to display the date.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577878533" id="bm_id6481215" localize="false"/><paragraph role="paragraph" id="par_id8718832" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable Include Time to insert a time field into the active area of the report. The time field displays the current time when the report is executed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577878022" id="bm_id5113681" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1577878023" id="bm_id3558458" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1577878024" id="bm_id3776360" localize="false"/><paragraph role="paragraph" id="par_id8561052" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a format to display the time.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_CHECKBOX_RID_DATETIME_DLG_CB_DATE" id="bm_id5607470" localize="false"/><paragraph role="paragraph" id="par_id393078" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable Include Date to insert a date field into the active area of the report. The date field displays the current date when the report is executed.</ahelp></paragraph>
+<!-- removed HID 1577878018 -->
+<!-- removed HID 1577878019 -->
+<!-- removed HID 1577878020 --><paragraph role="paragraph" id="par_id1271401" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a format to display the date.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_CHECKBOX_RID_DATETIME_DLG_CB_TIME" id="bm_id6481215" localize="false"/><paragraph role="paragraph" id="par_id8718832" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable Include Time to insert a time field into the active area of the report. The time field displays the current time when the report is executed.</ahelp></paragraph>
+<!-- removed HID 1577878022 -->
+<!-- removed HID 1577878023 -->
+<!-- removed HID 1577878024 --><paragraph role="paragraph" id="par_id8561052" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a format to display the time.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id5992919" xml-lang="en-US" l10n="NEW">Click OK to insert the field.</paragraph>
<paragraph role="paragraph" id="par_id4320810" xml-lang="en-US" l10n="NEW">You can click the date or time field and drag to another position within the same area, or edit the properties in the Properties window.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
index 05116569b5..6db770f8e8 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
@@ -50,13 +50,13 @@
<paragraph xml-lang="en-US" id="par_id5284279" role="paragraph" l10n="NEW">Choose Tools - Extension Manager to open the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id4494766" role="paragraph" l10n="NEW">Click the link "Get more extensions here". This opens your web browser at the address <link href="http://extensions.services.openoffice.org">http://extensions.services.openoffice.org</link> and shows a list of available extensions.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4494766" role="paragraph" l10n="CHG">If you see the Report Builder in the Extension Manager list, then you do not need to install the extension. Else click the link "Get more extensions here". This opens your web browser at the address <link href="http://extensions.services.openoffice.org">http://extensions.services.openoffice.org</link> and shows a list of available extensions.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id7858516" role="paragraph" l10n="NEW">Find the Report Builder extension. Click at the icon or the "click here" text link. This opens the download page for the extension.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id973540" role="paragraph" l10n="NEW">Click the "Get it!" icon. The file "report-builder.oxt" will be downloaded to your computer.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id973540" role="paragraph" l10n="NEW">Click the "Get it!" icon. The extension file will be downloaded to your computer.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id4680928" role="paragraph" l10n="NEW">Switch back from your web browser to the %PRODUCTNAME window. The Extension Manager should still be visible.</paragraph>
@@ -65,7 +65,7 @@
<paragraph xml-lang="en-US" id="par_id9014252" role="paragraph" l10n="NEW">In the Extension Manager, click Add to open the Add extensions dialog.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id6011841" role="paragraph" l10n="NEW">Select the "report-builder.oxt" file that you downloaded. Click Open.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6011841" role="paragraph" l10n="NEW">Select the extension file that you downloaded. Click Open.</paragraph>
<paragraph xml-lang="en-US" id="par_id2591326" role="paragraph" l10n="NEW">This starts the installation of the Report Builder extension.</paragraph>
</listitem>
<listitem>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp b/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp
index 2e62ad0c8c..a2c4323d92 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/64521" 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/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/64522" 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/64523" 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/64518" 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/64519" 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/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>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_pagenumbers.xhp b/helpcontent2/source/text/shared/explorer/database/rep_pagenumbers.xhp
index 65c5f52da0..b1e09930b7 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_pagenumbers.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_pagenumbers.xhp
@@ -44,11 +44,11 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3424481" xml-lang="en-US" l10n="NEW"><ahelp hid=".">You can open the Page Numbers dialog of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">Insert - Page Numbers</item>.</ahelp></paragraph>
<paragraph role="tip" id="par_id1068758" 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>
-<bookmark xml-lang="en-US" branch="hid/1577861634" id="bm_id7565843" localize="false"/><paragraph role="paragraph" id="par_id1559190" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Page N</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577861635" id="bm_id6649372" localize="false"/><paragraph role="paragraph" id="par_id9879146" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Page N of M</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577861637" id="bm_id7334208" localize="false"/><paragraph role="paragraph" id="par_id9404278" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Top of Page (Header)</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577861638" id="bm_id8313852" localize="false"/><paragraph role="paragraph" id="par_id7626880" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Bottom of Page (Footer)</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577864712" id="bm_id8829309" localize="false"/><paragraph role="paragraph" id="par_id6124149" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Alignment</ahelp></paragraph><comment>Show Number On First Page - not in UI</comment><paragraph role="paragraph" id="par_id9651478" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Show Number on First Page</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_N" id="bm_id7565843" localize="false"/><paragraph role="paragraph" id="par_id1559190" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Page N</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_N_OF_M" id="bm_id6649372" localize="false"/><paragraph role="paragraph" id="par_id9879146" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Page N of M</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_TOPPAGE" id="bm_id7334208" localize="false"/><paragraph role="paragraph" id="par_id9404278" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Top of Page (Header)</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_BOTTOMPAGE" id="bm_id8313852" localize="false"/><paragraph role="paragraph" id="par_id7626880" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Bottom of Page (Footer)</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_PAGENUMBERS_LST_ALIGNMENT" id="bm_id8829309" localize="false"/><paragraph role="paragraph" id="par_id6124149" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Alignment</ahelp></paragraph><comment>Show Number On First Page - not in UI</comment><paragraph role="paragraph" id="par_id9651478" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Show Number on First Page</ahelp></paragraph>
<list type="unordered">
<listitem>
<paragraph role="paragraph" id="par_id8257087" xml-lang="en-US" l10n="NEW">Select the format for the page numbers, either "Page N" or "Page N of M", where N stands for the current page number, and M for the total number of pages in the report.</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_prop.xhp b/helpcontent2/source/text/shared/explorer/database/rep_prop.xhp
index dfae282311..6f83c36817 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/64473" 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/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/64505" 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/64506" 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/64507" 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/64493" 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/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>
<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/64511" 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/64504" 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/64515" 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/64494" 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/64527" 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/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>
<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/64477" 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/64478" 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/64479" 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/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>
<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/64526" 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/64512" 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/64513" 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/64514" 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/64524" 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/64501" 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/37854" 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/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>
<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/64510" 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/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 790e0174ca..b7cb9952de 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_sort.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_sort.xhp
@@ -46,23 +46,23 @@
</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/64463" id="bm_id2480849" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/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/64461" id="bm_id4181951" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/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>
-<bookmark xml-lang="en-US" branch="hid/2114727444" id="bm_id2927335" localize="false"/>
+<!-- removed HID 2114727444 -->
<bookmark xml-lang="en-US" branch="hid/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>
-<bookmark xml-lang="en-US" branch="hid/2114727445" id="bm_id2107303" localize="false"/>
+<!-- removed HID 2114727445 -->
<bookmark xml-lang="en-US" branch="hid/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/2114719249" id="bm_id4071779" localize="false"/>
+<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>
-<bookmark xml-lang="en-US" branch="hid/2114719234" id="bm_id7844477" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_GROUPS_SORTING_LST_HEADERLST" id="bm_id7844477" localize="false"/>
<paragraph xml-lang="en-US" id="par_id5833307" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select to show or hide the Group Header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/2114719236" id="bm_id6478469" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_GROUPS_SORTING_LST_FOOTERLST" id="bm_id6478469" localize="false"/>
<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/2114719238" id="bm_id9038972" localize="false"/>
+<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"/>
<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>
@@ -78,7 +78,7 @@
<paragraph xml-lang="en-US" id="par_id2855616" role="paragraph" l10n="NEW">For fields of type AutoNumber, Currency, or Number, you specify an interval.<comment>how?</comment></paragraph>
</listitem>
</list>
-<bookmark xml-lang="en-US" branch="hid/2114721800" id="bm_id7985168" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_NUMERICFIELD_RID_GROUPS_SORTING_ED_GROUPINTERVALLST" id="bm_id7985168" localize="false"/>
<paragraph xml-lang="en-US" id="par_id7700430" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the group interval value that records are grouped by.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/reportdesign:ListBox:RID_GROUPS_SORTING:LST_KEEPTOGETHERLST" id="bm_id9573961" localize="false"/>
<paragraph xml-lang="en-US" id="par_id1180455" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select the level of detail by which a group is kept together on the same page.</ahelp></paragraph>