CWS changehid: generate former auto hids into src files

28 files changed, 171 insertions, 0 deletions

diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src
index 97cc72f5f..b772d3841 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -31,6 +31,7 @@
 // -----------------------------------------------------------------------------
 ModalDialog DLG_MACRO_MIGRATION
 {
+    HelpID = "dbaccess:ModalDialog:DLG_MACRO_MIGRATION";
     OutputSize = TRUE ;
     Moveable = TRUE;
     Closeable = TRUE ;
@@ -65,6 +66,7 @@ ModalDialog DLG_MACRO_MIGRATION
 
 TabPage TP_PREPARE
 {
+    HelpID = "dbaccess:TabPage:TP_PREPARE";
     Pos = MAP_APPFONT( 40, 130 );
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
 
@@ -115,6 +117,7 @@ TabPage TP_PREPARE
 
 TabPage TP_SAVE_DBDOC_AS
 {
+    HelpID = "dbaccess:TabPage:TP_SAVE_DBDOC_AS";
     Pos = MAP_APPFONT( 40, 130 );
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
 
@@ -152,6 +155,7 @@ TabPage TP_SAVE_DBDOC_AS
 
     ComboBox ED_SAVE_AS_LOCATION
     {
+        HelpID = "dbaccess:ComboBox:TP_SAVE_DBDOC_AS:ED_SAVE_AS_LOCATION";
         Pos = MAP_APPFONT(  TAB_PAGE_CONTENT_MARGIN + 60 + SPACING_RELATED,
                             CONTENT_POS_X + 5 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED );
         Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 + SPACING_RELATED ) - TAB_PAGE_CONTENT_MARGIN,
@@ -163,6 +167,7 @@ TabPage TP_SAVE_DBDOC_AS
 
     PushButton PB_BROWSE_SAVE_AS_LOCATION
     {
+        HelpID = "dbaccess:PushButton:TP_SAVE_DBDOC_AS:PB_BROWSE_SAVE_AS_LOCATION";
         Pos = MAP_APPFONT(  TAB_PAGE_WIDTH - BUTTON_WIDTH - TAB_PAGE_CONTENT_MARGIN,
                             CONTENT_POS_X + 5 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + INPUT_HEIGHT + SPACING_RELATED );
         Size = MAP_APPFONT( BUTTON_WIDTH, BUTTON_HEIGHT );
@@ -189,6 +194,7 @@ TabPage TP_SAVE_DBDOC_AS
 
 TabPage TP_MIGRATE
 {
+    HelpID = "dbaccess:TabPage:TP_MIGRATE";
     Pos = MAP_APPFONT( 40, 130 );
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
 
@@ -302,6 +308,7 @@ TabPage TP_MIGRATE
 
 TabPage TP_SUMMARY
 {
+    HelpID = "dbaccess:TabPage:TP_SUMMARY";
     Pos = MAP_APPFONT( 40, 130 );
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
 
@@ -325,6 +332,7 @@ TabPage TP_SUMMARY
 
     MultiLineEdit ED_CHANGES
     {
+        HelpID = "dbaccess:MultiLineEdit:TP_SUMMARY:ED_CHANGES";
         Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X + FIXED_TEXT_HEIGHT + SPACING_RELATED );
         Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
                             TAB_PAGE_HEIGHT - ( CONTENT_POS_X + FIXED_TEXT_HEIGHT + SPACING_RELATED ) - TAB_PAGE_CONTENT_MARGIN );
diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src
index 774725364..95932e67f 100644
--- a/dbaccess/source/ui/dlg/AdabasStat.src
+++ b/dbaccess/source/ui/dlg/AdabasStat.src
@@ -37,6 +37,7 @@
 
 ModalDialog DLG_ADABASSTAT
 {
+    HelpID = "dbaccess:ModalDialog:DLG_ADABASSTAT";
     OutputSize	= TRUE ;
     Moveable	= TRUE ;
     Closeable	= TRUE ;
@@ -59,6 +60,7 @@ ModalDialog DLG_ADABASSTAT
 
     Edit ET_SYSDEVSPACE
     {
+        HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_SYSDEVSPACE";
         Border		= TRUE ;
         Pos			= MAP_APPFONT ( 120 , 14 ) ;
         Size		= MAP_APPFONT ( 128 , 12 ) ;
@@ -75,6 +77,7 @@ ModalDialog DLG_ADABASSTAT
 
     Edit ET_TRANSACTIONLOG
     {
+        HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_TRANSACTIONLOG";
         Border		= TRUE ;
         Pos			= MAP_APPFONT ( 120 , 31 ) ;
         Size		= MAP_APPFONT ( 128 , 12 ) ;
@@ -91,6 +94,7 @@ ModalDialog DLG_ADABASSTAT
 
     ListBox LB_DATADEVS
     {
+        HelpID = "dbaccess:ListBox:DLG_ADABASSTAT:LB_DATADEVS";
         Border		= TRUE ;
         Pos			= MAP_APPFONT ( 120 , 48 ) ;
         Size		= MAP_APPFONT ( 128 , 42 ) ;
@@ -115,6 +119,7 @@ ModalDialog DLG_ADABASSTAT
 
     Edit ET_SIZE
     {
+        HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_SIZE";
         Border		= TRUE ;
         Pos			= MAP_APPFONT ( 120 , 109 ) ;
         Size		= MAP_APPFONT ( 60 , 12 ) ;
@@ -131,6 +136,7 @@ ModalDialog DLG_ADABASSTAT
 
     Edit ET_FREESIZE
     {
+        HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_FREESIZE";
         Border		= TRUE ;
         Pos			= MAP_APPFONT ( 120 , 126 ) ;
         Size		= MAP_APPFONT ( 60 , 12 ) ;
@@ -147,6 +153,7 @@ ModalDialog DLG_ADABASSTAT
 
     NumericField ET_MEMORYUSING
     {
+        HelpID = "dbaccess:NumericField:DLG_ADABASSTAT:ET_MEMORYUSING";
         Border				= TRUE ;
         Pos					= MAP_APPFONT ( 120 , 144 ) ;
         Size				= MAP_APPFONT ( 60 , 12 ) ;
diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src
index 3b82d565a..ac5cecec1 100644
--- a/dbaccess/source/ui/dlg/CollectionView.src
+++ b/dbaccess/source/ui/dlg/CollectionView.src
@@ -64,6 +64,7 @@ ModalDialog DLG_COLLECTION_VIEW
     };
     ImageButton BTN_EXPLORERFILE_NEWFOLDER
     {
+        HelpID = "dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_NEWFOLDER";
         TabStop = FALSE ;
         Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS -  RELATED_CONTROLS - 2*IMG_SIZE, UNRELATED_CONTROLS ) ;
         Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ;
@@ -71,6 +72,7 @@ ModalDialog DLG_COLLECTION_VIEW
     };
     ImageButton BTN_EXPLORERFILE_UP
     {
+        HelpID = "dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_UP";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - IMG_SIZE, UNRELATED_CONTROLS ) ;
         Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ;
@@ -93,6 +95,7 @@ ModalDialog DLG_COLLECTION_VIEW
     };
     Edit ED_EXPLORERFILE_FILENAME
     {
+        HelpID = "dbaccess:Edit:DLG_COLLECTION_VIEW:ED_EXPLORERFILE_FILENAME";
         Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS + 50 , WIN_Y - 3*UNRELATED_CONTROLS - BUTTON_HEIGHT - FIXEDLINE_HEIGHT - EDIT_HEIGHT) ;
         Size = MAP_APPFONT ( WIN_X - RELATED_CONTROLS - 2*UNRELATED_CONTROLS - 50 , EDIT_HEIGHT ) ;
         Border = TRUE ;
@@ -107,6 +110,7 @@ ModalDialog DLG_COLLECTION_VIEW
     
     PushButton BTN_EXPLORERFILE_SAVE
     {
+        HelpID = "dbaccess:PushButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_SAVE";
         Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - RELATED_CONTROLS - 150, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
         Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ;
         DefButton = TRUE ;
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src
index 89241aa5a..9cc27916c 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.src
+++ b/dbaccess/source/ui/dlg/ConnectionPage.src
@@ -42,6 +42,7 @@
 //.........................................................................
 TabPage PAGE_CONNECTION
 {
+    HelpID = "dbaccess:TabPage:PAGE_CONNECTION";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -91,6 +92,7 @@ TabPage PAGE_CONNECTION
     };
     Edit ET_USERNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_CONNECTION:ET_USERNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 90 , 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS -1 ) ;
         Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
@@ -98,6 +100,7 @@ TabPage PAGE_CONNECTION
     };
     CheckBox CB_PASSWORD_REQUIRED
     {
+        HelpID = "dbaccess:CheckBox:PAGE_CONNECTION:CB_PASSWORD_REQUIRED";
         Pos = MAP_APPFONT ( 90 , 4*UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) ;
         Size = MAP_APPFONT ( 105 , CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Password required";
@@ -129,6 +132,7 @@ TabPage PAGE_CONNECTION
 
     PushButton PB_TESTDRIVERCLASS
     {
+        HelpID = "dbaccess:PushButton:PAGE_CONNECTION:PB_TESTDRIVERCLASS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS , 5*UNRELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT + 3*RELATED_CONTROLS + CHECKBOX_HEIGHT -2 ) ;
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
@@ -137,6 +141,7 @@ TabPage PAGE_CONNECTION
 
     PushButton PB_TESTCONNECTION
     {
+        HelpID = "dbaccess:PushButton:PAGE_CONNECTION:PB_TESTCONNECTION";
         Pos = MAP_APPFONT ( PAGE_X  - 75 - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS) ;
         Size = MAP_APPFONT ( 75 , BUTTON_HEIGHT ) ;
         TabStop = TRUE ;
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.src b/dbaccess/source/ui/dlg/ExtensionNotPresent.src
index 9944278cd..206c280eb 100644
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.src
+++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.src
@@ -72,6 +72,7 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG
 
     PushButton PB_DOWNLOAD
     {
+        HelpID = "dbaccess:PushButton:RID_EXTENSION_NOT_PRESENT_DLG:PB_DOWNLOAD";
         Pos = MAP_APPFONT ( DLG_WIDTH / 2 - (CELL_PADDING/2) - BUTTON_WIDTH, ACTION_LINE_START ) ;
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
         DefButton = TRUE ;
diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src
index f0517f5c9..e29eec5ff 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.src
+++ b/dbaccess/source/ui/dlg/RelationDlg.src
@@ -36,6 +36,7 @@
 
 ModalDialog DLG_REL_PROPERTIES
 {
+    HelpID = "dbaccess:ModalDialog:DLG_REL_PROPERTIES";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 186 , 205 ) ;
diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src
index 7ec8120b5..8ff941f5d 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.src
+++ b/dbaccess/source/ui/dlg/UserAdmin.src
@@ -159,6 +159,7 @@ ModalDialog DLG_PASSWORD
     };
     Edit ED_OLDPASSWORD
     {
+        HelpID = "dbaccess:Edit:DLG_PASSWORD:ED_OLDPASSWORD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 16 ) ;
         Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
@@ -173,6 +174,7 @@ ModalDialog DLG_PASSWORD
     };
     Edit ED_PASSWORD
     {
+        HelpID = "dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 34 ) ;
         Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
@@ -186,6 +188,7 @@ ModalDialog DLG_PASSWORD
     };
     Edit ED_PASSWORD_REPEAT
     {
+        HelpID = "dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD_REPEAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 51 ) ;
         Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src
index b7966e5a2..13ce2e2ab 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.src
+++ b/dbaccess/source/ui/dlg/adtabdlg.src
@@ -46,6 +46,7 @@ ModelessDialog DLG_JOIN_TABADD
 
     RadioButton RB_CASE_TABLES
     {
+        HelpID = "dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_TABLES";
         Pos = MAP_APPFONT( 6, 6 );
         Size = MAP_APPFONT( 50, 8 );
         Text [ en-US ] = "Tables";
@@ -53,6 +54,7 @@ ModelessDialog DLG_JOIN_TABADD
 
     RadioButton RB_CASE_QUERIES
     {
+        HelpID = "dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_QUERIES";
         Pos = MAP_APPFONT( 62, 6 );
         Size = MAP_APPFONT( 50, 8 );
         Text [ en-US ] = "Queries";
@@ -69,6 +71,7 @@ ModelessDialog DLG_JOIN_TABADD
     };
     PushButton PB_ADDTABLE
     {
+        HelpID = "dbaccess:PushButton:DLG_JOIN_TABADD:PB_ADDTABLE";
         Pos = MAP_APPFONT ( 123 , 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add" ;
diff --git a/dbaccess/source/ui/dlg/advancedsettings.src b/dbaccess/source/ui/dlg/advancedsettings.src
index a4eb47133..071c286bc 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.src
+++ b/dbaccess/source/ui/dlg/advancedsettings.src
@@ -253,6 +253,7 @@
 
 TabPage PAGE_GENERATED_VALUES
 {
+    HelpID = "dbaccess:TabPage:PAGE_GENERATED_VALUES";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
@@ -311,6 +312,7 @@ TabPage PAGE_GENERATED_VALUES
 
 TabPage PAGE_ADVANCED_SETTINGS_SPECIAL
 {
+    HelpID = "dbaccess:TabPage:PAGE_ADVANCED_SETTINGS_SPECIAL";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index 02389611a..55e0acf98 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -196,6 +196,7 @@ TabPage PAGE_GENERAL
 
     RadioButton RB_OPENEXISTINGDOC
     {
+        HelpID = "dbaccess:RadioButton:PAGE_GENERAL:RB_OPENEXISTINGDOC";
         Pos = MAP_APPFONT (START_X + 6 , 97 );
         Size = MAP_APPFONT ( 206 , 8 ) ;
         Text [ en-US ]  = "Open an existing database ~file" ;
@@ -210,6 +211,7 @@ TabPage PAGE_GENERAL
 
     ListBox LB_DOCUMENTLIST
     {
+        HelpID = "dbaccess:ListBox:PAGE_GENERAL:LB_DOCUMENTLIST";
         Pos = MAP_APPFONT( START_X + INDENTED_X + INDENT_BELOW_RADIO, 121 );
         Size = MAP_APPFONT( 120, 14 );
         DropDown = TRUE;
@@ -218,6 +220,7 @@ TabPage PAGE_GENERAL
 
     PushButton PB_OPENDOCUMENT
     {
+        HelpID = "dbaccess:PushButton:PAGE_GENERAL:PB_OPENDOCUMENT";
         Pos = MAP_APPFONT( START_X + INDENTED_X + INDENT_BELOW_RADIO, 139 );
         Size = MAP_APPFONT( 50, 16 );
         OutputSize = TRUE;
@@ -419,6 +422,7 @@ TabPage PAGE_ADABAS
     };
     Edit ET_HOSTNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_HOSTNAME";
         TabStop = TRUE ;
         Border = TRUE ;
 
@@ -434,6 +438,7 @@ TabPage PAGE_ADABAS
     };
     NumericField NF_CACHE_SIZE
     {
+        HelpID = "dbaccess:NumericField:PAGE_ADABAS:NF_CACHE_SIZE";
         Pos				= MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT -1 ) ;
         Size			= MAP_APPFONT ( 40 , EDIT_HEIGHT ) ;
         Border			= TRUE ;
@@ -451,6 +456,7 @@ TabPage PAGE_ADABAS
     };
     NumericField NF_DATA_INCREMENT
     {
+        HelpID = "dbaccess:NumericField:PAGE_ADABAS:NF_DATA_INCREMENT";
         Pos				= MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ;
         Size			= MAP_APPFONT ( 40 , EDIT_HEIGHT ) ;
         Border			= TRUE ;
@@ -473,6 +479,7 @@ TabPage PAGE_ADABAS
     };
     Edit ET_CTRLUSERNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_CTRLUSERNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( EDIT_X , 4*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT-1 ) ;
         Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
@@ -486,6 +493,7 @@ TabPage PAGE_ADABAS
     };
     Edit ET_CTRLPASSWORD
     {
+        HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_CTRLPASSWORD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( EDIT_X , 5*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT-1 ) ;
         Size = MAP_APPFONT ( 105 , EDIT_HEIGHT) ;
@@ -495,6 +503,7 @@ TabPage PAGE_ADABAS
 
     CheckBox CB_SHUTDB
     {
+        HelpID = "dbaccess:CheckBox:PAGE_ADABAS:CB_SHUTDB";
         Pos = MAP_APPFONT ( 6 , 6*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT ) ;
         Size = MAP_APPFONT ( 248 , CHECKBOX_HEIGHT ) ;
         Text[ en-US ] = "~Shut down service when closing %PRODUCTNAME";
@@ -502,6 +511,7 @@ TabPage PAGE_ADABAS
 
     PushButton PB_STAT
     {
+        HelpID = "dbaccess:PushButton:PAGE_ADABAS:PB_STAT";
         Pos					= MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS ) ;
         Size				= MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
         Text[ en-US ] = "E~xtended...";
@@ -517,6 +527,7 @@ TabPage PAGE_ADABAS
 
 TabPage PAGE_MYSQL_ODBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_MYSQL_ODBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -527,6 +538,7 @@ TabPage PAGE_MYSQL_ODBC
 
 TabPage PAGE_MYSQL_JDBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_MYSQL_JDBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -545,6 +557,7 @@ TabPage PAGE_MYSQL_JDBC
     };
     Edit ET_JDBCDRIVERCLASS
     {
+        HelpID = "dbaccess:Edit:PAGE_MYSQL_JDBC:ET_JDBCDRIVERCLASS";
         Pos = MAP_APPFONT ( EDIT_X,
                             4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 + EDIT_HEIGHT) ;
         Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ;
@@ -553,6 +566,7 @@ TabPage PAGE_MYSQL_JDBC
     };
     PushButton PB_TESTDRIVERCLASS
     {
+        HelpID = "dbaccess:PushButton:PAGE_MYSQL_JDBC:PB_TESTDRIVERCLASS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS , 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -2 + EDIT_HEIGHT) ;
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
@@ -564,6 +578,7 @@ TabPage PAGE_MYSQL_JDBC
 
 TabPage PAGE_MYSQL_NATIVE
 {
+    HelpID = "dbaccess:TabPage:PAGE_MYSQL_NATIVE";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -585,6 +600,7 @@ TabPage PAGE_MYSQL_NATIVE
     };
     Edit ET_USERNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_MYSQL_NATIVE:ET_USERNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( EDIT_X, 4*UNRELATED_CONTROLS + 4*RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 3*EDIT_HEIGHT - 1 ) ;
         Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
@@ -592,6 +608,7 @@ TabPage PAGE_MYSQL_NATIVE
     };
     CheckBox CB_PASSWORD_REQUIRED
     {
+        HelpID = "dbaccess:CheckBox:PAGE_MYSQL_NATIVE:CB_PASSWORD_REQUIRED";
         Pos = MAP_APPFONT ( EDIT_X, 4*UNRELATED_CONTROLS + 5*RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 4*EDIT_HEIGHT ) ;
         Size = MAP_APPFONT ( 105, CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Password required";
@@ -602,6 +619,7 @@ TabPage PAGE_MYSQL_NATIVE
 
 TabPage PAGE_ORACLE_JDBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_ORACLE_JDBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -621,6 +639,7 @@ TabPage PAGE_ORACLE_JDBC
     };
     Edit ET_JDBCDRIVERCLASS
     {
+        HelpID = "dbaccess:Edit:PAGE_ORACLE_JDBC:ET_JDBCDRIVERCLASS";
         Pos = MAP_APPFONT ( EDIT_X,
                             4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT + ( FIXEDTEXT_HEIGHT - EDIT_HEIGHT ) / 2 ) ;
         Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ;
@@ -629,6 +648,7 @@ TabPage PAGE_ORACLE_JDBC
     };
     PushButton PB_TESTDRIVERCLASS
     {
+        HelpID = "dbaccess:PushButton:PAGE_ORACLE_JDBC:PB_TESTDRIVERCLASS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS,
                             4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT + ( FIXEDTEXT_HEIGHT - BUTTON_HEIGHT ) / 2 ) ;
@@ -744,6 +764,7 @@ TabPage PAGE_USERDRIVER
     };
     Edit ET_HOSTNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_USERDRIVER:ET_HOSTNAME";
         TabStop = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( EDIT_X , UNRELATED_CONTROLS -1 ) ;
@@ -759,6 +780,7 @@ TabPage PAGE_USERDRIVER
 
     NumericField NF_PORTNUMBER
     {
+        HelpID = "dbaccess:NumericField:PAGE_USERDRIVER:NF_PORTNUMBER";
         TabStop = TRUE ;
         Border = TRUE ;
         NoThousandSep = TRUE;
@@ -775,6 +797,7 @@ TabPage PAGE_USERDRIVER
     };
     Edit ET_OPTIONS
     {
+        HelpID = "dbaccess:Edit:PAGE_USERDRIVER:ET_OPTIONS";
         Border = TRUE ;
         TabStop = TRUE ;
     };
diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src
index 2a7c0abb1..a4c57e0fb 100644
--- a/dbaccess/source/ui/dlg/dbadmin2.src
+++ b/dbaccess/source/ui/dlg/dbadmin2.src
@@ -109,6 +109,7 @@ String STR_HINT_CONNECTION_NOT_CAPABLE
 
 ModalDialog DLG_DOMAINPASSWORD
 {
+    HelpID = "dbaccess:ModalDialog:DLG_DOMAINPASSWORD";
     Border = TRUE ;
     Moveable = TRUE ;
     OutputSize = TRUE ;
@@ -125,6 +126,7 @@ ModalDialog DLG_DOMAINPASSWORD
 
     Edit ET_PASSWORD
     {
+        HelpID = "dbaccess:Edit:DLG_DOMAINPASSWORD:ET_PASSWORD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 16 ) ;
         Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index 5bd7dce95..e5dc2301a 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -151,6 +151,7 @@ String STR_DATABASEDEFAULTNAME
 
 TabPage PAGE_DBWIZARD_MYSQL_INTRO
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_INTRO";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -197,6 +198,7 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO
     };
     RadioButton RB_CONNECTVIANATIVE
     {
+        HelpID = "dbaccess:RadioButton:PAGE_DBWIZARD_MYSQL_INTRO:RB_CONNECTVIANATIVE";
         Pos = MAP_APPFONT (START_X + 6 , 115 )  ;
         Size = MAP_APPFONT ( 205 , 9 ) ;
         Text[ en-US ] = "Connect directly" ;
@@ -209,6 +211,7 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO
 
 TabPage PAGE_DBWIZARD_AUTHENTIFICATION
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_AUTHENTIFICATION";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -267,6 +270,7 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION
 
 TabPage PAGE_DBWIZARD_FINAL
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_FINAL";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -343,6 +347,7 @@ TabPage PAGE_DBWIZARD_FINAL
 
 TabPage PAGE_DBWIZARD_MYSQL_JDBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_JDBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -375,6 +380,7 @@ TabPage PAGE_DBWIZARD_MYSQL_JDBC
 
 TabPage PAGE_DBWIZARD_MYSQL_NATIVE
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_NATIVE";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0, 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -400,6 +406,7 @@ TabPage PAGE_DBWIZARD_MYSQL_NATIVE
 
 TabPage PAGE_DBWIZARD_DBASE
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_DBASE";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -422,6 +429,7 @@ TabPage PAGE_DBWIZARD_DBASE
 
 TabPage PAGE_DBWIZARD_TEXT
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_TEXT";
 
     String STR_TEXT_HEADERTEXT
     {
@@ -448,6 +456,7 @@ TabPage PAGE_DBWIZARD_TEXT
 
 TabPage PAGE_DBWIZARD_MSACCESS
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MSACCESS";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -471,6 +480,7 @@ TabPage PAGE_DBWIZARD_MSACCESS
 
 TabPage PAGE_DBWIZARD_LDAP
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_LDAP";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -512,6 +522,7 @@ TabPage PAGE_DBWIZARD_LDAP
 
 TabPage PAGE_DBWIZARD_ADABAS
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADABAS";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -533,6 +544,7 @@ TabPage PAGE_DBWIZARD_ADABAS
 
 TabPage PAGE_DBWIZARD_ADO
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADO";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -554,6 +566,7 @@ TabPage PAGE_DBWIZARD_ADO
 
 TabPage PAGE_DBWIZARD_ODBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ODBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -573,6 +586,7 @@ TabPage PAGE_DBWIZARD_ODBC
 
 TabPage PAGE_DBWIZARD_USERDEFINED
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_USERDEFINED";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -585,6 +599,7 @@ TabPage PAGE_DBWIZARD_USERDEFINED
 
 TabPage PAGE_DBWIZARD_JDBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_JDBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -607,6 +622,7 @@ TabPage PAGE_DBWIZARD_JDBC
 
 TabPage PAGE_DBWIZARD_ORACLE
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ORACLE";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -638,6 +654,7 @@ TabPage PAGE_DBWIZARD_ORACLE
 
 TabPage PAGE_DBWIZARD_SPREADSHEET
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_SPREADSHEET";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src
index 8f6ef6e49..b0d91a94f 100644
--- a/dbaccess/source/ui/dlg/dbfindex.src
+++ b/dbaccess/source/ui/dlg/dbfindex.src
@@ -93,6 +93,7 @@ Image IMG_ALL_RIGHT_H
 
 ModalDialog DLG_DBASE_INDEXES
 {
+    HelpID = "dbaccess:ModalDialog:DLG_DBASE_INDEXES";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( WIN_X , WIN_Y ) ;
@@ -125,6 +126,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ComboBox CB_TABLES
     {
+        HelpID = "dbaccess:ComboBox:DLG_DBASE_INDEXES:CB_TABLES";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 62 , 5 ) ;
@@ -146,6 +148,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ListBox LB_TABLEINDEXES
     {
+        HelpID = "dbaccess:ListBox:DLG_DBASE_INDEXES:LB_TABLEINDEXES";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 12 , 44 ) ;
@@ -160,6 +163,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ListBox LB_FREEINDEXES
     {
+        HelpID = "dbaccess:ListBox:DLG_DBASE_INDEXES:LB_FREEINDEXES";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 120 , 44 ) ;
@@ -168,6 +172,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ImageButton IB_ADD
     {
+        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADD";
         Pos = MAP_APPFONT ( 94 , 60 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE ;
@@ -187,6 +192,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ImageButton IB_ADDALL
     {
+        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADDALL";
         Pos = MAP_APPFONT ( 94 , 77 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE ;
@@ -206,6 +212,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ImageButton IB_REMOVE
     {
+        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVE";
         Pos = MAP_APPFONT ( 94 , 98 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE ;
@@ -225,6 +232,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ImageButton IB_REMOVEALL
     {
+        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVEALL";
         Pos = MAP_APPFONT ( 94, 114 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE ;
diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src
index 1fa897b80..4a6d3fd85 100644
--- a/dbaccess/source/ui/dlg/directsql.src
+++ b/dbaccess/source/ui/dlg/directsql.src
@@ -40,6 +40,7 @@
 
 ModalDialog DLG_DIRECTSQL
 {
+    HelpID = "dbaccess:ModalDialog:DLG_DIRECTSQL";
     OutputSize	= TRUE ;
     Moveable	= TRUE ;
     Closeable	= TRUE ;
@@ -60,6 +61,7 @@ ModalDialog DLG_DIRECTSQL
     };
     MultiLineEdit ME_SQL
     {
+        HelpID = "dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_SQL";
         Pos = MAP_APPFONT( 7, 26 );
         Size = MAP_APPFONT( WINDOW_SIZE_X - 14, 80 );
         SVLook = TRUE;
@@ -69,6 +71,7 @@ ModalDialog DLG_DIRECTSQL
     };
     PushButton PB_EXECUTE
     {
+        HelpID = "dbaccess:PushButton:DLG_DIRECTSQL:PB_EXECUTE";
         Pos = MAP_APPFONT( WINDOW_SIZE_X - BUTTON_SIZE_X - 7, 109 );
         Size = MAP_APPFONT( BUTTON_SIZE_X, BUTTON_SIZE_Y );
         Text [ en-US ] = "Execute";
@@ -82,6 +85,7 @@ ModalDialog DLG_DIRECTSQL
     };
     ListBox LB_HISTORY
     {
+        HelpID = "dbaccess:ListBox:DLG_DIRECTSQL:LB_HISTORY";
         Pos = MAP_APPFONT( 7, 121 + BUTTON_SIZE_Y + 3 );
         Size = MAP_APPFONT( WINDOW_SIZE_X - 14, 14 );
         SvLook = TRUE;
@@ -96,6 +100,7 @@ ModalDialog DLG_DIRECTSQL
     };
     MultiLineEdit ME_STATUS
     {
+        HelpID = "dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_STATUS";
         Pos = MAP_APPFONT( 7, 153 + BUTTON_SIZE_Y );
         Size = MAP_APPFONT( WINDOW_SIZE_X - 14, 41 );
         Border = TRUE;
@@ -114,6 +119,7 @@ ModalDialog DLG_DIRECTSQL
     };
     PushButton PB_CLOSE
     {
+        HelpID = "dbaccess:PushButton:DLG_DIRECTSQL:PB_CLOSE";
         Pos = MAP_APPFONT( WINDOW_SIZE_X - 7 - BUTTON_SIZE_X, 207 + BUTTON_SIZE_Y );
         Size = MAP_APPFONT( BUTTON_SIZE_X, BUTTON_SIZE_Y );
         Text [ en-US ] = "Close";
diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src
index a6c036ec2..547630c71 100644
--- a/dbaccess/source/ui/dlg/dlgsave.src
+++ b/dbaccess/source/ui/dlg/dlgsave.src
@@ -61,6 +61,7 @@ ModalDialog DLG_SAVE_AS
     };
     ComboBox ET_CATALOG
     {
+        HelpID = "dbaccess:ComboBox:DLG_SAVE_AS:ET_CATALOG";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 77 , 25 ) ;
         Size = MAP_APPFONT ( 89 , 12 ) ;
@@ -77,6 +78,7 @@ ModalDialog DLG_SAVE_AS
     };
     ComboBox ET_SCHEMA
     {
+        HelpID = "dbaccess:ComboBox:DLG_SAVE_AS:ET_SCHEMA";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 77 , 42 ) ;
         Size = MAP_APPFONT ( 89 , 12 ) ;
@@ -92,6 +94,7 @@ ModalDialog DLG_SAVE_AS
     };
     Edit ET_TITLE
     {
+        HelpID = "dbaccess:Edit:DLG_SAVE_AS:ET_TITLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 77 , 59 ) ;
         Size = MAP_APPFONT ( 89 , 12 ) ;
diff --git a/dbaccess/source/ui/dlg/dlgsize.src b/dbaccess/source/ui/dlg/dlgsize.src
index b690e7e50..5fcaa1fcd 100644
--- a/dbaccess/source/ui/dlg/dlgsize.src
+++ b/dbaccess/source/ui/dlg/dlgsize.src
@@ -62,6 +62,7 @@ ModalDialog DLG_ROWHEIGHT
     };
     MetricField MF_VALUE
     {
+        HelpID = "dbaccess:MetricField:DLG_ROWHEIGHT:MF_VALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 36 , 6 ) ;
         Size = MAP_APPFONT ( 63 , 12 ) ;
@@ -75,6 +76,7 @@ ModalDialog DLG_ROWHEIGHT
     };
     CheckBox CB_STANDARD
     {
+        HelpID = "dbaccess:CheckBox:DLG_ROWHEIGHT:CB_STANDARD";
         Pos = MAP_APPFONT ( 36 , 25 ) ;
         Size = MAP_APPFONT ( 62 , 12 ) ;
         TabStop = TRUE ;
@@ -117,6 +119,7 @@ ModalDialog DLG_COLWIDTH
     };
     MetricField MF_VALUE
     {
+        HelpID = "dbaccess:MetricField:DLG_COLWIDTH:MF_VALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 36 , 6 ) ;
         Size = MAP_APPFONT ( 63 , 12 ) ;
@@ -130,6 +133,7 @@ ModalDialog DLG_COLWIDTH
     };
     CheckBox CB_STANDARD
     {
+        HelpID = "dbaccess:CheckBox:DLG_COLWIDTH:CB_STANDARD";
         Pos = MAP_APPFONT ( 36 , 25 ) ;
         Size = MAP_APPFONT ( 62 , 12 ) ;
         TabStop = TRUE ;
diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src
index 4539754e8..1b030ee1c 100644
--- a/dbaccess/source/ui/dlg/dsselect.src
+++ b/dbaccess/source/ui/dlg/dsselect.src
@@ -35,6 +35,7 @@
 
 ModalDialog DLG_DATASOURCE_SELECTION
 {
+    HelpID = "dbaccess:ModalDialog:DLG_DATASOURCE_SELECTION";
     OutputSize = TRUE ;
     Moveable = TRUE ;
     Closeable = TRUE ;
@@ -50,6 +51,7 @@ ModalDialog DLG_DATASOURCE_SELECTION
     };
     ListBox LB_DATASOURCE
     {
+        HelpID = "dbaccess:ListBox:DLG_DATASOURCE_SELECTION:LB_DATASOURCE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 19 ) ;
         Size = MAP_APPFONT ( 154 , 94 ) ;
@@ -79,6 +81,7 @@ ModalDialog DLG_DATASOURCE_SELECTION
     };
     PushButton PB_MANAGE
     {
+        HelpID = "dbaccess:PushButton:DLG_DATASOURCE_SELECTION:PB_MANAGE";
         Pos = MAP_APPFONT ( 166 , 99 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -88,6 +91,7 @@ ModalDialog DLG_DATASOURCE_SELECTION
     };
     PushButton PB_CREATE
     {
+        HelpID = "dbaccess:PushButton:DLG_DATASOURCE_SELECTION:PB_CREATE";
         Pos = MAP_APPFONT ( 166 , 99 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src
index ead770c40..fcc0a819c 100644
--- a/dbaccess/source/ui/dlg/indexdialog.src
+++ b/dbaccess/source/ui/dlg/indexdialog.src
@@ -47,6 +47,7 @@
 
 ModalDialog DLG_INDEXDESIGN
 {
+    HelpID = "dbaccess:ModalDialog:DLG_INDEXDESIGN";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ;
@@ -132,6 +133,7 @@ ModalDialog DLG_INDEXDESIGN
     };
     CheckBox CB_UNIQUE
     {
+        HelpID = "dbaccess:CheckBox:DLG_INDEXDESIGN:CB_UNIQUE";
         Pos = MAP_APPFONT ( LIST_WIDTH + 16, 34 ) ;
         Size = MAP_APPFONT ( DIALOG_SIZE_X - LIST_WIDTH - 22, 8 ) ;
         SVLook = TRUE;
@@ -154,6 +156,7 @@ ModalDialog DLG_INDEXDESIGN
     };
     PushButton PB_CLOSE
     {
+        HelpID = "dbaccess:PushButton:DLG_INDEXDESIGN:PB_CLOSE";
         Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6 - BUTTON_SIZE_X - 6, DIALOG_SIZE_Y - BUTTON_SIZE_Y - 6 ) ;
         Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y );
         SVLook = TRUE;
diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src
index c35e395c6..0be374ac5 100644
--- a/dbaccess/source/ui/dlg/paramdialog.src
+++ b/dbaccess/source/ui/dlg/paramdialog.src
@@ -37,6 +37,7 @@
 
 ModalDialog DLG_PARAMETERS
 {
+    HelpID = "dbaccess:ModalDialog:DLG_PARAMETERS";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 6 + LIST_WIDTH + 3 + 6 + BUTTON_WIDTH + 6, 98 ) ;
@@ -52,6 +53,7 @@ ModalDialog DLG_PARAMETERS
     };
     ListBox LB_ALLPARAMS
     {
+        HelpID = "dbaccess:ListBox:DLG_PARAMETERS:LB_ALLPARAMS";
         Pos = MAP_APPFONT ( 7 , 12 ) ;
         Size = MAP_APPFONT ( LIST_WIDTH , LIST_HEIGHT ) ;
         Border = TRUE;
@@ -65,6 +67,7 @@ ModalDialog DLG_PARAMETERS
     };
     Edit ET_PARAM
     {
+        HelpID = "dbaccess:Edit:DLG_PARAMETERS:ET_PARAM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 7 , 12 + LIST_HEIGHT + 4 + 8 + 3 ) ;
         Size = MAP_APPFONT ( LIST_WIDTH , 12 ) ;
@@ -72,6 +75,7 @@ ModalDialog DLG_PARAMETERS
     };
     PushButton BT_TRAVELNEXT
     {
+        HelpID = "dbaccess:PushButton:DLG_PARAMETERS:BT_TRAVELNEXT";
         Pos = MAP_APPFONT ( 4 + 3 + LIST_WIDTH + 3 + 6 , 12 + LIST_HEIGHT + 4 + 8 + 3 + ( 12 - BUTTON_HEIGHT ) / 2) ;
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
         TabStop = TRUE ;
diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src
index fcabfdcb4..4f8241dd8 100644
--- a/dbaccess/source/ui/dlg/queryfilter.src
+++ b/dbaccess/source/ui/dlg/queryfilter.src
@@ -53,6 +53,7 @@ ModalDialog DLG_FILTERCRIT
     HelpId = HID_DLG_FILTERCRIT ;
     ListBox LB_WHEREFIELD1
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
@@ -61,6 +62,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOMP1
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 25 ) ;
         Size = MAP_APPFONT ( 49 , 72 ) ;
@@ -71,6 +73,7 @@ ModalDialog DLG_FILTERCRIT
     };
     Edit ET_WHEREVALUE1
     {
+        HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 177 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
@@ -78,6 +81,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOND2
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 15 , 41 ) ;
         Size = MAP_APPFONT ( 41 , 36 ) ;
@@ -93,6 +97,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHEREFIELD2
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 41 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
@@ -101,6 +106,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOMP2
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 41 ) ;
         Size = MAP_APPFONT ( 49 , 72 ) ;
@@ -111,6 +117,7 @@ ModalDialog DLG_FILTERCRIT
     };
     Edit ET_WHEREVALUE2
     {
+        HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 177 , 41 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
@@ -118,6 +125,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOND3
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 15 , 57 ) ;
         Size = MAP_APPFONT ( 41 , 36 ) ;
@@ -133,6 +141,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHEREFIELD3
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 57 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
@@ -141,6 +150,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOMP3
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 57 ) ;
         Size = MAP_APPFONT ( 49 , 72 ) ;
@@ -151,6 +161,7 @@ ModalDialog DLG_FILTERCRIT
     };
     Edit ET_WHEREVALUE3
     {
+        HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 177 , 57 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src
index 2927be9d8..c585e48d5 100644
--- a/dbaccess/source/ui/dlg/queryorder.src
+++ b/dbaccess/source/ui/dlg/queryorder.src
@@ -42,6 +42,7 @@ ModalDialog DLG_ORDERCRIT
     Closeable = TRUE ;
     ListBox LB_ORDERFIELD1
     {
+        HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 59 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 72 ) ;
@@ -51,6 +52,7 @@ ModalDialog DLG_ORDERCRIT
     };
     ListBox LB_ORDERVALUE1
     {
+        HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 123 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 36 ) ;
@@ -65,6 +67,7 @@ ModalDialog DLG_ORDERCRIT
     };
     ListBox LB_ORDERFIELD2
     {
+        HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 59 , 41 ) ;
         Size = MAP_APPFONT ( 60 , 72 ) ;
@@ -74,6 +77,7 @@ ModalDialog DLG_ORDERCRIT
     };
     ListBox LB_ORDERVALUE2
     {
+        HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 123 , 41 ) ;
         Size = MAP_APPFONT ( 60 , 36 ) ;
@@ -88,6 +92,7 @@ ModalDialog DLG_ORDERCRIT
     };
     ListBox LB_ORDERFIELD3
     {
+        HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 59 , 57 ) ;
         Size = MAP_APPFONT ( 60 , 72 ) ;
@@ -97,6 +102,7 @@ ModalDialog DLG_ORDERCRIT
     };
     ListBox LB_ORDERVALUE3
     {
+        HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 123 , 57 ) ;
         Size = MAP_APPFONT ( 60 , 36 ) ;
diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src
index fe368f182..ae1f5e703 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.src
+++ b/dbaccess/source/ui/dlg/sqlmessage.src
@@ -73,6 +73,7 @@ Image BMP_EXCEPTION_INFO_SCH
 
 ModalDialog DLG_SQLEXCEPTIONCHAIN
 {
+    HelpID = "dbaccess:ModalDialog:DLG_SQLEXCEPTIONCHAIN";
     Moveable = TRUE ;
     Closeable = TRUE ;
     OutputSize = TRUE ;
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.src b/dbaccess/source/ui/dlg/textconnectionsettings.src
index f285199c5..2dfb816c8 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.src
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.src
@@ -34,6 +34,7 @@
 
 ModalDialog DLG_TEXT_CONNECTION_SETTINGS
 {
+    HelpID = "dbaccess:ModalDialog:DLG_TEXT_CONNECTION_SETTINGS";
     Size = MAP_APPFONT( DIALOG_WIDTH, DIALOG_HEIGHT );
     OutputSize = TRUE ;
 
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index 72f1eb3ac..21f479344 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -68,6 +68,7 @@ String STR_WIZ_NAME_MATCHING_TITEL
 
 ModalDialog WIZ_RTFCOPYTABLE
 {
+    HelpID = "dbaccess:ModalDialog:WIZ_RTFCOPYTABLE";
 
     Text [ en-US ] = "Copy RTF Table" ;
 
@@ -92,12 +93,14 @@ ModalDialog WIZ_RTFCOPYTABLE
     };
     PushButton PB_PREV
     {
+        HelpID = "dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_PREV";
         TabStop				= TRUE ;
         Size				= MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ;
         Text [ en-US ] = "< ~Back";
     };
     PushButton PB_NEXT
     {
+        HelpID = "dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_NEXT";
         TabStop				= TRUE ;
         Size				= MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ;
         Text [ en-US ] = "~Next>";
@@ -131,6 +134,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
 
     MultiListBox LB_ORG_COLUMN_NAMES
     {
+        HelpID = "dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_ORG_COLUMN_NAMES";
         Border				= TRUE ;
         Pos					= MAP_APPFONT ( WINDOW_BORDER_X , WINDOW_BORDER_Y ) ;
         Size                = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ;
@@ -143,6 +147,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
     };
     ImageButton IB_COLUMN_RH
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_RH";
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 25 ) ;
         Size				= MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE ;
@@ -162,6 +167,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
     };
     ImageButton IB_COLUMNS_RH
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_RH";
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 45 ) ;
         Size				= MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE;
@@ -182,6 +188,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
     };
     ImageButton IB_COLUMN_LH
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_LH";
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 65) ;
         Size				= MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE ;
@@ -201,6 +208,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
     };
     ImageButton IB_COLUMNS_LH
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_LH";
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 85) ;
         Size				= MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE ;
@@ -221,6 +229,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
 
     MultiListBox LB_NEW_COLUMN_NAMES
     {
+        HelpID = "dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_NEW_COLUMN_NAMES";
         Border				= TRUE ;
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 157, WINDOW_BORDER_Y) ;
         Size                = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ;
@@ -246,6 +255,7 @@ TabPage TAB_WIZ_TYPE_SELECT
 
     MultiListBox LB_NEW_COLUMN_NAMES
     {
+        HelpID = "dbaccess:MultiListBox:TAB_WIZ_TYPE_SELECT:LB_NEW_COLUMN_NAMES";
         Border				= TRUE ;
         Pos					= MAP_APPFONT ( 6 , 6 ) ;
         Size				= MAP_APPFONT ( 87 , WINDOW_SIZE_Y - 12 ) ;
@@ -265,6 +275,7 @@ TabPage TAB_WIZ_TYPE_SELECT
 
     TabPage CONTROL_CONTAINER
     {
+        HelpID = "dbaccess:TabPage:CONTROL_CONTAINER";
         Pos					= MAP_APPFONT ( 102 , WINDOW_BORDER_Y  ) ;
         Size				= MAP_APPFONT ( WINDOW_SIZE_X -  111, WINDOW_SIZE_Y - WINDOW_BORDER_Y - 67 );
         SVLook              = TRUE;
@@ -287,6 +298,7 @@ TabPage TAB_WIZ_TYPE_SELECT
 
     NumericField ET_AUTO
     {
+        HelpID = "dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO";
         Border				= TRUE ;
         Pos                 = MAP_APPFONT ( 151 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 29) ;
         Size				= MAP_APPFONT ( 40 , 12 ) ;
@@ -295,6 +307,7 @@ TabPage TAB_WIZ_TYPE_SELECT
 
     PushButton PB_AUTO
     {
+        HelpID = "dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO";
         Pos                 = MAP_APPFONT ( WINDOW_SIZE_X - 62 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 30 ) ;
         Size				= MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ;
         TabStop				= TRUE ;
@@ -320,6 +333,7 @@ Menu RID_SBA_RTF_PKEYPOPUP
  //==================================================================
 TabPage TAB_WIZ_NAME_MATCHING
 {
+    HelpID = "dbaccess:TabPage:TAB_WIZ_NAME_MATCHING";
     SVLook	= TRUE ;
     Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
@@ -361,6 +375,7 @@ TabPage TAB_WIZ_NAME_MATCHING
 
     ImageButton IB_COLUMN_UP
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP";
         Pos                 = MAP_APPFONT ( 19 ,  45 ) ;
         Size                = MAP_APPFONT ( 14 , 14 ) ;
         TabStop				= TRUE;
@@ -381,6 +396,7 @@ TabPage TAB_WIZ_NAME_MATCHING
     };
     ImageButton IB_COLUMN_DOWN
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN";
         Pos                 = MAP_APPFONT ( 19 ,  63 ) ;
         Size                = MAP_APPFONT ( 14 , 14 ) ;
         TabStop				= TRUE;
@@ -400,6 +416,7 @@ TabPage TAB_WIZ_NAME_MATCHING
     };
     ImageButton IB_COLUMN_UP_RIGHT
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP_RIGHT";
         Pos                 = MAP_APPFONT ( WINDOW_SIZE_X - 33, 45 ) ;
         Size                = MAP_APPFONT ( 14 , 14 ) ;
         TabStop				= TRUE;
@@ -420,6 +437,7 @@ TabPage TAB_WIZ_NAME_MATCHING
     };
     ImageButton IB_COLUMN_DOWN_RIGHT
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN_RIGHT";
         Pos                 = MAP_APPFONT ( WINDOW_SIZE_X - 33, 63) ;
         Size                = MAP_APPFONT ( 14 , 14 ) ;
         TabStop				= TRUE ;
@@ -440,6 +458,7 @@ TabPage TAB_WIZ_NAME_MATCHING
 
     PushButton PB_ALL
     {
+        HelpID = "dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_ALL";
         Pos                 = MAP_APPFONT ( 6, 83) ;
         Size				= MAP_APPFONT ( 40 , 14 ) ;
         TabStop				= TRUE ;
@@ -448,6 +467,7 @@ TabPage TAB_WIZ_NAME_MATCHING
 
     PushButton PB_NONE
     {
+        HelpID = "dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_NONE";
         Pos                 = MAP_APPFONT ( 6, 103) ;
         Size				= MAP_APPFONT ( 40 , 14 ) ;
         TabStop				= TRUE ;
@@ -486,12 +506,14 @@ TabPage TAB_WIZ_COPYTABLE
     };
     RadioButton RB_DEFDATA
     {
+        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEFDATA";
         Pos                 = MAP_APPFONT ( 12 , 35 ) ;
         Size				= MAP_APPFONT ( 73 , 10 ) ;
         Text [ en-US ] = "De~finition and data" ;
     };
     RadioButton RB_DEF
     {
+        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEF";
         Pos                 = MAP_APPFONT ( 12, 49 ) ;
         Size				= MAP_APPFONT ( 73 , 10 ) ;
         Text [ en-US ] = "Def~inition" ;
@@ -499,6 +521,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     RadioButton RB_VIEW
     {
+        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_VIEW";
         Pos                 = MAP_APPFONT ( 12, 63 ) ;
         Size				= MAP_APPFONT ( 73 , 10 ) ;
         Text [ en-US ] = "A~s table view";
@@ -506,6 +529,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     RadioButton RB_APPENDDATA
     {
+        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_APPENDDATA";
         Pos                 = MAP_APPFONT ( 12, 77 ) ;
         Size				= MAP_APPFONT ( 73 , 10 ) ;
         Text [ en-US ] = "Append ~data" ;
@@ -513,6 +537,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     CheckBox CB_USEHEADERLINE
     {
+        HelpID = "dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_USEHEADERLINE";
         Pos                 = MAP_APPFONT ( 12, 93 ) ;
         Size				= MAP_APPFONT ( WINDOW_SIZE_X - 18, 10 ) ;
         Text [ en-US ] = "Use first ~line as column names" ;
@@ -520,6 +545,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     CheckBox CB_PRIMARY_COLUMN
     {
+        HelpID = "dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_PRIMARY_COLUMN";
         Pos                 = MAP_APPFONT ( 12, 107 ) ;
         Size				= MAP_APPFONT ( 90 , 10 ) ;
         Text [ en-US ] = "Crea~te primary key";
@@ -533,6 +559,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     Edit ET_KEYNAME
     {
+        HelpID = "dbaccess:Edit:TAB_WIZ_COPYTABLE:ET_KEYNAME";
         Pos                 = MAP_APPFONT ( 80, 120 ) ;
         Size				= MAP_APPFONT ( 65 , 12 ) ;
         TabStop				= TRUE ;
diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src
index 30bc059c4..658cffeeb 100644
--- a/dbaccess/source/ui/querydesign/querydlg.src
+++ b/dbaccess/source/ui/querydesign/querydlg.src
@@ -82,6 +82,7 @@ ModalDialog DLG_QRY_JOIN
         };
         CheckBox CB_NATURAL
         {
+            HelpID = "dbaccess:CheckBox:DLG_QRY_JOIN:CB_NATURAL";
             Pos = MAP_APPFONT ( 101 , 31 ) ;
             Size = MAP_APPFONT ( 89 , 8 ) ;
 
diff --git a/reportdesign/source/ui/dlg/DateTime.src b/reportdesign/source/ui/dlg/DateTime.src
index 2c391d666..76eb493a6 100644
--- a/reportdesign/source/ui/dlg/DateTime.src
+++ b/reportdesign/source/ui/dlg/DateTime.src
@@ -47,6 +47,7 @@ ModalDialog RID_DATETIME_DLG
         
     CheckBox CB_DATE
     {
+        HelpID = "reportdesign:CheckBox:RID_DATETIME_DLG:CB_DATE";
         Pos = MAP_APPFONT ( UNRELATED_CONTROLS , RELATED_CONTROLS /* + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT */) ;
         Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ;
         Check = TRUE;
@@ -62,6 +63,7 @@ ModalDialog RID_DATETIME_DLG
 
     ListBox LB_DATE_TYPE
     {
+        HelpID = "reportdesign:ListBox:RID_DATETIME_DLG:LB_DATE_TYPE";
         Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH, RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT) ;
         Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS - BUTTON_WIDTH, 60 );
         Border = TRUE;
@@ -78,6 +80,7 @@ ModalDialog RID_DATETIME_DLG
     };
     CheckBox CB_TIME
     {
+        HelpID = "reportdesign:CheckBox:RID_DATETIME_DLG:CB_TIME";
         Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 3*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ;
         Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ;
         Check = TRUE;
@@ -93,6 +96,7 @@ ModalDialog RID_DATETIME_DLG
 
     ListBox LB_TIME_TYPE
     {
+        HelpID = "reportdesign:ListBox:RID_DATETIME_DLG:LB_TIME_TYPE";
          Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH, RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ;
         Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS - BUTTON_WIDTH, 60 );
         Border = TRUE;
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src
index af78f65de..fb4944c7a 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.src
+++ b/reportdesign/source/ui/dlg/GroupsSorting.src
@@ -166,6 +166,7 @@ FloatingWindow RID_GROUPS_SORTING
     };
     ListBox LST_ORDER
     {
+        HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_ORDER";
         Border = TRUE;
         Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 4*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + FIXEDTEXT_HEIGHT - 1 );
         Size = MAP_APPFONT( LISTBOX_WIDTH, 60 );
@@ -190,6 +191,7 @@ FloatingWindow RID_GROUPS_SORTING
     };
     ListBox LST_HEADERLST
     {
+        HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_HEADERLST";
         Border = TRUE;
         Hide = TRUE;
         Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 5*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 2*FIXEDTEXT_HEIGHT -1);
@@ -213,6 +215,7 @@ FloatingWindow RID_GROUPS_SORTING
     };
     ListBox LST_FOOTERLST
     {
+        HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_FOOTERLST";
         Border = TRUE;
         Hide = TRUE;
         Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 6*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 3*FIXEDTEXT_HEIGHT -1);
@@ -236,6 +239,7 @@ FloatingWindow RID_GROUPS_SORTING
     };
     ListBox LST_GROUPONLST
     {
+        HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_GROUPONLST";
         Border = TRUE;
         Hide = TRUE;
         Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 7*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 4*FIXEDTEXT_HEIGHT -1);
@@ -257,6 +261,7 @@ FloatingWindow RID_GROUPS_SORTING
     };
     NumericField ED_GROUPINTERVALLST
     {
+        HelpID = "reportdesign:NumericField:RID_GROUPS_SORTING:ED_GROUPINTERVALLST";
         Border = TRUE;
         Hide = TRUE;
         Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 8*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 5*FIXEDTEXT_HEIGHT -1);
@@ -273,6 +278,7 @@ FloatingWindow RID_GROUPS_SORTING
     };
     ListBox LST_KEEPTOGETHERLST
     {
+        HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_KEEPTOGETHERLST";
         Border = TRUE;
         Hide = TRUE;
         Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 9*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 6*FIXEDTEXT_HEIGHT -1);
diff --git a/reportdesign/source/ui/dlg/PageNumber.src b/reportdesign/source/ui/dlg/PageNumber.src
index 751bb7c54..58d8c4a04 100644
--- a/reportdesign/source/ui/dlg/PageNumber.src
+++ b/reportdesign/source/ui/dlg/PageNumber.src
@@ -54,6 +54,7 @@ ModalDialog RID_PAGENUMBERS
     
     RadioButton RB_PAGE_N
     {
+        HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_N";
         Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT) ;
         Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;
         Group = TRUE;
@@ -62,6 +63,7 @@ ModalDialog RID_PAGENUMBERS
     };
     RadioButton RB_PAGE_N_OF_M
     {
+        HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_N_OF_M";
         Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 3*RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT) ;
         Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ]  = "Page N of M";
@@ -76,6 +78,7 @@ ModalDialog RID_PAGENUMBERS
     
     RadioButton RB_PAGE_TOPPAGE
     {
+        HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_TOPPAGE";
         Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 4*RELATED_CONTROLS + UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT) ;
         Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;
         Group = TRUE;
@@ -84,6 +87,7 @@ ModalDialog RID_PAGENUMBERS
     };
     RadioButton RB_PAGE_BOTTOMPAGE
     {
+        HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_BOTTOMPAGE";
         Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 5*RELATED_CONTROLS + UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT) ;
         Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;		
         Text [ en-US ]  = "Bottom of Page (Footer)";
@@ -104,6 +108,7 @@ ModalDialog RID_PAGENUMBERS
     };
     ListBox LST_ALIGNMENT
     {
+        HelpID = "reportdesign:ListBox:RID_PAGENUMBERS:LST_ALIGNMENT";
         Border = TRUE;
         Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 6*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT -1);
         Size = MAP_APPFONT( LISTBOX_WIDTH, 60 );
@@ -121,6 +126,7 @@ ModalDialog RID_PAGENUMBERS
     };
     CheckBox CB_SHOWNUMBERONFIRSTPAGE
     {
+        HelpID = "reportdesign:CheckBox:RID_PAGENUMBERS:CB_SHOWNUMBERONFIRSTPAGE";
         Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 6*RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 8*FIXEDTEXT_HEIGHT) ;
         Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;
         Check = TRUE;