helpers/help_hid.lst | 6 ------
source/text/shared/explorer/database/dabapropgen.xhp | 4 ++--
source/text/shared/explorer/database/dabawiz02jdbc.xhp | 4 ++--
source/text/shared/explorer/database/dabawiz02oracle.xhp | 2 +-
4 files changed, 5 insertions(+), 11 deletions(-)
New commits:
commit 400d593bd7f28ed51f0f3e0d0c9a381436e1ca27
Author: David Tardon <dtar...@redhat.com>
Date: Tue Aug 5 13:15:17 2014 +0200
update help ids for ConnectionPage
Change-Id: I41f485e025de7254c46010024a48b720df124fe6
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index e7da7b9..2fb7be5 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1294,7 +1294,6 @@ HID_DSADMIN_CHARSET,38777,
HID_DSADMIN_DBASE_INDICIES,38814,
HID_DSADMIN_DBASE_PATH,39007,
HID_DSADMIN_DECIMAL_SEPARATOR,38820,
-HID_DSADMIN_DRIVERCLASS,38815,
HID_DSADMIN_FIELD_SEPARATOR,38818,
HID_DSADMIN_FLAT_PATH,39014,
HID_DSADMIN_HOSTNAME,39034,
@@ -4967,7 +4966,6 @@ chart2_TabPage_TP_LOCATION,551829504,
chart2_TabPage_TP_WIZARD_TITLEANDOBJECTS,551813120,
chart2_TabPage_TP_YERRORBAR,551927808,
dbaccess_CheckBox_PAGE_ADABAS_CB_SHUTDB,851526657,
-dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041,
dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953,
dbaccess_Edit_DLG_ADABASSTAT_ET_FREESIZE,1388611589,
dbaccess_Edit_DLG_ADABASSTAT_ET_SIZE,1388611588,
@@ -4978,7 +4976,6 @@ dbaccess_Edit_DLG_PARAMETERS_ET_PARAM,1388398596,
dbaccess_Edit_PAGE_ADABAS_ET_CTRLPASSWORD,851527681,
dbaccess_Edit_PAGE_ADABAS_ET_CTRLUSERNAME,851527682,
dbaccess_Edit_PAGE_ADABAS_ET_HOSTNAME,851527685,
-dbaccess_Edit_PAGE_CONNECTION_ET_USERNAME,851544065,
dbaccess_Edit_PAGE_MYSQL_JDBC_ET_JDBCDRIVERCLASS,851773444,
dbaccess_Edit_PAGE_MYSQL_NATIVE_ET_USERNAME,851838977,
dbaccess_Edit_PAGE_ORACLE_JDBC_ET_JDBCDRIVERCLASS,851888132,
@@ -5007,8 +5004,6 @@
dbaccess_NumericField_PAGE_USERDRIVER_NF_PORTNUMBER,851761153,
dbaccess_NumericField_TAB_WIZ_TYPE_SELECT_ET_AUTO,851613697,
dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158,
dbaccess_PushButton_PAGE_ADABAS_PB_STAT,851530241,
-dbaccess_PushButton_PAGE_CONNECTION_PB_TESTCONNECTION,851546626,
-dbaccess_PushButton_PAGE_CONNECTION_PB_TESTDRIVERCLASS,851546625,
dbaccess_PushButton_PAGE_GENERAL_PB_OPENDOCUMENT,851448326,
dbaccess_PushButton_PAGE_MYSQL_JDBC_PB_TESTDRIVERCLASS,851776005,
dbaccess_PushButton_PAGE_ORACLE_JDBC_PB_TESTDRIVERCLASS,851890693,
@@ -5019,7 +5014,6 @@ dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_NEXT,1388581385,
dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_PREV,1388581386,
dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC,851444227,
dbaccess_TabPage_PAGE_ADVANCED_SETTINGS_SPECIAL,851820544,
-dbaccess_TabPage_PAGE_CONNECTION,851542016,
dbaccess_TabPage_PAGE_MYSQL_JDBC,851771392,
dbaccess_TabPage_PAGE_MYSQL_NATIVE,851836928,
dbaccess_TabPage_PAGE_MYSQL_ODBC,851722240,
diff --git a/source/text/shared/explorer/database/dabapropgen.xhp
b/source/text/shared/explorer/database/dabapropgen.xhp
index 5267576..e5959d5 100644
--- a/source/text/shared/explorer/database/dabapropgen.xhp
+++ b/source/text/shared/explorer/database/dabapropgen.xhp
@@ -42,7 +42,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/ui/connectionpage/connectionButton" 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/DBACCESS_HID_DSADMIN_FLAT_PATH"
id="bm_id4529251" localize="false"/><paragraph role="heading" id="par_idN105B1"
xml-lang="en-US" level="2" l10n="NEW">Path to the text files<comment>UFI: found
for text file folder</comment></paragraph>
<paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US"
l10n="CHG"><ahelp hid=".">Enter the path to the folder of the text
files.</ahelp></paragraph>
@@ -52,7 +52,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/ui/connectionpage/passCheckbutton" 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/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME" id="bm_id7675099"
localize="false"/><paragraph role="heading" id="hd_id7806329" xml-lang="en-US"
level="2" l10n="NEW">Name of the database<comment>UFI: found for
JDBC</comment></paragraph>
<paragraph role="paragraph" id="par_id5589159" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Enter the name of the database.</ahelp></paragraph>
diff --git a/source/text/shared/explorer/database/dabawiz02jdbc.xhp
b/source/text/shared/explorer/database/dabawiz02jdbc.xhp
index deb326e..ab6cd50 100644
--- a/source/text/shared/explorer/database/dabawiz02jdbc.xhp
+++ b/source/text/shared/explorer/database/dabawiz02jdbc.xhp
@@ -77,10 +77,10 @@
<bookmark xml-lang="en-US"
branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL" id="bm_id6293221"
localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT" id="bm_id3450117"
localize="false"/><paragraph role="heading" id="par_idN106A0" xml-lang="en-US"
level="2" l10n="NEW">Data source URL</paragraph>
<paragraph role="paragraph" id="par_idN106A4" xml-lang="en-US"
l10n="NEW"><ahelp hid="HID_DSADMIN_CONNURL_JDBCPAGE">Enter the URL for the
database. For example, for the MySQL JDBC driver, enter
"jdbc:mysql://<Servername>/<name of the database>". For more
information on the JDBC driver, consult the documentation that came with the
driver.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_DRIVERCLASS"
id="bm_id3153970" localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/connectionpage/javaDriverLabel" id="bm_id3153970"
localize="false"/>
<!-- removed HID 852248660 -->
<!-- removed HID 852330580 --><paragraph role="heading" id="par_idN106BB"
xml-lang="en-US" level="2" l10n="NEW">JDBC Driver Class</paragraph>
-<paragraph role="paragraph" id="par_idN106BF" xml-lang="en-US"
l10n="NEW"><ahelp hid="HID_DSADMIN_DRIVERCLASS">Enter the name of the JDBC
driver.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN106BF" xml-lang="en-US"
l10n="NEW"><ahelp hid="dbaccess/ui/connectionpage/javaDriverLabel">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>- Advanced</emph>, and click the <emph>Class Path</emph> button. After
you add the path information, restart <item
type="productname">%PRODUCTNAME</item>.</paragraph>
diff --git a/source/text/shared/explorer/database/dabawiz02oracle.xhp
b/source/text/shared/explorer/database/dabawiz02oracle.xhp
index c45f4c0..d78e6f6 100644
--- a/source/text/shared/explorer/database/dabawiz02oracle.xhp
+++ b/source/text/shared/explorer/database/dabawiz02oracle.xhp
@@ -68,7 +68,7 @@
<paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Enter the port number for the database
server.</ahelp></paragraph>
<!-- removed HID 852231276 -->
<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>
+<paragraph role="paragraph" id="par_idN10621" xml-lang="en-US"
l10n="NEW"><ahelp hid="dbaccess/ui/connectionpage/javaDriverLabel">Enter the
name of the JDBC driver.</ahelp></paragraph>
<!-- 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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
