[Libreoffice-commits] help.git: source/text

Wed Jan 4 13:20:22 UTC 2017

source/text/shared/explorer/database/dabawiz00.xhp |    2 -
 source/text/shared/explorer/database/dabawiz01.xhp |   22 ++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 17e3d608a1d4a09b6ef258beb4c2c22becd16414
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date:   Tue Jan 3 23:11:46 2017 +0100

    Fix ahelps and bookmarks on the 'Database Selection' page
    
    The wizard page is renamed, so change that too.
    Main DB Wizard page bookmark was obsolete, fix that too
    
    Change-Id: Ida8827add4531efb0e0e1c7391eb2a17eb699f62
    Reviewed-on: https://gerrit.libreoffice.org/32707
    Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
    Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>

diff --git a/source/text/shared/explorer/database/dabawiz00.xhp b/source/text/shared/explorer/database/dabawiz00.xhp
index 792ba21..1f46aa1 100644
--- a/source/text/shared/explorer/database/dabawiz00.xhp
+++ b/source/text/shared/explorer/database/dabawiz00.xhp
@@ -35,7 +35,7 @@
 <bookmark_value>dBASE; database settings (Base)</bookmark_value>
 <bookmark_value>spreadsheets;as databases (base)</bookmark_value>
 </bookmark><comment>mw added "(Base)" to all entries</comment>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_DATABASE_WIZARD" id="bm_id3952452" localize="false"/><comment>UFI: added Help ID, see #i62242</comment>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/PageGeneral" id="bm_id3952452" localize="false"/>
 <paragraph role="heading" id="par_idN105B4" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
 <paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The Database Wizard creates a database file that contains information about a database.</ahelp><comment>UFI: extended help text must no longer contain switches or links</comment></paragraph>
 <paragraph role="paragraph" id="par_id9856563" xml-lang="en-US" l10n="NEW">The Database Wizard creates a <link href="text/shared/explorer/database/dabadoc.xhp">database file</link> that contains information about a database.</paragraph>
diff --git a/source/text/shared/explorer/database/dabawiz01.xhp b/source/text/shared/explorer/database/dabawiz01.xhp
index bbe0e62..4e739d0 100644
--- a/source/text/shared/explorer/database/dabawiz01.xhp
+++ b/source/text/shared/explorer/database/dabawiz01.xhp
@@ -29,30 +29,30 @@
 <body>
 <section id="dabaselection">
 <bookmark xml-lang="en-US" branch="index" id="bm_id2082583"><bookmark_value>databases; connecting (Base)</bookmark_value>
-</bookmark><comment>mw moved databases;formats (base) to shared/explorer/database/dabawiz00.xhp</comment>
-<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabawiz01.xhp">Database Selection</link></paragraph>
+</bookmark>
+<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabawiz01.xhp">Select Database</link></paragraph>
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Creates a new database, opens a database file, or connects to an existing database.</ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE" id="bm_id2482985" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/createDatabase" id="bm_id2482985" localize="false"/>
 <paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Create a new database</paragraph>
 <paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to create a new database. </ahelp>This option uses the HSQL database engine with default settings. The final page of the wizard appears next.</paragraph>
 <paragraph role="paragraph" id="par_id8584246" xml-lang="en-US" l10n="NEW"><link href="http://hsqldb.org/">External web page about HSQL</link>.</paragraph>
-<!-- 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"/>
+
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/openExistingDatabase" 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>
-<!-- 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"/>
+
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/docListBox" 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>
-<!-- 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"/>
+
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/openDatabase" 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/DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE" id="bm_id5028229" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/connectDatabase" id="bm_id5028229" localize="false"/>
 <paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="2" l10n="NEW">Connect to an existing database</paragraph>
 <paragraph role="paragraph" id="par_idN10590" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to create a database document for an existing database connection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_DSTYPE" id="bm_id763267" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/datasourceType" id="bm_id763267" localize="false"/>
 <paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="3" l10n="NEW">Database type</paragraph>
 <paragraph role="paragraph" id="par_idN10597" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the database type for the existing database connection.</ahelp></paragraph>
 <paragraph role="note" id="par_idN1059A" xml-lang="en-US" l10n="NEW">The Outlook, Evolution, KDE Address Book, and Seamonkey database types do not need additional information. For other database types, the wizard contains additional pages to specify the required information.</paragraph>
