diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp index e4917f3e0e..a9a439628d 100755 --- a/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp +++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp @@ -37,8 +37,8 @@ * License at http://www.openoffice.org/license.html. * * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. * See the License for the specific provisions governing your rights and * obligations concerning the Software. @@ -62,7 +62,7 @@ UFI: Database Wizard page 2 -YJ: checked +YJ: checked @@ -70,12 +70,16 @@ Next Steps Specifies whether you want to register the database, open the database for editing, or insert a new table. + Yes, register the Database for me Select to register the database within your user copy of %PRODUCTNAME. After registering, the database is displayed in the View - Data Sources window. -No, I'll register the database -Select to keep the database information only within the created database document. + +No, do not register the database +Select to keep the database information only within the created database file. + Open the database for editing -Select to display the database document window, where you can edit the database structure.UFI: is it so? +Select to display the database file, where you can edit the database structure. + Create tables using the table wizard Select to call the Table Wizard after the Database Wizard is finished. Database Wizard diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp index 9a8705b1a4..25c445466c 100755 --- a/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp +++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp @@ -37,8 +37,8 @@ * License at http://www.openoffice.org/license.html. * * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. * See the License for the specific provisions governing your rights and * obligations concerning the Software. @@ -62,14 +62,16 @@ UFI: Database Wizard MS Access page -YJ: checked +YJ: checked Microsoft Access Connection Specifies the settings for importing a database file in Microsoft Access format. + Microsoft Access database file Specifies the path to the database file. + Browse Click to open a file selection dialog. Database Wizard diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp index 11dae2f444..c90350652f 100755 --- a/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp +++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp @@ -37,8 +37,8 @@ * License at http://www.openoffice.org/license.html. * * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. * See the License for the specific provisions governing your rights and * obligations concerning the Software. @@ -62,7 +62,7 @@ UFI: Database Wizard ADO page -YJ: checked +YJ: checked @@ -70,6 +70,7 @@ Specifies the options for adding an ADO (Microsoft ActiveX Data Objects) database.UFI: copied text from shared\explorer\database\11160000 The ADO interface is a Microsoft Windows proprietary container for connecting to databases. $[officename] requires the Microsoft Data Access Components (MDAC) to use the ADO interface. Microsoft Windows 2000 and XP include these components by default. For earlier visions of Windows, you need to install MDAC separately. You can download MDAC from the Microsoft web site. + Data source URL Enter the data source URL. JDBC driver class @@ -80,10 +81,9 @@ PROVIDER=sqloledb;DATA SOURCE=turner;INITIAL CATALOG=First To access an ODBC driver as a provider: DSN=SQLSERVER + Browse -Click to open a file selection dialog. -Test Connection -Click to test the connection using the current settings. +Click to open a database selection dialog. A user name can have a maximum of 18 characters. A password must contain 3 to 18 characters. Database Wizard diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp index 4a6d93cd0a..8ebbf4ce99 100755 --- a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp +++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp @@ -62,7 +62,7 @@ UFI: Database Wizard JDBC page -DEDR: reviewed +DEDR: reviewed @@ -94,6 +94,7 @@ database_name is the name of the Oracle database. Ask your database administrator for the correct name. + MySQL database The mm.mysql-2.0.4-bin.jar driver archive for the MySQL database is available on the following web site: http://mmmysql.sourceforge.net/oldDist.html @@ -101,7 +102,7 @@ mysql://hostname:port/database_name -hostname is the name of the machine that runs the MySQL database. You can also replace hostname with the IP address of the server. +hostname is the name of the machine that runs the MySQL database. You can also replace hostname with the IP address of the server. port is the default port for MySQL databases, namely 3306. @@ -110,12 +111,17 @@ database_name is the name of the database. + + Data source URL 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. + + JDBC Driver Class Enter the name of the JDBC driver. -Test ConnectionUFI: may be Test Class - both strings are in spec + +Test ClassUFI: may be Test Connection - both strings are in spec Tests the connection with the current settings. Authentication Database Wizard diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp index 84946590dd..3dc9bb63bc 100755 --- a/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp +++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp @@ -37,8 +37,8 @@ * License at http://www.openoffice.org/license.html. * * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. * See the License for the specific provisions governing your rights and * obligations concerning the Software. @@ -62,22 +62,26 @@ UFI: Database Wizard LDAP page -YJ: checked +YJ: checked LDAP Connection Specifies the settings for importing a database using LDAP (Lightweight Directory Access Protocol). This page is only available if you registered an LDAP server as an address database.UFI: copied text from shared\explorer\database\11190000 -Host name + +Server URL Enter the name of the LDAP server using the format "ldap.server.com". + Base DN Enter the starting point to search the LDAP database, for example, "dc=com". + Port number Enter the port of the LDAP server, normally 389. -Use secure connection (SSL)UFI: deleted Help-ID because it seems to be re-used on another object + +Use secure connection (SSL) Creates a secure connection to the LDAP server through the Secure Sockets Layer (SSL). By default, an SSL connection uses port 636. A regular connection uses port 389. Authentication Database Wizard